From 019ca409a3c1bb97e2743e87b329b0953afdadbf Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Tue, 11 Feb 2020 15:42:16 +0100
Subject: [PATCH] add hourly flag to experiment path
---
.gitignore | 2 +-
src/helpers.py | 4 +++-
src/run_modules/experiment_setup.py | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index cec17a77..ff59ade5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,4 +58,4 @@ htmlcov/
/test/test_modules/data/
report.html
/TestExperiment/
-/testrun_network/
+/testrun_network*/
diff --git a/src/helpers.py b/src/helpers.py
index 4312eac2..c3368450 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -132,12 +132,14 @@ def prepare_host(create_new=True, sampling="daily"):
return path
-def set_experiment_name(experiment_date=None, experiment_path=None):
+def set_experiment_name(experiment_date=None, experiment_path=None, sampling=None):
if experiment_date is None:
experiment_name = "TestExperiment"
else:
experiment_name = f"{experiment_date}_network"
+ if sampling == "hourly":
+ experiment_name += f"_{sampling}"
if experiment_path is None:
experiment_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", experiment_name))
else:
diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index c995367f..44f1a382 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -44,7 +44,8 @@ class ExperimentSetup(RunEnvironment):
# set experiment name
exp_date = self._get_parser_args(parser_args).get("experiment_date")
- exp_name, exp_path = helpers.set_experiment_name(experiment_date=exp_date, experiment_path=experiment_path)
+ exp_name, exp_path = helpers.set_experiment_name(experiment_date=exp_date, experiment_path=experiment_path,
+ sampling=sampling)
self._set_param("experiment_name", exp_name)
self._set_param("experiment_path", exp_path)
helpers.check_path_and_create(self.data_store.get("experiment_path", "general"))
--
GitLab