Changeset 5127 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

12/17/10 13:42:53 (14 years ago)

Author:

svonolfe

Message:

Implemented unified tabu search (WIP) (#1177)

Location:

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

Files:

• Moves/VRPMoveAttribute.cs (added)
• Moves/VRPMoveEvaluator.cs (modified) (2 diffs)
• Moves/VRPMoveMaker.cs (modified) (2 diffs)
• TourEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

@@ -44 +44 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
+    public ILookupParameter<DoubleValue> MovePenaltyParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["MovePenalty"]; }
+    }
 
     [StorableConstructor]
@@ -52 +55 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MovePenalty", "The penalty applied to the move."));
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

@@ -42 +42 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
+    public ILookupParameter<DoubleValue> MovePenaltyParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["MovePenalty"]; }
+    }
 
     [StorableConstructor]
@@ -50 +53 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MovePenalty", "The penalty applied to the move."));
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -39 +39 @@
     #region IVRPEncoding Members
     public virtual List<Tour> GetTours() {
-      List<Tour> result = new List<Tour>(Tours);
+      List<Tour> result = new List<Tour>();
+
+      foreach(Tour tour in Tours) {
+        if (tour.Stops.Count > 0)
+          result.Add(tour);
+      }
 
      while (result.Count > ProblemInstance.Vehicles.Value) {