Changeset 16958 for branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate

Timestamp:

05/15/19 14:52:20 (6 years ago)

Author:

abeham

Message:

#2457: adapted to trunk

Location:

branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate

Files:

• UnivariateModel.cs (modified) (2 diffs)
• UnivariateModelTrainingOperator.cs (modified) (4 diffs)

branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModel.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel {
   [Item("Univariate solution model (binary)", "")]
-  [StorableClass]
+  [StorableType("E30B8452-970C-4AF2-B7E7-4AC9C21928BA")]
   public sealed class UnivariateModel : Item, ISolutionModel<BinaryVector> {
     [Storable]
@@ -37 +37 @@
 
     [StorableConstructor]
-    private UnivariateModel(bool deserializing) : base(deserializing) { }
+    private UnivariateModel(StorableConstructorFlag _) : base(_) { }
     private UnivariateModel(UnivariateModel original, Cloner cloner)
       : base(original, cloner) {

branches/2457_ExpertSystem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SolutionModel/Univariate/UnivariateModelTrainingOperator.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding.SolutionModel {
+  [StorableType("a70d9738-4012-442a-b6b2-b0aa2c34a3c5")]
   public enum ModelBiasOptions {
     Unbiased,
@@ -38 +39 @@
 
   [Item("Univariate Model Training Operator", "Adds a univariate solution sampling model to the scope.")]
-  [StorableClass]
+  [StorableType("CF6BF85A-8AC0-4DF3-8591-671FCBDDB4F2")]
   public class UnivariateModelTrainingOperator : InstrumentedOperator, IStochasticOperator, ISingleObjectiveOperator {
 
@@ -71 +72 @@
 
     [StorableConstructor]
-    protected UnivariateModelTrainingOperator(bool deserializing) : base() { }
+    protected UnivariateModelTrainingOperator(StorableConstructorFlag _) : base(_) { }
     protected UnivariateModelTrainingOperator(UnivariateModelTrainingOperator original, Cloner cloner)
       : base(original, cloner) { }