Changeset 4206 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion

Timestamp:

08/13/10 10:28:15 (14 years ago)

Author:

svonolfe

Message:

Updated naming and description of the VRP operators (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion

Files:

• . (added)
• ExhaustiveIntraRouteInversionMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/ExhaustiveSimpleLocalSearchMoveGenerator.cs) (2 diffs)
• IntraRouteInversionEvaluator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/SimpleLocalSearchMoveEvaluator.cs) (3 diffs)
• IntraRouteInversionMove.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/SimpleLocalSearchMove.cs) (3 diffs)
• IntraRouteInversionMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/SimpleLocalSearchMoveGenerator.cs) (3 diffs)
• IntraRouteInversionMoveMaker.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/SimpleLocalSearchMoveMaker.cs) (3 diffs)
• StochasticIntraRouteInversionMutliMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/StochasticSimpleLocalSearchMutliMoveGenerator.cs) (3 diffs)
• StochasticIntraRouteInversionSingleMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/StochasticSimpleLocalSearchSingleMoveGenerator.cs) (3 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/ExhaustiveIntraRouteInversionMoveGenerator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("ExhaustiveSimpleLocalSearchMoveGenerator", "Generates all possible simple local search moves from a given Alba VRP encoding.")]
+  [Item("ExhaustiveIntraRouteInversionGenerator", "Generates all possible intra route inversion moves from a given VRP encoding.")]
   [StorableClass]
