From 1a681d8df84c5d16da12d38f8cbb4ba7e72fa00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Wed, 21 Jul 2021 11:41:06 +0200 Subject: [PATCH] changed how cont seq finds prev data dir --- src/scgenerator/initialize.py | 14 +++++--------- src/scgenerator/utils/parameter.py | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/scgenerator/initialize.py b/src/scgenerator/initialize.py index 0b455c1..8924af1 100644 --- a/src/scgenerator/initialize.py +++ b/src/scgenerator/initialize.py @@ -366,11 +366,6 @@ class ContinuationParamSequence(ParamSequence): self.prev_sim_dir = Path(prev_sim_dir) init_config = io.load_config(self.prev_sim_dir / "initial_config.toml") - self.prev_variable_lists = [ - (set(variable_list[1:]), self.prev_sim_dir / utils.format_variable_list(variable_list)) - for variable_list, _ in required_simulations(init_config) - ] - new_variable_keys = set(new_config_dict.get("variable", {}).keys()) new_config = utils.override_config(new_config_dict, init_config) super().__init__(new_config) @@ -412,14 +407,15 @@ class ContinuationParamSequence(ParamSequence): ValueError no data folder found """ - new_set = set(new_variable_list[1:]) + new_target = set(utils.format_variable_list(new_variable_list).split()[2:]) path_dic = defaultdict(list) max_in_common = 0 - for stored_set, path in self.prev_variable_lists: - in_common = stored_set & new_set + for data_dir in self.prev_sim_dir.glob("id*"): + candidate = set(data_dir.name.split()[2:]) + in_common = candidate & new_target num_in_common = len(in_common) max_in_common = max(num_in_common, max_in_common) - path_dic[num_in_common].append(path) + path_dic[num_in_common].append(data_dir) return path_dic[max_in_common] diff --git a/src/scgenerator/utils/parameter.py b/src/scgenerator/utils/parameter.py index 8ee504c..e0b8c62 100644 --- a/src/scgenerator/utils/parameter.py +++ b/src/scgenerator/utils/parameter.py @@ -315,7 +315,7 @@ class BareParams: # root name: str = Parameter(string) prev_data_dir: str = Parameter(string) - previous_config_file:str = Parameter(string) + previous_config_file: str = Parameter(string) # # fiber input_transmission: float = Parameter(in_range_incl(0, 1))