Changeset 5867 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves

Timestamp:

03/29/11 15:40:01 (14 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

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

Files:

• PotvinCustomerRelocationMoveEvaluator.cs (modified) (1 diff)
• PotvinCustomerRelocationMoveMaker.cs (modified) (2 diffs)
• PotvinCustomerRelocationMultiMoveGenerator.cs (modified) (1 diff)
• PotvinCustomerRelocationSingleMoveGenerator.cs (modified) (1 diff)

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

@@ -85 +85 @@
         string key = AdditionFrequencyMemoryKeyParameter.Value.Value;
 
-        if (memory.ContainsKey(key)) {
+        if (memory != null && memory.ContainsKey(key)) {
           ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
                memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;

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

@@ -101 +101 @@
       PotvinCustomerRelocationMove move = CustomerRelocationMoveParameter.ActualValue;
 
-      PotvinEncoding newSolution = move.Individual as PotvinEncoding;
+      PotvinEncoding newSolution = move.Individual.Clone() as PotvinEncoding;
       Apply(newSolution, move);
       VRPToursParameter.ActualValue = newSolution;
@@ -125 +125 @@
       string key = AdditionFrequencyMemoryKeyParameter.Value.Value;
 
-      if (!memory.ContainsKey(key)) {
-        memory.Add(new Variable(key,
-            new ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>()));
+      if (memory != null) {
+        if (!memory.ContainsKey(key)) {
+          memory.Add(new Variable(key,
+              new ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>()));
+        }
+        ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
+          memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;
+
+        PotvinCustomerRelocationMoveAttribute attr = new PotvinCustomerRelocationMoveAttribute(0, move.Tour, move.City);
+        if (!additionFrequency.ContainsKey(attr))
+          additionFrequency[attr] = new IntValue(0);
+
+        additionFrequency[attr].Value++;
       }
-      ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
-        memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;
-
-      PotvinCustomerRelocationMoveAttribute attr = new PotvinCustomerRelocationMoveAttribute(0, move.Tour, move.City);
-      if (!additionFrequency.ContainsKey(attr))
-        additionFrequency[attr] = new IntValue(0);
-
-      additionFrequency[attr].Value++;
     }
   }

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

@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Data;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinCustomerRelocationMultiMoveGenerator", "Generates customer relocation moves from a given VRP encoding.")]
   [StorableClass]
-  public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator {
+  public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }

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

@@ -35 +35 @@
   [StorableClass]
   public sealed class PotvinCustomerRelocationSingleMoveGenerator : PotvinCustomerRelocationMoveGenerator,
-    ISingleMoveGenerator, IMultiVRPMoveGenerator {
+    ISingleMoveGenerator {
     #region IMultiVRPMoveOperator Members