- Timestamp:
- 07/26/12 09:51:13 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 8121,8231,8246
- Property svn:mergeinfo changed
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/Plugin.cs.frame
r7259 r8331 26 26 /// Plugin class for HeuristicLab.Problems.VehicleRouting plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.VehicleRouting", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Problems.VehicleRouting", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.VehicleRouting-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/Properties/AssemblyInfo.cs.frame
r7259 r8331 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseOneLevelExchangeManipulator.cs
r8086 r8331 27 27 28 28 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin { 29 [Item("PotvinPairwiseOneLevelExchangeMainpulator", "The 1M operator which manipulates a VRP representation. It is implemented as described inPotvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172. It was adapted to the PDP formulation.")]29 [Item("PotvinPairwiseOneLevelExchangeMainpulator", "The 1M operator which manipulates a PDP representation. It has been adapted to pickup and delivery from Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172. It was adapted to the PDP formulation.")] 30 30 [StorableClass] 31 31 public sealed class PotvinPairwiseOneLevelExchangeMainpulator : PotvinManipulator { -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseTwoLevelExchangeManipulator.cs
r8086 r8331 28 28 29 29 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin { 30 [Item("PotvinPairwiseTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation. It is implemented as described inPotvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172. It was adapted to the PDP formulation.")]30 [Item("PotvinPairwiseTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation. It has been adapted to pickup and delivery from Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172. It was adapted to the PDP formulation.")] 31 31 [StorableClass] 32 32 public sealed class PotvinPairwiseTwoLevelExchangeManipulator : PotvinManipulator { -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs
r8086 r8331 67 67 get { return (OptionalValueParameter<VRPSolution>)Parameters["BestKnownSolution"]; } 68 68 } 69 public I ValueParameter<IVRPCreator> SolutionCreatorParameter {70 get { return (I ValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }69 public IConstrainedValueParameter<IVRPCreator> SolutionCreatorParameter { 70 get { return (IConstrainedValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; } 71 71 } 72 72 IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter { … … 105 105 } 106 106 107 public ISolutionCreatorSolutionCreator {107 ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { 108 108 get { return SolutionCreatorParameter.Value; } 109 } 110 public IVRPCreator SolutionCreator { 111 get { return SolutionCreatorParameter.Value; } 112 set { SolutionCreatorParameter.Value = value; } 109 113 } 110 114 #endregion
Note: See TracChangeset
for help on using the changeset viewer.