Changeset 6838 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances

Timestamp:

09/27/11 13:29:56 (13 years ago)

Author:

svonolfe

Message:

Updated interface of evaluator - added individual (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances

Files:

• SingleDepotVRP/CVRP/CVRPEvaluator.cs (modified) (1 diff)
• SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs (modified) (1 diff)
• SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs (modified) (1 diff)
• SingleDepotVRP/SingleDepotVRPEvaluator.cs (modified) (1 diff)
• VRPEvaluator.cs (modified) (4 diffs)
• VRPProblemInstance.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

@@ -47 +47 @@
     }
 
-    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour) {
+    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
       TourInsertionInfo tourInfo = new TourInsertionInfo();
       eval.InsertionInfo.AddTourInsertionInfo(tourInfo);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs

@@ -47 +47 @@
     }
 
-    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour) {
+    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
       TourInsertionInfo tourInfo = new TourInsertionInfo();
       eval.InsertionInfo.AddTourInsertionInfo(tourInfo);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs

@@ -51 +51 @@
     }
 
-    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour) {
+    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
       TourInsertionInfo tourInfo = new TourInsertionInfo();
       eval.InsertionInfo.AddTourInsertionInfo(tourInfo);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs

@@ -40 +40 @@
   [StorableClass]
   public class SingleDepotVRPEvaluator: VRPEvaluator {
-    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour) {
+    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
       TourInsertionInfo tourInfo = new TourInsertionInfo();
       eval.InsertionInfo.AddTourInsertionInfo(tourInfo);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

@@ -81 +81 @@
     }
 
-    protected abstract void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour);
+    protected abstract void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution);
 
     protected virtual void InitResultParameters() {
@@ -95 +95 @@
       DistanceParameter.ActualValue.Value = tourEvaluation.Distance;
       PenaltyParameter.ActualValue.Value = tourEvaluation.Penalty;
-    }
-
-    private VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour) {
-      VRPEvaluation evaluation = CreateTourEvaluation();
-      EvaluateTour(evaluation, instance, tour);
-      return evaluation;
     }
 
@@ -123 +117 @@
     }
 
+    public VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
+      VRPEvaluation evaluation = CreateTourEvaluation();
+      EvaluateTour(evaluation, instance, tour, solution);
+      return evaluation;
+    }
+
     public VRPEvaluation Evaluate(IVRPProblemInstance instance, IVRPEncoding solution) {
       VRPEvaluation evaluation = CreateTourEvaluation();
 
       foreach (Tour tour in solution.GetTours()) {
-        EvaluateTour(evaluation, instance, tour);
+        EvaluateTour(evaluation, instance, tour, solution);
       }
 
       return evaluation;
-    }
-
-    public VRPEvaluation Evaluate(IVRPProblemInstance instance, Tour tour) {
-      return EvaluateTour(instance, tour);
     }
 
@@ -141 +137 @@
 
       VRPEvaluation evaluation = CreateTourEvaluation();
-      foreach (Tour tour in VRPToursParameter.ActualValue.GetTours()) {
-        EvaluateTour(evaluation, ProblemInstance, tour);
+      IVRPEncoding solution = VRPToursParameter.ActualValue;
+      foreach (Tour tour in solution.GetTours()) {
+        EvaluateTour(evaluation, ProblemInstance, tour, solution);
       }
       SetResultParameters(evaluation);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -212 +212 @@
     }
 
-    public bool Feasible(Tour tour) {
+    public bool TourFeasible(Tour tour, IVRPEncoding solution) {
       return evaluator.Feasible(
-        evaluator.Evaluate(
-        this, tour));
+        evaluator.EvaluateTour(
+        this, tour, solution));
     }
 
@@ -222 +222 @@
     }
 
-    public VRPEvaluation Evaluate(Tour tour) {
-      return evaluator.Evaluate(this, tour);
+    public VRPEvaluation EvaluateTour(Tour tour, IVRPEncoding solution) {
+      return evaluator.EvaluateTour(this, tour, solution);
     }