diff --git a/.gitignore b/.gitignore index cec17a77983bc017ef057b020600d15922e61f23..ff59ade5d38dac9c3cf2fecee6a676ee728a2162 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 4312eac2134a6a7f73d90f8e429203a791bfba83..c33684508b7b36cbebc3cbf3ac826d1779f9df50 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 c995367f06014ab3393317c48cb6ec2229ee21df..44f1a3821dfacba146a0aabe8fb0254068d9e6d3 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"))