Changeset 17097 for stable/HeuristicLab.Algorithms.ALPS/3.3/Analyzers

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ALPS (modified) (1 prop)
• HeuristicLab.Algorithms.ALPS/3.3/Analyzers/AgeDistributionAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeCalculator.cs (modified) (3 diffs)

stable/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/AgeDistributionAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.ALPS {
   // Based on QualityDistributionAnalyzer
   [Item("AgeDistributionAnalyzer", "Analyzes the distribution of the ages in that it adds a Histogram of them into the result collection.")]
-  [StorableClass]
+  [StorableType("714CE0E4-A88F-44A1-A2D0-92F4D8252C0C")]
   public sealed class AgeDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator {
 
@@ -69 +69 @@
 
     [StorableConstructor]
-    private AgeDistributionAnalyzer(bool deserializing)
-      : base(deserializing) { }
+    private AgeDistributionAnalyzer(StorableConstructorFlag _) : base(_) { }
     private AgeDistributionAnalyzer(AgeDistributionAnalyzer original, Cloner cloner)
       : base(original, cloner) { }

stable/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeAnalyzer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.ALPS {
   [Item("OldestAverageYoungestAgeAnalyzer", "An operator which calculates the current oldest, average and youngest age in the scope tree.")]
-  [StorableClass]
+  [StorableType("1AE2C4EF-BFCB-439C-AD5E-00E7740FD3D0")]
   public sealed class OldestAverageYoungestAgeAnalyzer : AlgorithmOperator, IAnalyzer {
     #region Parameter properties
@@ -67 +67 @@
     #region Storing & Cloning
     [StorableConstructor]
-    private OldestAverageYoungestAgeAnalyzer(bool deserializing) : base(deserializing) { }
+    private OldestAverageYoungestAgeAnalyzer(StorableConstructorFlag _) : base(_) { }
     private OldestAverageYoungestAgeAnalyzer(OldestAverageYoungestAgeAnalyzer original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.ALPS {
   [Item("OldestAverageYoungestAgeCalculator", "An operator which calculates the oldest, average and youngest age of solutions in the scope tree.")]
-  [StorableClass]
+  [StorableType("DF4FA02E-C328-4A6E-9096-5BFADFA9F5DE")]
   public sealed class OldestAverageYoungestAgeCalculator : SingleSuccessorOperator {
     public IScopeTreeLookupParameter<DoubleValue> AgeParameter {
@@ -46 +46 @@
     #region Storing & Cloning
     [StorableConstructor]
-    private OldestAverageYoungestAgeCalculator(bool deserializing) : base(deserializing) { }
+    private OldestAverageYoungestAgeCalculator(StorableConstructorFlag _) : base(_) { }
     private OldestAverageYoungestAgeCalculator(OldestAverageYoungestAgeCalculator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {