Commit bef18ad3 authored by Ivo's avatar Ivo Committed by Tjerk Vreeken

Fix function_range in initial state estimator goals

Since e9f500d7 it is no longer allowed to specify a function_range for a
minimization goal. Also, the scaling is only done with the
function_nominal since 5ac6be99, and function_nominal should therefore
be `max_deviation`.

Closes #1062
parent eb3a953d
......@@ -8,8 +8,7 @@ class _MeasurementGoal(Goal):
self.__state = state
self.__measurement_id = measurement_id
self.function_range = -max_deviation, max_deviation
self.function_nominal = 1.0
self.function_nominal = max_deviation
def function(self, optimization_problem, ensemble_member):
op = optimization_problem
......@@ -26,8 +25,7 @@ class _SmoothingGoal(Goal):
self.__state1 = state1
self.__state2 = state2
self.function_range = -max_deviation, max_deviation
self.function_nominal = 1.0
self.function_nominal = max_deviation
def function(self, optimization_problem, ensemble_member):
op = optimization_problem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment