Changeset 4241 for branches/VRP

Timestamp:

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

Author:

svonolfe

Message:

Added MultiVRPCreator (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3

Files:

• Encodings/General/Creators/MultiVRPCreator.cs (added)
• Encodings/General/Creators/PushForwardInsertionCreator.cs (modified) (2 diffs)
• Encodings/VRPCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (1 diff)
• Interfaces/IVRPCreator.cs (modified) (1 diff)
• VRPOperator.cs (modified) (1 diff)
• VehicleRoutingProblem.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) { }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

@@ -131 +131 @@
     <Compile Include="Encodings\Alba\Moves\IntraRouteInversion\IntraRouteInversionMoveMaker.cs" />
     <Compile Include="Encodings\Alba\Moves\IntraRouteInversion\IntraRouteInversionMove.cs" />
+    <Compile Include="Encodings\General\Creators\MultiVRPCreator.cs" />
     <Compile Include="Encodings\General\Crossovers\MultiVRPManipulator.cs" />
     <Compile Include="Encodings\General\Crossovers\MultiVRPCrossover.cs" />

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Interfaces/IVRPCreator.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.VehicleRouting {
   public interface IVRPCreator : IVRPOperator, ISolutionCreator {
-    IValueLookupParameter<IntValue> CitiesParameter { get; }
     ILookupParameter<IVRPEncoding> VRPToursParameter { get; }
   }

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

@@ -113 +113 @@
     public VRPOperator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntValue>("Cities", "The city count."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The coordinates of the cities."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities."));

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -333 +333 @@
     }
     private void ParameterizeSolutionCreator() {
-      SolutionCreator.CitiesParameter.Value = new IntValue(Coordinates.Rows - 1);
       SolutionCreator.VehiclesParameter.ActualName = VehiclesParameter.Name;
       SolutionCreator.CoordinatesParameter.ActualName = CoordinatesParameter.Name;