Changeset 7865 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs

Timestamp:

05/22/12 09:53:07 (12 years ago)

Author:

svonolfe

Message:

Fixed naming of moves (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar

Files:

• . (added)
• PotvinTwoOptStarMultiMoveGenerator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/OnePointCrossover/PotvinOnePointCrossoverMultiMoveGenerator.cs) (3 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs

@@ -32 +32 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
-  [Item("PotvinOnePointCrossoverMultiMoveGenerator", "Generates customer relocation moves from a given VRP encoding.")]
+  [Item("PotvinTwoOptStarMultiMoveGenerator", "Generates two opt star moves from a given VRP encoding.")]
   [StorableClass]
-  public sealed class PotvinOnePointCrossoverMultiMoveGenerator : PotvinOnePointCrossoverMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
+  public sealed class PotvinTwoOptStarMultiMoveGenerator : PotvinTwoOptStarMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -44 +44 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PotvinOnePointCrossoverMultiMoveGenerator(this, cloner);
+      return new PotvinTwoOptStarMultiMoveGenerator(this, cloner);
     }
 
     [StorableConstructor]
-    private PotvinOnePointCrossoverMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    private PotvinTwoOptStarMultiMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    public PotvinOnePointCrossoverMultiMoveGenerator()
+    public PotvinTwoOptStarMultiMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -56 +56 @@
     }
 
-    private PotvinOnePointCrossoverMultiMoveGenerator(PotvinOnePointCrossoverMoveGenerator original, Cloner cloner)
+    private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }
 
-    protected override PotvinOnePointCrossoverMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance) {
-      List<PotvinOnePointCrossoverMove> result = new List<PotvinOnePointCrossoverMove>();
+    protected override PotvinTwoOptStarMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance) {
+      List<PotvinTwoOptStarMove> result = new List<PotvinTwoOptStarMove>();
 
       for (int i = 0; i < SampleSizeParameter.ActualValue.Value; i++) {
-        result.Add(PotvinOnePointCrossoverSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue));
+        result.Add(PotvinTwoOptStarSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue));
       }