Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

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)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -30 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Random;
 using HeuristicLab.Selection;
@@ -283 +283 @@
     #region Events
     protected override void OnProblemChanged() {
-      ParameterizeStochasticOperator(Problem.SolutionCreator);
+      ParameterizeStochasticOperator(SolutionCreator);
       ParameterizeStochasticOperator(Problem.Evaluator);
       foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
@@ -298 +298 @@
       base.OnProblemChanged();
     }
-    protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
-      ParameterizeStochasticOperator(Problem.SolutionCreator);
+    protected override void SolutionCreatorOnChanged() {
+      ParameterizeStochasticOperator(SolutionCreator);
       ParameterizeSolutionsCreator();
-      base.Problem_SolutionCreatorChanged(sender, e);
+      base.SolutionCreatorOnChanged();
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
@@ -431 +431 @@
     private void ParameterizeSolutionsCreator() {
       SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-      SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+      SolutionsCreator.SolutionCreatorParameter.ActualName = SolutionCreatorParameter.Name;
     }
     private void ParameterizeMainLoop() {