Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.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.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (11 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -70 +70 @@
       get { return (OptionalValueParameter<VRPSolution>)Parameters["BestKnownSolution"]; }
     }
-    public IConstrainedValueParameter<IVRPCreator> SolutionCreatorParameter {
-      get { return (IConstrainedValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
-    }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
-      get { return SolutionCreatorParameter; }
-    }
     public IValueParameter<IVRPEvaluator> EvaluatorParameter {
       get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
@@ -106 +100 @@
     IEvaluator IHeuristicOptimizationProblem.Evaluator {
       get { return this.Evaluator; }
-    }
-
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
-      get { return SolutionCreatorParameter.Value; }
-    }
-    public IVRPCreator SolutionCreator {
-      get { return SolutionCreatorParameter.Value; }
-      set { SolutionCreatorParameter.Value = value; }
     }
     #endregion
@@ -126 +112 @@
       Parameters.Add(new OptionalValueParameter<VRPSolution>("BestKnownSolution", "The best known solution of this VRP instance."));
 
-      Parameters.Add(new ConstrainedValueParameter<IVRPCreator>("SolutionCreator", "The operator which should be used to create new VRP solutions."));
       Parameters.Add(new ValueParameter<IVRPEvaluator>("Evaluator", "The operator which should be used to evaluate VRP solutions."));
 
@@ -154 +139 @@
 
     #region Events
-    public event EventHandler SolutionCreatorChanged;
-    private void OnSolutionCreatorChanged() {
-      EventHandler handler = SolutionCreatorChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     public event EventHandler EvaluatorChanged;
     private void OnEvaluatorChanged() {
@@ -184 +164 @@
       BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
-      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
     }
 
@@ -225 +204 @@
       EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
 
-      OnSolutionCreatorChanged();
       OnEvaluatorChanged();
       OnOperatorsChanged();
@@ -236 +214 @@
       AttachProblemInstanceEventHandlers();
 
-      OnSolutionCreatorChanged();
       OnEvaluatorChanged();
 
@@ -242 +219 @@
     }
 
-    private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
-      OnSolutionCreatorChanged();
-    }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       if (ProblemInstance != null)
@@ -252 +226 @@
 
     private void InitializeOperators() {
-      var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>;
-      solutionCreatorParameter.ValidValues.Clear();
-
       Operators.Clear();
 
@@ -266 +237 @@
 
         IVRPCreator defaultCreator = null;
-        foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {
+        /*foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {
           solutionCreatorParameter.ValidValues.Add(creator);
           if (creator is Encodings.Alba.RandomCreator)
             defaultCreator = creator;
-        }
+        }*/
         Operators.Add(new AlbaLambdaInterchangeLocalImprovementOperator());
-        if (defaultCreator != null)
-          solutionCreatorParameter.Value = defaultCreator;
+        /*if (defaultCreator != null)
+          solutionCreatorParameter.Value = defaultCreator;*/
       }
 
@@ -287 +258 @@
       if (ProblemInstance != null) {
         foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
-          op.SolutionParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+          //op.SolutionParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
           op.SolutionParameter.Hidden = true;
         }
         foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
-          op.ParentsParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+          //op.ParentsParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
           op.ParentsParameter.Hidden = true;
         }
         foreach (ISolutionSimilarityCalculator op in Operators.OfType<ISolutionSimilarityCalculator>()) {
-          op.SolutionVariableName = SolutionCreator.VRPToursParameter.ActualName;
+          //op.SolutionVariableName = SolutionCreator.VRPToursParameter.ActualName;
           op.QualityVariableName = ProblemInstance.SolutionEvaluator.QualityParameter.ActualName;
           var calc = op as VRPSimilarityCalculator;