Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiObjective

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

Files:

• . (modified) (1 prop)
• 3.3/MultiObjective/ParetoFrontAnalyzer.cs (modified) (3 diffs)
• 3.3/MultiObjective/RankBasedParetoFrontAnalyzer.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.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.
@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("ParetoFrontAnalyzer", "Analyzer for multiobjective problems that collects and presents the current Pareto front as double matrix as well as the solution scopes that lie on the current front.")]
-  [StorableClass]
+  [StorableType("972CEB70-3D0D-4602-97B1-B02DC7FBD9E8")]
   public abstract class ParetoFrontAnalyzer : SingleSuccessorOperator, IAnalyzer, IMultiObjectiveOperator {
     public virtual bool EnabledByDefault {
@@ -44 +44 @@
 
     [StorableConstructor]
-    protected ParetoFrontAnalyzer(bool deserializing) : base(deserializing) { }
+    protected ParetoFrontAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected ParetoFrontAnalyzer(ParetoFrontAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public ParetoFrontAnalyzer() {

branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiObjective/RankBasedParetoFrontAnalyzer.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.
@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("RankBasedParetoFrontAnalyzer", "Uses the rank value that is computed by e.g. the NSGA2's fast non dominated sort operator to collect all solutions and their qualities of front 0 (the current Pareto front).")]
-  [StorableClass]
+  [StorableType("9F314FB6-6BA2-4CC8-843B-B68CF01F7BE7")]
   public class RankBasedParetoFrontAnalyzer : ParetoFrontAnalyzer {
     public IScopeTreeLookupParameter<IntValue> RankParameter {
@@ -38 +38 @@
 
     [StorableConstructor]
-    protected RankBasedParetoFrontAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RankBasedParetoFrontAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RankBasedParetoFrontAnalyzer(RankBasedParetoFrontAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public RankBasedParetoFrontAnalyzer() {