Disregard expected_objectives from OptimalResults

The calculation within seba does not make sense, and we do not use it for anything.
equinor · Nov 13, 2024 · 9339e8b · 9339e8b
1 parent 7369c4f
commit 9339e8b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 31 deletions.
diff --git a/...everest/snapshots/test_api_snapshots/test_api_snapshots/config_advanced.yml/snapshot.json b/...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/...shots/test_api_snapshots/test_api_snapshots/config_auto_scaled_controls.yml/snapshot.json b/...shots/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
@@ -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/...everest/snapshots/test_api_snapshots/test_api_snapshots/config_discrete.yml/snapshot.json b/...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/.../everest/snapshots/test_api_snapshots/test_api_snapshots/config_minimal.yml/snapshot.json b/.../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/...everest/snapshots/test_api_snapshots/test_api_snapshots/config_multiobj.yml/snapshot.json b/...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/...s/everest/snapshots/test_api_snapshots/test_api_snapshots/config_stddev.yml/snapshot.json b/...s/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
@@ -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)