From 3d247fcf36fcba481f2d172633bb5cbcac7c28dd Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <gattringera@a772-cvl-ws23.biodiv.univie.ac.at>
Date: Wed, 28 Jun 2023 14:29:52 +0200
Subject: [PATCH] butterflies: even more info
---
src/modules/butterflies/butterflies_actions.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/modules/butterflies/butterflies_actions.c b/src/modules/butterflies/butterflies_actions.c
index 049740a..a6013fc 100644
--- a/src/modules/butterflies/butterflies_actions.c
+++ b/src/modules/butterflies/butterflies_actions.c
@@ -49,6 +49,7 @@ enum action_status bf_action_stats_reset(struct cats_grid *grid, struct cats_con
// that survive and become adult has to be the reproduction rate divided by the female fraction divided by the number of eggs
cats_dt_rates eggs_to_adults_rate = bf_egg_to_adult_survival_rate(reproduction_rate, local_eggs, female_fraction);
cats_dt_rates result = local_eggs * eggs_to_adults_rate * female_fraction;
+ cats_dt_rates generations = calculate_rate_for_matrix(&module_conf->butterfly_generations, &l_param, print_rate);
log_message(LOG_INFO, "SUMMARY: reproduction rate at OT: %Lf", reproduction_rate);
@@ -56,8 +57,9 @@ enum action_status bf_action_stats_reset(struct cats_grid *grid, struct cats_con
log_message(LOG_INFO, "SUMMARY: local eggs at OT: %Lf", local_eggs);
log_message(LOG_INFO, "SUMMARY: stationary females at OT: %Lf", stationary);
log_message(LOG_INFO, "SUMMARY: eggs to adult rate at OT: %Lf", eggs_to_adults_rate);
- log_message(LOG_INFO, "SUMMARY: egg fraction source at OT: %Lf", egg_fraction_source);
+ log_message(LOG_INFO, "SUMMARY: egg fraction source (non-stationary females) at OT: %Lf", egg_fraction_source);
log_message(LOG_INFO, "SUMMARY: carrying capacity at OT: %Lf", K);
+ log_message(LOG_INFO, "SUMMARY: generations at OT: %Lf", generations);
log_message(LOG_INFO, "SUMMARY: effective female to female rate at OT: %Lf\n", result);
l_param.suitability = 1.0;
@@ -67,15 +69,17 @@ enum action_status bf_action_stats_reset(struct cats_grid *grid, struct cats_con
local_eggs = (stationary + mobile * egg_fraction_source ) * eggs_per_female;
eggs_to_adults_rate = bf_egg_to_adult_survival_rate(reproduction_rate, local_eggs, female_fraction);
result = local_eggs * eggs_to_adults_rate * female_fraction;
-
+ generations = calculate_rate_for_matrix(&module_conf->butterfly_generations, &l_param, print_rate);
+
log_message(LOG_INFO, "SUMMARY: reproduction rate at suitability 1: %Lf", reproduction_rate);
log_message(LOG_INFO, "SUMMARY: eggs per female at suitability 1: %Lf", eggs_per_female);
log_message(LOG_INFO, "SUMMARY: local eggs at suitability 1: %Lf", local_eggs);
log_message(LOG_INFO, "SUMMARY: stationary females at suitability 1: %Lf", stationary);
log_message(LOG_INFO, "SUMMARY: eggs to adult rate at suitability 1: %Lf", eggs_to_adults_rate);
- log_message(LOG_INFO, "SUMMARY: egg fraction source at suitability 1: %Lf", egg_fraction_source);
+ log_message(LOG_INFO, "SUMMARY: egg fraction source (non-stationary females) at suitability 1: %Lf", egg_fraction_source);
log_message(LOG_INFO, "SUMMARY: carrying capacity at suitability 1: %Lf", K);
log_message(LOG_INFO, "SUMMARY: effective female to female rate at suitability 1: %Lf\n", result);
+ log_message(LOG_INFO, "SUMMARY: generations at suitability 2: %Lf", generations);
}
--
GitLab