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:
35 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Operators/3.3/AlgorithmOperator.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.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("AlgorithmOperator", "An operator which represents an algorithm represented as an operator graph.")]
    32   [StorableClass]
     32  [StorableType("A0F318EF-7614-4208-99C0-56DF89D4C23D")]
    3333  public abstract class AlgorithmOperator : SingleSuccessorOperator, IOperatorGraphOperator {
    3434    public static new Image StaticItemImage {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected AlgorithmOperator(bool deserializing) : base(deserializing) { }
     50    protected AlgorithmOperator(StorableConstructorFlag _) : base(_) { }
    5151    protected AlgorithmOperator(AlgorithmOperator original, Cloner cloner)
    5252      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/Assigner.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("Assigner", "An operator which clones and assigns the value of one parameter to another parameter.")]
    32   [StorableClass]
     32  [StorableType("78FF1ACA-3D1E-4541-917F-B0431BAEC593")]
    3333  public sealed class Assigner : SingleSuccessorOperator {
    3434    public LookupParameter<IItem> LeftSideParameter {
    … …  
    4040
    4141    [StorableConstructor]
    42     private Assigner(bool deserializing) : base(deserializing) { }
     42    private Assigner(StorableConstructorFlag _) : base(_) { }
    4343    private Assigner(Assigner original, Cloner cloner)
    4444      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/CheckedMultiOperator.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.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("CheckedMultiOperator", "A base class for operators which apply arbitrary many other operators of a specific type that can be checked or unchecked.")]
    34   [StorableClass]
     34  [StorableType("7C166074-0171-4574-8689-8CDB75A9BB1A")]
    3535  public abstract class CheckedMultiOperator<T> : MultiOperator<T>, ICheckedMultiOperator<T> where T : class, IOperator {
    3636    /// <summary>
    … …  
    4343
    4444    [StorableConstructor]
    45     protected CheckedMultiOperator(bool deserializing) : base(deserializing) { }
     45    protected CheckedMultiOperator(StorableConstructorFlag _) : base(_) { }
    4646    protected CheckedMultiOperator(CheckedMultiOperator<T> original, Cloner cloner)
    4747      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/CombinedOperator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Operators {
    … …  
    2929  /// </summary>
    3030  [Item("CombinedOperator", "An operator which contains an operator graph.")]
    31   [StorableClass]
     31  [StorableType("8A035E57-6D50-4797-96D2-BDDD2B1FACC4")]
    3232  public sealed class CombinedOperator : AlgorithmOperator, IParameterizedItem, IStorableContent {
    3333    public string Filename { get; set; }
    … …  
    4444
    4545    [StorableConstructor]
    46     private CombinedOperator(bool deserializing) : base(deserializing) { }
     46    private CombinedOperator(StorableConstructorFlag _) : base(_) { }
    4747    private CombinedOperator(CombinedOperator original, Cloner cloner)
    4848      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/Comparator.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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("Comparator", "An operator which compares two items.")]
    34   [StorableClass]
     34  [StorableType("21C6129E-1D5C-43BB-8E6D-1F1DD5C2E995")]
    3535  public sealed class Comparator : SingleSuccessorOperator {
    3636    public LookupParameter<IItem> LeftSideParameter {
    … …  
    5252
    5353    [StorableConstructor]
    54     private Comparator(bool deserializing) : base(deserializing) { }
     54    private Comparator(StorableConstructorFlag _) : base(_) { }
    5555    private Comparator(Comparator original, Cloner cloner)
    5656      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/ConditionalBranch.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("ConditionalBranch", "A branch of two operators whose executions depend on a boolean condition. If the boolean condition is not present, the false branch is executed.")]
    33   [StorableClass]
     33  [StorableType("DAE01CA9-CE0C-48BB-BA7B-6BF380B02862")]
    3434  public class ConditionalBranch : SingleSuccessorOperator {
    3535    public LookupParameter<BoolValue> ConditionParameter {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected ConditionalBranch(bool deserializing) : base(deserializing) { }
     54    protected ConditionalBranch(StorableConstructorFlag _) : base(_) { }
    5555    protected ConditionalBranch(ConditionalBranch original, Cloner cloner)
    5656      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/DataReducer.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.Operators {
    3232  [Item("DataReducer", "An operator to reduce values of sub scopes.")]
    33   [StorableClass]
     33  [StorableType("87DC7AB9-4C8D-4FF9-B0B0-70B7E7F32C3C")]
    3434  public sealed class DataReducer : SingleSuccessorOperator {
    3535    #region Parameter Properties
    … …  
    4949
    5050    [StorableConstructor]
    51     private DataReducer(bool deserializing) : base(deserializing) { }
     51    private DataReducer(StorableConstructorFlag _) : base(_) { }
    5252    private DataReducer(DataReducer original, Cloner cloner)
    5353      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/DoubleCounter.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("DoubleCounter", "An operator which increments a double variable.")]
    33   [StorableClass]
     33  [StorableType("0DD61CAD-1FBB-4677-840C-3A1A85D77110")]
    3434  public sealed class DoubleCounter : SingleSuccessorOperator {
    3535    public LookupParameter<DoubleValue> ValueParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     private DoubleCounter(bool deserializing) : base(deserializing) { }
     47    private DoubleCounter(StorableConstructorFlag _) : base(_) { }
    4848    private DoubleCounter(DoubleCounter original, Cloner cloner)
    4949      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/EmptyOperator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Operators {
    … …  
    2929  /// </summary>
    3030  [Item("EmptyOperator", "An operator which represents an empty statement.")]
    31   [StorableClass]
     31  [StorableType("E385372F-A82C-4C27-8D93-A5366F454A17")]
    3232  public sealed class EmptyOperator : SingleSuccessorOperator {
    3333    [StorableConstructor]
    34     private EmptyOperator(bool deserializing) : base(deserializing) { }
     34    private EmptyOperator(StorableConstructorFlag _) : base(_) { }
    3535    private EmptyOperator(EmptyOperator original, Cloner cloner)
    3636      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

    r11623 r16565  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
    … …  
    108108  </PropertyGroup>
    109109  <ItemGroup>
     110    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     115    </Reference>
    110116    <Reference Include="System" />
    111117    <Reference Include="System.Core">
    … …  
    114120    <Reference Include="System.Data" />
    115121    <Reference Include="System.Drawing" />
     122    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     123      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     124    </Reference>
    116125    <Reference Include="System.Xml" />
    117126  </ItemGroup>
    … …  
    120129    <Compile Include="CombinedOperator.cs" />
    121130    <Compile Include="Operator.InstrumentedOperatorWrapper.cs" />
     131    <None Include="packages.config" />
    122132    <None Include="Plugin.cs.frame" />
    123133    <Compile Include="ConditionalBranch.cs" />

  • trunk/HeuristicLab.Operators/3.3/InstrumentedOperator.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.Core;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Operators {
    3030  [Item("InstrumentedOperator", "A operator that can execute pre- and post actions.")]
    31   [StorableClass]
     31  [StorableType("FE448512-394C-471E-B7E4-077FA273C173")]
    3232  public abstract class InstrumentedOperator : SingleSuccessorOperator, IInstrumentedOperator {
    3333    private const string BeforeExecutionOperatorsParameterName = "BeforeExecutionOperators";
    … …  
    5252
    5353    [StorableConstructor]
    54     protected InstrumentedOperator(bool deserializing) : base(deserializing) { }
     54    protected InstrumentedOperator(StorableConstructorFlag _) : base(_) { }
    5555    protected InstrumentedOperator(InstrumentedOperator original, Cloner cloner)
    5656      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/IntCounter.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("IntCounter", "An operator which increments an integer variable.")]
    33   [StorableClass]
     33  [StorableType("053589D0-CEF2-465C-98F8-0A1FB7206B60")]
    3434  public sealed class IntCounter : SingleSuccessorOperator {
    3535
    … …  
    4646
    4747    [StorableConstructor]
    48     private IntCounter(bool deserializing) : base(deserializing) { }
     48    private IntCounter(StorableConstructorFlag _) : base(_) { }
    4949    private IntCounter(IntCounter original, Cloner cloner)
    5050      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/LocalRandomCreator.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    2828  [Item("LocalRandomCreator", "Creates a local pseudo random number generator from a global random number generator.")]
    29   [StorableClass]
     29  [StorableType("C1E56840-D71E-46F0-A964-AB8E9340333C")]
    3030  public sealed class LocalRandomCreator : SingleSuccessorOperator {
    3131    #region Parameter Properties
    … …  
    3939
    4040    [StorableConstructor]
    41     private LocalRandomCreator(bool deserializing) : base(deserializing) { }
     41    private LocalRandomCreator(StorableConstructorFlag _) : base(_) { }
    4242    private LocalRandomCreator(LocalRandomCreator original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/MultiOperator.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.Core;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Operators {
    … …  
    3434  /// </summary>
    3535  [Item("MultiOperator", "A base class for operators which apply arbitrary many other operators of a specific type.")]
    36   [StorableClass]
     36  [StorableType("B8991981-2A8E-4A84-914D-24EE977BFB8F")]
    3737  public abstract class MultiOperator<T> : InstrumentedOperator, IMultiOperator<T> where T : class, IOperator {
    3838    private List<IValueParameter<T>> operatorParameters;
    … …  
    5757
    5858    [StorableConstructor]
    59     protected MultiOperator(bool deserializing) : base(deserializing) { }
     59    protected MultiOperator(StorableConstructorFlag _) : base(_) { }
    6060    protected MultiOperator(MultiOperator<T> original, Cloner cloner)
    6161      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/Operator.InstrumentedOperatorWrapper.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.PluginInfrastructure;
    3131using ExecutionContext = HeuristicLab.Core.ExecutionContext;
    … …  
    3838    }
    3939
    40     [StorableClass]
     40    [StorableType("6F0E5A4B-596C-435E-8CCA-969FE8745E92")]
    4141    [NonDiscoverableType]
    4242    private class InstrumentedOperatorWrapper : Operator {
    … …  
    4545
    4646      [StorableConstructor]
    47       private InstrumentedOperatorWrapper(bool deserializing) : base(deserializing) { }
     47      private InstrumentedOperatorWrapper(StorableConstructorFlag _) : base(_) { }
    4848
    4949      private InstrumentedOperatorWrapper(InstrumentedOperatorWrapper original, Cloner cloner)

  • trunk/HeuristicLab.Operators/3.3/Operator.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.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("Operator", "Base class for operators.")]
    35   [StorableClass]
     35  [StorableType("6AC01841-FF13-41B5-87E4-181F10D08835")]
    3636  public abstract partial class Operator : ParameterizedNamedItem, IOperator, IStatefulItem {
    3737    public static new Image StaticItemImage {
    … …  
    7676
    7777    [StorableConstructor]
    78     protected Operator(bool deserializing)
    79       : base(deserializing) {
     78    protected Operator(StorableConstructorFlag _) : base(_) {
    8079      executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
    8180    }

  • trunk/HeuristicLab.Operators/3.3/Placeholder.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("Placeholder", "An operator which acts as a placeholder for another operator retrieved from the scope or a parent execution context.")]
    32   [StorableClass]
     32  [StorableType("B197A6BB-9C18-4E0B-8FE6-D4746C4892CD")]
    3333  public sealed class Placeholder : SingleSuccessorOperator {
    3434    public LookupParameter<IOperator> OperatorParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     private Placeholder(bool deserializing) : base(deserializing) { }
     39    private Placeholder(StorableConstructorFlag _) : base(_) { }
    4040    private Placeholder(Placeholder original, Cloner cloner)
    4141      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/Plugin.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.Operators/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.Operators/3.3/ReductionOperation.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.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
     29  [StorableType("1080f82a-f4cd-41db-a474-6578a4b9ec82")]
    2930  public enum ReductionOperations {
    3031    Sum,
    … …  
    4041
    4142  [Item("ReductionOperation", "Represents a certain type of reduction operation.")]
    42   [StorableClass]
     43  [StorableType("32D733BA-9331-46D2-8BB3-95E23431F00B")]
    4344  public class ReductionOperation : ValueTypeValue<ReductionOperations> {
    4445    public static new Image StaticItemImage {
    … …  
    4748
    4849    [StorableConstructor]
    49     protected ReductionOperation(bool deserializing) : base(deserializing) { }
     50    protected ReductionOperation(StorableConstructorFlag _) : base(_) { }
    5051    protected ReductionOperation(ReductionOperation original, Cloner cloner) : base(original, cloner) { }
    5152    public ReductionOperation() : base() { }

  • trunk/HeuristicLab.Operators/3.3/ScopeCleaner.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("ScopeCleaner", "An operator which removes all variables and sub-scopes from the current scope.")]
    32   [StorableClass]
     32  [StorableType("A18BFE15-F006-4603-9F66-A6EAABB0FCBF")]
    3333  public sealed class ScopeCleaner : SingleSuccessorOperator {
    3434    private ScopeParameter CurrentScopeParameter {
    … …  
    4040
    4141    [StorableConstructor]
    42     private ScopeCleaner(bool deserializing) : base(deserializing) { }
     42    private ScopeCleaner(StorableConstructorFlag _) : base(_) { }
    4343    private ScopeCleaner(ScopeCleaner original, Cloner cloner)
    4444      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SingleSuccessorOperator.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("SingleSuccessorOperator", "A base class for operators which have only one successor.")]
    32   [StorableClass]
     32  [StorableType("2A75BE8A-26AA-49CD-8152-42AA97C0FF45")]
    3333  public abstract class SingleSuccessorOperator : Operator {
    3434    protected OperatorParameter SuccessorParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     protected SingleSuccessorOperator(bool deserializing) : base(deserializing) { }
     43    protected SingleSuccessorOperator(StorableConstructorFlag _) : base(_) { }
    4444    protected SingleSuccessorOperator(SingleSuccessorOperator original, Cloner cloner)
    4545      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/StochasticBranch.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("StochasticBranch", "A branch of two operators which are executed with a specified probability.")]
    33   [StorableClass]
     33  [StorableType("5B4F6317-501A-4D29-A6D7-0B926BAD0A88")]
    3434  public class StochasticBranch : SingleSuccessorOperator {
    3535    public LookupParameter<IRandom> RandomParameter {
    … …  
    5555
    5656    [StorableConstructor]
    57     protected StochasticBranch(bool deserializing) : base(deserializing) { }
     57    protected StochasticBranch(StorableConstructorFlag _) : base(_) { }
    5858    protected StochasticBranch(StochasticBranch original, Cloner cloner)
    5959      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/StochasticMultiBranch.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.
    … …  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Operators {
    … …  
    3535  /// </summary>
    3636  [Item("StochasticMultiBranch", "Selects one of its branches (if there are any) given a list of relative probabilities.")]
    37   [StorableClass]
     37  [StorableType("9BD4C2C2-945F-4FAD-AE19-28C0D66BE476")]
    3838  public abstract class StochasticMultiBranch<T> : CheckedMultiOperator<T> where T : class, IOperator {
    3939    /// <summary>
    … …  
    6262
    6363    [StorableConstructor]
    64     protected StochasticMultiBranch(bool deserializing) : base(deserializing) { }
     64    protected StochasticMultiBranch(StorableConstructorFlag _) : base(_) { }
    6565    protected StochasticMultiBranch(StochasticMultiBranch<T> original, Cloner cloner)
    6666      : base(original, cloner) {
    … …  
    176176  /// </summary>
    177177  [Item("StochasticMultiBranch", "Selects one of its branches (if there are any) given a list of relative probabilities.")]
    178   [StorableClass]
     178  [StorableType("33C9B48B-10F7-4832-9F5F-1421A4467A87")]
    179179  public class StochasticMultiBranch : StochasticMultiBranch<IOperator> {
    180180    [StorableConstructor]
    181     protected StochasticMultiBranch(bool deserializing) : base(deserializing) { }
     181    protected StochasticMultiBranch(StorableConstructorFlag _) : base(_) { }
    182182    protected StochasticMultiBranch(StochasticMultiBranch original, Cloner cloner)
    183183      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesCloner.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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    2824using HeuristicLab.Common;
    2925using HeuristicLab.Parameters;
    … …  
    3531  /// </summary>
    3632  [Item("SubScopesCloner", "An operator which creates multiple copies of the subscopes of the current scope.")]
    37   [StorableClass]
     33  [StorableType("1F299CDC-13E0-4F12-9E2D-7D3CAC8C651C")]
    3834  public class SubScopesCloner : SingleSuccessorOperator {
    3935    private ScopeParameter CurrentScopeParameter {
    … …  
    5450
    5551    [StorableConstructor]
    56     protected SubScopesCloner(bool deserializing) : base(deserializing) { }
     52    protected SubScopesCloner(StorableConstructorFlag _) : base(_) { }
    5753    protected SubScopesCloner(SubScopesCloner original, Cloner cloner)
    5854      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesCounter.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    2929  [Item("SubScopesCounter", "Counts the number of direct sub-scopes and increments or assigns it to the value given in the parameter.")]
    30   [StorableClass]
     30  [StorableType("8F19EB3E-EA93-44DA-98C3-D19017FBCA1F")]
    3131  public class SubScopesCounter : SingleSuccessorOperator {
    3232
    … …  
    3939
    4040    [StorableConstructor]
    41     protected SubScopesCounter(bool deserializing) : base(deserializing) { }
     41    protected SubScopesCounter(StorableConstructorFlag _) : base(_) { }
    4242    protected SubScopesCounter(SubScopesCounter original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesCreator.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("SubScopesCreator", "An operator which adds new and empty sub-scopes to the current scope.")]
    33   [StorableClass]
     33  [StorableType("E9669404-045B-45CA-A922-9C81ACBBAF0C")]
    3434  public class SubScopesCreator : SingleSuccessorOperator {
    3535    public ValueLookupParameter<IntValue> NumberOfSubScopesParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected SubScopesCreator(bool deserializing) : base(deserializing) { }
     46    protected SubScopesCreator(StorableConstructorFlag _) : base(_) { }
    4747    protected SubScopesCreator(SubScopesCreator original, Cloner cloner)
    4848      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesMixer.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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("SubScopesMixer", "Changes the order of the sub-scopes by repartitioning the sub-scopes such that each new partition contains one scope from each old partition.")]
    34   [StorableClass]
     34  [StorableType("B69AE39A-B6E9-4ADB-94B4-77E172691D13")]
    3535  public class SubScopesMixer : SingleSuccessorOperator {
    3636    public ValueParameter<IntValue> PartitionsParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected SubScopesMixer(bool deserializing) : base(deserializing) { }
     46    protected SubScopesMixer(StorableConstructorFlag _) : base(_) { }
    4747    protected SubScopesMixer(SubScopesMixer original, Cloner cloner)
    4848      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesProcessor.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.Operators {
    … …  
    3434  /// </summary>
    3535  [Item("SubScopesProcessor", "An operator which contains multiple operators of which each is applied on one sub-scope at the given depth of the current scope. The first operator is applied on the first sub-scope, the second on the second, and so on.")]
    36   [StorableClass]
     36  [StorableType("A81F34BC-68D9-416D-9E6B-49652B4F7E98")]
    3737  public sealed class SubScopesProcessor : MultiOperator<IOperator> {
    3838    public ValueLookupParameter<BoolValue> ParallelParameter {
    … …  
    5353
    5454    [StorableConstructor]
    55     private SubScopesProcessor(bool deserializing) : base(deserializing) { }
     55    private SubScopesProcessor(StorableConstructorFlag _) : base(_) { }
    5656    private SubScopesProcessor(SubScopesProcessor original, Cloner cloner)
    5757      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesRemover.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("SubScopesRemover", "An operator which removes all sub-scopes or one specified sub-scope from the current scope.")]
    33   [StorableClass]
     33  [StorableType("A9624A3A-F8E9-4B8C-AE89-D243987F3505")]
    3434  public sealed class SubScopesRemover : SingleSuccessorOperator {
    3535    private ValueParameter<BoolValue> RemoveAllSubScopesParameter {
    … …  
    5252
    5353    [StorableConstructor]
    54     private SubScopesRemover(bool deserializing) : base(deserializing) { }
     54    private SubScopesRemover(StorableConstructorFlag _) : base(_) { }
    5555    private SubScopesRemover(SubScopesRemover original, Cloner cloner)
    5656      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/SubScopesSorter.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Operators {
    … …  
    3131  /// </summary>
    3232  [Item("SubScopesSorter", "An operator which sorts the sub-scopes of the current scope.")]
    33   [StorableClass]
     33  [StorableType("39AAED75-CD24-43EF-86C4-0CC4CA03749C")]
    3434  public sealed class SubScopesSorter : SingleSuccessorOperator {
    3535    private bool descending;
    … …  
    5050
    5151    [StorableConstructor]
    52     private SubScopesSorter(bool deserializing) : base(deserializing) { }
     52    private SubScopesSorter(StorableConstructorFlag _) : base(_) { }
    5353    private SubScopesSorter(SubScopesSorter original, Cloner cloner)
    5454      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.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.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("UniformSubScopesProcessor", "An operator which applies a specified operator on all sub-scopes at the given depth of the current scope.")]
    35   [StorableClass]
     35  [StorableType("C224E539-75F9-468C-B04F-2C2EE75D2F73")]
    3636  public sealed class UniformSubScopesProcessor : SingleSuccessorOperator {
    3737    private OperatorParameter OperatorParameter {
    … …  
    5959
    6060    [StorableConstructor]
    61     private UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
     61    private UniformSubScopesProcessor(StorableConstructorFlag _) : base(_) { }
    6262    private UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
    6363      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/ValuesCollector.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.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("ValuesCollector", "An operator which collects the actual values of parameters.")]
    32   [StorableClass]
     32  [StorableType("83F958A5-AE91-44C9-B329-BC9A36DC4E40")]
    3333  public abstract class ValuesCollector : SingleSuccessorOperator, IOperator {
    3434    [Storable]
    … …  
    3939
    4040    [StorableConstructor]
    41     protected ValuesCollector(bool deserializing) : base(deserializing) { }
     41    protected ValuesCollector(StorableConstructorFlag _) : base(_) { }
    4242    protected ValuesCollector(ValuesCollector original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Operators/3.3/VariableCreator.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("VariableCreator", "An operator which collects the actual values of parameters and clones them into the current scope.")]
    32   [StorableClass]
     32  [StorableType("FF3526E7-216C-4F4B-8BBF-F3F67E9FE671")]
    3333  public class VariableCreator : ValuesCollector {
    3434    protected ScopeParameter CurrentScopeParameter {
    … …  
    4040
    4141    [StorableConstructor]
    42     protected VariableCreator(bool deserializing) : base(deserializing) { }
     42    protected VariableCreator(StorableConstructorFlag _) : base(_) { }
    4343    protected VariableCreator(VariableCreator original, Cloner cloner)
    4444      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.