Changeset 4686

Timestamp:

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

Author:

abeham

Message:

#922

• Refactored Prins encoding in HeuristicLab.Problems.VehicleRouting

Location:

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins

Files:

• Crossovers/PrinsCrossover.cs (modified) (2 diffs)
• Crossovers/PrinsPermutationCrossover.cs (modified) (2 diffs)
• Manipulators/PrinsExhaustiveLSManipulator.cs (modified) (2 diffs)
• Manipulators/PrinsLSManipulator.cs (modified) (2 diffs)
• Manipulators/PrinsManipulator.cs (modified) (3 diffs)
• Manipulators/PrinsPermutationManipulator.cs (modified) (2 diffs)
• Manipulators/PrinsStochasticLSManipulator.cs (modified) (2 diffs)
• PrinsEncoding.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Crossovers/PrinsCrossover.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
@@ -53 +54 @@
     [StorableConstructor]
     protected PrinsCrossover(bool deserializing) : base(deserializing) { }
-
+    protected PrinsCrossover(PrinsCrossover original, Cloner cloner) : base(original, cloner) { }
     public PrinsCrossover()
       : base() {

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Crossovers/PrinsPermutationCrossover.cs

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

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Manipulators/PrinsExhaustiveLSManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
@@ -33 +34 @@
     [StorableConstructor]
     private PrinsExhaustiveLSManipulator(bool deserializing) : base(deserializing) { }
-
+    private PrinsExhaustiveLSManipulator(PrinsExhaustiveLSManipulator original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PrinsExhaustiveLSManipulator(this, cloner);
+    }
     public PrinsExhaustiveLSManipulator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Manipulators/PrinsLSManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
@@ -37 +38 @@
     [StorableConstructor]
     protected PrinsLSManipulator(bool deserializing) : base(deserializing) { }
-
+    protected PrinsLSManipulator(PrinsLSManipulator original, Cloner cloner) : base(original, cloner) { }
     public PrinsLSManipulator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Manipulators/PrinsManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
@@ -53 +54 @@
     [StorableConstructor]
     protected PrinsManipulator(bool deserializing) : base(deserializing) { }
-
+    protected PrinsManipulator(PrinsManipulator original, Cloner cloner) : base(original, cloner) { }
     public PrinsManipulator()
       : base() {
@@ -61 +62 @@
       Parameters.Add(new LookupParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation."));
       Parameters.Add(new LookupParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation."));
-
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
     }

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Manipulators/PrinsPermutationManipulator.cs

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

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/Manipulators/PrinsStochasticLSManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
@@ -37 +38 @@
     [StorableConstructor]
     private PrinsStochasticLSManipulator(bool deserializing) : base(deserializing) { }
-
+    private PrinsStochasticLSManipulator(PrinsStochasticLSManipulator original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PrinsStochasticLSManipulator(this, cloner);
+    }
     public PrinsStochasticLSManipulator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Prins/PrinsEncoding.cs

@@ -178 +178 @@
     }
     #endregion
-
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      PrinsEncoding clone = new PrinsEncoding(
-        new Permutation(this.PermutationType, this.array), cities, 
-        dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
-        fleetUsageFactor, timeFactor, distanceFactor, overloadPenalty, tardinessPenalty,
-        coordinates, useDistanceMatrix);
-
-      cloner.RegisterClonedObject(this, clone);
-      clone.readOnly = readOnly;
-      return clone;
-    }
-
+    
+    [StorableConstructor]
+    protected PrinsEncoding(bool deserializing) : base(deserializing) { }
+    protected PrinsEncoding(PrinsEncoding original, Cloner cloner)
+      : base(original, cloner) {
+      this.cities = original.cities;
+      this.dueTimeArray = original.dueTimeArray;
+      this.serviceTimeArray = original.serviceTimeArray;
+      this.readyTimeArray = original.readyTimeArray;
+      this.demandArray = original.demandArray;
+      this.capacity = original.capacity;
+      this.fleetUsageFactor = original.fleetUsageFactor;
+      this.timeFactor = original.timeFactor;
+      this.distanceFactor = original.distanceFactor;
+      this.overloadPenalty = original.overloadPenalty;
+      this.tardinessPenalty = original.tardinessPenalty;
+      this.coordinates = original.coordinates;
+      this.useDistanceMatrix = original.useDistanceMatrix;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PrinsEncoding(this, cloner);
+    }
     public PrinsEncoding(Permutation permutation, int cities,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
@@ -211 +220 @@
     }
 
-    [StorableConstructor]
-    private PrinsEncoding(bool serializing)
-      : base(serializing) {
-    }
-
     public static PrinsEncoding ConvertFrom(IVRPEncoding encoding, int cities,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,