Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation.Matlab

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.ExternalEvaluation.Matlab/3.3

Files:

• HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj (modified) (1 diff)
• MatlabParameterOptimizationProblem.cs (modified) (2 diffs)
• MatlabParameterVectorEvaluator.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

@@ -83 +83 @@
       <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.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterOptimizationProblem.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.ParameterOptimization;
 
 namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
   [Item("MATLAB Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in MATLAB.")]
-  [StorableClass]
+  [StorableType("CC937102-7280-484C-BB85-88C357E31C6B")]
   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 110)]
   public class MatlabParameterOptimizationProblem : ParameterOptimizationProblem {
@@ -62 +62 @@
 
     [StorableConstructor]
-    protected MatlabParameterOptimizationProblem(bool deserializing) : base(deserializing) { }
+    protected MatlabParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { }
     protected MatlabParameterOptimizationProblem(MatlabParameterOptimizationProblem original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.ParameterOptimization;
 
 namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
   [Item("MATLABParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a MATLAB script.")]
-  [StorableClass]
+  [StorableType("C1BE88E2-B48F-4EB6-9F9F-25082639DA5C")]
   public sealed class MatlabParameterVectorEvaluator : ParameterVectorEvaluator {
     private const string QualityVariableParameterName = "QualityVariableName";
@@ -51 +51 @@
 
     [StorableConstructor]
-    private MatlabParameterVectorEvaluator(bool deserializing) : base(deserializing) { }
+    private MatlabParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { }
     private MatlabParameterVectorEvaluator(MatlabParameterVectorEvaluator original, Cloner cloner)
       : base(original, cloner) {