Changeset 4690 for branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators

Timestamp:

10/29/10 20:30:20 (14 years ago)

Author:

gkronber

Message:

Refactored cloning in HeuristicLab.Problems.VehicleRouting. #922

Location:

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators

Files:

• AlbaCustomerInsertionManipulator.cs (modified) (2 diffs)
• AlbaCustomerInversionManipulator.cs (modified) (2 diffs)
• AlbaCustomerSwapManipulator.cs (modified) (2 diffs)
• AlbaIntraRouteInversionManipulator.cs (modified) (2 diffs)
• AlbaLambdaInterchangeManipulator.cs (modified) (2 diffs)
• AlbaManipulator.cs (modified) (2 diffs)
• AlbaPermutationManipulator.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -32 +33 @@
     [StorableConstructor]
     private AlbaCustomerInsertionManipulator(bool deserializing) : base(deserializing) { }
-
+    private AlbaCustomerInsertionManipulator(AlbaCustomerInsertionManipulator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public AlbaCustomerInsertionManipulator()
       : base() {
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaCustomerInsertionManipulator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -33 +34 @@
     [StorableConstructor]
     private AlbaCustomerInversionManipulator(bool deserializing) : base(deserializing) { }
-
+    private AlbaCustomerInversionManipulator(AlbaCustomerInversionManipulator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public AlbaCustomerInversionManipulator()
       : base() {
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaCustomerInversionManipulator(this, cloner);
+    }
     protected override void Manipulate(IRandom random, AlbaEncoding individual) {
       int breakPoint1, breakPoint2;

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -32 +33 @@
     [StorableConstructor]
     private AlbaCustomerSwapManipulator(bool deserializing) : base(deserializing) { }
-
+    private AlbaCustomerSwapManipulator(AlbaCustomerSwapManipulator original, Cloner cloner) : base(original, cloner) { }
     public AlbaCustomerSwapManipulator()
       : base() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaCustomerSwapManipulator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.cs

@@ -27 +27 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [Item("AlbaIntraRouteInversionManipulator", "An operator which applies the SLS operation to a VRP representation. It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
   [StorableClass]
-  public sealed class AlbaIntraRouteInversionManipulator : AlbaManipulator {   
+  public sealed class AlbaIntraRouteInversionManipulator : AlbaManipulator {
     [StorableConstructor]
     private AlbaIntraRouteInversionManipulator(bool deserializing) : base(deserializing) { }
-
+    private AlbaIntraRouteInversionManipulator(AlbaIntraRouteInversionManipulator original, Cloner cloner) : base(original, cloner) { }
     public AlbaIntraRouteInversionManipulator()
       : base() {
-     }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaIntraRouteInversionManipulator(this, cloner);
+    }
 
     public static void Apply(AlbaEncoding individual, int index1, int index2) {
@@ -72 +77 @@
 
         int currentTourEnd = currentTourStart;
-        while (currentTourEnd < individual.Length && 
+        while (currentTourEnd < individual.Length &&
           individual[currentTourEnd] < individual.Cities) {
           currentTourEnd++;

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.cs

@@ -27 +27 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -35 +36 @@
       get { return (IValueParameter<IntValue>)Parameters["Lambda"]; }
     }
-    
+
     [StorableConstructor]
     private AlbaLambdaInterchangeManipulator(bool deserializing) : base(deserializing) { }
-
+    private AlbaLambdaInterchangeManipulator(AlbaLambdaInterchangeManipulator original, Cloner cloner) : base(original, cloner) { }
     public AlbaLambdaInterchangeManipulator()
       : base() {
-        Parameters.Add(new ValueParameter<IntValue>("Lambda", "The lambda value.", new IntValue(1)));
-     }
+      Parameters.Add(new ValueParameter<IntValue>("Lambda", "The lambda value.", new IntValue(1)));
+    }
 
-    public static void Apply(AlbaEncoding individual, int tour1Index, int position1, int length1, 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaLambdaInterchangeManipulator(this, cloner);
+    }
+
+    public static void Apply(AlbaEncoding individual, int tour1Index, int position1, int length1,
       int tour2Index, int position2, int length2) {
       List<Tour> tours = individual.GetTours();

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -37 +38 @@
     [StorableConstructor]
     protected AlbaManipulator(bool deserializing) : base(deserializing) { }
-
+    protected AlbaManipulator(AlbaManipulator original, Cloner cloner) : base(original, cloner) { }
     public AlbaManipulator()
       : base() {
-        Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
 
-        AlbaEncoding.RemoveUnusedParameters(Parameters);
+      AlbaEncoding.RemoveUnusedParameters(Parameters);
     }
 

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -36 +37 @@
     [StorableConstructor]
     private AlbaPermutationManipualtor(bool deserializing) : base(deserializing) { }
-
+    private AlbaPermutationManipualtor(AlbaPermutationManipualtor original, Cloner cloner) : base(original, cloner) { }
     public AlbaPermutationManipualtor()
       : base() {
-        Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("InnerManipulator", "The permutation manipulator.", new TranslocationManipulator()));
+      Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("InnerManipulator", "The permutation manipulator.", new TranslocationManipulator()));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AlbaPermutationManipualtor(this, cloner);
     }