Changeset 4241 for branches/VRP/HeuristicLab.Problems.VehicleRouting
- Timestamp:
- 08/17/10 11:36:17 (14 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/PushForwardInsertionCreator.cs
r4183 r4241 225 225 int customer = -1; 226 226 int subTourCount = 1; 227 List<int> route = new List<int>(Cities Parameter.ActualValue.Value+ VehiclesParameter.ActualValue.Value - 1);227 List<int> route = new List<int>(Cities + VehiclesParameter.ActualValue.Value - 1); 228 228 minimumCost = double.MaxValue; 229 229 indexOfMinimumCost = -1; … … 271 271 customer = -1; 272 272 } while (unroutedList.Count > 0); 273 while (route.Count < Cities Parameter.ActualValue.Value+ VehiclesParameter.ActualValue.Value - 1)273 while (route.Count < Cities + VehiclesParameter.ActualValue.Value - 1) 274 274 route.Add(0); 275 275 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/VRPCreator.cs
r4179 r4241 39 39 } 40 40 41 public IValueLookupParameter<IntValue> CitiesParameter {42 get { return (IValueLookupParameter<IntValue>)Parameters["Cities"]; }43 }44 45 41 [StorableConstructor] 46 42 protected VRPCreator(bool deserializing) : base(deserializing) { } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj
r4232 r4241 131 131 <Compile Include="Encodings\Alba\Moves\IntraRouteInversion\IntraRouteInversionMoveMaker.cs" /> 132 132 <Compile Include="Encodings\Alba\Moves\IntraRouteInversion\IntraRouteInversionMove.cs" /> 133 <Compile Include="Encodings\General\Creators\MultiVRPCreator.cs" /> 133 134 <Compile Include="Encodings\General\Crossovers\MultiVRPManipulator.cs" /> 134 135 <Compile Include="Encodings\General\Crossovers\MultiVRPCrossover.cs" /> -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Interfaces/IVRPCreator.cs
r4179 r4241 26 26 namespace HeuristicLab.Problems.VehicleRouting { 27 27 public interface IVRPCreator : IVRPOperator, ISolutionCreator { 28 IValueLookupParameter<IntValue> CitiesParameter { get; }29 28 ILookupParameter<IVRPEncoding> VRPToursParameter { get; } 30 29 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VRPOperator.cs
r4230 r4241 113 113 public VRPOperator() 114 114 : base() { 115 Parameters.Add(new ValueLookupParameter<IntValue>("Cities", "The city count."));116 115 Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The coordinates of the cities.")); 117 116 Parameters.Add(new LookupParameter<DoubleMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities.")); -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs
r4232 r4241 333 333 } 334 334 private void ParameterizeSolutionCreator() { 335 SolutionCreator.CitiesParameter.Value = new IntValue(Coordinates.Rows - 1);336 335 SolutionCreator.VehiclesParameter.ActualName = VehiclesParameter.Name; 337 336 SolutionCreator.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
Note: See TracChangeset
for help on using the changeset viewer.