Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.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.Optimization/3.3/BasicProblems/Problem.cs (modified) (6 diffs)

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

@@ -37 +37 @@
     where TEvaluator : class, IEvaluator {
 
-    [Storable] protected ConstrainedValueParameter<ISolutionCreator> SolutionCreatorParameter { get; private set; }
-
     //TODO remove parameter for encoding?
     protected IValueParameter<TEncoding> EncodingParameter {
@@ -50 +48 @@
         if (value == null) throw new ArgumentNullException("Encoding must not be null.");
         EncodingParameter.Value = value;
-      }
-    }
-
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { get => SolutionCreatorParameter.Value; }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter { get => SolutionCreatorParameter; }
-
-    event EventHandler IHeuristicOptimizationProblem.SolutionCreatorChanged {
-      add {
-        SolutionCreatorParameter.ValueChanged += value;
-      }
-      remove {
-        SolutionCreatorParameter.ValueChanged -= value;
       }
     }
@@ -103 +89 @@
       Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any.", encoding) { Hidden = true });
       Parameters.Add(new ValueParameter<TEvaluator>("Evaluator", "The operator used to evaluate a solution.") { Hidden = true });
-      Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "The operator used to create a solution."));
-
+      
       oldEncoding = Encoding;
       Parameterize();
@@ -114 +99 @@
       : base(original, cloner) {
       oldEncoding = cloner.Clone(original.oldEncoding);
-      SolutionCreatorParameter = cloner.Clone(original.SolutionCreatorParameter);
       RegisterEvents();
     }
@@ -123 +107 @@
     private void AfterDeserialization() {
       oldEncoding = Encoding;
-      // TODO: remove below
-      if (SolutionCreatorParameter == null) Parameters.Add(SolutionCreatorParameter = new ConstrainedValueParameter<ISolutionCreator>("SolutionCreator", "The operator used to create a solution."));
-
       RegisterEvents();
     }
@@ -160 +141 @@
       Encoding.ConfigureOperators(Operators);
 
-      SolutionCreatorParameter.Repopulate(GetOperators());
       //var multiEncoding = Encoding as MultiEncoding;
       //if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;