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

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)
• IntraRouteInversionMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/SimpleLocalSearchMoveGenerator.cs) (3 diffs)

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);