dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hot fix

Browse Source
This commit is contained in:
Benoît Sierro
2021-06-21 16:42:40 +02:00
parent e11c67e354
commit 28e890ee43
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scgenerator/initialize.py
View File

@@ -526,7 +526,7 @@ def validate_config_sequence(*configs: os.PathLike) -> Tuple[Config, int]:
previous = Config.from_bare(override_config(dico, previous)) previous = Config.from_bare(override_config(dico, previous))
variables |= {(k, tuple(v)) for k, v in previous.variable.items()} variables |= {(k, tuple(v)) for k, v in previous.variable.items()}
variables.add(("repeat", range(previous.repeat))) variables.add(("repeat", range(previous.repeat)))
return previous, int(np.product([len(v) for k, v in variables if len(v) > 0])) return previous, int(np.product([len(v) for _, v in variables if len(v) > 0]))
def wspace(t, t_num=0): def wspace(t, t_num=0):

2
src/scgenerator/utils/__init__.py
View File

@@ -196,7 +196,7 @@ def format_variable_list(l: List[Tuple[str, Any]]):
def branch_id(branch: Tuple[Path, ...]) -> str: def branch_id(branch: Tuple[Path, ...]) -> str:
return "".join("".join(re.sub(r"id\d\S*num\d", "", b.name).split()[2:-2]) for b in branch) return "".join("".join(re.sub(r"id\d+\S*num\d+", "", b.name).split()[2:-2]) for b in branch)
def format_value(value) -> str: def format_value(value) -> str: