Changeset 17270 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3

Timestamp:

09/26/19 10:02:47 (5 years ago)

Author:

abeham

Message:

#2521: worked on removing virtual from Maximization for single-objective problems

File:

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

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

@@ -38 +38 @@
     where TEncodedSolution : class, IEncodedSolution {
 
-    protected IValueParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (IValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
-    }
-
-    protected IFixedValueParameter<BoolValue> MaximizationParameter {
-      get { return (IFixedValueParameter<BoolValue>)Parameters["Maximization"]; }
-    }
+    [Storable] protected IValueParameter<DoubleValue> BestKnownQualityParameter { get; set; }
+    [Storable] protected IValueParameter<BoolValue> MaximizationParameter { get; set; }
 
     public double BestKnownQuality {
@@ -61 +56 @@
     }
 
+    public bool Maximization {
+      get { return MaximizationParameter.Value.Value; }
+      protected set {
+        if (MaximizationParameter.Value.Value == value) return;
+        MaximizationParameter.Value = new BoolValue(value).AsReadOnly();
+      }
+    }
+
     [StorableConstructor]
     protected SingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
@@ -66 +69 @@
     protected SingleObjectiveProblem(SingleObjectiveProblem<TEncoding, TEncodedSolution> original, Cloner cloner)
       : base(original, cloner) {
+      BestKnownQualityParameter = cloner.Clone(original.BestKnownQualityParameter);
+      MaximizationParameter = cloner.Clone(original.MaximizationParameter);
       ParameterizeOperators();
     }
   
     protected SingleObjectiveProblem() : base() {
-      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
-      Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+      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."));
 
       Operators.Add(Evaluator);
@@ -84 +89 @@
 
     protected SingleObjectiveProblem(TEncoding encoding) : base(encoding) {
-      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
-      Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+      Parameters.Add(MaximizationParameter = new ValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", 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."));
 
       Operators.Add(Evaluator);
@@ -102 +107 @@
     }
 
-    public abstract bool Maximization { get; }
     public abstract double Evaluate(TEncodedSolution solution, IRandom random);
     public virtual void Analyze(TEncodedSolution[] solutions, double[] qualities, ResultCollection results, IRandom random) { }