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

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.MOCMAEvolutionStrategy/3.3

Files:

• HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj (modified) (1 diff)
• Indicators/CrowdingIndicator.cs (modified) (1 diff)
• Indicators/HypervolumeIndicator.cs (modified) (1 diff)
• Indicators/MinimalDistanceIndicator.cs (modified) (1 diff)
• Individual.cs (modified) (2 diffs)
• MOCMAEvolutionStrategy.cs (modified) (3 diffs)

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

@@ -80 +80 @@
       <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.MOCMAEvolutionStrategy/3.3/Indicators/CrowdingIndicator.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
   [Item("CrowdingIndicator", "Selection of Offspring based on CrowdingDistance")]
-  [StorableClass]
+  [StorableType("FEC5F17A-C720-4411-8AD6-42BA0F392AE9")]
   internal class CrowdingIndicator : Item, IIndicator {
     #region Constructors and Cloning
     [StorableConstructor]
-    protected CrowdingIndicator(bool deserializing) : base(deserializing) { }
+    protected CrowdingIndicator(StorableConstructorFlag _) : base(_) { }
     protected CrowdingIndicator(CrowdingIndicator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new CrowdingIndicator(this, cloner); }

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/HypervolumeIndicator.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.TestFunctions.MultiObjective;
 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
   [Item("HypervolumeIndicator", "Selection of Offspring based on contributing Hypervolume")]
-  [StorableClass]
+  [StorableType("ADF439D6-64E4-4C92-A4D3-E8C05B050406")]
   internal class HypervolumeIndicator : Item, IIndicator {
     #region Constructors and Cloning
     [StorableConstructor]
-    protected HypervolumeIndicator(bool deserializing) : base(deserializing) { }
+    protected HypervolumeIndicator(StorableConstructorFlag _) : base(_) { }
     protected HypervolumeIndicator(HypervolumeIndicator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new HypervolumeIndicator(this, cloner); }

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/MinimalDistanceIndicator.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
   [Item("MinimalDistanceIndicator", "Selection of Offspring based on distance to nearest neighbour")]
-  [StorableClass]
+  [StorableType("FBBD4517-164C-4DEE-B87D-49B99172EDF4")]
   internal class MinimalDistanceIndicator : Item, IIndicator {
 
     #region Constructor and Cloning
     [StorableConstructor]
-    protected MinimalDistanceIndicator(bool deserializing) : base(deserializing) { }
+    protected MinimalDistanceIndicator(StorableConstructorFlag _) : base(_) { }
     protected MinimalDistanceIndicator(MinimalDistanceIndicator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) { return new MinimalDistanceIndicator(this, cloner); }

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
-  [StorableClass]
+  [StorableType("8D5AF328-84A0-4924-9909-A113CDCFC117")]
   public class Individual : IDeepCloneable {
 
@@ -63 +63 @@
     #region Constructors and Cloning
     [StorableConstructor]
-    protected Individual(bool deserializing) { }
+    protected Individual(StorableConstructorFlag _) { }
 
     public Individual(RealVector mean, double pSucc, double sigma, RealVector pc, double[,] c, MOCMAEvolutionStrategy strategy) {

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

@@ -32 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.TestFunctions.MultiObjective;
 using HeuristicLab.Random;
@@ -39 +39 @@
   [Item("Multi-Objective CMA Evolution Strategy (MOCMAES)", "A multi objective evolution strategy based on covariance matrix adaptation. Code is based on 'Covariance Matrix Adaptation for Multi - objective Optimization' by Igel, Hansen and Roth")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 210)]
-  [StorableClass]
+  [StorableType("C10264E3-E4C6-4735-8E94-0DC116E8908D")]
   public class MOCMAEvolutionStrategy : BasicAlgorithm {
     public override Type ProblemType {
@@ -265 +265 @@
 
     [StorableConstructor]
-    protected MOCMAEvolutionStrategy(bool deserializing) : base(deserializing) { }
+    protected MOCMAEvolutionStrategy(StorableConstructorFlag _) : base(_) { }
 
     protected MOCMAEvolutionStrategy(MOCMAEvolutionStrategy original, Cloner cloner) : base(original, cloner) {