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

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

Files:

• KnapsackMoveEvaluator.cs (modified) (3 diffs)
• KnapsackOneBitflipMoveEvaluator.cs (modified) (3 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.Knapsack {
@@ -34 +33 @@
   /// </summary>
   [Item("KnapsackMoveEvaluator", "A base class for operators which evaluate Knapsack moves.")]
-  [StorableClass]
+  [StorableType("F953FC74-8688-48E5-856D-E9D8A2411CA0")]
   public abstract class KnapsackMoveEvaluator : SingleSuccessorOperator, IKnapsackMoveEvaluator, IBinaryVectorMoveOperator {
     public ILookupParameter<DoubleValue> QualityParameter {
@@ -59 +58 @@
 
     [StorableConstructor]
-    protected KnapsackMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected KnapsackMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected KnapsackMoveEvaluator(KnapsackMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     protected KnapsackMoveEvaluator()

branches/2520_PersistenceReintegration/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.Knapsack {
@@ -32 +32 @@
   /// </summary>
   [Item("KnapsackOneBitflipMoveEvaluator", "Base class for evaluating one bitflip moves.")]
-  [StorableClass]
+  [StorableType("E1BB4CCB-E9C3-4A16-8F03-3F619D4A4B0A")]
   public class KnapsackOneBitflipMoveEvaluator : KnapsackMoveEvaluator, IOneBitflipMoveOperator {
     public ILookupParameter<OneBitflipMove> OneBitflipMoveParameter {
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected KnapsackOneBitflipMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected KnapsackOneBitflipMoveEvaluator(StorableConstructorFlag _) : base(_) { }
     protected KnapsackOneBitflipMoveEvaluator(KnapsackOneBitflipMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public KnapsackOneBitflipMoveEvaluator()