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

Timestamp:

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

Author:

svonolfe

Message:

Refactored VRP based on the code review (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveOperator.cs (modified) (1 diff)

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