Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators

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.Problems.TestFunctions/3.3/MoveEvaluators

Files:

• AckleyAdditiveMoveEvaluator.cs (modified) (2 diffs)
• AdditiveMoveEvaluator.cs (modified) (2 diffs)
• BealeAdditiveMoveEvaluator.cs (modified) (2 diffs)
• BoothAdditiveMoveEvaluator.cs (modified) (2 diffs)
• GriewankAdditiveMoveEvaluator.cs (modified) (2 diffs)
• LevyAdditiveMoveEvaluator.cs (modified) (2 diffs)
• MatyasAdditiveMoveEvaluator.cs (modified) (2 diffs)
• MultinormalAdditiveMoveEvaluator.cs (modified) (2 diffs)
• RandomAdditiveMoveEvaluator.cs (modified) (2 diffs)
• RastriginAdditiveMoveEvaluator.cs (modified) (2 diffs)
• RealVectorAdditiveMoveWrapper.cs (modified) (1 diff)
• RosenbrockAdditiveMoveEvaluator.cs (modified) (2 diffs)
• SchwefelAdditiveMoveEvaluator.cs (modified) (2 diffs)
• SphereAdditiveMoveEvaluator.cs (modified) (2 diffs)
• SumSquaresAdditiveMoveEvaluator.cs (modified) (2 diffs)
• ZakharovAdditiveMoveEvaluator.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/AckleyAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("AckleyAdditiveMoveEvaluator", "Class for evaluating an additive move on the Ackley function.")]
-  [StorableClass]
+  [StorableType("C28EF2FB-0EF2-4A69-910D-210A808A0420")]
   public class AckleyAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected AckleyAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected AckleyAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected AckleyAdditiveMoveEvaluator(AckleyAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public AckleyAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/AdditiveMoveEvaluator.cs

@@ -27 +27 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("AdditiveMoveEvaluator", "Base class for evaluating an additive move.")]
-  [StorableClass]
+  [StorableType("3B4F3C57-78CE-4881-8E3B-6E784A495734")]
   public abstract class AdditiveMoveEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionAdditiveMoveEvaluator {
 
@@ -53 +53 @@
 
     [StorableConstructor]
-    protected AdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected AdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected AdditiveMoveEvaluator(AdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     protected AdditiveMoveEvaluator()

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/BealeAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("BealeAdditiveMoveEvaluator", "Class for evaluating an additive move on the Beale function.")]
-  [StorableClass]
+  [StorableType("1F069200-31A3-45B0-A9E1-86C501148550")]
   public class BealeAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected BealeAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected BealeAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected BealeAdditiveMoveEvaluator(BealeAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public BealeAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/BoothAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("BoothAdditiveMoveEvaluator", "Class for evaluating an additive move on the Booth function.")]
-  [StorableClass]
+  [StorableType("869C2238-2423-42FC-A34E-54009D58365D")]
   public class BoothAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected BoothAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected BoothAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected BoothAdditiveMoveEvaluator(BoothAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public BoothAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/GriewankAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("GriewankAdditiveMoveEvaluator", "Class for evaluating an additive move on the Griewank function.")]
-  [StorableClass]
+  [StorableType("A3AC4364-7F3A-431E-8AE0-A1B46EC9FA4D")]
   public class GriewankAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected GriewankAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected GriewankAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected GriewankAdditiveMoveEvaluator(GriewankAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public GriewankAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/LevyAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("LevyAdditiveMoveEvaluator", "Class for evaluating an additive move on the Levy function.")]
-  [StorableClass]
+  [StorableType("EF50460A-400C-47DE-96D0-51107E353467")]
   public class LevyAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected LevyAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected LevyAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected LevyAdditiveMoveEvaluator(LevyAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public LevyAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/MatyasAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("MatyasAdditiveMoveEvaluator", "Class for evaluating an additive move on the Matyas function.")]
-  [StorableClass]
+  [StorableType("7B8A70DA-019D-4724-8AB8-6F42D60FB398")]
   public class MatyasAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected MatyasAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected MatyasAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected MatyasAdditiveMoveEvaluator(MatyasAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public MatyasAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/MultinormalAdditiveMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.TestFunctions.Evaluators;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("MultinormalAdditiveMoveEvaluator", "Class for evaluating an additive move on the multinormal function.")]
-  [StorableClass]
+  [StorableType("BF3794EF-E2C1-457C-8460-75EE179B0B30")]
   public class MultinormalAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public LookupParameter<ISingleObjectiveTestFunctionProblemEvaluator> EvaluatorParameter {
@@ -37 +37 @@
 
     [StorableConstructor]
-    protected MultinormalAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected MultinormalAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected MultinormalAdditiveMoveEvaluator(MultinormalAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public MultinormalAdditiveMoveEvaluator() {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RandomAdditiveMoveEvaluator.cs

@@ -24 +24 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("RandomAdditiveMoveEvaluator", "Class for evaluating an additive move on the Random function.")]
-  [StorableClass]
+  [StorableType("B8C621D3-6F11-417C-947B-F02484987313")]
   public class RandomAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected RandomAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected RandomAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected RandomAdditiveMoveEvaluator(RandomAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public RandomAdditiveMoveEvaluator()

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RastriginAdditiveMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("RastriginAdditiveMoveEvaluator", "Class for evaluating an additive move on the Rastrigin function.")]
-  [StorableClass]
+  [StorableType("F4D22E9B-6D46-4F7A-AABA-A77048F879DB")]
   public class RastriginAdditiveMoveEvaluator : AdditiveMoveEvaluator, IRastriginMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -49 +49 @@
 
     [StorableConstructor]
-    protected RastriginAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected RastriginAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected RastriginAdditiveMoveEvaluator(RastriginAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public RastriginAdditiveMoveEvaluator() {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RealVectorAdditiveMoveWrapper.cs

@@ -34 +34 @@
     private RealVector vector;
 
-    private RealVectorAdditiveMoveWrapper(bool deserializing) : base(deserializing) { }
     private RealVectorAdditiveMoveWrapper(RealVectorAdditiveMoveWrapper original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RosenbrockAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("RosenbrockAdditiveMoveEvaluator", "Class for evaluating an additive move on the Rosenbrock function.")]
-  [StorableClass]
+  [StorableType("A4CE5DFB-BC5C-4024-AD0F-7E23D6A50FBD")]
   public class RosenbrockAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected RosenbrockAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected RosenbrockAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected RosenbrockAdditiveMoveEvaluator(RosenbrockAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public RosenbrockAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/SchwefelAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("SchwefelAdditiveMoveEvaluator", "Class for evaluating an additive move on the Schwefel function.")]
-  [StorableClass]
+  [StorableType("BBCD57E2-4E1E-44E7-8943-8CCA5A6FFBB9")]
   public class SchwefelAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected SchwefelAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected SchwefelAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected SchwefelAdditiveMoveEvaluator(SchwefelAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public SchwefelAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/SphereAdditiveMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("SphereAdditiveMoveEvaluator", "Class for evaluating an additive move on the Sphere function.")]
-  [StorableClass]
+  [StorableType("4A2D54BA-31B3-4A2E-BDCA-D33C0C79E75B")]
   public class SphereAdditiveMoveEvaluator : AdditiveMoveEvaluator, ISphereMoveEvaluator {
     /// <summary>
@@ -63 +63 @@
 
     [StorableConstructor]
-    protected SphereAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected SphereAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected SphereAdditiveMoveEvaluator(SphereAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public SphereAdditiveMoveEvaluator() {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/SumSquaresAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("SumSquaresAdditiveMoveEvaluator", "Class for evaluating an additive move on the SumSquares function.")]
-  [StorableClass]
+  [StorableType("83294D8D-7286-4B95-87B8-CE55528B46E5")]
   public class SumSquaresAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected SumSquaresAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected SumSquaresAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected SumSquaresAdditiveMoveEvaluator(SumSquaresAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public SumSquaresAdditiveMoveEvaluator() : base() { }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/ZakharovAdditiveMoveEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.TestFunctions {
   [Item("ZakharovAdditiveMoveEvaluator", "Class for evaluating an additive move on the Zakharov function.")]
-  [StorableClass]
+  [StorableType("76A5302B-9A7F-4334-8180-3F2A0537F4E2")]
   public class ZakharovAdditiveMoveEvaluator : AdditiveMoveEvaluator {
     public override System.Type EvaluatorType {
@@ -34 +34 @@
 
     [StorableConstructor]
-    protected ZakharovAdditiveMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected ZakharovAdditiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected ZakharovAdditiveMoveEvaluator(ZakharovAdditiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public ZakharovAdditiveMoveEvaluator() : base() { }