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

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

Files:

• AlbaEncoding.cs (modified) (1 diff)
• Creators (deleted)
• Crossovers/AlbaCrossover.cs (modified) (1 diff)
• Manipulators/AlbaManipulator.cs (modified) (1 diff)
• Moves/AlbaMoveMaker.cs (modified) (1 diff)
• Moves/AlbaMoveOperator.cs (modified) (1 diff)
• Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.cs (modified) (2 diffs)
• Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs (modified) (2 diffs)
• Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs (modified) (1 diff)
• Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs (modified) (1 diff)
• Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs (modified) (1 diff)
• Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/AlbaEncoding.cs

@@ -154 +154 @@
         cities);
     }
+
+    internal static void RemoveUnusedParameters(ParameterCollection parameters) {
+      parameters.Remove("DistanceMatrix");
+      parameters.Remove("UseDistanceMatrix");
+      parameters.Remove("Capacity");
+      parameters.Remove("Demand");
+      parameters.Remove("ReadyTime");
+      parameters.Remove("DueTime");
+      parameters.Remove("ServiceTime");
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Crossovers/AlbaCrossover.cs

@@ -30 +30 @@
   [StorableClass]
   public sealed class AlbaCrossover : VRPCrossover {    
-    public IValueLookupParameter<IPermutationCrossover> PermutationCrossoverParameter {
-      get { return (IValueLookupParameter<IPermutationCrossover>)Parameters["PermutationCrossover"]; }
+    public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
+      get { return (IValueLookupParameter<IPermutationCrossover>)Parameters["InnerCrossover"]; }
     }
+
+    [StorableConstructor]
+    private AlbaCrossover(bool deserializing) : base(deserializing) { }
 
     public AlbaCrossover()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IPermutationCrossover>("PermutationCrossover", "The permutation crossover.", new EdgeRecombinationCrossover()));
+      Parameters.Add(new ValueLookupParameter<IPermutationCrossover>("InnerCrossover", "The permutation crossover.", new EdgeRecombinationCrossover()));
+    
+      AlbaEncoding.RemoveUnusedParameters(Parameters);
     }
 
-    void Crossover() {
-      PermutationCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
+    private void Crossover() {
+      //note - the inner crossover is called here and the result is converted to an alba representation
+      //some refactoring should be done here in the future - the crossover operation should be called directly
+
+      InnerCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
       IAtomicOperation op = this.ExecutionContext.CreateOperation(
-        PermutationCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
+        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
       op.Operator.Execute((IExecutionContext)op);
 
-      string childName = PermutationCrossoverParameter.ActualValue.ChildParameter.ActualName;
+      string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
       if (ExecutionContext.Scope.Variables.ContainsKey(childName)) {
         Permutation permutation = ExecutionContext.Scope.Variables[childName].Value as Permutation;

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

@@ -29 +29 @@
   [Item("AlbaManipulator", "An operator which manipulates an alba VRP representation.")]
   [StorableClass]
-  public sealed class AlbaManipulator : VRPManipulator {    
-    public IValueLookupParameter<IPermutationManipulator> PermutationManipulatorParameter {
-      get { return (IValueLookupParameter<IPermutationManipulator>)Parameters["PermutationManipulator"]; }
+  public sealed class AlbaManipulator : VRPManipulator {
+    public IValueLookupParameter<IPermutationManipulator> InnerManipulatorParameter {
+      get { return (IValueLookupParameter<IPermutationManipulator>)Parameters["InnerManipulator"]; }
     }
+
+    [StorableConstructor]
+    private AlbaManipulator(bool deserializing) : base(deserializing) { }
 
     public AlbaManipulator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("PermutationManipulator", "The permutation manipulator.", new TranslocationManipulator()));
+        Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("InnerManipulator", "The permutation manipulator.", new TranslocationManipulator()));
+
+        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);
       }
       
       OperationCollection next = new OperationCollection(base.Apply());
 
-      IPermutationManipulator op = PermutationManipulatorParameter.ActualValue;
+      IPermutationManipulator op = InnerManipulatorParameter.ActualValue;
       if (op != null) {
-        op.PermutationParameter.ActualName = VRPSolutionParameter.ActualName;
+        op.PermutationParameter.ActualName = VRPToursParameter.ActualName;
         next.Insert(0, ExecutionContext.CreateOperation(op));
       }

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() {