Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator

Timestamp:

03/31/19 14:40:15 (6 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator

Files:

• AdaptiveWalkCalculator.cs (modified) (2 diffs)
• RandomWalkCalculator.cs (modified) (2 diffs)
• UpDownWalkCalculator.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/AdaptiveWalkCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Adaptive Walk Calculator", "Calculates characteristics from an adaptive walk.")]
-  [StorableClass]
+  [StorableType("1F29D2EB-0348-4DC9-AF26-073489D7DE04")]
   public class AdaptiveWalkCalculator : NamedItem, ICharacteristicCalculator {
 
@@ -51 +51 @@
 
     [StorableConstructor]
-    private AdaptiveWalkCalculator(bool deserializing) : base(deserializing) { }
+    private AdaptiveWalkCalculator(StorableConstructorFlag _) : base(_) { }
     private AdaptiveWalkCalculator(AdaptiveWalkCalculator original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/RandomWalkCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Random Walk Calculator", "Calculates characteristics from a random walk.")]
-  [StorableClass]
+  [StorableType("0BB4ACDB-8FB3-4D21-AF0B-2DAE4F0E9DDC")]
   public class RandomWalkCalculator : NamedItem, ICharacteristicCalculator {
 
@@ -51 +51 @@
 
     [StorableConstructor]
-    private RandomWalkCalculator(bool deserializing) : base(deserializing) { }
+    private RandomWalkCalculator(StorableConstructorFlag _) : base(_) { }
     private RandomWalkCalculator(RandomWalkCalculator original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/CharacteristicCalculator/UpDownWalkCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Up/Down Walk Calculator", "Calculates characteristics from an up/down walk.")]
-  [StorableClass]
+  [StorableType("8BFA83BD-231E-43C6-AA1A-0F9094163B26")]
   public class UpDownWalkCalculator : NamedItem, ICharacteristicCalculator {
 
@@ -51 +51 @@
 
     [StorableConstructor]
-    private UpDownWalkCalculator(bool deserializing) : base(deserializing) { }
+    private UpDownWalkCalculator(StorableConstructorFlag _) : base(_) { }
     private UpDownWalkCalculator(UpDownWalkCalculator original, Cloner cloner)
       : base(original, cloner) {