Changeset 14927 for branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators

Timestamp:

05/04/17 17:19:35 (7 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.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/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/AttDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Att Distance", "Calculates the att distance.")]
-  [StorableClass]
+  [StorableType("bbfc9701-d243-43d8-8826-5949d00f6694")]
   public sealed class AttDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/DistanceCalculator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Distance calculator", "Calculates the distance between two cities given as index of a coordinates matrix.")]
-  [StorableClass]
+  [StorableType("ba89c83d-c118-470a-8a3f-69da44615055")]
   public abstract class DistanceCalculator : Item {
     [StorableConstructor]

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/EuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Euclidean Distance", "Calculates the euclidean distance.")]
-  [StorableClass]
+  [StorableType("d3e985ee-ba6d-4cbf-8c36-ac609606aaa9")]
   public sealed class EuclideanDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/GeoDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Geo Distance", "Calculates the geo distance.")]
-  [StorableClass]
+  [StorableType("0db0ff90-2c17-4116-9a5d-c6af9407c692")]
   public sealed class GeoDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/ManhattanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Manhattan Distance", "Calculates the Manhattan distance.")]
-  [StorableClass]
+  [StorableType("d7a8c747-e528-4ca4-b3eb-4705ddc3a5ab")]
   public sealed class ManhattanDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/MaximumDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Maximum Distance", "Calculates the maximum distance.")]
-  [StorableClass]
+  [StorableType("893efc65-3a00-437a-82a3-fb4d50979969")]
   public sealed class MaximumDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/RoundedEuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 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("756d98c4-72a7-48f8-9d35-cd53a7ceedfb")]
   public sealed class RoundedEuclideanDistance : DistanceCalculator {
 

branches/PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/UpperEuclideanDistance.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.PTSP {
   [Item("Upper Euclidean Distance", "Calculates the ceiling of the euclidean distance.")]
-  [StorableClass]
+  [StorableType("0509e809-fae5-44cd-8cfd-8e7db34381f8")]
   public sealed class UpperEuclideanDistance : DistanceCalculator {