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

Timestamp:

08/09/10 18:08:14 (14 years ago)

Author:

svonolfe

Message:

Refactored VRP based on the code review (#1039)

Location:

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

Files:

• AlbaMoveMaker.cs (modified) (1 diff)
• AlbaMoveOperator.cs (modified) (1 diff)
• ThreeOpt/AlbaTranslocationMoveEvaluator.cs (modified) (2 diffs)
• ThreeOpt/AlbaTranslocationMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs (modified) (1 diff)
• ThreeOpt/AlbaTranslocationMoveMaker.cs (modified) (1 diff)
• ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs (modified) (1 diff)
• ThreeOpt/AlbaTranslocationMoveTabuMaker.cs (modified) (1 diff)

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

@@ -61 +61 @@
     }
     
+    [StorableConstructor]
+    protected AlbaMoveMaker(bool deserializing) : base(deserializing) { }
 
     public AlbaMoveMaker()

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

@@ -33 +33 @@
     protected abstract IPermutationMoveOperator PermutationMoveOperatorParameter { get; set; }
 
+    [StorableConstructor]
+    protected AlbaMoveOperator(bool deserializing) : base(deserializing) { }
+
+    public AlbaMoveOperator() : base() 
+    {
+      AlbaEncoding.RemoveUnusedParameters(Parameters);
+    }
+
     public override IOperation Apply() {
-      IVRPEncoding solution = VRPSolutionParameter.ActualValue;
+      IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is AlbaEncoding)) {
-        VRPSolutionParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value);
+        VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value);
       }
 
-      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPSolutionParameter.ActualName;
+      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
       IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
       op.Operator.Execute((IExecutionContext)op);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.cs

@@ -35 +35 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveEvaluator()
       : base() {
@@ -43 +46 @@
       TranslocationMove move = TranslocationMoveParameter.ActualValue;
       //perform move
-      AlbaEncoding newSolution = VRPSolutionParameter.ActualValue.Clone() as AlbaEncoding;
+      AlbaEncoding newSolution = VRPToursParameter.ActualValue.Clone() as AlbaEncoding;
       TranslocationManipulator.Apply(newSolution, move.Index1, move.Index2, move.Index3);
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

@@ -68 +68 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveGenerator()
       : base() {
@@ -80 +83 @@
       IOperation successor = base.Apply();
 
-      Permutation permutation = VRPSolutionParameter.ActualValue as Permutation;
+      Permutation permutation = VRPToursParameter.ActualValue as Permutation;
       string moveName = TranslocationMoveGeneratorParameter.ActualValue.TranslocationMoveParameter.Name;
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

@@ -56 +56 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveHardTabuCriterion()
       : base() {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs

@@ -52 +52 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveMaker(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveMaker()
       : base() {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

@@ -56 +56 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveSoftTabuCriterion()
       : base() {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

@@ -56 +56 @@
     }
 
+    [StorableConstructor]
+    private AlbaTranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
+
     public AlbaTranslocationMoveTabuMaker()
       : base() {