Changeset 4365 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Timestamp:

09/06/10 17:05:13 (14 years ago)

Author:

svonolfe

Message:

Worked on VRP operators (WIP) (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• Encodings/Alba/AlbaEncoding.cs (added)
• Encodings/Alba/Creators/DefaultRepresentationCreator.cs (modified) (1 diff)
• Encodings/Alba/Creators/PushForwardInsertionCreator.cs (added)
• Encodings/Alba/Crossovers (added)
• Encodings/Alba/Crossovers/AlbaCrossover.cs (added)
• Encodings/Alba/Crossovers/AlbaPermutationCrossover.cs (added)
• Encodings/Alba/Manipulators (added)
• Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaManipulator.cs (added)
• Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs (added)
• Encodings/General (added)
• Encodings/General/Creators (added)
• Encodings/General/Creators/MultiVRPSolutionCreator.cs (added)
• Encodings/General/PermutationEncoding.cs (added)
• Encodings/General/TourEncoding.cs (added)
• Encodings/VRPEncoding.cs (deleted)
• Encodings/VRPOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting-3.4.csproj (modified) (2 diffs)
• HeuristicLabProblemsVehicleRoutingPlugin.cs (modified) (1 diff)
• Interfaces/IMultiVRPOperator.cs (added)
• Interfaces/IVRPCrossover.cs (added)
• Interfaces/IVRPManipulator.cs (added)
• Interfaces/IVRPOperator.cs (modified) (1 diff)
• ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs (modified) (1 diff)
• ProblemInstances/VRPEvaluator.cs (modified) (1 diff)
• ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)
• Variants/General (added)
• Variants/General/IGeneralVRPOperator.cs (added)
• VehicleRoutingProblem.cs (modified) (8 diffs)

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

