Changeset 6569 for branches/QAPAlgorithms/HeuristicLab.Problems.VehicleRouting/3.3/VRPOperator.cs

Timestamp:

07/17/11 22:51:11 (13 years ago)

Author:

abeham

Message:

#1541

• updated to latest trunk version

Location:

branches/QAPAlgorithms

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/VRPOperator.cs (modified) (1 diff)

branches/QAPAlgorithms

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/QAPAlgorithms/HeuristicLab.Problems.VehicleRouting/3.3/VRPOperator.cs

@@ -123 +123 @@
       Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
     }
-
-    protected bool Feasible(Tour tour) {
-      return tour.Feasible(
-                  DueTimeParameter.ActualValue,
-                  ServiceTimeParameter.ActualValue,
-                  ReadyTimeParameter.ActualValue,
-                  DemandParameter.ActualValue,
-                  CapacityParameter.ActualValue,
-                  CoordinatesParameter.ActualValue,
-                  DistanceMatrixParameter,
-                  UseDistanceMatrixParameter.ActualValue);
-    }
-
-    protected bool Feasible(IVRPEncoding solution) {
-      bool feasible = true;
-
-      foreach (Tour tour in solution.GetTours(DistanceMatrixParameter)) {
-        if (!Feasible(tour)) {
-          feasible = false;
-          break;
-        }
-      }
-
-      return feasible;
-    }
-
-    protected double GetLength(Tour tour) {
-      return tour.GetLength(
-                CoordinatesParameter.ActualValue,
-                DistanceMatrixParameter,
-                UseDistanceMatrixParameter.ActualValue);
-    }
   }
 }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates