Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.GradientDescent/3.3/Lbfgs.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.GradientDescent/3.3/Lbfgs.cs (modified) (8 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.GradientDescent/3.3/Lbfgs.cs

@@ -23 +23 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -31 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -199 +199 @@
       if (Problem != null) {
         RegisterEvents();
-        solutionCreator.OperatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+        solutionCreator.OperatorParameter.ActualName = SolutionCreatorParameter.Name;
         solutionCreator.OperatorParameter.Hidden = true;
         evaluator.OperatorParameter.ActualName = Problem.EvaluatorParameter.Name;
@@ -208 +208 @@
     }
 
-    protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
-      base.Problem_SolutionCreatorChanged(sender, e);
+    protected override void SolutionCreatorOnChanged() {
+      base.SolutionCreatorOnChanged();
       RegisterSolutionCreatorEvents();
       ParameterizeOperators();
@@ -223 +223 @@
       base.Problem_OperatorsChanged(sender, e);
       RegisterEvents();
-      solutionCreator.OperatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+      solutionCreator.OperatorParameter.ActualName = SolutionCreatorParameter.Name;
       solutionCreator.OperatorParameter.Hidden = true;
       evaluator.OperatorParameter.ActualName = Problem.EvaluatorParameter.Name;
@@ -232 +232 @@
 
     private void RegisterSolutionCreatorEvents() {
-      var realVectorCreator = Problem.SolutionCreator as IRealVectorCreator;
+      var realVectorCreator = SolutionCreator as IRealVectorCreator;
       // ignore if we have a different kind of problem
       if (realVectorCreator != null) {
@@ -245 +245 @@
 
     protected override void OnStarted() {
-      var realVectorCreator = Problem.SolutionCreator as IRealVectorCreator;
+      var realVectorCreator = SolutionCreator as IRealVectorCreator;
       // must catch the case that user loaded an unsupported problem
       if (realVectorCreator == null)
@@ -269 +269 @@
 
     private void ParameterizeOperators() {
-      var realVectorCreator = Problem.SolutionCreator as IRealVectorCreator;
+      var realVectorCreator = SolutionCreator as IRealVectorCreator;
       // ignore if we have a different kind of problem
       if (realVectorCreator != null) {