Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs (modified) (2 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

@@ -48 +48 @@
 
     protected override ZhuEncoding Crossover(IRandom random, ZhuEncoding parent1, ZhuEncoding parent2) {
-      //note - the inner crossover is called here and the result is converted to a prins representation
+      //note - the inner crossover is called here and the solution is converted to a prins representation
       //some refactoring should be done here in the future - the crossover operation should be called directly
 
-      InnerCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
-      IAtomicOperation op = this.ExecutionContext.CreateOperation(
-        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
-      op.Operator.Execute((IExecutionContext)op, CancellationToken);
+      if (parent1.Length == parent2.Length) {
+        InnerCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
+        IAtomicOperation op = this.ExecutionContext.CreateOperation(
+          InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
+        op.Operator.Execute((IExecutionContext)op, CancellationToken);
 
-      string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
-      if (ExecutionContext.Scope.Variables.ContainsKey(childName)) {
-        Permutation permutation = ExecutionContext.Scope.Variables[childName].Value as Permutation;
-        ExecutionContext.Scope.Variables.Remove(childName);
+        string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
+        if (ExecutionContext.Scope.Variables.ContainsKey(childName)) {
+          Permutation permutation = ExecutionContext.Scope.Variables[childName].Value as Permutation;
+          ExecutionContext.Scope.Variables.Remove(childName);
 
-        return new ZhuEncoding(permutation, Cities,
-          DueTimeParameter.ActualValue,
-            ServiceTimeParameter.ActualValue,
-            ReadyTimeParameter.ActualValue,
-            DemandParameter.ActualValue,
-            CapacityParameter.ActualValue,
-            CoordinatesParameter.ActualValue,
-            UseDistanceMatrixParameter.ActualValue);
-      } else
-        return null;
+          return new ZhuEncoding(permutation, Cities,
+            DueTimeParameter.ActualValue,
+              ServiceTimeParameter.ActualValue,
+              ReadyTimeParameter.ActualValue,
+              DemandParameter.ActualValue,
+              CapacityParameter.ActualValue,
+              CoordinatesParameter.ActualValue,
+              UseDistanceMatrixParameter.ActualValue);
+        } else
+          return null;
+      } else {
+        return parent1.Clone() as ZhuEncoding;
+      }
     }
   }

branches/PersistenceSpeedUp/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs

@@ -63 +63 @@
       Tour newTour = new Tour();
 
+      DistanceMatrix distMatrix = VRPUtilities.GetDistanceMatrix(coordinates, distanceMatrix, useDistanceMatrix);
+
       for (int i = 0; i < this.Length; i++) {
         int city = this[i] + 1;
@@ -72 +74 @@
           demandArray,
           capacity,
-          coordinates,
-          distanceMatrix,
-          useDistanceMatrix)) {
+          distMatrix)) {
           newTour.Cities.Remove(city);
           if (newTour.Cities.Count > 0)

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates