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

Timestamp:

09/06/10 17:05:13 (14 years ago)

Author:

svonolfe

Message:

Worked on VRP operators (WIP) (#1177)

Location:

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

Files:

• SingleDepotVRP/SingleDepotVRPProblemInstance.cs (modified) (1 diff)
• VRPEvaluator.cs (modified) (1 diff)
• VRPProblemInstance.cs (modified) (1 diff)

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

@@ -43 +43 @@
     }
 
+    public override IntValue Cities {
+      get {
+        return new IntValue(Demand.Length - 1);
+      }
+    }
+
     protected override IVRPEvaluator Evaluator {
       get {

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

@@ -124 +124 @@
 
     public override IOperation Apply() {
+      double quality = 0;
       InitResultParameters();
 
       foreach (Tour tour in VRPToursParameter.ActualValue.GetTours()) {
         VRPEvaluation tourEvaluation = EvaluateTour(ProblemInstance, tour);
+        quality += tourEvaluation.Quality;
 
         UpdateResultParameters(tourEvaluation);
       }
+
+      QualityParameter.ActualValue = new DoubleValue(quality);
 
       return base.Apply();

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

@@ -89 +89 @@
       set { DemandParameter.Value = value; }
     }
-    public IntValue Cities {
+    public virtual IntValue Cities {
       get { return new IntValue(Demand.Length); }
     }