Changeset 17279 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems

Timestamp:

09/27/19 17:51:35 (5 years ago)

Author:

mkommend

Message:

#2521: Updated single-objective problem to include a static is better method and fixed setter of maximization property.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -38 +38 @@
     where TEncodedSolution : class, IEncodedSolution {
 
-    [Storable] protected IValueParameter<DoubleValue> BestKnownQualityParameter { get; set; }
-    [Storable] protected IValueParameter<BoolValue> MaximizationParameter { get; set; }
+    [Storable] protected IValueParameter<DoubleValue> BestKnownQualityParameter { get; }
+    [Storable] protected IValueParameter<BoolValue> MaximizationParameter { get; }
 
     public double BestKnownQuality {
@@ -60 +60 @@
       protected set {
         if (MaximizationParameter.Value.Value == value) return;
+        MaximizationParameter.ReadOnly = false;
         MaximizationParameter.Value = new BoolValue(value).AsReadOnly();
+        MaximizationParameter.ReadOnly = true;
       }
     }
@@ -73 +75 @@
       ParameterizeOperators();
     }
-  
+
     protected SingleObjectiveProblem() : base() {
-      Parameters.Add(MaximizationParameter = new ValueParameter<BoolValue>("Maximization", "Whether the problem should be maximized (True) or minimized (False).", new BoolValue(false).AsReadOnly()) { Hidden = true, ReadOnly = true });
-      Parameters.Add(BestKnownQualityParameter = new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+
+      MaximizationParameter = new ValueParameter<BoolValue>("Maximization", "Whether the problem should be maximized (True) or minimized (False).", new BoolValue(false).AsReadOnly()) { Hidden = true, ReadOnly = true };
+      BestKnownQualityParameter = new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem.");
+
+      Parameters.Add(MaximizationParameter);
+      Parameters.Add(BestKnownQualityParameter);
 
       Operators.Add(Evaluator);
@@ -113 +119 @@
     }
 
+    public static bool IsBetter(bool maximization, double quality, double bestQuality) {
+      return (maximization && quality > bestQuality || !maximization && quality < bestQuality);
+    }
+
     public virtual bool IsBetter(double quality, double bestQuality) {
-      return (Maximization && quality > bestQuality || !Maximization && quality < bestQuality);
+      return IsBetter(Maximization, quality, bestQuality);
     }