Changeset 16958 for branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators

Timestamp:

05/15/19 14:52:20 (5 years ago)

Author:

abeham

Message:

#2457: adapted to trunk

Location:

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape

Files:

• . (modified) (1 prop)
• 3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs (modified) (2 diffs)
• 3.3/DistanceCalculators/IItemDistanceCalculator.cs (modified) (1 diff)
• 3.3/DistanceCalculators/PermutationDistanceCalculator.cs (modified) (2 diffs)
• 3.3/DistanceCalculators/RealVectorDistanceCalculator.cs (modified) (3 diffs)

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/BinaryVectorDistanceCalculator.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
 
   [Item("BinaryVectorDistanceCalculator", "Calculates the hamming distance of two binary vectors")]
-  [StorableClass]
+  [StorableType("BB6A8FD8-22B1-41CC-B38D-C8C9A2B79C83")]
   public class BinaryVectorDistanceCalculator : NamedItem, IItemDistanceCalculator {
 
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected BinaryVectorDistanceCalculator(bool deserializing) : base(deserializing) { }
+    protected BinaryVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { }
 
     protected BinaryVectorDistanceCalculator(BinaryVectorDistanceCalculator original, Cloner cloner)

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/IItemDistanceCalculator.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
+  [StorableType("79CBD877-B9E9-4CFE-B1E3-5FCF0DB17EF1")]
   public interface IItemDistanceCalculator : IItem {
     Type ItemType { get; }

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/PermutationDistanceCalculator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
 
   [Item("PermutationDistanceCalculator", "Calculates the distance of two permutations")]
-  [StorableClass]
+  [StorableType("F2B93749-3059-4D37-91A5-FAE2DC9DB794")]
   public class PermutationDistanceCalculator : NamedItem, IItemDistanceCalculator {
 
@@ -46 +46 @@
 
     [StorableConstructor]
-    protected PermutationDistanceCalculator(bool deserializing) : base(deserializing) { }
+    protected PermutationDistanceCalculator(StorableConstructorFlag _) : base(_) { }
 
     protected PermutationDistanceCalculator(PermutationDistanceCalculator original, Cloner cloner)

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/DistanceCalculators/RealVectorDistanceCalculator.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -27 +28 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators {
 
   [Item("RealVectorDistanceCalculator", "Calculates the Euclidian distance of two real vectors")]
-  [StorableClass]
+  [StorableType("26271DB0-0868-4363-84AE-46CF583276F0")]
   public class RealVectorDistanceCalculator : NamedItem, IItemDistanceCalculator {
 
@@ -46 +46 @@
 
     [StorableConstructor]
-    protected RealVectorDistanceCalculator(bool deserializing) : base(deserializing) { }
+    protected RealVectorDistanceCalculator(StorableConstructorFlag _) : base(_) { }
 
     protected RealVectorDistanceCalculator(RealVectorDistanceCalculator original, Cloner cloner)