Changeset 14927 for branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers

Timestamp:

05/04/17 17:19:35 (8 years ago)

Author:

gkronber

Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:

branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers

Files:

• PotvinCrossover.cs (modified) (2 diffs)
• PotvinInsertionBasedCrossover.cs (modified) (6 diffs)
• PotvinRouteBasedCrossover.cs (modified) (1 diff)
• PotvinSequenceBasedCrossover.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinCrossover.cs

@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
@@ -32 +32 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinCrossover", "A VRP crossover operation.")]
-  [StorableClass]
+  [StorableType("365b6188-8945-45ec-ba4b-9e23fd8ad1c5")]
   public abstract class PotvinCrossover : VRPCrossover, IStochasticOperator, IPotvinOperator {
     public ILookupParameter<IRandom> RandomParameter {

branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using System.Collections.Generic;
 using HeuristicLab.Data;
@@ -32 +32 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinInsertionBasedCrossover", "The IBX crossover for VRP representations. It is implemented as described in Berger, J and Solois, M and Begin, R (1998). A hybrid genetic algorithm for the vehicle routing problem with time windows. LNCS 1418. Springer, London 114-127.")]
-  [StorableClass]
+  [StorableType("c64c5246-3ee2-4860-9e92-984dac2fde25")]
   public sealed class PotvinInsertionBasedCrossover : PotvinCrossover {
     public IValueParameter<IntValue> Length {
@@ -206 +206 @@
       int length = Math.Min(Length.Value.Value, parent1.Tours.Count) + 1;
       int k = 1;
-      if(length > 1)
+      if (length > 1)
         k = random.Next(1, length);
       for (int i = 0; i < k; i++) {
@@ -230 +230 @@
         //DESTROY - remove cities from r1
         int removed = 1;
-        if(r1.Stops.Count > 1)
+        if (r1.Stops.Count > 1)
           removed = random.Next(1, r1.Stops.Count + 1);
         for (int i = 0; i < removed; i++) {
@@ -238 +238 @@
         //REPAIR - add cities from R2
         int maxCount = 1;
-        if(R2.Count > 1)
+        if (R2.Count > 1)
           maxCount = random.Next(1, Math.Min(5, R2.Count));
         int count = 0;
@@ -248 +248 @@
 
           int place = -1;
-          bool found = FindRouteInsertionPlace(child, childTour, city, allowInfeasible, out place); 
+          bool found = FindRouteInsertionPlace(child, childTour, city, allowInfeasible, out place);
           if (found) {
             childTour.Stops.Insert(place, city);

branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinRouteBasedCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinRouteBasedCrossover", "The RBX crossover for a VRP representations.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
-  [StorableClass]
+  [StorableType("0040d697-3e0e-481f-b2af-5d5a99c0b32c")]
   public sealed class PotvinRouteBasedCrossover : PotvinCrossover {
     [StorableConstructor]

branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinSequenceBasedCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinSequenceBasedCrossover", "The SBX crossover for a VRP representations.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
-  [StorableClass]
+  [StorableType("9e773df8-58d7-4899-9329-22b8cd52fe26")]
   public sealed class PotvinSequenceBasedCrossover : PotvinCrossover {
     [StorableConstructor]