From 991b6b81b02cd3d78f81609241c00c1594e8a726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Mon, 21 Jun 2021 15:21:48 +0200 Subject: [PATCH] miscount --- src/scgenerator/cli/cli.py | 2 +- src/scgenerator/initialize.py | 6 ++++-- src/scgenerator/scripts/__init__.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/scgenerator/cli/cli.py b/src/scgenerator/cli/cli.py index 134138f..90c1c20 100644 --- a/src/scgenerator/cli/cli.py +++ b/src/scgenerator/cli/cli.py @@ -216,7 +216,7 @@ def plot_init(args): def plot_dispersion(args): if args.limits is None: - lims = [None, None] + lims = None else: lims = 1e-9 * np.array(args.limits, dtype=float) scripts.plot_dispersion(args.config, lims) diff --git a/src/scgenerator/initialize.py b/src/scgenerator/initialize.py index 2ee47b9..bfe4d6d 100644 --- a/src/scgenerator/initialize.py +++ b/src/scgenerator/initialize.py @@ -14,7 +14,7 @@ from .errors import * from .logger import get_logger from .math import power_fact from .physics import fiber, pulse, units -from .utils import count_variations, override_config, required_simulations +from .utils import count_variations, override_config, pretty_format_value, required_simulations from .utils.parameter import BareConfig, BareParams, hc_model_specific_parameters @@ -519,13 +519,15 @@ def validate_config_sequence(*configs: os.PathLike) -> Tuple[Config, int]: """ previous = None variables = set() + num = 1 for config in configs: if (p := Path(config)).is_dir(): config = p / "initial_config.toml" dico = io.load_toml(config) previous = Config.from_bare(override_config(dico, previous)) + num *= previous.repeat variables |= {(k, tuple(v)) for k, v in previous.variable.items()} - return previous, np.product([len(v) for k, v in variables]) + return previous, num * int(np.product([len(v) for k, v in variables if len(v) > 0])) def wspace(t, t_num=0): diff --git a/src/scgenerator/scripts/__init__.py b/src/scgenerator/scripts/__init__.py index 34d3c9a..d37775e 100644 --- a/src/scgenerator/scripts/__init__.py +++ b/src/scgenerator/scripts/__init__.py @@ -43,7 +43,7 @@ def plot_init_field_spec( else: continue - plot_1_init_spec_field(lim_t, lim_l, left, right, style, lbl, params) + lbl = plot_1_init_spec_field(lim_t, lim_l, left, right, style, lbl, params) all_labels.append(lbl) finish_plot(fig, left, right, all_labels, params) @@ -60,7 +60,7 @@ def plot_dispersion(config_path: Path, lim: tuple[float, float] = None): else: continue - plot_1_dispersion(lim, left, right, style, lbl, params) + lbl = plot_1_dispersion(lim, left, right, style, lbl, params) all_labels.append(lbl) finish_plot(fig, left, right, all_labels, params)