diff --git a/smash/core/signal_analysis/evaluation/_standardize.py b/smash/core/signal_analysis/evaluation/_standardize.py index 93337267..bd839b09 100644 --- a/smash/core/signal_analysis/evaluation/_standardize.py +++ b/smash/core/signal_analysis/evaluation/_standardize.py @@ -8,8 +8,7 @@ if TYPE_CHECKING: from smash.fcore._mwd_setup import SetupDT - from smash.util._typing import AnyTuple - from smash.util._typing import ListLike + from smash.util._typing import AnyTuple, ListLike def _standardize_evaluation_metric(metric: str | ListLike[str]) -> list: @@ -20,17 +19,19 @@ def _standardize_evaluation_metric(metric: str | ListLike[str]) -> list: metric = [metric.lower()] elif isinstance(metric, list): - for mtc in metric: + for i, mtc in enumerate(metric): if isinstance(mtc, str): if mtc.lower() not in METRICS: - raise ValueError(f"Unknown evaluation metric {mtc}. Choices: {METRICS}") + raise ValueError( + f"Unknown evaluation metric {mtc} at index {i} in metric. Choices: {METRICS}" + ) else: - raise TypeError(f"metric '{mtc}' must be str or a list of str") + raise TypeError("List of evaluation metrics must contain only str") metric = [c.lower() for c in metric] else: - raise TypeError("metric must be str or a list of str") + raise TypeError("Evaluation metric must be str or a list of str") return metric @@ -40,13 +41,7 @@ def _standardize_evaluation_start_end_eval(eval: str | pd.Timestamp | None, kind et = pd.Timestamp(setup.end_time) if eval is None: - if kind == "start": - eval = pd.Timestamp(st) - elif kind == "end": - eval = pd.Timestamp(et) - # % Should be unreachable - else: - pass + eval = pd.Timestamp(getattr(setup, f"{kind}_time")) else: if isinstance(eval, str): @@ -60,7 +55,7 @@ def _standardize_evaluation_start_end_eval(eval: str | pd.Timestamp | None, kind pass else: - raise TypeError("{kind}_eval argument must be str or pandas.Timestamp object") + raise TypeError(f"{kind}_eval argument must be str or pandas.Timestamp object") if (eval - st).total_seconds() < 0 or (et - eval).total_seconds() < 0: raise ValueError( diff --git a/smash/core/signal_analysis/evaluation/evaluation.py b/smash/core/signal_analysis/evaluation/evaluation.py index 5b44a83b..71b6edf6 100644 --- a/smash/core/signal_analysis/evaluation/evaluation.py +++ b/smash/core/signal_analysis/evaluation/evaluation.py @@ -8,11 +8,10 @@ from smash.core.signal_analysis.evaluation._standardize import _standardize_evaluation_args if TYPE_CHECKING: - from smash.util._typing import ListLike - from pandas import Timestamp from smash.core.model.model import Model + from smash.util._typing import ListLike __all__ = ["evaluation"] diff --git a/smash/tests/baseline.hdf5 b/smash/tests/baseline.hdf5 index 6748cc58..f59b3c50 100644 Binary files a/smash/tests/baseline.hdf5 and b/smash/tests/baseline.hdf5 differ diff --git a/smash/tests/core/signal_analysis/test_evaluation.py b/smash/tests/core/signal_analysis/test_evaluation.py index 0d6c6a08..27936900 100644 --- a/smash/tests/core/signal_analysis/test_evaluation.py +++ b/smash/tests/core/signal_analysis/test_evaluation.py @@ -17,7 +17,7 @@ def generic_evaluation(model: smash.Model, qs: np.ndarray, **kwargs) -> dict: metrics = smash.evaluation(instance, metric=METRICS) for i, m in enumerate(METRICS): - res[f"metrics.{m}"] = metrics[:, i] + res[f"evaluation.{m}"] = metrics[:, i] return res diff --git a/smash/tests/diff_baseline.csv b/smash/tests/diff_baseline.csv index 963654e7..f42ded9c 100644 --- a/smash/tests/diff_baseline.csv +++ b/smash/tests/diff_baseline.csv @@ -1,8 +1,8 @@ -commit 307eb806a3ba38a0b22e3318a42de96a94793400 -Author: Francois Colleoni -Date: Thu Mar 28 16:26:18 2024 +0100 +commit 56a706681ccdb579bad89a05912b24adb8e47516 +Author: ngo-nghi-truyen.huynh +Date: Thu Jun 20 23:01:58 2024 +0200 - FIX PR: Change test multiset estimate setup + MAINT: smash.metrics is deprecated and replaced by smash.evaluation TEST NAME |STATUS bbox_mesh.active_cell |NON MODIFIED @@ -23,63 +23,71 @@ bbox_mesh.xmin |NON MODIFIED bbox_mesh.xres |NON MODIFIED bbox_mesh.ymax |NON MODIFIED bbox_mesh.yres |NON MODIFIED -custom_bayesian_optimize.zero-gr4-lr.custom_set_1.sim_q |MODIFIED -custom_bayesian_optimize.zero-gr4-lr.custom_set_2.sim_q |MODIFIED -custom_bayesian_optimize.zero-gr4-lr.custom_set_3.sim_q |MODIFIED -custom_bayesian_optimize.zero-gr4-lr.custom_set_4.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_1.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_2.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_3.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_4.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_5.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_6.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_7.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_8.sim_q |MODIFIED -custom_optimize.zero-gr4-lr.custom_set_9.sim_q |MODIFIED -forward_run.zero-gr4-kw.cost |MODIFIED -forward_run.zero-gr4-kw.jobs |MODIFIED -forward_run.zero-gr4-kw.q_domain |MODIFIED +custom_bayesian_optimize.zero-gr4-lr.custom_set_1.sim_q |NON MODIFIED +custom_bayesian_optimize.zero-gr4-lr.custom_set_2.sim_q |NON MODIFIED +custom_bayesian_optimize.zero-gr4-lr.custom_set_3.sim_q |NON MODIFIED +custom_bayesian_optimize.zero-gr4-lr.custom_set_4.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_1.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_2.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_3.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_4.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_5.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_6.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_7.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_8.sim_q |NON MODIFIED +custom_optimize.zero-gr4-lr.custom_set_9.sim_q |NON MODIFIED +evaluation.kge |ADDED +evaluation.lgrm |ADDED +evaluation.mae |ADDED +evaluation.mape |ADDED +evaluation.mse |ADDED +evaluation.nnse |ADDED +evaluation.nse |ADDED +evaluation.rmse |ADDED +forward_run.zero-gr4-kw.cost |NON MODIFIED +forward_run.zero-gr4-kw.jobs |NON MODIFIED +forward_run.zero-gr4-kw.q_domain |NON MODIFIED forward_run.zero-gr4-kw.rr_states.hi |NON MODIFIED -forward_run.zero-gr4-kw.rr_states.hp |MODIFIED -forward_run.zero-gr4-kw.rr_states.ht |MODIFIED -forward_run.zero-gr4-kw.sim_q |MODIFIED -forward_run.zero-gr4-lag0.cost |MODIFIED -forward_run.zero-gr4-lag0.jobs |MODIFIED -forward_run.zero-gr4-lag0.q_domain |MODIFIED +forward_run.zero-gr4-kw.rr_states.hp |NON MODIFIED +forward_run.zero-gr4-kw.rr_states.ht |NON MODIFIED +forward_run.zero-gr4-kw.sim_q |NON MODIFIED +forward_run.zero-gr4-lag0.cost |NON MODIFIED +forward_run.zero-gr4-lag0.jobs |NON MODIFIED +forward_run.zero-gr4-lag0.q_domain |NON MODIFIED forward_run.zero-gr4-lag0.rr_states.hi |NON MODIFIED -forward_run.zero-gr4-lag0.rr_states.hp |MODIFIED -forward_run.zero-gr4-lag0.rr_states.ht |MODIFIED -forward_run.zero-gr4-lag0.sim_q |MODIFIED -forward_run.zero-gr4-lr.cost |MODIFIED -forward_run.zero-gr4-lr.jobs |MODIFIED -forward_run.zero-gr4-lr.q_domain |MODIFIED +forward_run.zero-gr4-lag0.rr_states.hp |NON MODIFIED +forward_run.zero-gr4-lag0.rr_states.ht |NON MODIFIED +forward_run.zero-gr4-lag0.sim_q |NON MODIFIED +forward_run.zero-gr4-lr.cost |NON MODIFIED +forward_run.zero-gr4-lr.jobs |NON MODIFIED +forward_run.zero-gr4-lr.q_domain |NON MODIFIED forward_run.zero-gr4-lr.rr_states.hi |NON MODIFIED forward_run.zero-gr4-lr.rr_states.hlr |NON MODIFIED -forward_run.zero-gr4-lr.rr_states.hp |MODIFIED -forward_run.zero-gr4-lr.rr_states.ht |MODIFIED -forward_run.zero-gr4-lr.sim_q |MODIFIED -forward_run.zero-gr5-kw.cost |MODIFIED -forward_run.zero-gr5-kw.jobs |MODIFIED -forward_run.zero-gr5-kw.q_domain |MODIFIED +forward_run.zero-gr4-lr.rr_states.hp |NON MODIFIED +forward_run.zero-gr4-lr.rr_states.ht |NON MODIFIED +forward_run.zero-gr4-lr.sim_q |NON MODIFIED +forward_run.zero-gr5-kw.cost |NON MODIFIED +forward_run.zero-gr5-kw.jobs |NON MODIFIED +forward_run.zero-gr5-kw.q_domain |NON MODIFIED forward_run.zero-gr5-kw.rr_states.hi |NON MODIFIED -forward_run.zero-gr5-kw.rr_states.hp |MODIFIED -forward_run.zero-gr5-kw.rr_states.ht |MODIFIED -forward_run.zero-gr5-kw.sim_q |MODIFIED -forward_run.zero-gr5-lag0.cost |MODIFIED -forward_run.zero-gr5-lag0.jobs |MODIFIED -forward_run.zero-gr5-lag0.q_domain |MODIFIED +forward_run.zero-gr5-kw.rr_states.hp |NON MODIFIED +forward_run.zero-gr5-kw.rr_states.ht |NON MODIFIED +forward_run.zero-gr5-kw.sim_q |NON MODIFIED +forward_run.zero-gr5-lag0.cost |NON MODIFIED +forward_run.zero-gr5-lag0.jobs |NON MODIFIED +forward_run.zero-gr5-lag0.q_domain |NON MODIFIED forward_run.zero-gr5-lag0.rr_states.hi |NON MODIFIED -forward_run.zero-gr5-lag0.rr_states.hp |MODIFIED -forward_run.zero-gr5-lag0.rr_states.ht |MODIFIED -forward_run.zero-gr5-lag0.sim_q |MODIFIED -forward_run.zero-gr5-lr.cost |MODIFIED -forward_run.zero-gr5-lr.jobs |MODIFIED -forward_run.zero-gr5-lr.q_domain |MODIFIED +forward_run.zero-gr5-lag0.rr_states.hp |NON MODIFIED +forward_run.zero-gr5-lag0.rr_states.ht |NON MODIFIED +forward_run.zero-gr5-lag0.sim_q |NON MODIFIED +forward_run.zero-gr5-lr.cost |NON MODIFIED +forward_run.zero-gr5-lr.jobs |NON MODIFIED +forward_run.zero-gr5-lr.q_domain |NON MODIFIED forward_run.zero-gr5-lr.rr_states.hi |NON MODIFIED forward_run.zero-gr5-lr.rr_states.hlr |NON MODIFIED -forward_run.zero-gr5-lr.rr_states.hp |MODIFIED -forward_run.zero-gr5-lr.rr_states.ht |MODIFIED -forward_run.zero-gr5-lr.sim_q |MODIFIED +forward_run.zero-gr5-lr.rr_states.hp |NON MODIFIED +forward_run.zero-gr5-lr.rr_states.ht |NON MODIFIED +forward_run.zero-gr5-lr.sim_q |NON MODIFIED forward_run.zero-grd-kw.cost |NON MODIFIED forward_run.zero-grd-kw.jobs |NON MODIFIED forward_run.zero-grd-kw.q_domain |NON MODIFIED @@ -99,25 +107,25 @@ forward_run.zero-grd-lr.rr_states.hlr |NON MODIFIED forward_run.zero-grd-lr.rr_states.hp |NON MODIFIED forward_run.zero-grd-lr.rr_states.ht |NON MODIFIED forward_run.zero-grd-lr.sim_q |NON MODIFIED -forward_run.zero-loieau-kw.cost |MODIFIED -forward_run.zero-loieau-kw.jobs |MODIFIED -forward_run.zero-loieau-kw.q_domain |MODIFIED -forward_run.zero-loieau-kw.rr_states.ha |MODIFIED -forward_run.zero-loieau-kw.rr_states.hc |MODIFIED -forward_run.zero-loieau-kw.sim_q |MODIFIED -forward_run.zero-loieau-lag0.cost |MODIFIED -forward_run.zero-loieau-lag0.jobs |MODIFIED -forward_run.zero-loieau-lag0.q_domain |MODIFIED -forward_run.zero-loieau-lag0.rr_states.ha |MODIFIED -forward_run.zero-loieau-lag0.rr_states.hc |MODIFIED -forward_run.zero-loieau-lag0.sim_q |MODIFIED -forward_run.zero-loieau-lr.cost |MODIFIED -forward_run.zero-loieau-lr.jobs |MODIFIED -forward_run.zero-loieau-lr.q_domain |MODIFIED -forward_run.zero-loieau-lr.rr_states.ha |MODIFIED -forward_run.zero-loieau-lr.rr_states.hc |MODIFIED +forward_run.zero-loieau-kw.cost |NON MODIFIED +forward_run.zero-loieau-kw.jobs |NON MODIFIED +forward_run.zero-loieau-kw.q_domain |NON MODIFIED +forward_run.zero-loieau-kw.rr_states.ha |NON MODIFIED +forward_run.zero-loieau-kw.rr_states.hc |NON MODIFIED +forward_run.zero-loieau-kw.sim_q |NON MODIFIED +forward_run.zero-loieau-lag0.cost |NON MODIFIED +forward_run.zero-loieau-lag0.jobs |NON MODIFIED +forward_run.zero-loieau-lag0.q_domain |NON MODIFIED +forward_run.zero-loieau-lag0.rr_states.ha |NON MODIFIED +forward_run.zero-loieau-lag0.rr_states.hc |NON MODIFIED +forward_run.zero-loieau-lag0.sim_q |NON MODIFIED +forward_run.zero-loieau-lr.cost |NON MODIFIED +forward_run.zero-loieau-lr.jobs |NON MODIFIED +forward_run.zero-loieau-lr.q_domain |NON MODIFIED +forward_run.zero-loieau-lr.rr_states.ha |NON MODIFIED +forward_run.zero-loieau-lr.rr_states.hc |NON MODIFIED forward_run.zero-loieau-lr.rr_states.hlr |NON MODIFIED -forward_run.zero-loieau-lr.sim_q |MODIFIED +forward_run.zero-loieau-lr.sim_q |NON MODIFIED forward_run.zero-vic3l-kw.cost |NON MODIFIED forward_run.zero-vic3l-kw.jobs |NON MODIFIED forward_run.zero-vic3l-kw.q_domain |NON MODIFIED @@ -170,14 +178,14 @@ mesh_io.xmin |NON MODIFIED mesh_io.xres |NON MODIFIED mesh_io.ymax |NON MODIFIED mesh_io.yres |NON MODIFIED -metrics.kge |NON MODIFIED -metrics.lgrm |NON MODIFIED -metrics.mae |NON MODIFIED -metrics.mape |NON MODIFIED -metrics.mse |NON MODIFIED -metrics.nnse |NON MODIFIED -metrics.nse |NON MODIFIED -metrics.rmse |NON MODIFIED +metrics.kge |DELETED +metrics.lgrm |DELETED +metrics.mae |DELETED +metrics.mape |DELETED +metrics.mse |DELETED +metrics.nnse |DELETED +metrics.nse |DELETED +metrics.rmse |DELETED model_ddt_io.mesh.active_cell |NON MODIFIED model_ddt_io.mesh.area |NON MODIFIED model_ddt_io.mesh.code |NON MODIFIED @@ -224,16 +232,16 @@ model_io.setup.end_time |NON MODIFIED model_io.setup.start_time |NON MODIFIED model_io.setup.structure |NON MODIFIED multiset_estimate.mfwr.lcurve_multiset.alpha |NON MODIFIED -multiset_estimate.mfwr.lcurve_multiset.alpha_opt |MODIFIED -multiset_estimate.mfwr.lcurve_multiset.cost |MODIFIED -multiset_estimate.mfwr.lcurve_multiset.mahal_dist |MODIFIED -multiset_estimate.mfwr.sim_q |MODIFIED -multiset_estimate.mopt_ml.sim_q |MODIFIED +multiset_estimate.mfwr.lcurve_multiset.alpha_opt |NON MODIFIED +multiset_estimate.mfwr.lcurve_multiset.cost |NON MODIFIED +multiset_estimate.mfwr.lcurve_multiset.mahal_dist |NON MODIFIED +multiset_estimate.mfwr.sim_q |NON MODIFIED +multiset_estimate.mopt_ml.sim_q |NON MODIFIED multiset_estimate.mopt_unf.lcurve_multiset.alpha |NON MODIFIED -multiset_estimate.mopt_unf.lcurve_multiset.alpha_opt |MODIFIED -multiset_estimate.mopt_unf.lcurve_multiset.cost |MODIFIED -multiset_estimate.mopt_unf.lcurve_multiset.mahal_dist |MODIFIED -multiset_estimate.mopt_unf.sim_q |MODIFIED +multiset_estimate.mopt_unf.lcurve_multiset.alpha_opt |NON MODIFIED +multiset_estimate.mopt_unf.lcurve_multiset.cost |NON MODIFIED +multiset_estimate.mopt_unf.lcurve_multiset.mahal_dist |NON MODIFIED +multiset_estimate.mopt_unf.sim_q |NON MODIFIED net_init.bias_layer_1 |NON MODIFIED net_init.bias_layer_2 |NON MODIFIED net_init.bias_layer_3 |NON MODIFIED @@ -243,84 +251,84 @@ net_init.weight_layer_1 |NON MODIFIED net_init.weight_layer_2 |NON MODIFIED net_init.weight_layer_3 |NON MODIFIED net_init.weight_layer_4 |NON MODIFIED -optimize.zero-gr4-kw.ann.sim_q |MODIFIED -optimize.zero-gr4-kw.distributed.control_vector |MODIFIED -optimize.zero-gr4-kw.distributed.iter_cost |MODIFIED -optimize.zero-gr4-kw.distributed.sim_q |MODIFIED -optimize.zero-gr4-kw.multi-linear.control_vector |MODIFIED -optimize.zero-gr4-kw.multi-linear.iter_cost |MODIFIED -optimize.zero-gr4-kw.multi-linear.sim_q |MODIFIED -optimize.zero-gr4-kw.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr4-kw.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr4-kw.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr4-kw.uniform.control_vector |MODIFIED -optimize.zero-gr4-kw.uniform.iter_cost |MODIFIED -optimize.zero-gr4-kw.uniform.sim_q |MODIFIED -optimize.zero-gr4-lag0.ann.sim_q |MODIFIED -optimize.zero-gr4-lag0.distributed.control_vector |MODIFIED -optimize.zero-gr4-lag0.distributed.iter_cost |MODIFIED -optimize.zero-gr4-lag0.distributed.sim_q |MODIFIED -optimize.zero-gr4-lag0.multi-linear.control_vector |MODIFIED -optimize.zero-gr4-lag0.multi-linear.iter_cost |MODIFIED -optimize.zero-gr4-lag0.multi-linear.sim_q |MODIFIED -optimize.zero-gr4-lag0.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr4-lag0.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr4-lag0.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr4-lag0.uniform.control_vector |MODIFIED -optimize.zero-gr4-lag0.uniform.iter_cost |MODIFIED -optimize.zero-gr4-lag0.uniform.sim_q |MODIFIED -optimize.zero-gr4-lr.ann.sim_q |MODIFIED -optimize.zero-gr4-lr.distributed.control_vector |MODIFIED -optimize.zero-gr4-lr.distributed.iter_cost |MODIFIED -optimize.zero-gr4-lr.distributed.sim_q |MODIFIED -optimize.zero-gr4-lr.multi-linear.control_vector |MODIFIED -optimize.zero-gr4-lr.multi-linear.iter_cost |MODIFIED -optimize.zero-gr4-lr.multi-linear.sim_q |MODIFIED -optimize.zero-gr4-lr.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr4-lr.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr4-lr.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr4-lr.uniform.control_vector |MODIFIED -optimize.zero-gr4-lr.uniform.iter_cost |MODIFIED -optimize.zero-gr4-lr.uniform.sim_q |MODIFIED -optimize.zero-gr5-kw.ann.sim_q |MODIFIED -optimize.zero-gr5-kw.distributed.control_vector |MODIFIED -optimize.zero-gr5-kw.distributed.iter_cost |MODIFIED -optimize.zero-gr5-kw.distributed.sim_q |MODIFIED -optimize.zero-gr5-kw.multi-linear.control_vector |MODIFIED -optimize.zero-gr5-kw.multi-linear.iter_cost |MODIFIED -optimize.zero-gr5-kw.multi-linear.sim_q |MODIFIED -optimize.zero-gr5-kw.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr5-kw.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr5-kw.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr5-kw.uniform.control_vector |MODIFIED -optimize.zero-gr5-kw.uniform.iter_cost |MODIFIED -optimize.zero-gr5-kw.uniform.sim_q |MODIFIED -optimize.zero-gr5-lag0.ann.sim_q |MODIFIED -optimize.zero-gr5-lag0.distributed.control_vector |MODIFIED -optimize.zero-gr5-lag0.distributed.iter_cost |MODIFIED -optimize.zero-gr5-lag0.distributed.sim_q |MODIFIED -optimize.zero-gr5-lag0.multi-linear.control_vector |MODIFIED -optimize.zero-gr5-lag0.multi-linear.iter_cost |MODIFIED -optimize.zero-gr5-lag0.multi-linear.sim_q |MODIFIED -optimize.zero-gr5-lag0.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr5-lag0.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr5-lag0.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr5-lag0.uniform.control_vector |MODIFIED -optimize.zero-gr5-lag0.uniform.iter_cost |MODIFIED -optimize.zero-gr5-lag0.uniform.sim_q |MODIFIED -optimize.zero-gr5-lr.ann.sim_q |MODIFIED -optimize.zero-gr5-lr.distributed.control_vector |MODIFIED -optimize.zero-gr5-lr.distributed.iter_cost |MODIFIED -optimize.zero-gr5-lr.distributed.sim_q |MODIFIED -optimize.zero-gr5-lr.multi-linear.control_vector |MODIFIED -optimize.zero-gr5-lr.multi-linear.iter_cost |MODIFIED -optimize.zero-gr5-lr.multi-linear.sim_q |MODIFIED -optimize.zero-gr5-lr.multi-polynomial.control_vector |MODIFIED -optimize.zero-gr5-lr.multi-polynomial.iter_cost |MODIFIED -optimize.zero-gr5-lr.multi-polynomial.sim_q |MODIFIED -optimize.zero-gr5-lr.uniform.control_vector |MODIFIED -optimize.zero-gr5-lr.uniform.iter_cost |MODIFIED -optimize.zero-gr5-lr.uniform.sim_q |MODIFIED +optimize.zero-gr4-kw.ann.sim_q |NON MODIFIED +optimize.zero-gr4-kw.distributed.control_vector |NON MODIFIED +optimize.zero-gr4-kw.distributed.iter_cost |NON MODIFIED +optimize.zero-gr4-kw.distributed.sim_q |NON MODIFIED +optimize.zero-gr4-kw.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr4-kw.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr4-kw.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr4-kw.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr4-kw.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr4-kw.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr4-kw.uniform.control_vector |NON MODIFIED +optimize.zero-gr4-kw.uniform.iter_cost |NON MODIFIED +optimize.zero-gr4-kw.uniform.sim_q |NON MODIFIED +optimize.zero-gr4-lag0.ann.sim_q |NON MODIFIED +optimize.zero-gr4-lag0.distributed.control_vector |NON MODIFIED +optimize.zero-gr4-lag0.distributed.iter_cost |NON MODIFIED +optimize.zero-gr4-lag0.distributed.sim_q |NON MODIFIED +optimize.zero-gr4-lag0.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr4-lag0.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr4-lag0.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr4-lag0.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr4-lag0.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr4-lag0.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr4-lag0.uniform.control_vector |NON MODIFIED +optimize.zero-gr4-lag0.uniform.iter_cost |NON MODIFIED +optimize.zero-gr4-lag0.uniform.sim_q |NON MODIFIED +optimize.zero-gr4-lr.ann.sim_q |NON MODIFIED +optimize.zero-gr4-lr.distributed.control_vector |NON MODIFIED +optimize.zero-gr4-lr.distributed.iter_cost |NON MODIFIED +optimize.zero-gr4-lr.distributed.sim_q |NON MODIFIED +optimize.zero-gr4-lr.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr4-lr.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr4-lr.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr4-lr.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr4-lr.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr4-lr.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr4-lr.uniform.control_vector |NON MODIFIED +optimize.zero-gr4-lr.uniform.iter_cost |NON MODIFIED +optimize.zero-gr4-lr.uniform.sim_q |NON MODIFIED +optimize.zero-gr5-kw.ann.sim_q |NON MODIFIED +optimize.zero-gr5-kw.distributed.control_vector |NON MODIFIED +optimize.zero-gr5-kw.distributed.iter_cost |NON MODIFIED +optimize.zero-gr5-kw.distributed.sim_q |NON MODIFIED +optimize.zero-gr5-kw.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr5-kw.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr5-kw.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr5-kw.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr5-kw.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr5-kw.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr5-kw.uniform.control_vector |NON MODIFIED +optimize.zero-gr5-kw.uniform.iter_cost |NON MODIFIED +optimize.zero-gr5-kw.uniform.sim_q |NON MODIFIED +optimize.zero-gr5-lag0.ann.sim_q |NON MODIFIED +optimize.zero-gr5-lag0.distributed.control_vector |NON MODIFIED +optimize.zero-gr5-lag0.distributed.iter_cost |NON MODIFIED +optimize.zero-gr5-lag0.distributed.sim_q |NON MODIFIED +optimize.zero-gr5-lag0.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr5-lag0.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr5-lag0.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr5-lag0.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr5-lag0.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr5-lag0.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr5-lag0.uniform.control_vector |NON MODIFIED +optimize.zero-gr5-lag0.uniform.iter_cost |NON MODIFIED +optimize.zero-gr5-lag0.uniform.sim_q |NON MODIFIED +optimize.zero-gr5-lr.ann.sim_q |NON MODIFIED +optimize.zero-gr5-lr.distributed.control_vector |NON MODIFIED +optimize.zero-gr5-lr.distributed.iter_cost |NON MODIFIED +optimize.zero-gr5-lr.distributed.sim_q |NON MODIFIED +optimize.zero-gr5-lr.multi-linear.control_vector |NON MODIFIED +optimize.zero-gr5-lr.multi-linear.iter_cost |NON MODIFIED +optimize.zero-gr5-lr.multi-linear.sim_q |NON MODIFIED +optimize.zero-gr5-lr.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-gr5-lr.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-gr5-lr.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-gr5-lr.uniform.control_vector |NON MODIFIED +optimize.zero-gr5-lr.uniform.iter_cost |NON MODIFIED +optimize.zero-gr5-lr.uniform.sim_q |NON MODIFIED optimize.zero-grd-kw.ann.sim_q |NON MODIFIED optimize.zero-grd-kw.distributed.control_vector |NON MODIFIED optimize.zero-grd-kw.distributed.iter_cost |NON MODIFIED @@ -360,45 +368,45 @@ optimize.zero-grd-lr.multi-polynomial.sim_q |NON MODIFIED optimize.zero-grd-lr.uniform.control_vector |NON MODIFIED optimize.zero-grd-lr.uniform.iter_cost |NON MODIFIED optimize.zero-grd-lr.uniform.sim_q |NON MODIFIED -optimize.zero-loieau-kw.ann.sim_q |MODIFIED -optimize.zero-loieau-kw.distributed.control_vector |MODIFIED -optimize.zero-loieau-kw.distributed.iter_cost |MODIFIED -optimize.zero-loieau-kw.distributed.sim_q |MODIFIED -optimize.zero-loieau-kw.multi-linear.control_vector |MODIFIED -optimize.zero-loieau-kw.multi-linear.iter_cost |MODIFIED -optimize.zero-loieau-kw.multi-linear.sim_q |MODIFIED -optimize.zero-loieau-kw.multi-polynomial.control_vector |MODIFIED -optimize.zero-loieau-kw.multi-polynomial.iter_cost |MODIFIED -optimize.zero-loieau-kw.multi-polynomial.sim_q |MODIFIED -optimize.zero-loieau-kw.uniform.control_vector |MODIFIED -optimize.zero-loieau-kw.uniform.iter_cost |MODIFIED -optimize.zero-loieau-kw.uniform.sim_q |MODIFIED -optimize.zero-loieau-lag0.ann.sim_q |MODIFIED -optimize.zero-loieau-lag0.distributed.control_vector |MODIFIED -optimize.zero-loieau-lag0.distributed.iter_cost |MODIFIED -optimize.zero-loieau-lag0.distributed.sim_q |MODIFIED -optimize.zero-loieau-lag0.multi-linear.control_vector |MODIFIED -optimize.zero-loieau-lag0.multi-linear.iter_cost |MODIFIED -optimize.zero-loieau-lag0.multi-linear.sim_q |MODIFIED -optimize.zero-loieau-lag0.multi-polynomial.control_vector |MODIFIED -optimize.zero-loieau-lag0.multi-polynomial.iter_cost |MODIFIED -optimize.zero-loieau-lag0.multi-polynomial.sim_q |MODIFIED -optimize.zero-loieau-lag0.uniform.control_vector |MODIFIED -optimize.zero-loieau-lag0.uniform.iter_cost |MODIFIED -optimize.zero-loieau-lag0.uniform.sim_q |MODIFIED -optimize.zero-loieau-lr.ann.sim_q |MODIFIED -optimize.zero-loieau-lr.distributed.control_vector |MODIFIED -optimize.zero-loieau-lr.distributed.iter_cost |MODIFIED -optimize.zero-loieau-lr.distributed.sim_q |MODIFIED -optimize.zero-loieau-lr.multi-linear.control_vector |MODIFIED -optimize.zero-loieau-lr.multi-linear.iter_cost |MODIFIED -optimize.zero-loieau-lr.multi-linear.sim_q |MODIFIED -optimize.zero-loieau-lr.multi-polynomial.control_vector |MODIFIED -optimize.zero-loieau-lr.multi-polynomial.iter_cost |MODIFIED -optimize.zero-loieau-lr.multi-polynomial.sim_q |MODIFIED -optimize.zero-loieau-lr.uniform.control_vector |MODIFIED -optimize.zero-loieau-lr.uniform.iter_cost |MODIFIED -optimize.zero-loieau-lr.uniform.sim_q |MODIFIED +optimize.zero-loieau-kw.ann.sim_q |NON MODIFIED +optimize.zero-loieau-kw.distributed.control_vector |NON MODIFIED +optimize.zero-loieau-kw.distributed.iter_cost |NON MODIFIED +optimize.zero-loieau-kw.distributed.sim_q |NON MODIFIED +optimize.zero-loieau-kw.multi-linear.control_vector |NON MODIFIED +optimize.zero-loieau-kw.multi-linear.iter_cost |NON MODIFIED +optimize.zero-loieau-kw.multi-linear.sim_q |NON MODIFIED +optimize.zero-loieau-kw.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-loieau-kw.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-loieau-kw.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-loieau-kw.uniform.control_vector |NON MODIFIED +optimize.zero-loieau-kw.uniform.iter_cost |NON MODIFIED +optimize.zero-loieau-kw.uniform.sim_q |NON MODIFIED +optimize.zero-loieau-lag0.ann.sim_q |NON MODIFIED +optimize.zero-loieau-lag0.distributed.control_vector |NON MODIFIED +optimize.zero-loieau-lag0.distributed.iter_cost |NON MODIFIED +optimize.zero-loieau-lag0.distributed.sim_q |NON MODIFIED +optimize.zero-loieau-lag0.multi-linear.control_vector |NON MODIFIED +optimize.zero-loieau-lag0.multi-linear.iter_cost |NON MODIFIED +optimize.zero-loieau-lag0.multi-linear.sim_q |NON MODIFIED +optimize.zero-loieau-lag0.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-loieau-lag0.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-loieau-lag0.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-loieau-lag0.uniform.control_vector |NON MODIFIED +optimize.zero-loieau-lag0.uniform.iter_cost |NON MODIFIED +optimize.zero-loieau-lag0.uniform.sim_q |NON MODIFIED +optimize.zero-loieau-lr.ann.sim_q |NON MODIFIED +optimize.zero-loieau-lr.distributed.control_vector |NON MODIFIED +optimize.zero-loieau-lr.distributed.iter_cost |NON MODIFIED +optimize.zero-loieau-lr.distributed.sim_q |NON MODIFIED +optimize.zero-loieau-lr.multi-linear.control_vector |NON MODIFIED +optimize.zero-loieau-lr.multi-linear.iter_cost |NON MODIFIED +optimize.zero-loieau-lr.multi-linear.sim_q |NON MODIFIED +optimize.zero-loieau-lr.multi-polynomial.control_vector |NON MODIFIED +optimize.zero-loieau-lr.multi-polynomial.iter_cost |NON MODIFIED +optimize.zero-loieau-lr.multi-polynomial.sim_q |NON MODIFIED +optimize.zero-loieau-lr.uniform.control_vector |NON MODIFIED +optimize.zero-loieau-lr.uniform.iter_cost |NON MODIFIED +optimize.zero-loieau-lr.uniform.sim_q |NON MODIFIED optimize.zero-vic3l-kw.ann.sim_q |NON MODIFIED optimize.zero-vic3l-kw.distributed.control_vector |NON MODIFIED optimize.zero-vic3l-kw.distributed.iter_cost |NON MODIFIED diff --git a/smash/tests/generate_baseline.py b/smash/tests/generate_baseline.py index 6aedfe91..6a0169c7 100644 --- a/smash/tests/generate_baseline.py +++ b/smash/tests/generate_baseline.py @@ -101,7 +101,9 @@ def compare_baseline(f: h5py.File, new_f: h5py.File): if key in new_f_keys and key in f_keys: # % If an error occurs during check (inconsistent shapes ...) try: - if f[key][:].dtype == "object" or f[key][:].dtype.char == "S": + if f[key][:].size == 0: + is_equal = True + elif f[key][:].dtype == "object" or f[key][:].dtype.char == "S": is_equal = np.array_equal(f[key][:], new_f[key][:]) else: is_equal = np.allclose(f[key][:], new_f[key][:], equal_nan=True, atol=1e-3)