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

Timestamp:

12/28/18 16:10:48 (5 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.EvolutionStrategy/3.3

Files:

• EvolutionStrategy.cs (modified) (previous)
• EvolutionStrategyMainLoop.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj (modified) (1 diff)
• WithoutRepeatingBatchedRandomSelector.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.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("EvolutionStrategyMainLoop", "An operator which represents the main loop of an evolution strategy (EvolutionStrategy).")]
-  [StorableClass]
+  [StorableType("1B28A359-B37A-4959-A9B1-93C2E8C7C20A")]
   public sealed class EvolutionStrategyMainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -101 +101 @@
 
     [StorableConstructor]
-    private EvolutionStrategyMainLoop(bool deserializing) : base(deserializing) { }
+    private EvolutionStrategyMainLoop(StorableConstructorFlag _) : base(_) { }
     private EvolutionStrategyMainLoop(EvolutionStrategyMainLoop original, Cloner cloner)
       : base(original, cloner) {

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

@@ -102 +102 @@
       <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.EvolutionStrategy/3.3/WithoutRepeatingBatchedRandomSelector.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.EvolutionStrategy {
   [Item("WithoutRepeatingBatchedRandomSelector", "Selects m batches of n parents where in each batch the n parents are drawn without repeating.")]
-  [StorableClass]
+  [StorableType("FF9A96DC-8B6D-40D2-99A2-D91A4C990E15")]
   public class WithoutRepeatingBatchedRandomSelector : StochasticSelector {
     public override bool CanChangeName {
@@ -44 +44 @@
 
     [StorableConstructor]
-    protected WithoutRepeatingBatchedRandomSelector(bool deserializing) : base(deserializing) { }
+    protected WithoutRepeatingBatchedRandomSelector(StorableConstructorFlag _) : base(_) { }
     protected WithoutRepeatingBatchedRandomSelector(WithoutRepeatingBatchedRandomSelector original, Cloner cloner)
       : base(original, cloner) {