Changeset 4206 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/StochasticIntraRouteInversionMutliMoveGenerator.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)
• StochasticIntraRouteInversionMutliMoveGenerator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/SimpleLocalSearch/StochasticSimpleLocalSearchMutliMoveGenerator.cs) (3 diffs)

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