Fix everest result tables

equinor · Oct 4, 2024 · 90ddf0b · 90ddf0b
1 parent 604ff34
commit 90ddf0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -148,7 +148,7 @@ everest = [
     "decorator",
     "resdata",
     "colorama",
-    "ropt[pandas]>=0.7,<0.8",
+    "ropt[pandas]>=0.8,<0.9",
     "ropt-dakota>=0.7,<0.8",
     "seba-sqlite",
 ]

diff --git a/src/everest/suite.py b/src/everest/suite.py
@@ -38,15 +38,14 @@
     "nonlinear_constraints.violations": "OC-violation",
     "functions.objectives": "Objective",
     "functions.constraints": "Constraint",
-    "evaluations.unscaled_variables": "Control",
+    "evaluations.variables": "Control",
     "linear_constraints.values": "IC-diff",
     "nonlinear_constraints.values": "OC-diff",
     "functions.scaled_objectives": "Scaled-Objective",
     "functions.scaled_constraints": "Scaled-Constraint",
-    "evaluations.variables": "Scaled-Control",
+    "evaluations.scaled_variables": "Scaled-Control",
     "nonlinear_constraints.scaled_values": "Scaled-OC-diff",
     "nonlinear_constraints.scaled_violations": "Scaled-OC-violation",
-    "metadata.restart": "Restart",
 }
 GRADIENT_COLUMNS = {
     "result_id": "ID",
@@ -60,10 +59,10 @@
     "batch_id": "Batch",
     "realization": "Realization",
     "evaluations.evaluation_ids": "Simulation",
-    "evaluations.unscaled_variables": "Control",
+    "evaluations.variables": "Control",
     "evaluations.objectives": "Objective",
     "evaluations.constraints": "Constraint",
-    "evaluations.variables": "Scaled-Control",
+    "evaluations.scaled_variables": "Scaled-Control",
     "evaluations.scaled_objectives": "Scaled-Objective",
     "evaluations.scaled_constraints": "Scaled-Constraint",
 }
@@ -72,10 +71,10 @@
     "batch_id": "Batch",
     "realization": "Realization",
     "evaluations.perturbed_evaluation_ids": "Simulation",
-    "evaluations.unscaled_perturbed_variables": "Control",
+    "evaluations.perturbed_variables": "Control",
     "evaluations.perturbed_objectives": "Objective",
     "evaluations.perturbed_constraints": "Constraint",
-    "evaluations.perturbed_variables": "Scaled-Control",
+    "evaluations.scaled_perturbed_variables": "Scaled-Control",
     "evaluations.scaled_perturbed_objectives": "Scaled-Objective",
     "evaluations.scaled_perturbed_constraints": "Scaled-Constraint",
 }