From 90ddf0b4b9f938785f48b07eb1ed54b632ee1bcf Mon Sep 17 00:00:00 2001 From: Peter Verveer Date: Fri, 4 Oct 2024 10:11:06 +0000 Subject: [PATCH] Fix everest result tables --- pyproject.toml | 2 +- src/everest/suite.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5c8b5d8a55d..3f9c230a579 100644 --- 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 index b7253b2dc10..e320af75760 100644 --- 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", }