Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationChannel.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.Problems.ExternalEvaluation {
    2828  [Item("EvaluationChannel", "Abstract base class for channels to be used in an external evaluation problem.")]
    29   [StorableClass]
     29  [StorableType("2BE4FE9D-D5FE-45C3-9F85-3BF7200F0913")]
    3030  public abstract class EvaluationChannel : NamedItem, IEvaluationChannel {
    3131    public override bool CanChangeName { get { return false; } }
    … …  
    3333
    3434    [StorableConstructor]
    35     protected EvaluationChannel(bool deserializing) : base(deserializing) { }
     35    protected EvaluationChannel(StorableConstructorFlag _) : base(_) { }
    3636    protected EvaluationChannel(EvaluationChannel original, Cloner cloner) : base(original, cloner) { }
    3737    protected EvaluationChannel()

  • trunk/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationProcessChannel.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("EvaluationProcessChannel", "A channel that launches an external application in a new process and communicates with that process via stdin and stdout.")]
    32   [StorableClass]
     32  [StorableType("ECC07782-60E0-483C-8632-476697A058D2")]
    3333  public class EvaluationProcessChannel : EvaluationChannel {
    3434
    … …  
    6464    #region Construction & Cloning
    6565    [StorableConstructor]
    66     protected EvaluationProcessChannel(bool deserializing) : base(deserializing) { }
     66    protected EvaluationProcessChannel(StorableConstructorFlag _) : base(_) { }
    6767    protected EvaluationProcessChannel(EvaluationProcessChannel original, Cloner cloner)
    6868      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationServiceClient.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.
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.ExternalEvaluation {
    3232  [Item("EvaluationServiceClient", "An RPC client that evaluates a solution.")]
    33   [StorableClass]
     33  [StorableType("97F11C34-F32B-4AD2-92FB-F4A12311C962")]
    3434  public class EvaluationServiceClient : ParameterizedNamedItem, IEvaluationServiceClient {
    3535
    … …  
    5353    #region Construction & Cloning
    5454    [StorableConstructor]
    55     protected EvaluationServiceClient(bool deserializing) : base(deserializing) { }
     55    protected EvaluationServiceClient(StorableConstructorFlag _) : base(_) { }
    5656    protected EvaluationServiceClient(EvaluationServiceClient original, Cloner cloner)
    5757      : base(original, cloner) {
    … …  
    150150      OnNameChanged();
    151151    }
     152
     153    [StorableType("9f1ab6e1-fe6e-4624-afbd-9bfdfdb75d44")]
    152154    #endregion
    153155

  • trunk/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationStreamChannel.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.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [Item("EvaluationStreamChannel", "A channel that communicates via an input and an output stream.")]
    31   [StorableClass]
     31  [StorableType("15DD5556-3C31-4D18-BE18-D438B45591D8")]
    3232  public class EvaluationStreamChannel : EvaluationChannel {
    3333
    … …  
    3636
    3737    [StorableConstructor]
    38     protected EvaluationStreamChannel(bool deserializing) : base(deserializing) { }
     38    protected EvaluationStreamChannel(StorableConstructorFlag _) : base(_) { }
    3939    protected EvaluationStreamChannel(EvaluationStreamChannel original, Cloner cloner) : base(original, cloner) { }
    4040    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationTCPChannel.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("EvaluationTCPChannel", "A channel that creates a TCP connection over a network.")]
    32   [StorableClass]
     32  [StorableType("FECC0F5B-B22A-4117-888D-5B8B84332D24")]
    3333  public class EvaluationTCPChannel : EvaluationChannel {
    3434
    … …  
    6363    #region Construction & Cloning
    6464    [StorableConstructor]
    65     protected EvaluationTCPChannel(bool deserializing) : base(deserializing) { }
     65    protected EvaluationTCPChannel(StorableConstructorFlag _) : base(_) { }
    6666    protected EvaluationTCPChannel(EvaluationTCPChannel original, Cloner cloner)
    6767      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.