Changeset 10363 for trunk/sources

Timestamp:

01/21/14 10:58:32 (11 years ago)

Author:

pfleck

Message:

#2141 - corrected evaluator assignment for construction, cloning and deserialization

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -143 +143 @@
       AttachEventHandlers();
       AttachProblemInstanceEventHandlers();
+
+      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
     }
 
@@ -154 +156 @@
       this.AttachEventHandlers();
       this.AttachProblemInstanceEventHandlers();
+
+      ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
     }
 
@@ -174 +178 @@
       AttachEventHandlers();
       AttachProblemInstanceEventHandlers();
+
+      ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
     }
 
@@ -190 +196 @@
     private void AttachProblemInstanceEventHandlers() {
       if (ProblemInstance != null) {
-        ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
       }
@@ -210 +215 @@
 
     void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
-      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
       EvalBestKnownSolution();
     }
@@ -217 +221 @@
       InitializeOperators();
       AttachProblemInstanceEventHandlers();
+
+      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
 
       OnSolutionCreatorChanged();