Changeset 4241 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings

Timestamp:

08/17/10 11:36:17 (14 years ago)

Author:

svonolfe

Message:

Added MultiVRPCreator (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings

Files:

• General/Creators/MultiVRPCreator.cs (added)
• General/Creators/PushForwardInsertionCreator.cs (modified) (2 diffs)
• VRPCreator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/PushForwardInsertionCreator.cs

@@ -225 +225 @@
       int customer = -1;
       int subTourCount = 1;
-      List<int> route = new List<int>(CitiesParameter.ActualValue.Value + VehiclesParameter.ActualValue.Value - 1);
+      List<int> route = new List<int>(Cities + VehiclesParameter.ActualValue.Value - 1);
       minimumCost = double.MaxValue;
       indexOfMinimumCost = -1;
@@ -271 +271 @@
         customer = -1;
       } while (unroutedList.Count > 0);
-      while (route.Count < CitiesParameter.ActualValue.Value + VehiclesParameter.ActualValue.Value - 1)
+      while (route.Count < Cities + VehiclesParameter.ActualValue.Value - 1)
         route.Add(0);
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/VRPCreator.cs

@@ -39 +39 @@
     }
     
-    public IValueLookupParameter<IntValue> CitiesParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Cities"]; }
-    }
-
     [StorableConstructor]
     protected VRPCreator(bool deserializing) : base(deserializing) { }