Remove simulation concept

equinor · Nov 19, 2024 · 5002365 · 5002365
1 parent cf451e2
commit 5002365
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 46 deletions.
diff --git a/everviz/pages/deltaplot.py b/everviz/pages/deltaplot.py
@@ -12,7 +12,7 @@
 
 
 def _get_objective_delta_values(api, best_batch):
-    data = pd.DataFrame(api.objective_values).drop(columns=["simulation"])
+    data = pd.DataFrame(api.objective_values)
     initial = data[(data.batch == 0)].drop(columns=["batch"])
     best = data[data.batch == best_batch].drop(columns=["batch"])
     initial = initial.pivot(index="realization", values="value", columns="function")
@@ -25,7 +25,7 @@ def _get_summary_delta_values(api, best_batch):
     if summary.empty:
         return summary
     data = (
-        summary.drop(columns="simulation")
+        summary
         .set_index(["realization", "date"])
         .dropna(axis=1, how="all")
     )

diff --git a/everviz/pages/objectives.py b/everviz/pages/objectives.py
@@ -19,7 +19,6 @@ def _total_objective_values_from_api(api):
 
 def _objective_values(data):
     # Sort by the index columns.
-    data = data.drop(columns=["simulation"])
     sorted_values = (
         data.set_index(["function", "batch", "realization"]).sort_index().reset_index()
     )

diff --git a/everviz/pages/summary_values.py b/everviz/pages/summary_values.py
@@ -12,7 +12,7 @@
 def _summary_values(summary_values):
     # Sort by the index columns.
     sorted_values = (
-        summary_values.drop(columns="simulation")
+        summary_values
         .set_index(["batch", "date", "realization"])
         .dropna(axis=1, how="all")
         .sort_index()

diff --git a/tests/integration/delta_plot/test_objectives_delta_plot_integration.py b/tests/integration/delta_plot/test_objectives_delta_plot_integration.py
@@ -2,14 +2,14 @@
 from everviz.pages.deltaplot import _get_objective_delta_values
 
 _OBJECTIVES = [
-    {"batch": 0, "realization": 1, "function": "f0", "value": 100, "simulation": 1},
-    {"batch": 0, "realization": 2, "function": "f0", "value": 200, "simulation": 2},
-    {"batch": 0, "realization": 1, "function": "f1", "value": 300, "simulation": 1},
-    {"batch": 0, "realization": 2, "function": "f1", "value": 400, "simulation": 2},
-    {"batch": 2, "realization": 1, "function": "f0", "value": 500, "simulation": 1},
-    {"batch": 2, "realization": 2, "function": "f0", "value": 600, "simulation": 2},
-    {"batch": 2, "realization": 1, "function": "f1", "value": 800, "simulation": 1},
-    {"batch": 2, "realization": 2, "function": "f1", "value": 900, "simulation": 2},
+    {"batch": 0, "realization": 1, "function": "f0", "value": 100 },
+    {"batch": 0, "realization": 2, "function": "f0", "value": 200 },
+    {"batch": 0, "realization": 1, "function": "f1", "value": 300 },
+    {"batch": 0, "realization": 2, "function": "f1", "value": 400 },
+    {"batch": 2, "realization": 1, "function": "f0", "value": 500 },
+    {"batch": 2, "realization": 2, "function": "f0", "value": 600 },
+    {"batch": 2, "realization": 1, "function": "f1", "value": 800 },
+    {"batch": 2, "realization": 2, "function": "f1", "value": 900 },
 ]
 
 

diff --git a/tests/integration/delta_plot/test_summary_delta_plot_integration.py b/tests/integration/delta_plot/test_summary_delta_plot_integration.py
@@ -7,7 +7,6 @@
 
 _SUMMARY = {
     "realization": 3 * [1] + 3 * [2] + 3 * [1] + 3 * [2],
-    "simulation": 3 * [1] + 3 * [2] + 3 * [1] + 3 * [2],
     "batch": [0] * 6 + [2] * 6,
     "date": 4
     * [
@@ -19,7 +18,7 @@
     "key2": range(10, 130, 10),
 }
 
-_EMPTY_SUMMARY = {"realization": [], "simulation": [], "date": [], "batch": []}
+_EMPTY_SUMMARY = {"realization": [], "date": [], "batch": []}
 
 
 def test_summary_delta_plot_callback(app, dash_duo, mocker, caplog):

diff --git a/tests/integration/objectives_plot/test_objectives_plot_integration.py b/tests/integration/objectives_plot/test_objectives_plot_integration.py
@@ -10,7 +10,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 1,
             "function": "f0",
             "value": 100,
-            "simulation": 1,
             "weight": 0.75,
             "norm": 1.5,
         },
@@ -19,7 +18,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 1,
             "function": "f1",
             "value": 200,
-            "simulation": 1,
             "weight": 0.25,
             "norm": 1,
         },
