Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

• added nuget references to HEAL.Fossil
• added StorableType attributes to many classes
• changed signature of StorableConstructors
• removed some classes in old persistence
• removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators

Files:

• AttDistance.cs (modified) (1 diff)
• DistanceCalculator.cs (modified) (1 diff)
• EuclideanDistance.cs (modified) (1 diff)
• GeoDistance.cs (modified) (1 diff)
• ManhattanDistance.cs (modified) (1 diff)
• MaximumDistance.cs (modified) (1 diff)
• RoundedEuclideanDistance.cs (modified) (1 diff)
• UpperEuclideanDistance.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/AttDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Att Distance", "Calculates the att distance.")]
-  [StorableClass]
+  [StorableType("7A21281C-EED9-4FE0-A6B1-DE916A074739")]
   public sealed class AttDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private AttDistance(bool deserializing) : base(deserializing) { }
+    private AttDistance(StorableConstructorFlag _) : base(_) { }
     private AttDistance(AttDistance original, Cloner cloner) : base(original, cloner) { }
     public AttDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/DistanceCalculator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Distance calculator", "Calculates the distance between two cities given as index of a coordinates matrix.")]
-  [StorableClass]
+  [StorableType("7CC7E665-A6A7-478B-B978-7079E1DDBA70")]
   public abstract class DistanceCalculator : Item {
     [StorableConstructor]
-    protected DistanceCalculator(bool deserializing) : base(deserializing) { }
+    protected DistanceCalculator(StorableConstructorFlag _) : base(_) { }
     protected DistanceCalculator(DistanceCalculator original, Cloner cloner) : base(original, cloner) { }
     protected DistanceCalculator() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/EuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Euclidean Distance", "Calculates the euclidean distance.")]
-  [StorableClass]
+  [StorableType("D769186D-11F8-4F67-A39A-4B78184334E7")]
   public sealed class EuclideanDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private EuclideanDistance(bool deserializing) : base(deserializing) { }
+    private EuclideanDistance(StorableConstructorFlag _) : base(_) { }
     private EuclideanDistance(EuclideanDistance original, Cloner cloner) : base(original, cloner) { }
     public EuclideanDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/GeoDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Geo Distance", "Calculates the geo distance.")]
-  [StorableClass]
+  [StorableType("B6CAD594-7558-4F19-ACE3-7739D29621F1")]
   public sealed class GeoDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private GeoDistance(bool deserializing) : base(deserializing) { }
+    private GeoDistance(StorableConstructorFlag _) : base(_) { }
     private GeoDistance(GeoDistance original, Cloner cloner) : base(original, cloner) { }
     public GeoDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/ManhattanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Manhattan Distance", "Calculates the Manhattan distance.")]
-  [StorableClass]
+  [StorableType("1395A5AC-9A55-40F0-B5C4-1EF15284938F")]
   public sealed class ManhattanDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private ManhattanDistance(bool deserializing) : base(deserializing) { }
+    private ManhattanDistance(StorableConstructorFlag _) : base(_) { }
     private ManhattanDistance(ManhattanDistance original, Cloner cloner) : base(original, cloner) { }
     public ManhattanDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/MaximumDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Maximum Distance", "Calculates the maximum distance.")]
-  [StorableClass]
+  [StorableType("4ADF8A83-B110-4B39-882F-B5286EFB78A9")]
   public sealed class MaximumDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private MaximumDistance(bool deserializing) : base(deserializing) { }
+    private MaximumDistance(StorableConstructorFlag _) : base(_) { }
     private MaximumDistance(MaximumDistance original, Cloner cloner) : base(original, cloner) { }
     public MaximumDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/RoundedEuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Rounded Euclidean Distance", "Calculates the euclidean distance and rounds it to the nearest integer.")]
-  [StorableClass]
+  [StorableType("5AE6854F-505E-438A-8668-2758FEF20861")]
   public sealed class RoundedEuclideanDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private RoundedEuclideanDistance(bool deserializing) : base(deserializing) { }
+    private RoundedEuclideanDistance(StorableConstructorFlag _) : base(_) { }
     private RoundedEuclideanDistance(RoundedEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
     public RoundedEuclideanDistance() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/UpperEuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Upper Euclidean Distance", "Calculates the ceiling of the euclidean distance.")]
-  [StorableClass]
+  [StorableType("960A75FA-C8A7-4927-9814-C454343C198E")]
   public sealed class UpperEuclideanDistance : DistanceCalculator {
 
     [StorableConstructor]
-    private UpperEuclideanDistance(bool deserializing) : base(deserializing) { }
+    private UpperEuclideanDistance(StorableConstructorFlag _) : base(_) { }
     private UpperEuclideanDistance(UpperEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
     public UpperEuclideanDistance() { }