Changeset 17709 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

08/03/20 11:35:39 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (3 diffs)

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

@@ -97 +97 @@
 
     public override ISingleObjectiveEvaluationResult Evaluate(IVRPEncodedSolution solution, IRandom random, CancellationToken cancellationToken) {
-      return new SingleObjectiveEvaluationResult(ProblemInstance.Evaluate(solution).Quality);
+      return ProblemInstance.Evaluate(solution);
     }
 
@@ -150 +150 @@
 
     void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
-      //InitializeOperators();
-      AttachProblemInstanceEventHandlers();
-
-      //OnOperatorsChanged();
+      InitializeOperators();
+      AttachProblemInstanceEventHandlers();
+
+      OnOperatorsChanged();
     }
 
@@ -169 +169 @@
       Operators.Add(new QualitySimilarityCalculator());
       Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
+      Operators.AddRange(ProblemInstance.Operators.OfType<IAnalyzer>());
     }