Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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.Clients.Hive/3.3
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r16454 r16462  
    110110      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    111111    </Reference>
    112     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     112    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113113      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    114114    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

    r16453 r16462  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.PluginInfrastructure;
    3333
    … …  
    3535
    3636  [Item("Hive Task", "Represents a hive task.")]
    37   [StorableClass]
     37  [StorableType("AB546F71-AB78-44AF-9954-1A269D278C56")]
    3838  public class HiveTask : NamedItem, IItemTree<HiveTask>, IDisposable {
    3939    protected static object locker = new object();
    … …  
    170170    #region Constructors and Cloning
    171171    [StorableConstructor]
    172     protected HiveTask(bool deserializing) { }
     172    protected HiveTask(StorableConstructorFlag _) : base(_) { }
    173173
    174174    public HiveTask()
    … …  
    541541
    542542  [Item("Hive Task", "Represents a hive task.")]
    543   [StorableClass]
     543  [StorableType("F185C6FD-7282-4EE1-9F76-C4DD32C69207")]
    544544  public class HiveTask<T> : HiveTask where T : ItemTask {
    545545
    … …  
    552552    public HiveTask() : base() { }
    553553    [StorableConstructor]
    554     protected HiveTask(bool deserializing) { }
     554    protected HiveTask(StorableConstructorFlag _) : base(_) { }
    555555    public HiveTask(T itemTask) : base(itemTask, true) { }
    556556    protected HiveTask(HiveTask<T> original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/ServiceClients/LightweightTask.cs

    r16453 r16462  
    2424using System.Linq;
    2525using HeuristicLab.Common;
     26using HEAL.Fossil;
    2627
    2728namespace HeuristicLab.Clients.Hive {
     29  [StorableType("35B1D7FC-0A94-48E0-A17D-888C2AFE58D9")]
    2830  public partial class LightweightTask : IDeepCloneable, IContent {
    2931    public StateLog CurrentStateLog { get { return StateLog.LastOrDefault(); } }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
     25using HEAL.Fossil;
    2526
    2627namespace HeuristicLab.Clients.Hive {
     28  [StorableType("2590428E-5F97-48EC-AE82-E2F614BEF34C")]
    2729  public partial class Task : LightweightTask {
    2830

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/StateLogList.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Clients.Hive {
    28   [StorableClass]
     28  [StorableType("A7A58A86-6059-4364-AD3B-BA439CB85101")]
    2929  public class StateLogList : ItemList<StateLog> {
    3030
    3131    [StorableConstructor]
    32     protected StateLogList(bool deserializing) : base(deserializing) { }
     32    protected StateLogList(StorableConstructorFlag _) : base(_) { }
    3333    public StateLogList() : base() { }
    3434    protected StateLogList(StateLogList original, Cloner cloner) : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/StateLogListList.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Clients.Hive {
    28   [StorableClass]
     28  [StorableType("DE613E80-EA09-4F5E-AB15-2E830866FCE3")]
    2929  public class StateLogListList : ItemList<StateLogList> {
    3030
    3131    [StorableConstructor]
    32     protected StateLogListList(bool deserializing) : base(deserializing) { }
     32    protected StateLogListList(StorableConstructorFlag _) : base(_) { }
    3333    public StateLogListList() : base() { }
    3434    protected StateLogListList(StateLogListList original, Cloner cloner) : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Clients.Hive {
    29   [StorableClass]
     29  [StorableType("FFDE8A4B-FDEC-47AA-B8E2-B16E5B513055")]
    3030  public class EngineTask : ItemTask {
    3131    public override HiveTask CreateHiveTask() {
    … …  
    6363
    6464    [StorableConstructor]
    65     protected EngineTask(bool deserializing) : base(deserializing) { }
     65    protected EngineTask(StorableConstructorFlag _) : base(_) { }
    6666    protected EngineTask(EngineTask original, Cloner cloner)
    6767      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Hive;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    3131namespace HeuristicLab.Clients.Hive {
    3232  [Item("Item Task", "Represents a executable hive task which contains a HeuristicLab Item.")]
    33   [StorableClass]
     33  [StorableType("69EB65A5-9132-41B6-BE1D-60EDA46EF3C5")]
    3434  public abstract class ItemTask : NamedItem, ITask {
    3535    public virtual HiveTask CreateHiveTask() {
    … …  
    7272
    7373    [StorableConstructor]
    74     protected ItemTask(bool deserializing) { }
     74    protected ItemTask(StorableConstructorFlag _) : base(_) { }
    7575    protected ItemTask(ItemTask original, Cloner cloner)
    7676      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Clients.Hive.Jobs {
    2929  [Item("Optimizer Task", "Represents Task which executes a IOptimizer object.")]
    30   [StorableClass]
     30  [StorableType("9A59FAAF-3F5C-4629-B22D-714488DC2678")]
    3131  public class OptimizerTask : ItemTask {
    3232    public override HiveTask CreateHiveTask() {
    … …  
    6060    }
    6161    [StorableConstructor]
    62     protected OptimizerTask(bool deserializing) { }
     62    protected OptimizerTask(StorableConstructorFlag _) : base(_) { }
    6363    protected OptimizerTask(OptimizerTask original, Cloner cloner)
    6464      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.