Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Algorithms

Timestamp:

07/23/20 16:21:55 (4 years ago)

Author:

abeham

Message:

#2521:

• Moving solution creator parameter from problems to algorithms (breaking wiring in some HeuristicOptimizationProblems)
• Disallowing evaluator or encoding changes in encoding-specific base problems (to avoid confusion in derived problems whether this needs to be handled or not)
• Added private set to ReferenceParameter property (serialization)

Location:

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

Files:

• HeuristicOptimizationAlgorithm.cs (deleted)
• HeuristicOptimizationEngineAlgorithm.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Optimization {
@@ -37 +38 @@
     }
 
-    protected HeuristicOptimizationEngineAlgorithm() : base() { }
-    protected HeuristicOptimizationEngineAlgorithm(string name) : base(name) { }
-    protected HeuristicOptimizationEngineAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) { }
-    protected HeuristicOptimizationEngineAlgorithm(string name, string description) : base(name, description) { }
-    protected HeuristicOptimizationEngineAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
+    [Storable] public IConstrainedValueParameter<ISolutionCreator> SolutionCreatorParameter { get; private set; }
+    public ISolutionCreator SolutionCreator {
+      get => SolutionCreatorParameter.Value;
+      set {
+        if (!SolutionCreatorParameter.ValidValues.Contains(value))
+          SolutionCreatorParameter.ValidValues.Add(value);
+        SolutionCreatorParameter.Value = value;
+      }
+    }
+
+    protected HeuristicOptimizationEngineAlgorithm() : base() {
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "An operator that creates a solution for a given problem."));
+
+      RegisterEventHandlers();
+    }
+    protected HeuristicOptimizationEngineAlgorithm(string name) : base(name) {
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "An operator that creates a solution for a given problem."));
+
+      RegisterEventHandlers();
+    }
+    protected HeuristicOptimizationEngineAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) {
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "An operator that creates a solution for a given problem."));
+
+      RegisterEventHandlers();
+    }
+    protected HeuristicOptimizationEngineAlgorithm(string name, string description) : base(name, description) {
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "An operator that creates a solution for a given problem."));
+
+      RegisterEventHandlers();
+    }
+    protected HeuristicOptimizationEngineAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) {
+      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "An operator that creates a solution for a given problem."));
+
+      RegisterEventHandlers();
+    }
 
     [StorableConstructor]
     protected HeuristicOptimizationEngineAlgorithm(StorableConstructorFlag _) : base(_) { }
-    protected HeuristicOptimizationEngineAlgorithm(HeuristicOptimizationEngineAlgorithm original, Cloner cloner) : base(original, cloner) { }
+    protected HeuristicOptimizationEngineAlgorithm(HeuristicOptimizationEngineAlgorithm original, Cloner cloner) : base(original, cloner) {
+      SolutionCreatorParameter = cloner.Clone(original.SolutionCreatorParameter);
+
+      RegisterEventHandlers();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
 
     #region Events
+    private void RegisterEventHandlers() {
+      ParameterChangeHandler<ISolutionCreator>.Create(SolutionCreatorParameter, SolutionCreatorOnChanged);
+    }
     protected override void DeregisterProblemEvents() {
-      Problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
-      Problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
+      Problem.EvaluatorChanged -= Problem_EvaluatorChanged;
       base.DeregisterProblemEvents();
     }
     protected override void RegisterProblemEvents() {
       base.RegisterProblemEvents();
-      Problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
-      Problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
+      Problem.EvaluatorChanged += Problem_EvaluatorChanged;
+    }
+    protected override void OnProblemChanged() {
+      base.OnProblemChanged();
+      SolutionCreatorParameter.Repopulate(Problem.Operators);
     }
 
-    protected virtual void Problem_SolutionCreatorChanged(object sender, EventArgs e) { }
+    protected virtual void SolutionCreatorOnChanged() { }
     protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
+
+    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
+      base.Problem_OperatorsChanged(sender, e);
+      SolutionCreatorParameter.Repopulate(Problem.Operators);
+    }
     #endregion
   }