Changeset 6751

Timestamp:

09/13/11 15:59:26 (13 years ago)

Author:

svonolfe

Message:

Fixed minor bugs in VRP operators (#1177)

Location:

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

Files:

• Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs (modified) (1 diff)
• Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs (modified) (1 diff)
• Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveEvaluator.cs (modified) (2 diffs)
• Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs (modified) (7 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs

@@ -73 +73 @@
 
     protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, IVRPProblemInstance problemInstance, int lambda) {
-      return GenerateAllMoves(individual, problemInstance, lambda, SampleSizeParameter.Value.Value, RandomParameter.ActualValue);
+      return GenerateAllMoves(individual, problemInstance, lambda, SampleSizeParameter.ActualValue.Value, RandomParameter.ActualValue);
     }
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
-  [Item("AlbaLambdaInterchangeMove", "Item that describes a lambda move on a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
+  [Item("PotvinCustomerRelocationMove", "Item that describes a relocation move on a VRP representation.")]
   [StorableClass]
   public class PotvinCustomerRelocationMove: Item, IVRPMove {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveEvaluator.cs

@@ -76 +76 @@
 
       PotvinEncoding newSolution = CustomerRelocationMoveParameter.ActualValue.Individual.Clone() as PotvinEncoding;
-      PotvinCustomerRelocationMoveMaker.Apply(newSolution, move);
+      PotvinCustomerRelocationMoveMaker.Apply(newSolution, move, ProblemInstance);
 
       UpdateEvaluation(newSolution);
@@ -91 +91 @@
           if (additionFrequency.ContainsKey(attr)) {
             int frequency = additionFrequency[attr].Value;
-            double quality = MoveQualityParameter.ActualValue.Value - MovePenaltyParameter.ActualValue.Value;
+            double quality = MoveQualityParameter.ActualValue.Value;
 
             MoveQualityParameter.ActualValue.Value +=
-              LambdaParameter.Value.Value * quality * frequency * System.Math.Sqrt(ProblemInstance.Cities.Value * ProblemInstance.Vehicles.Value);
+              LambdaParameter.Value.Value * quality * frequency;
           }
         }
       }
-
-      //Apply constraint relaxation
-      MoveQualityParameter.ActualValue.Value += MovePenaltyParameter.ActualValue.Value * (newSolution.PenaltyFactor - 1.0); 
     } 
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -39 +41 @@
     public override ILookupParameter VRPMoveParameter {
          get { return CustomerRelocationMoveParameter; }
-    }
-
-    public IValueParameter<DoubleValue> SigmaParameter {
-      get { return (IValueParameter<DoubleValue>)Parameters["Sigma"]; }
-    }
-
-    public IValueParameter<DoubleValue> MinPenaltyFactorParameter {
-      get { return (IValueParameter<DoubleValue>)Parameters["MinPenaltyFactor"]; }
-    }
-
-    public IValueParameter<DoubleValue> MaxPenaltyFactorParameter {
-      get { return (IValueParameter<DoubleValue>)Parameters["MaxPenaltyFactor"]; }
     }
 
@@ -67 +57 @@
       : base() {
       Parameters.Add(new LookupParameter<PotvinCustomerRelocationMove>("PotvinCustomerRelocationMove", "The moves that should be made."));
-      Parameters.Add(new ValueParameter<DoubleValue>("Sigma", "The sigma applied to the penalty factor.", new DoubleValue(0.5)));
-      Parameters.Add(new ValueParameter<DoubleValue>("MinPenaltyFactor", "The minimum penalty factor.", new DoubleValue(-1000.0)));
-      Parameters.Add(new ValueParameter<DoubleValue>("MaxPenaltyFactor", "The maximum penalty factor.", new DoubleValue(1000.0)));
 
       Parameters.Add(new LookupParameter<VariableCollection>("Memories", "The TS memory collection."));
@@ -83 +70 @@
     }
 
-    public static void Apply(PotvinEncoding solution, PotvinCustomerRelocationMove move) {
+    public static void Apply(PotvinEncoding solution, PotvinCustomerRelocationMove move, IVRPProblemInstance problemInstance) {
       if (move.Tour >= solution.Tours.Count)
         solution.Tours.Add(new Tour());
@@ -94 +81 @@
 
       int place = solution.FindBestInsertionPlace(tour, move.City);
-
       tour.Stops.Insert(place, move.City);
     }
@@ -102 +88 @@
 
       PotvinEncoding newSolution = move.Individual.Clone() as PotvinEncoding;
-      Apply(newSolution, move);
+      Apply(newSolution, move, ProblemInstance);
       VRPToursParameter.ActualValue = newSolution;
 
@@ -108 +94 @@
       VRPEvaluation eval = ProblemInstance.Evaluate(newSolution);
       MoveQualityParameter.ActualValue.Value = eval.Quality;
-
-      //update penalty factor
-      double sigma = SigmaParameter.Value.Value;
-      if (ProblemInstance.Feasible(eval)) {
-        newSolution.PenaltyFactor /= (1 + sigma);
-        if (newSolution.PenaltyFactor < MinPenaltyFactorParameter.Value.Value)
-          newSolution.PenaltyFactor = MinPenaltyFactorParameter.Value.Value;
-      } else {
-        newSolution.PenaltyFactor *= (1 + sigma);
-        if (newSolution.PenaltyFactor > MaxPenaltyFactorParameter.Value.Value)
-          newSolution.PenaltyFactor = MaxPenaltyFactorParameter.Value.Value;
-      }
 
       //update memory