@@ -28,7 +26,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 1,
             "function": "f0",
             "value": 300,
-            "simulation": 1,
             "weight": 0.75,
             "norm": 1.5,
         },
@@ -37,7 +34,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 1,
             "function": "f1",
             "value": 400,
-            "simulation": 1,
             "weight": 0.25,
             "norm": 1,
         },
@@ -46,7 +42,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 2,
             "function": "f0",
             "value": 500,
-            "simulation": 2,
             "weight": 0.75,
             "norm": 1.5,
         },
@@ -55,7 +50,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 2,
             "function": "f1",
             "value": 600,
-            "simulation": 2,
             "weight": 0.25,
             "norm": 1,
         },
@@ -64,7 +58,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 2,
             "function": "f0",
             "value": 700,
-            "simulation": 2,
             "weight": 0.75,
             "norm": 1.5,
         },
@@ -73,7 +66,6 @@ def test_objective_plot_callback(app, dash_duo, mocker, caplog):
             "realization": 2,
             "function": "f1",
             "value": 800,
-            "simulation": 2,
             "weight": 0.25,
             "norm": 1,
         },

diff --git a/tests/integration/summary_plot/test_summary_plot_integration.py b/tests/integration/summary_plot/test_summary_plot_integration.py
@@ -7,7 +7,6 @@
 def test_summary_plot_callback(app, dash_duo, mocker, caplog):
     test_data = {
         "realization": range(12),
-        "simulation": range(12),
         "batch": [0] * 6 + [1] * 6,
         "date": [
             datetime(2000, 1, 1),

diff --git a/tests/integration/summary_plot/test_well_plot_integration.py b/tests/integration/summary_plot/test_well_plot_integration.py
@@ -10,7 +10,6 @@
 def test_well_plot(app, dash_duo, mocker, caplog):
     test_data = {
         "realization": range(12),
-        "simulation": range(12),
         "batch": [0] * 6 + [1] * 6,
         "date": [
             datetime(2000, 1, 1),

diff --git a/tests/unit/test_delta_plot_data.py b/tests/unit/test_delta_plot_data.py
@@ -11,19 +11,18 @@
 )
 
 _OBJECTIVES = [
-    {"batch": 0, "realization": 1, "function": "f0", "value": 100, "simulation": 1},
-    {"batch": 0, "realization": 2, "function": "f0", "value": 200, "simulation": 2},
-    {"batch": 0, "realization": 1, "function": "f1", "value": 300, "simulation": 1},
-    {"batch": 0, "realization": 2, "function": "f1", "value": 400, "simulation": 2},
-    {"batch": 2, "realization": 1, "function": "f0", "value": 500, "simulation": 1},
-    {"batch": 2, "realization": 2, "function": "f0", "value": 600, "simulation": 2},
-    {"batch": 2, "realization": 1, "function": "f1", "value": 800, "simulation": 1},
-    {"batch": 2, "realization": 2, "function": "f1", "value": 900, "simulation": 2},
+    {"batch": 0, "realization": 1, "function": "f0", "value": 100 },
+    {"batch": 0, "realization": 2, "function": "f0", "value": 200 },
+    {"batch": 0, "realization": 1, "function": "f1", "value": 300 },
+    {"batch": 0, "realization": 2, "function": "f1", "value": 400 },
+    {"batch": 2, "realization": 1, "function": "f0", "value": 500 },
+    {"batch": 2, "realization": 2, "function": "f0", "value": 600 },
+    {"batch": 2, "realization": 1, "function": "f1", "value": 800 },
+    {"batch": 2, "realization": 2, "function": "f1", "value": 900 },
 ]
 
 _SUMMARY = {
     "realization": 3 * [1] + 3 * [2] + 3 * [1] + 3 * [2],
-    "simulation": 3 * [1] + 3 * [2] + 3 * [1] + 3 * [2],
     "batch": [0] * 6 + [2] * 6,
     "date": 4
     * [
@@ -93,7 +92,7 @@ def test_delta_plot_layout_with_empty_summary(mocker, tmpdir):
     mock_api.objective_values = _OBJECTIVES
     mock_api.single_objective_values = _SINGLE_OBJECTIVES
     mock_api.summary_values.return_value = pandas.DataFrame(
-        {"realization": [], "simulation": [], "date": [], "batch": []}
+        {"realization": [], "date": [], "batch": []}
     )
     mock_api.output_folder = tmpdir
 

diff --git a/tests/unit/test_objective_plot_data.py b/tests/unit/test_objective_plot_data.py
@@ -19,7 +19,6 @@
         "realization": 1,
         "function": "f0",
         "value": 100,
-        "simulation": 1,
         "weight": 0.75,
         "norm": 1,
     },
@@ -28,7 +27,6 @@
         "realization": 1,
         "function": "f1",
         "value": 200,
-        "simulation": 1,
         "weight": 0.25,
         "norm": 1.5,
     },
@@ -37,7 +35,6 @@
         "realization": 2,
         "function": "f0",
         "value": 200,
-        "simulation": 2,
         "weight": 0.75,
         "norm": 1,
     },
@@ -46,7 +43,6 @@
         "realization": 2,
         "function": "f1",
         "value": 400,
-        "simulation": 2,
         "weight": 0.25,
         "norm": 1.5,
     },
@@ -55,7 +51,6 @@
         "realization": 1,
         "function": "f0",
         "value": 300,
-        "simulation": 1,
         "weight": 0.75,
         "norm": 1,
     },
