Changeset 4369 for branches/VRP
- Timestamp:
- 09/07/10 17:24:00 (14 years ago)
- Location:
- branches/VRP
- Files:
-
- 16 added
- 7 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLabProblemsVehicleRoutingViewsPlugin.cs
r4365 r4369 26 26 /// Plugin class for HeuristicLab.Problems.VehicleRouting.Views plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.436 3")]28 [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.4365")] 29 29 [PluginFile("HeuristicLab.Problems.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/AlbaCreator.cs
r4362 r4369 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 27 using HeuristicLab.Problems.VehicleRouting.Interfaces; 28 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 28 29 29 30 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 30 31 [Item("AlbaCreator", "A VRP creator.")] 31 32 [StorableClass] 32 public abstract class AlbaCreator : AlbaOperator, IVRPCreator {33 public abstract class AlbaCreator : VRPCreator, IAlbaOperator, IVRPCreator { 33 34 public override bool CanChangeName { 34 35 get { return false; } 35 }36 37 #region IVRPCreator Members38 public ILookupParameter<IVRPEncoding> VRPToursParameter {39 get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }40 36 } 41 37 … … 45 41 public AlbaCreator() 46 42 : base() { 47 Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The new VRP tours."));48 43 } 49 50 #endregion51 44 } 52 45 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaCrossover.cs
r4365 r4369 27 27 using HeuristicLab.Optimization; 28 28 using HeuristicLab.Problems.VehicleRouting.Interfaces; 29 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 29 30 30 31 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 31 32 [Item("AlbaCrossover", "An operator which crosses two VRP representations.")] 32 33 [StorableClass] 33 public abstract class AlbaCrossover : AlbaOperator, IVRPCrossover, IStochasticOperator {34 public abstract class AlbaCrossover : VRPCrossover, IAlbaOperator, IVRPCrossover, IStochasticOperator { 34 35 public ILookupParameter<IRandom> RandomParameter { 35 36 get { return (LookupParameter<IRandom>)Parameters["Random"]; } 36 }37 38 public ILookupParameter<ItemArray<IVRPEncoding>> ParentsParameter {39 get { return (ScopeTreeLookupParameter<IVRPEncoding>)Parameters["Parents"]; }40 }41 42 public ILookupParameter<IVRPEncoding> ChildParameter {43 get { return (ILookupParameter<IVRPEncoding>)Parameters["Child"]; }44 37 } 45 38 … … 51 44 : base() { 52 45 Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators.")); 53 54 Parameters.Add(new ScopeTreeLookupParameter<IVRPEncoding>("Parents", "The parent permutations which should be crossed."));55 ParentsParameter.ActualName = "VRPTours";56 Parameters.Add(new LookupParameter<IVRPEncoding>("Child", "The child permutation resulting from the crossover."));57 ChildParameter.ActualName = "VRPTours";58 46 } 59 47 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/IAlbaOperator.cs
r4365 r4369 32 32 33 33 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 34 [Item("AlbaOperator", "Represents a VRP operator.")] 35 [StorableClass] 36 public abstract class AlbaOperator : VRPOperator, 34 public interface IAlbaOperator: 37 35 ISingleDepotOperator, IHeterogenousCapacitatedOperator, ITimeWindowedOperator { 38 [StorableConstructor]39 protected AlbaOperator(bool deserializing) : base(deserializing) { }40 41 public AlbaOperator()42 : base() {43 }44 36 } 45 37 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.cs
r4365 r4369 27 27 using HeuristicLab.Optimization; 28 28 using HeuristicLab.Problems.VehicleRouting.Interfaces; 29 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 29 30 30 31 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 31 32 [Item("AlbaManipulator", "An operator which manipulates a VRP representation.")] 32 33 [StorableClass] 33 public abstract class AlbaManipulator : AlbaOperator, IVRPManipulator, IStochasticOperator {34 public abstract class AlbaManipulator : VRPManipulator, IAlbaOperator, IVRPManipulator, IStochasticOperator { 34 35 public ILookupParameter<IRandom> RandomParameter { 35 36 get { return (LookupParameter<IRandom>)Parameters["Random"]; } 36 }37 38 public ILookupParameter<IVRPEncoding> VRPToursParameter {39 get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }40 37 } 41 38 … … 46 43 : base() { 47 44 Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators.")); 48 Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours to be manipulated."));49 45 } 50 46 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj
r4365 r4369 111 111 <Compile Include="Encodings\Alba\Creators\RandomCreator.cs" /> 112 112 <Compile Include="Encodings\Alba\Creators\AlbaCreator.cs" /> 113 <Compile Include="Encodings\Alba\ AlbaOperator.cs" />113 <Compile Include="Encodings\Alba\IAlbaOperator.cs" /> 114 114 <Compile Include="Encodings\Alba\Crossovers\AlbaCrossover.cs" /> 115 115 <Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" /> … … 121 121 <Compile Include="Encodings\Alba\Manipulators\AlbaManipulator.cs" /> 122 122 <Compile Include="Encodings\Alba\Manipulators\AlbaPermutationManipulator.cs" /> 123 <Compile Include="Encodings\Alba\Moves\AlbaMoveEvaluator.cs" /> 124 <Compile Include="Encodings\Alba\Moves\AlbaMoveMaker.cs" /> 125 <Compile Include="Encodings\Alba\Moves\AlbaMoveGenerator.cs" /> 126 <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveEvaluator.cs" /> 127 <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveGenerator.cs" /> 128 <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveMaker.cs" /> 129 <Compile Include="Encodings\Alba\Moves\ThreeOpt\IAlbaTranslocationMoveOperator.cs" /> 123 130 <Compile Include="Encodings\General\Creators\MultiVRPSolutionCreator.cs" /> 131 <Compile Include="Encodings\General\Creators\VRPCreator.cs" /> 124 132 <Compile Include="Encodings\General\Crossovers\MultiVRPSolutionCrossover.cs" /> 125 133 <Compile Include="Encodings\General\Crossovers\RandomParentCloneCrossover.cs" /> 134 <Compile Include="Encodings\General\Crossovers\VRPCrossover.cs" /> 126 135 <Compile Include="Encodings\General\Manipulators\MultiVRPSolutionManipulator.cs" /> 136 <Compile Include="Encodings\General\Manipulators\VRPManipulator.cs" /> 137 <Compile Include="Encodings\General\Moves\VRPMoveGenerator.cs" /> 138 <Compile Include="Encodings\General\Moves\VRPMoveOperator.cs" /> 139 <Compile Include="Encodings\General\Moves\VRPMoveMaker.cs" /> 140 <Compile Include="Encodings\General\Moves\VRPMoveEvaluator.cs" /> 127 141 <Compile Include="Encodings\General\PermutationEncoding.cs" /> 128 142 <Compile Include="Encodings\General\TourEncoding.cs" /> … … 133 147 <Compile Include="Interfaces\IVRPEvaluator.cs" /> 134 148 <Compile Include="Interfaces\IVRPCreator.cs" /> 149 <Compile Include="Interfaces\IVRPMoveOperator.cs" /> 135 150 <Compile Include="Interfaces\IVRPOperator.cs" /> 136 151 <Compile Include="Interfaces\IVRPEncoding.cs" /> -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLabProblemsVehicleRoutingPlugin.cs
r4365 r4369 26 26 /// Plugin class for HeuristicLab.Problems.VehicleRouting plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.436 3")]28 [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.4365")] 29 29 [PluginFile("HeuristicLab.Problems.VehicleRouting-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEvaluator.cs
r4363 r4369 29 29 namespace HeuristicLab.Problems.VehicleRouting.Interfaces { 30 30 public interface IVRPEvaluator: IVRPOperator, ISingleObjectiveEvaluator { 31 ILookupParameter<IVRPEncoding> VRPToursParameter { get; } 32 31 33 bool Feasible(IVRPProblemInstance instance, IVRPEncoding solution); 32 34 bool Feasible(IVRPProblemInstance instance, Tour tour);
Note: See TracChangeset
for help on using the changeset viewer.