From 6ca0d81c2b9cd6742511b419bf7f9ba2b5022c21 Mon Sep 17 00:00:00 2001 From: John Gerrard Holland Date: Thu, 6 Jul 2023 10:41:51 -0400 Subject: [PATCH 1/4] Update src/autora/workflow/state/param.py Co-authored-by: benwandrew --- src/autora/workflow/state/param.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autora/workflow/state/param.py b/src/autora/workflow/state/param.py index 08b8750c..1317b069 100644 --- a/src/autora/workflow/state/param.py +++ b/src/autora/workflow/state/param.py @@ -46,7 +46,7 @@ def _get_state_dependent_properties(state: SupportsControllerState): ), "%observations.dvs[-1]%": deprecate( lambda: np.array(state.observations[-1])[:, n_ivs:], - "%observations.dvs[-1]% is deprecated, use %data.observations[-1]% instead.", + "%observations.dvs[-1]% is deprecated, use %experiment_data.observations[-1]% instead.", ), "%observations.ivs%": deprecate( lambda: np.row_stack( From 3fee0faf306b70c2ab4d68224b665aec21a86080 Mon Sep 17 00:00:00 2001 From: John Gerrard Holland Date: Thu, 6 Jul 2023 10:41:58 -0400 Subject: [PATCH 2/4] Update src/autora/workflow/state/param.py Co-authored-by: benwandrew --- src/autora/workflow/state/param.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autora/workflow/state/param.py b/src/autora/workflow/state/param.py index 1317b069..de9b6f51 100644 --- a/src/autora/workflow/state/param.py +++ b/src/autora/workflow/state/param.py @@ -42,7 +42,7 @@ def _get_state_dependent_properties(state: SupportsControllerState): { "%observations.ivs[-1]%": deprecate( lambda: np.array(state.observations[-1])[:, 0:n_ivs], - "%observations.ivs[-1]% is deprecated, use %data.conditions[-1]% instead.", + "%observations.ivs[-1]% is deprecated, use %experiment_data.conditions[-1]% instead.", ), "%observations.dvs[-1]%": deprecate( lambda: np.array(state.observations[-1])[:, n_ivs:], From b537ec3f0b90d3fd7a46efed06174fd36761a69c Mon Sep 17 00:00:00 2001 From: John Gerrard Holland Date: Thu, 6 Jul 2023 10:42:05 -0400 Subject: [PATCH 3/4] Update src/autora/workflow/state/param.py Co-authored-by: benwandrew --- src/autora/workflow/state/param.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autora/workflow/state/param.py b/src/autora/workflow/state/param.py index de9b6f51..43344748 100644 --- a/src/autora/workflow/state/param.py +++ b/src/autora/workflow/state/param.py @@ -52,7 +52,7 @@ def _get_state_dependent_properties(state: SupportsControllerState): lambda: np.row_stack( [np.empty([0, n_ivs + n_dvs])] + list(state.observations) )[:, 0:n_ivs], - "%observations.ivs% is deprecated, use %data.conditions% instead.", + "%observations.ivs% is deprecated, use %experiment_data.conditions% instead.", ), "%observations.dvs%": deprecate( lambda: np.row_stack(state.observations)[:, n_ivs:], From 36b4ed78414d49eb06a7364d840f4e4f339959b3 Mon Sep 17 00:00:00 2001 From: John Gerrard Holland Date: Thu, 6 Jul 2023 10:42:13 -0400 Subject: [PATCH 4/4] Update src/autora/workflow/state/param.py Co-authored-by: benwandrew --- src/autora/workflow/state/param.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autora/workflow/state/param.py b/src/autora/workflow/state/param.py index 43344748..5637b52f 100644 --- a/src/autora/workflow/state/param.py +++ b/src/autora/workflow/state/param.py @@ -56,7 +56,7 @@ def _get_state_dependent_properties(state: SupportsControllerState): ), "%observations.dvs%": deprecate( lambda: np.row_stack(state.observations)[:, n_ivs:], - "%observations.dvs% is deprecated, " "use %data.observations% instead", + "%observations.dvs% is deprecated, " "use %experiment_data.observations% instead", ), "%experiment_data.conditions[-1]%": lambda: np.array( state.observations[-1]