Changeset 17614 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

Timestamp:

06/19/20 17:53:36 (4 years ago)

Author:

abeham

Message:

#2521: work in progress (removed solution creator parameter from encoding), OrienteeringProblem and test functions are broken

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?
@@ -52 +53 @@
     }
 
-
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
-      get { return Encoding.SolutionCreator; }
-    }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
-      get { return Encoding.SolutionCreatorParameter; }
-    }
+    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { get => SolutionCreatorParameter.Value; }
+    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter { get => SolutionCreatorParameter; }
+
     event EventHandler IHeuristicOptimizationProblem.SolutionCreatorChanged {
       add {
-        if (Encoding != null) Encoding.SolutionCreatorChanged += value;
+        SolutionCreatorParameter.ValueChanged += value;
       }
       remove {
-        if (Encoding != null) Encoding.SolutionCreatorChanged -= value;
+        SolutionCreatorParameter.ValueChanged -= value;
       }
     }
@@ -106 +103 @@
       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;
@@ -116 +114 @@
       : base(original, cloner) {
       oldEncoding = cloner.Clone(original.oldEncoding);
+      SolutionCreatorParameter = cloner.Clone(original.SolutionCreatorParameter);
       RegisterEvents();
     }
@@ -124 +123 @@
     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();
     }
@@ -157 +159 @@
 
       Encoding.ConfigureOperators(Operators);
+
+      SolutionCreatorParameter.Repopulate(GetOperators());
       //var multiEncoding = Encoding as MultiEncoding;
       //if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;