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

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/General

Files:

• DefaultRepresentationCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/IntListRepresentationCreator.cs) (1 diff)
• PushForwardInsertionCreator.cs (modified) (2 diffs)
• RandomCreator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/DefaultRepresentationCreator.cs

@@ -27 +27 @@
 using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
+using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
+  [Item("DefaultRepresentationCreator", "An operator which creates a VRP solution in the default representation.")]
   [StorableClass]
-  public abstract class IntListRepresentationCreator : VRPCreator {
-    protected abstract IVRPEncoding CreateEncoding(List<int> route);
-
+  public abstract class DefaultRepresentationCreator : VRPCreator {
     protected abstract List<int> CreateSolution();
 
+    [StorableConstructor]
+    protected DefaultRepresentationCreator(bool deserializing) : base(deserializing) { }
+
+    public DefaultRepresentationCreator() : base() { }
+
     public override IOperation Apply() {
-      VRPSolutionParameter.ActualValue = CreateEncoding(CreateSolution());
+      //choose default encoding here
+      VRPToursParameter.ActualValue = PotvinEncoding.ConvertFrom(CreateSolution());
 
       return base.Apply();

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/PushForwardInsertionCreator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
+  [Item("PushForwardCreator", "The push forward insertion heuristic.  It is implemented as described in Sam, and Thangiah, R. (1999). A Hybrid Genetic Algorithms, Simulated Annealing and Tabu Search Heuristic for Vehicle Routing Problems with Time Windows. Practical Handbook of Genetic Algorithms, Volume III, pp 347–381.")]
   [StorableClass]
-  //The push forward insertion heuristic.  It is implemented as described in Sam, and Thangiah, R. (1999). A Hybrid Genetic Algorithms, Simulated Annealing and Tabu Search Heuristic for Vehicle Routing Problems with Time Windows. Practical Handbook of Genetic Algorithms, Volume III, pp 347–381.
-  public abstract class PushForwardCreator : IntListRepresentationCreator, IStochasticOperator {
+  public sealed class PushForwardCreator : DefaultRepresentationCreator, IStochasticOperator {
     #region IStochasticOperator Members
     public ILookupParameter<IRandom> RandomParameter {
@@ -57 +57 @@
       get { return (IValueParameter<DoubleValue>)Parameters["GammaVariance"]; }
     }
+
+    [StorableConstructor]
+    private PushForwardCreator(bool deserializing) : base(deserializing) { }
 
     public PushForwardCreator()

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/RandomCreator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
+  [Item("RandomCreator", "Creates a randomly initialized VRP solution.")]
   [StorableClass]
-  public abstract class RandomCreator : IntListRepresentationCreator, IStochasticOperator {
+  public sealed class RandomCreator : DefaultRepresentationCreator, IStochasticOperator {
     #region IStochasticOperator Members
     public ILookupParameter<IRandom> RandomParameter {
@@ -37 +38 @@
     }
     #endregion
+
+    [StorableConstructor]
+    private RandomCreator(bool deserializing) : base(deserializing) { }
 
     public RandomCreator()