Changeset 4369 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Timestamp:

09/07/10 17:24:00 (14 years ago)

Author:

svonolfe

Message:

Added move operators (WIP) (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Files:

• Alba/Creators/AlbaCreator.cs (modified) (2 diffs)
• Alba/Crossovers/AlbaCrossover.cs (modified) (2 diffs)
• Alba/IAlbaOperator.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaOperator.cs) (1 diff)
• Alba/Manipulators/AlbaManipulator.cs (modified) (2 diffs)
• Alba/Moves (added)
• Alba/Moves/AlbaMoveEvaluator.cs (added)
• Alba/Moves/AlbaMoveGenerator.cs (added)
• Alba/Moves/AlbaMoveMaker.cs (added)
• Alba/Moves/ThreeOpt (added)
• Alba/Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.cs (added)
• Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs (added)
• Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs (added)
• Alba/Moves/ThreeOpt/IAlbaTranslocationMoveOperator.cs (added)
• General/Creators/VRPCreator.cs (added)
• General/Moves (added)
• General/Moves/VRPMoveEvaluator.cs (added)
• General/Moves/VRPMoveGenerator.cs (added)
• General/Moves/VRPMoveMaker.cs (added)
• General/Moves/VRPMoveOperator.cs (added)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/AlbaCreator.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [Item("AlbaCreator", "A VRP creator.")]
   [StorableClass]
-  public abstract class AlbaCreator : AlbaOperator, IVRPCreator {
+  public abstract class AlbaCreator : VRPCreator, IAlbaOperator, IVRPCreator {
     public override bool CanChangeName {
       get { return false; }
-    }
-
-    #region IVRPCreator Members
-    public ILookupParameter<IVRPEncoding> VRPToursParameter {
-      get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
     }
     
@@ -45 +41 @@
     public AlbaCreator()
       : base() {
-      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The new VRP tours."));
     }
-
-    #endregion
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaCrossover.cs

@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [Item("AlbaCrossover", "An operator which crosses two VRP representations.")]
   [StorableClass]
-  public abstract class AlbaCrossover : AlbaOperator, IVRPCrossover, IStochasticOperator {
+  public abstract class AlbaCrossover : VRPCrossover, IAlbaOperator, IVRPCrossover, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
-    public ILookupParameter<ItemArray<IVRPEncoding>> ParentsParameter {
-      get { return (ScopeTreeLookupParameter<IVRPEncoding>)Parameters["Parents"]; }
-    }
-
-    public ILookupParameter<IVRPEncoding> ChildParameter {
-      get { return (ILookupParameter<IVRPEncoding>)Parameters["Child"]; }
     }
     
@@ -51 +44 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
-
-      Parameters.Add(new ScopeTreeLookupParameter<IVRPEncoding>("Parents", "The parent permutations which should be crossed."));
-      ParentsParameter.ActualName = "VRPTours";
-      Parameters.Add(new LookupParameter<IVRPEncoding>("Child", "The child permutation resulting from the crossover."));
-      ChildParameter.ActualName = "VRPTours";
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/IAlbaOperator.cs

@@ -32 +32 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("AlbaOperator", "Represents a VRP operator.")]
-  [StorableClass]
-  public abstract class AlbaOperator : VRPOperator, 
+  public interface IAlbaOperator: 
     ISingleDepotOperator, IHeterogenousCapacitatedOperator, ITimeWindowedOperator {    
-    [StorableConstructor]
-    protected AlbaOperator(bool deserializing) : base(deserializing) { }
-
-    public AlbaOperator()
-      : base() {
-    }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [Item("AlbaManipulator", "An operator which manipulates a VRP representation.")]
   [StorableClass]
-  public abstract class AlbaManipulator : AlbaOperator, IVRPManipulator, IStochasticOperator {
+  public abstract class AlbaManipulator : VRPManipulator, IAlbaOperator, IVRPManipulator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
-    public ILookupParameter<IVRPEncoding> VRPToursParameter {
-      get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
     }
 
@@ -46 +43 @@
       : base() {
         Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
-        Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours to be manipulated."));
     }