-  public sealed class ExhaustiveSimpleLocalSearchMoveGenerator : SimpleLocalSearchMoveGenerator, IExhaustiveMoveGenerator, IAlbaSimpleLocalSearchMoveOperator {
+  public sealed class ExhaustiveIntraRouteInversionGenerator : IntraRouteInversionMoveGenerator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
     [StorableConstructor]
-    private ExhaustiveSimpleLocalSearchMoveGenerator(bool deserializing) : base(deserializing) { }
+    private ExhaustiveIntraRouteInversionGenerator(bool deserializing) : base(deserializing) { }
 
-    public ExhaustiveSimpleLocalSearchMoveGenerator()
+    public ExhaustiveIntraRouteInversionGenerator()
       : base() {
     }
 
-    protected override SimpleLocalSearchMove[] GenerateMoves(AlbaEncoding individual) {
-      List<SimpleLocalSearchMove> moves = new List<SimpleLocalSearchMove>();
+    protected override IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
+      List<IntraRouteInversionMove> moves = new List<IntraRouteInversionMove>();
 
       int currentTourStart = 0;
@@ -55 +55 @@
           for (int i = 0; i <= tourLength - 4; i++ ) {
             for (int j = i + 2; j <= tourLength - 2; j++) {
-              SimpleLocalSearchMove move = new SimpleLocalSearchMove(
+              IntraRouteInversionMove move = new IntraRouteInversionMove(
                 currentTourStart + i, 
                 currentTourStart + j, 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionEvaluator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting {
-  [Item("SimpleLocalSearchMoveEvaluator", "Evaluates a simple local search move for the Alba representation.")]
+  [Item("IntraRouteInversionMoveEvaluator", "Evaluates a intra route inversion move for a VRP representation.")]
   [StorableClass]
-  public sealed class SimpleLocalSearchMoveEvaluator : VRPMoveEvaluator, IAlbaSimpleLocalSearchMoveOperator {
-    public ILookupParameter<SimpleLocalSearchMove> SimpleLocalSearchMoveParameter {
-      get { return (ILookupParameter<SimpleLocalSearchMove>)Parameters["SimpleLocalSearchMove"]; }
+  public sealed class IntraRouteInversionMoveEvaluator : VRPMoveEvaluator, IAlbaIntraRouteInversionMoveOperator {
+    public ILookupParameter<IntraRouteInversionMove> IntraRouteInversionMoveParameter {
+      get { return (ILookupParameter<IntraRouteInversionMove>)Parameters["IntraRouteInversionMove"]; }
     }
 
     [StorableConstructor]
-    private SimpleLocalSearchMoveEvaluator(bool deserializing) : base(deserializing) { }
+    private IntraRouteInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
 
-    public SimpleLocalSearchMoveEvaluator()
+    public IntraRouteInversionMoveEvaluator()
       : base() {
-      Parameters.Add(new LookupParameter<SimpleLocalSearchMove>("SimpleLocalSearchMove", "The move to evaluate."));
+        Parameters.Add(new LookupParameter<IntraRouteInversionMove>("IntraRouteInversionMove", "The move to evaluate."));
     }
 
-    public static TourEvaluation GetMoveQuality(AlbaEncoding individual, SimpleLocalSearchMove move,
+    public static TourEvaluation GetMoveQuality(AlbaEncoding individual, IntraRouteInversionMove move,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray,
       DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
@@ -50 +50 @@
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
       AlbaEncoding newSolution = individual.Clone() as AlbaEncoding;
-      SimpleLocalSearchMoveMaker.Apply(newSolution, move);
+      IntraRouteInversionMoveMaker.Apply(newSolution, move);
 
       return VRPEvaluator.Evaluate(
@@ -60 +60 @@
     protected override TourEvaluation GetMoveQuality() {
       return GetMoveQuality(
-        VRPToursParameter.ActualValue as AlbaEncoding, SimpleLocalSearchMoveParameter.ActualValue,
+        VRPToursParameter.ActualValue as AlbaEncoding, IntraRouteInversionMoveParameter.ActualValue,
         DueTimeParameter.ActualValue, ServiceTimeParameter.ActualValue, ReadyTimeParameter.ActualValue,
         DemandParameter.ActualValue, CapacityParameter.ActualValue, CoordinatesParameter.ActualValue,

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionMove.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("InversionMove", "Item that describes a simple local search move on an Alba VRP representation.")]
+  [Item("InversionMove", "Item that describes an intra route inversion move on a VRP representation.")]
   [StorableClass]
-  public class SimpleLocalSearchMove : TwoIndexMove, IVRPMove {
-    public SimpleLocalSearchMove()
+  public class IntraRouteInversionMove : TwoIndexMove, IVRPMove {
+    public IntraRouteInversionMove()
       : base() {
     }
 
-    public SimpleLocalSearchMove(int index1, int index2)
+    public IntraRouteInversionMove(int index1, int index2)
       : base(index1, index2, null) {
     }
 
-    public SimpleLocalSearchMove(int index1, int index2, AlbaEncoding permutation)
+    public IntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
       : base(index1, index2, permutation) {
     }
 
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      SimpleLocalSearchMove clone = new SimpleLocalSearchMove(
+      IntraRouteInversionMove clone = new IntraRouteInversionMove(
         Index1, Index2);
 
@@ -63 +63 @@
       DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
-        return SimpleLocalSearchMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,
+        return IntraRouteInversionMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,
           dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           coordinates, fleetUsageFactor, timeFactor, distanceFactor,
@@ -70 +70 @@
 
     public void MakeMove(IRandom random, IVRPEncoding individual) {
-      SimpleLocalSearchMoveMaker.Apply(individual as AlbaEncoding, this);
+      IntraRouteInversionMoveMaker.Apply(individual as AlbaEncoding, this);
     }
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionMoveGenerator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("SimpleLocalSearchMoveGenerator", "Generates local search moves from a given Alba VRP encoding.")]
+  [Item("IntraRouteInversionMoveGenerator", "Generates intra route inversion moves from a given VRP encoding.")]
   [StorableClass]
-  public abstract class SimpleLocalSearchMoveGenerator : AlbaMoveOperator, IExhaustiveMoveGenerator, IAlbaSimpleLocalSearchMoveOperator {
-    #region IAlbaSimpleLocalSearchMoveOperator Members
-
-    public ILookupParameter<SimpleLocalSearchMove> SimpleLocalSearchMoveParameter {
-      get { return (ILookupParameter<SimpleLocalSearchMove>)Parameters["SimpleLocalSearchMove"]; }
+  public abstract class IntraRouteInversionMoveGenerator : AlbaMoveOperator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
+    public ILookupParameter<IntraRouteInversionMove> IntraRouteInversionMoveParameter {
+      get { return (ILookupParameter<IntraRouteInversionMove>)Parameters["IntraRouteInversionMove"]; }
     }
 
@@ -42 +40 @@
     }
 
-    #endregion
+    [StorableConstructor]
+    protected IntraRouteInversionMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    [StorableConstructor]
-    protected SimpleLocalSearchMoveGenerator(bool deserializing) : base(deserializing) { }
-
-    public SimpleLocalSearchMoveGenerator()
+    public IntraRouteInversionMoveGenerator()
       : base() {
-        Parameters.Add(new LookupParameter<SimpleLocalSearchMove>("SimpleLocalSearchMove", "The moves that should be generated in subscopes."));
+        Parameters.Add(new LookupParameter<IntraRouteInversionMove>("IntraRouteInversionMove", "The moves that should be generated in subscopes."));
         Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
     }
 
-    protected abstract SimpleLocalSearchMove[] GenerateMoves(AlbaEncoding individual);
+    protected abstract IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual);
 
     public override IOperation Apply() {
@@ -59 +55 @@
 
       AlbaEncoding individual = VRPToursParameter.ActualValue as AlbaEncoding;
-      SimpleLocalSearchMove[] moves = GenerateMoves(individual);
+      IntraRouteInversionMove[] moves = GenerateMoves(individual);
       Scope[] moveScopes = new Scope[moves.Length];
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString());
-        moveScopes[i].Variables.Add(new Variable(SimpleLocalSearchMoveParameter.ActualName, moves[i]));
+        moveScopes[i].Variables.Add(new Variable(IntraRouteInversionMoveParameter.ActualName, moves[i]));
       }
       CurrentScopeParameter.ActualValue.SubScopes.AddRange(moveScopes);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionMoveMaker.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("SimpleLocalSearchMoveMaker", "Peforms a simple local search moves on a given Alba VRP encoding and updates the quality.")]
+  [Item("IntraRouteInversionMoveMaker", "Peforms the SLS move on a given VRP encoding and updates the quality.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
   [StorableClass]
-  public class SimpleLocalSearchMoveMaker : AlbaMoveMaker, IAlbaSimpleLocalSearchMoveOperator, IMoveMaker {
+  public class IntraRouteInversionMoveMaker : AlbaMoveMaker, IAlbaIntraRouteInversionMoveOperator, IMoveMaker {
     public override bool CanChangeName {
       get { return false; }
@@ -40 +40 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
-    public ILookupParameter<SimpleLocalSearchMove> SimpleLocalSearchMoveParameter {
-      get { return (ILookupParameter<SimpleLocalSearchMove>)Parameters["SimpleLocalSearchMove"]; }
+    public ILookupParameter<IntraRouteInversionMove> IntraRouteInversionMoveParameter {
+      get { return (ILookupParameter<IntraRouteInversionMove>)Parameters["IntraRouteInversionMove"]; }
     }
 
     [StorableConstructor]
-    private SimpleLocalSearchMoveMaker(bool deserializing) : base(deserializing) { }
+    private IntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { }
 
-    public SimpleLocalSearchMoveMaker()
+    public IntraRouteInversionMoveMaker()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
-      Parameters.Add(new LookupParameter<SimpleLocalSearchMove>("SimpleLocalSearchMove", "The move to make."));
+      Parameters.Add(new LookupParameter<IntraRouteInversionMove>("IntraRouteInversionMove", "The move to make."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
     }
 
-    public static void Apply(AlbaEncoding solution, SimpleLocalSearchMove move) {
-      SimpleLocalSearchManipulator.Apply(solution, move.Index1, move.Index2);
+    public static void Apply(AlbaEncoding solution, IntraRouteInversionMove move) {
+      IntraRouteInversionManipulator.Apply(solution, move.Index1, move.Index2);
     }
 
@@ -63 +63 @@
       AlbaEncoding solution = VRPToursParameter.ActualValue as AlbaEncoding;
 
-      SimpleLocalSearchMove move = SimpleLocalSearchMoveParameter.ActualValue;
+      IntraRouteInversionMove move = IntraRouteInversionMoveParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
       DoubleValue quality = QualityParameter.ActualValue;

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/StochasticIntraRouteInversionMutliMoveGenerator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("StochasticSimpleLocalSearchMultiMoveGenerator", "Generates multiple random simple local search moves from a given Alba VRP encoding.")]
+  [Item("StochasticIntraRouteInversionMultiMoveGenerator", "Generates multiple random intra route inversion moves from a given VRP encoding.")]
   [StorableClass]
-  public sealed class StochasticSimpleLocalSearchMultiMoveGenerator : SimpleLocalSearchMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaSimpleLocalSearchMoveOperator {
+  public sealed class StochasticIntraRouteInversionMultiMoveGenerator : IntraRouteInversionMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -42 +42 @@
     
     [StorableConstructor]
-    private StochasticSimpleLocalSearchMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    private StochasticIntraRouteInversionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    public StochasticSimpleLocalSearchMultiMoveGenerator()
+    public StochasticIntraRouteInversionMultiMoveGenerator()
       : base() {
         Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -50 +50 @@
     }
 
-    protected override SimpleLocalSearchMove[] GenerateMoves(AlbaEncoding individual) {
+    protected override IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
       int sampleSize = SampleSizeParameter.ActualValue.Value;
 
-      SimpleLocalSearchMove[] moves = new SimpleLocalSearchMove[sampleSize];
+      IntraRouteInversionMove[] moves = new IntraRouteInversionMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
-        moves[i] = StochasticSimpleLocalSearchSingleMoveGenerator.Apply(
+        moves[i] = StochasticIntraRouteInversionSingleMoveGenerator.Apply(
           individual, Cities, RandomParameter.ActualValue);
       }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/StochasticIntraRouteInversionSingleMoveGenerator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("StochasticSimpleLocalSearchSingleMoveGenerator", "Generates one random simple local search move from a given Alba VRP encoding.")]
+  [Item("StochasticIntraRouteInversionSingleMoveGenerator", "Generates one random intra route inversion move from a given VRP encoding.")]
   [StorableClass]
-  public sealed class StochasticSimpleLocalSearchSingleMoveGenerator : SimpleLocalSearchMoveGenerator,
-    IStochasticOperator, ISingleMoveGenerator, IAlbaSimpleLocalSearchMoveOperator, IMultiVRPMoveGenerator {
+  public sealed class StochasticIntraRouteInversionSingleMoveGenerator : IntraRouteInversionMoveGenerator,
+    IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator {
     #region IMultiVRPMoveOperator Members
 
     public ILookupParameter VRPMoveParameter {
-      get { return (ILookupParameter)Parameters["SimpleLocalSearchMove"]; }
+      get { return (ILookupParameter)Parameters["IntraRouteInversionMove"]; }
     }
 
@@ -47 +47 @@
     
     [StorableConstructor]
-    private StochasticSimpleLocalSearchSingleMoveGenerator(bool deserializing) : base(deserializing) { }
+    private StochasticIntraRouteInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    public StochasticSimpleLocalSearchSingleMoveGenerator()
+    public StochasticIntraRouteInversionSingleMoveGenerator()
       : base() {
         Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
     }
 
-    public static SimpleLocalSearchMove Apply(AlbaEncoding individual, int cities, IRandom rand) {
+    public static IntraRouteInversionMove Apply(AlbaEncoding individual, int cities, IRandom rand) {
       int index1 = -1;
       int index2 = -1;
@@ -86 +86 @@
       }
 
-      return new SimpleLocalSearchMove(index1, index2, individual);
+      return new IntraRouteInversionMove(index1, index2, individual);
     }
 
-    protected override SimpleLocalSearchMove[] GenerateMoves(AlbaEncoding individual) {
-      List<SimpleLocalSearchMove> moves = new List<SimpleLocalSearchMove>();
+    protected override IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
+      List<IntraRouteInversionMove> moves = new List<IntraRouteInversionMove>();
 
-      SimpleLocalSearchMove move = Apply(individual, Cities, RandomParameter.ActualValue);
+      IntraRouteInversionMove move = Apply(individual, Cities, RandomParameter.ActualValue);
       if(move != null)
         moves.Add(move);