From 9339e8bc9869b5856ee2c2ac0fe47398cd756c13 Mon Sep 17 00:00:00 2001 From: "Yngve S. Kristiansen" Date: Wed, 13 Nov 2024 16:01:13 +0100 Subject: [PATCH] Disregard expected_objectives from OptimalResults The calculation within seba does not make sense, and we do not use it for anything. --- .../test_api_snapshots/config_advanced.yml/snapshot.json | 5 +---- .../config_auto_scaled_controls.yml/snapshot.json | 5 +---- .../test_api_snapshots/config_cvar.yml/snapshot.json | 5 +---- .../test_api_snapshots/config_discrete.yml/snapshot.json | 5 +---- .../test_api_snapshots/config_minimal.yml/snapshot.json | 5 +---- .../test_api_snapshots/config_multiobj.yml/snapshot.json | 6 +----- .../test_api_snapshots/config_stddev.yml/snapshot.json | 6 +----- tests/everest/test_api_snapshots.py | 1 - 8 files changed, 7 insertions(+), 31 deletions(-) diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_advanced.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_advanced.yml/snapshot.json index fba847b520a..2e16cee5078 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_advanced.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_advanced.yml/snapshot.json @@ -381,9 +381,6 @@ "point_x-1": 0.00635029, "point_x-2": 0.38836369 }, - "total_objective": -1.52561897, - "expected_objectives": { - "distance": -1.52561897 - } + "total_objective": -1.52561897 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_auto_scaled_controls.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_auto_scaled_controls.yml/snapshot.json index 34def1be5da..b64a8509f93 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_auto_scaled_controls.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_auto_scaled_controls.yml/snapshot.json @@ -192,9 +192,6 @@ "point_y": 0.21233962, "point_z": 0.49289096 }, - "total_objective": -0.159768, - "expected_objectives": { - "distance": -0.159768 - } + "total_objective": -0.159768 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_cvar.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_cvar.yml/snapshot.json index c7b6a104bdf..fc533eed74b 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_cvar.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_cvar.yml/snapshot.json @@ -155,9 +155,6 @@ "point_y": 0.49610079, "point_z": 0.50412446 }, - "total_objective": -0.00003229, - "expected_objectives": { - "distance": 0.0 - } + "total_objective": -0.00003229 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_discrete.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_discrete.yml/snapshot.json index 4f750cdcc28..1e69333d249 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_discrete.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_discrete.yml/snapshot.json @@ -103,9 +103,6 @@ "point_x": 3.0, "point_y": 7.0 }, - "total_objective": 7.0, - "expected_objectives": { - "func": 7.0 - } + "total_objective": 7.0 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_minimal.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_minimal.yml/snapshot.json index c203e798f37..ff0f92f0347 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_minimal.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_minimal.yml/snapshot.json @@ -126,9 +126,6 @@ "point_y": 0.50022835, "point_z": 0.49962361 }, - "total_objective": -2.2e-7, - "expected_objectives": { - "distance": -2.2e-7 - } + "total_objective": -2.2e-7 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_multiobj.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_multiobj.yml/snapshot.json index 55f31a1ec64..d8b99ac5b60 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_multiobj.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_multiobj.yml/snapshot.json @@ -151,10 +151,6 @@ "point_y": -0.00564829, "point_z": 0.49992811 }, - "total_objective": -2.00004834, - "expected_objectives": { - "distance_p": -0.50778502, - "distance_q": -4.47678995 - } + "total_objective": -2.00004834 } } diff --git a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_stddev.yml/snapshot.json b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_stddev.yml/snapshot.json index 97408c90abe..88aed7501a5 100644 --- a/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_stddev.yml/snapshot.json +++ b/tests/everest/snapshots/test_api_snapshots/test_api_snapshots/config_stddev.yml/snapshot.json @@ -162,10 +162,6 @@ "point_y": 0.50220467, "point_z": 0.48265145 }, - "total_objective": -0.00022499, - "expected_objectives": { - "distance": 0.0, - "stddev": 0.0 - } + "total_objective": -0.00022499 } } diff --git a/tests/everest/test_api_snapshots.py b/tests/everest/test_api_snapshots.py index efb23a2d95d..ffada2ee07d 100644 --- a/tests/everest/test_api_snapshots.py +++ b/tests/everest/test_api_snapshots.py @@ -74,7 +74,6 @@ def test_api_snapshots( "batch": optimal_result.batch, "controls": optimal_result.controls, "total_objective": optimal_result.total_objective, - "expected_objectives": optimal_result.expected_objectives, } api = EverestDataAPI(config)