Changeset 17011

Timestamp:

06/14/19 15:55:34 (6 years ago)

Author:

pfleck

Message:

#2707 Adapted to HEAL.Attic changes

Location:

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin

Files:

• Creators/Cluster.cs (modified) (1 diff)
• Creators/ClusterCreator.cs (modified) (4 diffs)
• Creators/GeographicDistanceClusterCreator.cs (modified) (2 diffs)
• Creators/TemporalDistanceClusterCreator.cs (modified) (3 diffs)
• Crossovers/PotvinEdgePreservingSequenceBasedCrossover.cs (modified) (2 diffs)
• Manipulators/PotvinGreedyTourCreationManipulator.cs (modified) (2 diffs)

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/Cluster.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/ClusterCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("ClusterCreator", "Creates a VRP solution by clustering customers first with a KMeans-algorithm and building tours afterwards alternatevly in a random or a greedy fashion.")]
-  [StorableClass]
+  [StorableType("B57A7C93-FE0B-4D3E-BC2D-DD2B8F4323CB")]
   public abstract class ClusterCreator : PotvinCreator, IStochasticOperator {
 
@@ -59 +59 @@
 
     [StorableConstructor]
-    public ClusterCreator(bool deserializing) : base(deserializing) { }
+    public ClusterCreator(StorableConstructorFlag _) : base(_) { }
 
     public ClusterCreator() : base() {
@@ -65 +65 @@
       Parameters.Add(new ValueParameter<IntValue>("MinK", "Minimum number of clusters which should be created", new IntValue(1)));
       Parameters.Add(new OptionalValueParameter<IntValue>("MaxK", "Maximum number of clusters which should be created"));
-      Parameters.Add(new ValueParameter<DoubleValue>("ClusterChangeThreshold", "A certain ratio below which a cluster should be considered as computed satisfactory", new DoubleValue(0.0)));     
-      Parameters.Add(new ValueParameter<DoubleArray>("TourCreationProbabilities", "This weightage array denotes the probability which tour creation method is employed: [shuffled; greedy]", new DoubleArray(new double[] {1, 1})));
+      Parameters.Add(new ValueParameter<DoubleValue>("ClusterChangeThreshold", "A certain ratio below which a cluster should be considered as computed satisfactory", new DoubleValue(0.0)));
+      Parameters.Add(new ValueParameter<DoubleArray>("TourCreationProbabilities", "This weightage array denotes the probability which tour creation method is employed: [shuffled; greedy]", new DoubleArray(new double[] { 1, 1 })));
     }
 

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/GeographicDistanceClusterCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("GeographicDistanceClusterCreator", "Creates a VRP solution by clustering customers first with a KMeans-algorithm based on their geographic position and building tours afterwards alternatevly in a random or a greedy fashion.")]
-  [StorableClass]
+  [StorableType("C2E0290D-D97A-4DD7-83EC-03A309836CBC")]
   public sealed class GeographicDistanceClusterCreator : ClusterCreator {
 
     [StorableConstructor]
-    private GeographicDistanceClusterCreator(bool deserializing) : base(deserializing) { }
+    private GeographicDistanceClusterCreator(StorableConstructorFlag _) : base(_) { }
 
     public GeographicDistanceClusterCreator() : base() {

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/TemporalDistanceClusterCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("TemporalDistanceClusterCreator", "Creates a VRP solution by clustering customers first with a KMeans-algorithm based on their geographic position and building tours afterwards alternatevly in a random or a greedy fashion.")]
-  [StorableClass]
+  [StorableType("8D2C7AEA-023B-4B6B-82D2-43FA8B0CA7FF")]
   public sealed class TemporalDistanceClusterCreator : ClusterCreator {
 
     [StorableConstructor]
-    private TemporalDistanceClusterCreator(bool deserializing) : base(deserializing) { }
+    private TemporalDistanceClusterCreator(StorableConstructorFlag _) : base(_) { }
 
     public TemporalDistanceClusterCreator() : base() {
@@ -98 +98 @@
     private static double CalculateDistanceHelper(Tuple<double, double> time1, Tuple<double, double> time2) {
       double distance = 0.0;
-      distance +=   Math.Pow(time1.Item1 - time2.Item1, 2);
-      distance +=   Math.Pow(time1.Item2 - time2.Item2, 2);
+      distance += Math.Pow(time1.Item1 - time2.Item1, 2);
+      distance += Math.Pow(time1.Item2 - time2.Item2, 2);
       return Math.Sqrt(distance);
     }

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinEdgePreservingSequenceBasedCrossover.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HEAL.Attic;
 
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinEdgePreservingSequenceBasedCrossover", "An enhanced variant of the SBX crossover 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. In this SBX variant the second tour segment continues after the last stop of the first segment")]
+  [StorableType("04EAB1A0-F424-4B79-8489-096C6FDCE354")]
   public sealed class PotvinEdgePreservingSequenceBasedCrossover : PotvinCrossover {
-    private PotvinEdgePreservingSequenceBasedCrossover(bool deserializing) : base(deserializing) { }
+    private PotvinEdgePreservingSequenceBasedCrossover(StorableConstructorFlag _) : base(_) { }
 
     public PotvinEdgePreservingSequenceBasedCrossover() : base() { }

branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinGreedyTourCreationManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinGreedyTourCreationManipulator", "This Manipulator reorders the stops within all tours of a solution candidate by following the greedy heuristic: gradually adding those stops to a tour with the least effect on the overall costs.")]
-  [StorableClass]
+  [StorableType("9CAFF9B9-FFEE-4838-92CA-46C0F0FE780F")]
   public sealed class PotvinGreedyTourCreationManipulator : PotvinManipulator {
     public IValueParameter<BoolValue> IncludeCosts {
-      get { return (IValueParameter<BoolValue>) Parameters["IncludeCosts"]; }
+      get { return (IValueParameter<BoolValue>)Parameters["IncludeCosts"]; }
     }
 
     [StorableConstructor]
-    private PotvinGreedyTourCreationManipulator(bool deserializing) : base(deserializing) { }
+    private PotvinGreedyTourCreationManipulator(StorableConstructorFlag _) : base(_) { }
 
     public PotvinGreedyTourCreationManipulator() : base() {