Ignore:
Timestamp:
12/28/18 16:10:48 (2 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

    r16454 r16462  
    108108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    109109    </Reference>
    110     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     110    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111111      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    112112    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

    r16453 r16462  
    3434using HeuristicLab.Core;
    3535using HeuristicLab.Persistence.Auxiliary;
    36 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     36using HEAL.Fossil;
    3737using HeuristicLab.PluginInfrastructure;
    3838using Microsoft.CSharp;
     
    4141
    4242  [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
    43   [StorableClass]
     43  [StorableType("741279E4-4C38-4D66-B9F1-03E0F8B47A78")]
    4444  public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent, IProgrammableItem {
    4545
     
    166166
    167167    [StorableConstructor]
    168     protected ProgrammableOperator(bool deserializing)
    169       : base(deserializing) {
     168    protected ProgrammableOperator(StorableConstructorFlag _) : base(_) {
    170169      ProgrammableOperator.StaticInitialize();
    171170      Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Operators.Programmable {
    2828
    2929  [Item("ProgrammableSingleSuccessorOperator", "An operator that can be programmed for arbitrary needs and handle a single successor.")]
    30   [StorableClass]
     30  [StorableType("61B9FA72-9C6D-46AC-B514-5240D71170D8")]
    3131  public class ProgrammableSingleSuccessorOperator : ProgrammableOperator {
    3232
     
    4646
    4747    [StorableConstructor]
    48     protected ProgrammableSingleSuccessorOperator(bool deserializing) : base(deserializing) { }
     48    protected ProgrammableSingleSuccessorOperator(StorableConstructorFlag _) : base(_) { }
    4949    protected ProgrammableSingleSuccessorOperator(ProgrammableSingleSuccessorOperator original, Cloner cloner)
    5050      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.