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

Timestamp:

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

Author:

abeham

Message:

#2457: adapted to trunk

Location:

branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3

Files:

• BestNScopesSolutionAnalyzer.cs (modified) (4 diffs)
• Optimizers/IteratedAlgorithm.cs (modified) (4 diffs)

branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Analysis {
@@ -37 +37 @@
   /// </summary>
   [Item("BestNScopesSolutionAnalyzer", "An operator that maintains at most N scopes containing good quality solutions.")]
-  [StorableClass]
+  [StorableType("9E9CB06C-EFF2-4A99-9203-E334771FF613")]
   public class BestNScopesSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
 
@@ -82 +82 @@
     #region Storing & Cloning
     [StorableConstructor]
-    protected BestNScopesSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected BestNScopesSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected BestNScopesSolutionAnalyzer(BestNScopesSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HEAL.Attic;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -26 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Analysis {
@@ -38 +38 @@
   [Item("Iterated Algorithm", "An algorithm that repeats an algorithm until either a certain target value is reached or a maximum budget is exceeded.")]
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 116)]
-  [StorableClass]
+  [StorableType("787AF25E-46FF-4FBF-A2ED-011E7F41AF58")]
   public sealed class IteratedAlgorithm : Algorithm, IStorableContent {
     private const string ExecutionTimeResultName = "Execution Time";
@@ -166 +166 @@
 
     [StorableConstructor]
-    private IteratedAlgorithm(bool deserializing) : base(deserializing) { }
+    private IteratedAlgorithm(StorableConstructorFlag _) : base(_) { }
     private IteratedAlgorithm(IteratedAlgorithm original, Cloner cloner)
       : base(original, cloner) {