Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.NSGA2

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

• added nuget references to HEAL.Fossil
• added StorableType attributes to many classes
• changed signature of StorableConstructors
• removed some classes in old persistence
• removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.NSGA2/3.3

Files:

• HeuristicLab.Algorithms.NSGA2-3.3.csproj (modified) (1 diff)
• NSGA2.cs (modified) (3 diffs)
• NSGA2MainLoop.cs (modified) (3 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj

@@ -166 +166 @@
       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
     </Reference>

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs

@@ -30 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
@@ -40 +40 @@
   [Item("NSGA-II", "The Nondominated Sorting Genetic Algorithm II was introduced in Deb et al. 2002. A Fast and Elitist Multiobjective Genetic Algorithm: NSGA-II. IEEE Transactions on Evolutionary Computation, 6(2), pp. 182-197.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 135)]
-  [StorableClass]
+  [StorableType("9F34A562-68E7-4C4A-B452-F915802BACDA")]
   public class NSGA2 : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -162 +162 @@
 
     [StorableConstructor]
-    protected NSGA2(bool deserializing) : base(deserializing) { }
+    protected NSGA2(StorableConstructorFlag _) : base(_) { }
     protected NSGA2(NSGA2 original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2MainLoop.cs

@@ -26 +26 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Selection;
 
@@ -34 +34 @@
   /// </summary>
   [Item("NSGA2MainLoop", "An operator which represents the main loop of the NSGA-II algorithm.")]
-  [StorableClass]
+  [StorableType("F81EA9B1-0A1A-4597-BF2C-C830C32D3394")]
   public class NSGA2MainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -85 +85 @@
 
     [StorableConstructor]
-    protected NSGA2MainLoop(bool deserializing) : base(deserializing) { }
+    protected NSGA2MainLoop(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {