Changeset 17317 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems

Timestamp:

10/04/19 16:03:51 (5 years ago)

Author:

abeham

Message:

#2521: refactored multi-objective problems' maximization

• Add ForceValue method to IValueParameter to perform changes even when it is read-only
• Add MaximizationChanged event handler

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems

Files:

• MultiObjectiveHeuristicOptimizationProblem.cs (modified) (4 diffs)
• SingleObjectiveHeuristicOptimizationProblem.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -36 +37 @@
     [StorableConstructor]
     protected MultiObjectiveHeuristicOptimizationProblem(StorableConstructorFlag _) : base(_) { }
-    protected MultiObjectiveHeuristicOptimizationProblem(MultiObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner) : base(original, cloner) { }
+    protected MultiObjectiveHeuristicOptimizationProblem(MultiObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEventHandlers();
+    }
     protected MultiObjectiveHeuristicOptimizationProblem()
       : base() {
       Parameters.Add(new ValueParameter<BoolArray>(MaximizationParameterName, "Determines for each objective whether it should be maximized or minimized."));
+
+      RegisterEventHandlers();
     }
 
@@ -45 +51 @@
       : base(evaluator, solutionCreator) {
       Parameters.Add(new ValueParameter<BoolArray>(MaximizationParameterName, "Determines for each objective whether it should be maximized or minimized."));
+
+      RegisterEventHandlers();
+    }
+
+    private void RegisterEventHandlers() {
+      MaximizationParameter.ValueChanged += MaximizationParameterOnValueChanged;
+    }
+
+    private void MaximizationParameterOnValueChanged(object sender, EventArgs e) {
+      OnMaximizationChanged();
     }
 
@@ -61 +77 @@
       get { return Evaluator; }
     }
+
+    public event EventHandler MaximizationChanged;
+    protected void OnMaximizationChanged() {
+      MaximizationChanged?.Invoke(this, EventArgs.Empty);
+    }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -37 +38 @@
     [StorableConstructor]
     protected SingleObjectiveHeuristicOptimizationProblem(StorableConstructorFlag _) : base(_) { }
-    protected SingleObjectiveHeuristicOptimizationProblem(SingleObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner) : base(original, cloner) { }
+    protected SingleObjectiveHeuristicOptimizationProblem(SingleObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEventHandlers();
+    }
     protected SingleObjectiveHeuristicOptimizationProblem()
       : base() {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
       Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
+
+      RegisterEventHandlers();
     }
 
@@ -48 +54 @@
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue()));
       Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
+
+      RegisterEventHandlers();
+    }
+
+    private void RegisterEventHandlers() {
+      MaximizationParameter.ValueChanged += MaximizationParameterOnValueChanged;
+    }
+
+    private void MaximizationParameterOnValueChanged(object sender, EventArgs e) {
+      OnMaximizationChanged();
     }
 
@@ -59 +75 @@
       }
       #endregion
+      RegisterEventHandlers();
     }
     public ValueParameter<BoolValue> MaximizationParameter {
@@ -68 +85 @@
     public BoolValue Maximization {
       get { return MaximizationParameter.Value; }
-      set { MaximizationParameter.Value = value; }
+      set {
+        if (Maximization == value) return;
+        MaximizationParameter.Value = value;
+      }
     }
 
@@ -85 +105 @@
       get { return Evaluator; }
     }
+
+    public event EventHandler MaximizationChanged;
+    protected void OnMaximizationChanged() {
+      MaximizationChanged?.Invoke(this, EventArgs.Empty);
+    }
   }
 }