Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (5 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
55 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Clients.Hive

  • trunk/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloaderException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/AddTaskToHiveException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/AnonymousUserException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/HiveException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/OptimizerNotFoundException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/ResourceNotFoundException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/ServiceClientFactoryException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Exceptions/TaskResultPollingException.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r16430 r16565  
    1111    <RootNamespace>HeuristicLab.Clients.Hive</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
     
    107107  </PropertyGroup>
    108108  <ItemGroup>
     109    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     110      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     113      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     114    </Reference>
    109115    <Reference Include="System" />
    110116    <Reference Include="System.Configuration" />
    111117    <Reference Include="System.Core" />
    112118    <Reference Include="System.Drawing" />
     119    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     120      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     121    </Reference>
    113122    <Reference Include="System.Runtime.Remoting" />
    114123    <Reference Include="System.Runtime.Serialization" />
     
    143152      <SubType>Designer</SubType>
    144153    </None>
     154    <None Include="packages.config" />
    145155    <None Include="Plugin.cs.frame" />
    146156    <Compile Include="Exceptions\AddTaskToHiveException.cs" />
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

    r16209 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r16430 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    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)
  • trunk/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/IHiveServiceLocator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

    r16430 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Properties/AssemblyInfo.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ScopeExtensions.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Downtime.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Heartbeat.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItem.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItemCollection.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/IHiveItem.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

    r16117 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobPermission.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/LightweightTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using System.Linq;
    2525using HeuristicLab.Common;
     26using HEAL.Attic;
    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(); } }
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/MessageContainer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/NamedHiveItem.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Project.cs

    r16117 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Resource.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/ResourcePermission.cs

    r16117 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Slave.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/SlaveGroup.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Clients.Hive {
     28  [StorableType("2590428E-5F97-48EC-AE82-E2F614BEF34C")]
    2729  public partial class Task : LightweightTask {
    2830
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/ServiceClients/UserPriority.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/StateLogList.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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) { }
  • trunk/HeuristicLab.Clients.Hive/3.3/StateLogListList.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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) { }
  • trunk/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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) {
  • trunk/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Hive;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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) {
  • trunk/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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) {
  • trunk/HeuristicLab.Clients.Hive/3.3/TreeView/IItemTree.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/TreeView/IItemTreeAction.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using System.Collections.Generic;
    2424using System.IO;
    25 using HeuristicLab.Persistence.Core;
     25using HEAL.Attic;
    2626using HeuristicLab.Persistence.Default.Xml;
    2727
     
    2929  public static class PersistenceUtil {
    3030    public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
    31       using (MemoryStream memStream = new MemoryStream()) {
    32         XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
    33         byte[] jobByteArray = memStream.ToArray();
    34         return jobByteArray;
    35       }
     31      var ser = new ProtoBufSerializer();
     32      var bytes = ser.Serialize(obj, out SerializationInfo info);
     33      types = info.SerializedTypes;
     34      return bytes;
    3635    }
    3736
    3837    public static byte[] Serialize(object obj) {
    39       using (MemoryStream memStream = new MemoryStream()) {
    40         XmlGenerator.Serialize(obj, memStream);
    41         byte[] jobByteArray = memStream.ToArray();
    42         return jobByteArray;
    43       }
     38      var ser = new ProtoBufSerializer();
     39      return ser.Serialize(obj);
    4440    }
    4541
    4642    public static T Deserialize<T>(byte[] sjob) {
    47       using (MemoryStream memStream = new MemoryStream(sjob)) {
    48         T job = XmlParser.Deserialize<T>(memStream);
    49         return job;
     43      var ser = new ProtoBufSerializer();
     44      try {
     45        return (T)ser.Deserialize(sjob);
     46      } catch (Exception) {
     47        // retry with old persistence
     48        using (MemoryStream memStream = new MemoryStream(sjob)) {
     49          return XmlParser.Deserialize<T>(memStream);
     50        }
    5051      }
    5152    }
  • trunk/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.