Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3

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

Files:

• HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj (modified) (1 diff)
• ScilabParameterOptimizationProblem.cs (modified) (2 diffs)
• ScilabParameterVectorEvaluator.cs (modified) (3 diffs)

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

@@ -88 +88 @@
       <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.Scilab/3.3/ScilabParameterOptimizationProblem.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.Scilab {
   [Item("Scilab Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in Scilab.")]
-  [StorableClass]
+  [StorableType("247B26FF-0C43-44EA-A768-183B9B60653B")]
   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 120)]
   public class ScilabParameterOptimizationProblem : ParameterOptimizationProblem {
@@ -63 +63 @@
 
     [StorableConstructor]
-    protected ScilabParameterOptimizationProblem(bool deserializing) : base(deserializing) { }
+    protected ScilabParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { }
     protected ScilabParameterOptimizationProblem(ScilabParameterOptimizationProblem original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Problems.ParameterOptimization;
 using ScilabConnector = DotNetScilab.Scilab;
@@ -33 +33 @@
 namespace HeuristicLab.Problems.ExternalEvaluation.Scilab {
   [Item("SciLabParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a Scilab script.")]
-  [StorableClass]
+  [StorableType("B0EEB2BC-B35E-47AC-93DE-8B2C0EFF8650")]
   public sealed class ScilabParameterVectorEvaluator : ParameterVectorEvaluator {
     private const string MaximizationParameterName = "Maximization";
@@ -56 +56 @@
 
     [StorableConstructor]
-    private ScilabParameterVectorEvaluator(bool deserializing) : base(deserializing) { }
+    private ScilabParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { }
     private ScilabParameterVectorEvaluator(ScilabParameterVectorEvaluator original, Cloner cloner)
       : base(original, cloner) {