From 667963135ca83556f4d6300aabe5ec92d30c3390 Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <gattringera@a772-cvl-ws23.biodiv.univie.ac.at>
Date: Wed, 21 Jun 2023 21:39:23 +0200
Subject: [PATCH] butterflies: corresponding output changes
---
src/modules/butterflies/butterflies_filenames.c | 9 +++++++++
src/modules/butterflies/butterflies_filenames.h | 1 +
src/modules/butterflies/butterflies_main.c | 3 +++
3 files changed, 13 insertions(+)
diff --git a/src/modules/butterflies/butterflies_filenames.c b/src/modules/butterflies/butterflies_filenames.c
index 6f71a7f..1b37a64 100644
--- a/src/modules/butterflies/butterflies_filenames.c
+++ b/src/modules/butterflies/butterflies_filenames.c
@@ -10,6 +10,15 @@
#include "butterflies_filenames.h"
#include "module.h"
+void bf_add_directories(struct cats_configuration *conf)
+{
+ add_module_output_directory(conf, "butterfly-adults");
+ if (conf->output.write_all) {
+ add_module_output_directory(conf,"butterfly-eggs");
+ add_module_output_directory(conf,"butterfly-overlay");
+ }
+
+}
char *bf_population_filename(struct cats_configuration *conf, struct cats_grid *grid)
{
diff --git a/src/modules/butterflies/butterflies_filenames.h b/src/modules/butterflies/butterflies_filenames.h
index 79c42e5..05ae286 100644
--- a/src/modules/butterflies/butterflies_filenames.h
+++ b/src/modules/butterflies/butterflies_filenames.h
@@ -6,4 +6,5 @@ char *bf_population_eggs_filename(struct cats_configuration *conf, struct cats_g
char *bf_population_filename(struct cats_configuration *conf, struct cats_grid *grid);
char *bf_stats_filename(struct cats_configuration *conf, struct cats_grid *grid);
char *bf_population_overlay_filename(struct cats_configuration *conf, struct cats_grid *grid);
+void bf_add_directories(struct cats_configuration *conf);
#endif //CATS_BUTTERFLIES_FILENAMES_H
diff --git a/src/modules/butterflies/butterflies_main.c b/src/modules/butterflies/butterflies_main.c
index 5573e4b..e9650a4 100644
--- a/src/modules/butterflies/butterflies_main.c
+++ b/src/modules/butterflies/butterflies_main.c
@@ -11,6 +11,7 @@
#include "paths/output_paths.h"
#include "paths/directory_helper.h"
#include "butterflies_populations.h"
+#include "butterflies_filenames.h"
struct cats_global global;
struct cats_debug_options cats_debug;
@@ -192,4 +193,6 @@ void cats_module_init(struct cats_configuration *conf)
for (enum butterfly_stats which = BF_STAT_MIN; which < BF_STAT_MAX; which++) {
data->stat_ids[which] = add_custom_stat(&conf->stats_registry, bf_get_stats_field_name(which));
}
+
+ bf_add_directories(conf);
}
--
GitLab