Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/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.Operators.Programmable/3.3

Files:

• HeuristicLab.Operators.Programmable-3.3.csproj (modified) (1 diff)
• ProgrammableOperator.cs (modified) (3 diffs)
• ProgrammableSingleSuccessorOperator.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

@@ -108 +108 @@
       <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.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -34 +34 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Auxiliary;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.PluginInfrastructure;
 using Microsoft.CSharp;
@@ -41 +41 @@
 
   [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
-  [StorableClass]
+  [StorableType("741279E4-4C38-4D66-B9F1-03E0F8B47A78")]
   public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent, IProgrammableItem {
 
@@ -166 +166 @@
 
     [StorableConstructor]
-    protected ProgrammableOperator(bool deserializing)
-      : base(deserializing) {
+    protected ProgrammableOperator(StorableConstructorFlag _) : base(_) {
       ProgrammableOperator.StaticInitialize();
       Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);

branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Operators.Programmable {
 
   [Item("ProgrammableSingleSuccessorOperator", "An operator that can be programmed for arbitrary needs and handle a single successor.")]
-  [StorableClass]
+  [StorableType("61B9FA72-9C6D-46AC-B514-5240D71170D8")]
   public class ProgrammableSingleSuccessorOperator : ProgrammableOperator {
 
@@ -46 +46 @@
 
     [StorableConstructor]
-    protected ProgrammableSingleSuccessorOperator(bool deserializing) : base(deserializing) { }
+    protected ProgrammableSingleSuccessorOperator(StorableConstructorFlag _) : base(_) { }
     protected ProgrammableSingleSuccessorOperator(ProgrammableSingleSuccessorOperator original, Cloner cloner)
       : base(original, cloner) {