Changeset 4177 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs

Timestamp:

08/09/10 13:29:06 (14 years ago)

Author:

svonolfe

Message:

Refactored VRP in preparation for the code review (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
+  [Item("AlbaManipulator", "An operator which manipulates an alba VRP representation.")]
   [StorableClass]
-  public abstract class AlbaManipulator : VRPManipulator {    
-    protected virtual void Manipulate() {
+  public sealed class AlbaManipulator : VRPManipulator {    
+    public IValueLookupParameter<IPermutationManipulator> PermutationManipulatorParameter {
+      get { return (IValueLookupParameter<IPermutationManipulator>)Parameters["PermutationManipulator"]; }
     }
-    
+
+    public AlbaManipulator()
+      : base() {
+      Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("PermutationManipulator", "The permutation manipulator.", new TranslocationManipulator()));
+    }
+
     public override IOperation Apply() {
       IVRPEncoding solution = VRPSolutionParameter.ActualValue;
@@ -38 +45 @@
       }
       
-      Manipulate();
+      OperationCollection next = new OperationCollection(base.Apply());
 
-      return base.Apply();
+      IPermutationManipulator op = PermutationManipulatorParameter.ActualValue;
+      if (op != null) {
+        op.PermutationParameter.ActualName = VRPSolutionParameter.ActualName;
+        next.Insert(0, ExecutionContext.CreateOperation(op));
+      }
+
+      return next;
     }
   }