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

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/Analysis/FitnessCloudAnalyzer.cs (modified) (3 diffs)
• 3.3/Analysis/InformationAnalyzer.cs (modified) (3 diffs)
• 3.3/Analysis/QualityTrailMultiAnalyzer.cs (modified) (3 diffs)
• 3.3/Analysis/RuggednessAnalyzer.cs (modified) (3 diffs)
• 3.3/Analysis/UpDownWalkAnalyzer.cs (modified) (3 diffs)

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/FitnessCloudAnalyzer.cs

@@ -22 +22 @@
 using System.Drawing;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
 
-  [StorableClass]
+  [StorableType("4156976F-4E61-48BA-B598-FEA872F2E948")]
   public class FitnessCloudAnalyzer : AlgorithmOperator, IQualityTrailAnalyzer {
     public bool EnabledByDefault {
@@ -50 +50 @@
 
     [StorableConstructor]
-    protected FitnessCloudAnalyzer(bool deserializing) : base(deserializing) { }
+    protected FitnessCloudAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected FitnessCloudAnalyzer(FitnessCloudAnalyzer original, Cloner cloner) : base(original, cloner) { }
 

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/InformationAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
 
-  [StorableClass]
+  [StorableType("57803A7A-E1A7-4AD8-9F32-D97F5983ACBD")]
   public class InformationAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
     public bool EnabledByDefault {
@@ -83 +83 @@
 
     [StorableConstructor]
-    protected InformationAnalyzer(bool deserializing) : base(deserializing) { }
+    protected InformationAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected InformationAnalyzer(InformationAnalyzer original, Cloner cloner) : base(original, cloner) { }
 

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/QualityTrailMultiAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using System.Linq;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("QualityTrailAnalyzer", "An analyzer that creates a quality trail which can be further analyzed by several analyzers.")]
-  [StorableClass]
+  [StorableType("E02FC8FB-85AD-42AB-8E14-EA509579C8BE")]
   public class QualityTrailMultiAnalyzer : CheckedMultiOperator<IQualityTrailAnalyzer>, IAnalyzer {
     public bool EnabledByDefault {
@@ -67 +67 @@
 
     [StorableConstructor]
-    protected QualityTrailMultiAnalyzer(bool deserializing) : base(deserializing) { }
+    protected QualityTrailMultiAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected QualityTrailMultiAnalyzer(QualityTrailMultiAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public QualityTrailMultiAnalyzer()

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/RuggednessAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Ruggedness Analyzer", "Analyzes autocorrelation for one mutation step and correlation length. Correlation length is calculated according to the statistical correlation length defined by Hordijk, W., 1996. A measure of landscapes. Evolutionary computation, 4(4), pp.335-360.")]
-  [StorableClass]
+  [StorableType("F018AA6C-B392-4D10-8817-D058D7678149")]
   public class RuggednessAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
     public bool EnabledByDefault {
@@ -56 +56 @@
 
     [StorableConstructor]
-    protected RuggednessAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RuggednessAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RuggednessAnalyzer(RuggednessAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public RuggednessAnalyzer() {

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/Analysis/UpDownWalkAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Up/Down Walk Analyzer", "Analyzes the quality trail produced from an up/down walk.")]
-  [StorableClass]
+  [StorableType("0D054A87-A040-4DC5-A722-0952EE96C924")]
   public class UpDownWalkAnalyzer : SingleSuccessorOperator, IQualityTrailAnalyzer {
     public bool EnabledByDefault {
@@ -65 +65 @@
 
     [StorableConstructor]
-    protected UpDownWalkAnalyzer(bool deserializing) : base(deserializing) { }
+    protected UpDownWalkAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected UpDownWalkAnalyzer(UpDownWalkAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public UpDownWalkAnalyzer() {