@@ -64,7 +59,6 @@
         "realization": 1,
         "function": "f1",
         "value": 600,
-        "simulation": 1,
         "weight": 0.25,
         "norm": 1.5,
     },
@@ -73,7 +67,6 @@
         "realization": 2,
         "function": "f0",
         "value": 400,
-        "simulation": 2,
         "weight": 0.75,
         "norm": 1,
     },
@@ -82,7 +75,6 @@
         "realization": 2,
         "function": "f1",
         "value": 800,
-        "simulation": 2,
         "weight": 0.25,
         "norm": 1.5,
     },
@@ -183,7 +175,7 @@ def test_set_up_sources(mocker, monkeypatch, tmpdir):
         mocker.Mock(return_value=pd.DataFrame(OBJECTIVES)),
     )
     total_data = pd.DataFrame(OBJECTIVES).drop(
-        columns=["realization", "function", "simulation"]
+        columns=["realization", "function"]
     )
     monkeypatch.setattr(
         everviz.pages.objectives,
@@ -200,7 +192,7 @@ def test_set_up_sources(mocker, monkeypatch, tmpdir):
 
 def test_total_objective_values_data_frame():
     total_data = pd.DataFrame(OBJECTIVES).drop(
-        columns=["realization", "function", "simulation", "weight", "norm"]
+        columns=["realization", "function", "weight", "norm"]
     )
     total_objective_values = _total_objective_values(total_data)
 

diff --git a/tests/unit/test_summary_plot.py b/tests/unit/test_summary_plot.py
@@ -8,7 +8,6 @@
 
 __TEST_DATA = {
     "realization": range(12),
-    "simulation": range(12),
     "batch": [0] * 6 + [1] * 6,
     "date": [
         datetime(2000, 1, 1),
@@ -45,7 +44,6 @@ def test_summary_values_data_frame():
     assert list(
         summary_values.columns == ["summary_key", "batch", "date", "key1", "key2"]
     )
-    assert len(summary_values) == len(__TEST_DATA["simulation"])
     assert set(summary_values["batch"]) == set(__TEST_DATA["batch"])
     assert set(summary_values["date"]) == {
         pd.Timestamp(date) for date in __TEST_DATA["date"]