@@ -42 +42 @@
     public override IOperation Apply() {
       //choose default encoding here
-      //VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(CreateSolution());
+      VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(CreateSolution(), ProblemInstance);
 
       return base.Apply();

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

@@ -34 +34 @@
   [StorableClass]
   public abstract class VRPOperator : SingleSuccessorOperator, IVRPOperator {
-    protected LookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
+    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
       get { return (LookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }
     }
 
-    protected IVRPProblemInstance ProblemInstance {
+    public IVRPProblemInstance ProblemInstance {
       get { return ProblemInstanceParameter.ActualValue; }
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

@@ -106 +106 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Encodings\Alba\AlbaEncoding.cs" />
     <Compile Include="Encodings\Alba\Creators\DefaultRepresentationCreator.cs" />
+    <Compile Include="Encodings\Alba\Creators\PushForwardInsertionCreator.cs" />
     <Compile Include="Encodings\Alba\Creators\RandomCreator.cs" />
     <Compile Include="Encodings\Alba\Creators\AlbaCreator.cs" />
     <Compile Include="Encodings\Alba\AlbaOperator.cs" />
+    <Compile Include="Encodings\Alba\Crossovers\AlbaCrossover.cs" />
+    <Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaCustomerInsertionManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaCustomerInversionManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaCustomerSwapManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaIntraRouteInversionManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaLambdaInterchangeManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaManipulator.cs" />
+    <Compile Include="Encodings\Alba\Manipulators\AlbaPermutationManipulator.cs" />
+    <Compile Include="Encodings\General\Creators\MultiVRPSolutionCreator.cs" />
+    <Compile Include="Encodings\General\Crossovers\MultiVRPSolutionCrossover.cs" />
+    <Compile Include="Encodings\General\Crossovers\RandomParentCloneCrossover.cs" />
+    <Compile Include="Encodings\General\Manipulators\MultiVRPSolutionManipulator.cs" />
+    <Compile Include="Encodings\General\PermutationEncoding.cs" />
+    <Compile Include="Encodings\General\TourEncoding.cs" />
     <Compile Include="Encodings\VRPOperator.cs" />
-    <Compile Include="Encodings\VRPEncoding.cs" />
+    <Compile Include="Interfaces\IMultiVRPOperator.cs" />
+    <Compile Include="Interfaces\IVRPManipulator.cs" />
+    <Compile Include="Interfaces\IVRPCrossover.cs" />
     <Compile Include="Interfaces\IVRPEvaluator.cs" />
     <Compile Include="Interfaces\IVRPCreator.cs" />
@@ -123 +142 @@
     <Compile Include="Variants\Capacitated\Homogenous\ICapacitatedOperator.cs" />
     <Compile Include="Variants\Capacitated\Homogenous\ICapacitatedProblemInstance.cs" />
+    <Compile Include="Variants\General\IGeneralVRPOperator.cs" />
     <Compile Include="Variants\SingleDepot\ISingleDepotOperator.cs" />
     <Compile Include="Variants\SingleDepot\ISingleDepotEncoding.cs" />

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLabProblemsVehicleRoutingPlugin.cs

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Problems.VehicleRouting plugin
   /// </summary>
-  [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.4362")]
+  [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.4363")]
   [PluginFile("HeuristicLab.Problems.VehicleRouting-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPOperator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.VehicleRouting.Interfaces {
   public interface IVRPOperator: IItem {
+    ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter { get; }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs

@@ -43 +43 @@
     }
 
+    public override IntValue Cities {
+      get {
+        return new IntValue(Demand.Length - 1);
+      }
+    }
+
     protected override IVRPEvaluator Evaluator {
       get {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

@@ -124 +124 @@
 
     public override IOperation Apply() {
+      double quality = 0;
       InitResultParameters();
 
       foreach (Tour tour in VRPToursParameter.ActualValue.GetTours()) {
         VRPEvaluation tourEvaluation = EvaluateTour(ProblemInstance, tour);
+        quality += tourEvaluation.Quality;
 
         UpdateResultParameters(tourEvaluation);
       }
+
+      QualityParameter.ActualValue = new DoubleValue(quality);
 
       return base.Apply();

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -89 +89 @@
       set { DemandParameter.Value = value; }
     }
-    public IntValue Cities {
+    public virtual IntValue Cities {
       get { return new IntValue(Demand.Length); }
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -35 +35 @@
 using HeuristicLab.Problems.VehicleRouting.Parsers;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -61 +62 @@
       get { return BestKnownQualityParameter; }
     }
-    public IParameter SolutionCreatorParameter {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.SolutionCreatorParameter;
-        else
-          return null;
-      }
-    }
-    public IParameter EvaluatorParameter {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.EvaluatorParameter;
-        else
-          return null;
-      }
+    public IValueParameter<IVRPCreator> SolutionCreatorParameter {
+      get { return (IValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
+    }
+    IParameter IProblem.SolutionCreatorParameter {
+      get { return SolutionCreatorParameter; }
+    }
+    public IValueParameter<IVRPEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
+    }
+    IParameter IProblem.EvaluatorParameter {
+      get { return EvaluatorParameter; }
     }
     #endregion
@@ -86 +83 @@
 
     public ISingleObjectiveEvaluator Evaluator {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.EvaluatorParameter.Value;
-        else
-          return null;
-      }
+      get { return ProblemInstance.EvaluatorParameter.Value; }
     }
 
@@ -99 +91 @@
 
     public ISolutionCreator SolutionCreator {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.SolutionCreatorParameter.Value;
-        else
-          return null;
-      }
-    }
+      get { return ProblemInstance.SolutionCreatorParameter.Value; }
+    }
+
+    [Storable]
+    private List<IOperator> operators; 
 
     public IEnumerable<IOperator> Operators {
-      get {
-        if (ProblemInstance != null)
-          return ProblemInstance.Operators.OrderBy(op => op.Name);
-        else
-          return null;
-      }
+      get { return operators; }
     }
     #endregion
@@ -124 +109 @@
       Parameters.Add(new ValueParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
- 
+
+      operators = new List<IOperator>();
+
       InitializeRandomVRPInstance();
+      InitializeOperators();
 
       AttachEventHandlers();
@@ -133 +121 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       VehicleRoutingProblem clone = (VehicleRoutingProblem)base.Clone(cloner);
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
       clone.AttachEventHandlers();
       return clone;
@@ -172 +161 @@
 
     private void AttachProblemInstanceEventHandlers() {
+      if (Parameters.ContainsKey("Evaluator"))
+        Parameters.Remove("Evaluator");
+
+      if (Parameters.ContainsKey("SolutionCreator"))
+        Parameters.Remove("SolutionCreator");
+
       if (ProblemInstance != null) {
         ProblemInstance.SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
         ProblemInstance.EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+        Parameters.Add(ProblemInstance.EvaluatorParameter);
+        Parameters.Add(ProblemInstance.SolutionCreatorParameter);
       }
     }
@@ -180 +177 @@
     void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
       AttachProblemInstanceEventHandlers();
-    }
-
+      InitializeOperators();
+
+      OnSolutionCreatorChanged();
+      OnEvaluatorChanged();
+      OnOperatorsChanged();
+    }
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeSolutionCreator();
+      
       OnSolutionCreatorChanged();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       OnEvaluatorChanged();
+    }
+
+    private void InitializeOperators() {
+      operators = new List<IOperator>();
+
+      if (ProblemInstance != null) {
+        operators.AddRange(
+        ProblemInstance.Operators.Concat(
+          ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name));
+      }
+
+      ParameterizeOperators();
+    }
+
+    private void ParameterizeSolutionCreator() {
+      if (SolutionCreator is IMultiVRPOperator) {
+        (SolutionCreator as IMultiVRPOperator).SetOperators(Operators);
+      }
+    }
+
+    private void ParameterizeOperators() {
+      foreach (IOperator op in Operators) {
+        if (op is IMultiVRPOperator) {
+          (op as IMultiVRPOperator).SetOperators(Operators);
+        }
+      }
     }
     #endregion