Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 16:54:20 (5 years ago)
Author:
abeham
Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

  • it doesn't build
Location:
branches/2521_ProblemRefactoring
Files:
94 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Core

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

    r16692 r16723  
    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.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("CAD59659-15B5-4CB0-A199-272E28F40832")]
    3535  [Item("CheckedItemCollection", "Represents a collection of items that can be checked or unchecked.")]
    3636  public class CheckedItemCollection<T> : ItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
    … …  
    5050    /// <param name="deserializing"></param>
    5151    [StorableConstructor]
    52     protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
     52    protected CheckedItemCollection(StorableConstructorFlag _) : base(_) { }
    5353    protected CheckedItemCollection(CheckedItemCollection<T> original, Cloner cloner)
    5454      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

    r16692 r16723  
    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.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  /// <typeparam name="T">The element type (base type is IItem)</typeparam>
    34   [StorableClass]
     34  [StorableType("83222907-689C-484B-8431-BA85DF516761")]
    3535  [Item("CheckedItemList", "Represents a list of items that can be checked or unchecked.")]
    3636  public class CheckedItemList<T> : ItemList<T>, ICheckedItemList<T> where T : class, IItem {
    … …  
    5454    /// <param name="deserializing"></param>
    5555    [StorableConstructor]
    56     protected CheckedItemList(bool deserializing) : base(deserializing) { }
     56    protected CheckedItemList(StorableConstructorFlag _) : base(_) { }
    5757    protected CheckedItemList(CheckedItemList<T> original, Cloner cloner)
    5858      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("5E78ED3E-97A4-4632-B729-C9B7DC965609")]
    2828  [Item("ConstraintCollection", "Represents a collection of constraints.")]
    2929  public class ConstraintCollection : ItemCollection<IConstraint> {
    3030    [StorableConstructor]
    31     protected ConstraintCollection(bool deserializing) : base(deserializing) { }
     31    protected ConstraintCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ConstraintCollection(ConstraintCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ConstraintCollection() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

    r16692 r16723  
    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 System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    2727  [Item("Arc", "A graph arc connecting two graph vertices, that can have a weight, label, and data object for holding additional info")]
    28   [StorableClass]
     28  [StorableType("E91E40A2-FE77-49F0-866E-5127F3C1AC79")]
    2929  public class Arc : Item, IArc {
    3030    [Storable]
    … …  
    5858
    5959    [StorableConstructor]
    60     protected Arc(bool deserializing) : base(deserializing) { }
     60    protected Arc(StorableConstructorFlag _) : base(_) { }
    6161
    6262    public Arc(IVertex source, IVertex target) {
    … …  
    8282  }
    8383
    84   [StorableClass]
     84  [StorableType("5F06782E-3BD2-4A9D-B030-BE1D6A6B714F")]
    8585  public class Arc<T> : Arc, IArc<T> where T : class, IDeepCloneable {
    8686    [Storable]
    … …  
    105105    }
    106106
    107     public Arc(bool deserializing)
    108       : base(deserializing) {
     107    [StorableConstructor]
     108    public Arc(StorableConstructorFlag _)
     109      : base(_) {
    109110    }
    110111

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.cs

    r16692 r16723  
    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.Common.Resources;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Core {
    3131  [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
    32   [StorableClass]
     32  [StorableType("C7DF8A65-95AE-4D73-950B-27A8086D7DA2")]
    3333  public class DirectedGraph : Item, IDirectedGraph {
    3434    public override Image ItemImage { get { return VSImageLibrary.Graph; } }
    … …  
    7070
    7171    [StorableConstructor]
    72     protected DirectedGraph(bool serializing)
    73       : base(serializing) {
     72    protected DirectedGraph(StorableConstructorFlag _) : base(_) {
    7473    }
    7574

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

    r16692 r16723  
    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;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    2929  [Item("Vertex", "An object representing a vertex in the graph. It can have a text label, a weight, and an additional data object.")]
    30   [StorableClass]
     30  [StorableType("3FA3AAFA-05FF-4BE9-BD72-05A822A5E8CC")]
    3131  public class Vertex : Item, IVertex {
    3232    [Storable]
    … …  
    6767
    6868    [StorableConstructor]
    69     public Vertex(bool deserializing) : base(deserializing) { }
     69    public Vertex(StorableConstructorFlag _) : base(_) { }
    7070
    7171    [StorableHook(HookType.AfterDeserialization)]
    … …  
    141141  }
    142142
    143   [StorableClass]
     143  [StorableType("ED2FD106-6F97-415A-A6D0-7F6690426910")]
    144144  public class Vertex<T> : Vertex, IVertex<T> where T : class,IDeepCloneable {
    145145    [Storable]
    … …  
    155155
    156156    [StorableConstructor]
    157     protected Vertex(bool deserializing) : base(deserializing) { }
     157    protected Vertex(StorableConstructorFlag _) : base(_) { }
    158158
    159159    protected Vertex(Vertex<T> original, Cloner cloner)

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ItemArray.cs

    r16692 r16723  
    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.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("CB8A238C-B8E6-47A3-A7D8-AB1212DEC672")]
    3232  [Item("ItemArray", "Represents an array of items.")]
    3333  public class ItemArray<T> : ObservableArray<T>, IItemArray<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemArray(bool deserializing) : base(deserializing) { }
     51    protected ItemArray(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemArray(ItemArray<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

    r16692 r16723  
    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.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("0BD4F01E-2D52-4E41-AEF8-611F10856D90")]
    3232  [Item("ItemCollection", "Represents a collection of items.")]
    3333  public class ItemCollection<T> : ObservableCollection<T>, IItemCollection<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemCollection(bool deserializing) : base(deserializing) { }
     51    protected ItemCollection(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemCollection(ItemCollection<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

    r16692 r16723  
    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.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    30   [StorableClass]
     30  [StorableType("C2B03555-3956-400E-94C3-3FB868F30DD2")]
    3131  [Item("ItemDictionary", "Represents a dictionary of items.")]
    3232  public class ItemDictionary<TKey, TValue> : ObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>
    … …  
    5151
    5252    [StorableConstructor]
    53     protected ItemDictionary(bool deserializing) : base(deserializing) { }
     53    protected ItemDictionary(StorableConstructorFlag _) : base(_) { }
    5454    protected ItemDictionary(ItemDictionary<TKey, TValue> original, Cloner cloner) {
    5555      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ItemList.cs

    r16692 r16723  
    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.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("EF6B019D-4ECF-4146-A77D-FF041D0B85F5")]
    3232  [Item("ItemList", "Represents a list of items.")]
    3333  public class ItemList<T> : ObservableList<T>, IItemList<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemList(bool deserializing) : base(deserializing) { }
     51    protected ItemList(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemList(ItemList<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ItemSet.cs

    r16692 r16723  
    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.Collections;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Core {
    31   [StorableClass]
     31  [StorableType("C2660C9F-3886-458E-80DF-06EEE9BB3C21")]
    3232  [Item("ItemSet", "Represents a set of items.")]
    3333  public class ItemSet<T> : ObservableSet<T>, IItemSet<T> where T : class, IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ItemSet(bool deserializing) : base(deserializing) { }
     51    protected ItemSet(StorableConstructorFlag _) : base(_) { }
    5252    protected ItemSet(ItemSet<T> original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

    r16692 r16723  
    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.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("KeyedItemCollection", "Represents a keyed collection of items.")]
    31   [StorableClass]
     31  [StorableType("176A9538-58A6-4D3F-9590-26FC37E2BA04")]
    3232  public abstract class KeyedItemCollection<TKey, TItem> : ObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
    3333    public virtual string ItemName {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected KeyedItemCollection(bool deserializing) : base(deserializing) { }
     50    protected KeyedItemCollection(StorableConstructorFlag _) : base(_) { }
    5151    protected KeyedItemCollection(KeyedItemCollection<TKey, TItem> original, Cloner cloner) {
    5252      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs

    r16692 r16723  
    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;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    2828  [Item("NamedItemCollection", "Represents a collection of named items.")]
    29   [StorableClass]
     29  [StorableType("A7DC6650-2486-472C-8515-0D66C93C03F6")]
    3030  public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {
    3131    [StorableConstructor]
    32     protected NamedItemCollection(bool deserializing) : base(deserializing) { }
     32    protected NamedItemCollection(StorableConstructorFlag _) : base(_) { }
    3333    protected NamedItemCollection(NamedItemCollection<T> original, Cloner cloner)
    3434      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/OperationCollection.cs

    r16692 r16723  
    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.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("EDE09772-7C20-4B51-90FF-5867B1D91ABE")]
    2929  public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
    3030    [Storable]
    … …  
    3939
    4040    [StorableConstructor]
    41     private OperationCollection(bool deserializing) { }
     41    private OperationCollection(StorableConstructorFlag _) { }
    4242    private OperationCollection(OperationCollection original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("35A02DD1-33F8-4F0D-9DD5-93ED71EE1591")]
    2828  [Item("Operator Collection", "Represents a collection of operators.")]
    2929  public class OperatorCollection : ItemCollection<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorCollection(bool deserializing) : base(deserializing) { }
     31    protected OperatorCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorCollection(OperatorCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorCollection() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/OperatorList.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("0477DDAD-41AA-41E7-AE2A-5C0288484119")]
    2828  [Item("OperatorList", "Represents a list of operators.")]
    2929  public class OperatorList : ItemList<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorList(bool deserializing) : base(deserializing) { }
     31    protected OperatorList(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorList(OperatorList original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorList() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/OperatorSet.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("FC16764E-EA5C-4D53-953B-3BEE85C7C376")]
    2828  [Item("OperatorSet", "Represents a set of operators.")]
    2929  public class OperatorSet : ItemSet<IOperator> {
    3030    [StorableConstructor]
    31     protected OperatorSet(bool deserializing) : base(deserializing) { }
     31    protected OperatorSet(StorableConstructorFlag _) : base(_) { }
    3232    protected OperatorSet(OperatorSet original, Cloner cloner) : base(original, cloner) { }
    3333    public OperatorSet() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("D1F7CEF4-42C6-46E1-B2B9-AB49C1420D55")]
    2828  [Item("ParameterCollection", "Represents a collection of parameters.")]
    2929  public class ParameterCollection : NamedItemCollection<IParameter> {
    3030    [StorableConstructor]
    31     protected ParameterCollection(bool deserializing) : base(deserializing) { }
     31    protected ParameterCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ParameterCollection(ParameterCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ParameterCollection() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("81B63F7B-0AD4-4BAD-8F39-BAB1F6B006C8")]
    3030  [Item("ReadOnlyCheckedItemCollection", "Represents a read-only collection of checked items.")]
    3131  public class ReadOnlyCheckedItemCollection<T> : ReadOnlyItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ReadOnlyCheckedItemCollection(bool deserializing) : base(deserializing) { }
     37    protected ReadOnlyCheckedItemCollection(StorableConstructorFlag _) : base(_) { }
    3838    protected ReadOnlyCheckedItemCollection(ReadOnlyCheckedItemCollection<T> original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("BE738F46-3864-42BB-BD29-F3E933B0AC06")]
    3030  [Item("ReadOnlyCheckedItemList", "Represents a read-only list of checked items.")]
    3131  public class ReadOnlyCheckedItemList<T> : ReadOnlyItemList<T>, ICheckedItemList<T> where T : class, IItem {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ReadOnlyCheckedItemList(bool deserializing) : base(deserializing) { }
     37    protected ReadOnlyCheckedItemList(StorableConstructorFlag _) : base(_) { }
    3838    protected ReadOnlyCheckedItemList(ReadOnlyCheckedItemList<T> original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("29C0CA71-5C3C-48A7-93B3-289E532F396E")]
    3030  [Item("ReadOnlyItemArray", "Represents a read-only array of items.")]
    3131  public class ReadOnlyItemArray<T> : ReadOnlyObservableArray<T>, IItemArray<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemArray(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemArray(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemArray(ReadOnlyItemArray<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("B8D4A97C-4277-4B42-86E2-8D64B254BCFD")]
    3030  [Item("ReadOnlyItemCollection", "Represents a read-only collection of items.")]
    3131  public class ReadOnlyItemCollection<T> : ReadOnlyObservableCollection<T>, IItemCollection<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemCollection(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemCollection(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemCollection(ReadOnlyItemCollection<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("DCF34C1E-1F68-4AAB-9761-4036D58E7E75")]
    3030  [Item("ReadOnlyItemDictionary", "Represents a read-only dictionary of items.")]
    3131  public class ReadOnlyItemDictionary<TKey, TValue> : ReadOnlyObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue>
    … …  
    5050
    5151    [StorableConstructor]
    52     protected ReadOnlyItemDictionary(bool deserializing) : base(deserializing) { }
     52    protected ReadOnlyItemDictionary(StorableConstructorFlag _) : base(_) { }
    5353    protected ReadOnlyItemDictionary(ReadOnlyItemDictionary<TKey, TValue> original, Cloner cloner) {
    5454      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("8FC81B05-B27D-4FD7-A8F9-7EE29839B056")]
    3030  [Item("ReadOnlyItemList", "Represents a read-only list of items.")]
    3131  public class ReadOnlyItemList<T> : ReadOnlyObservableList<T>, IItemList<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemList(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemList(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemList(ReadOnlyItemList<T> original, Cloner cloner)
    5151      : base(cloner.Clone((IItemList<T>)original.list)) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("65208683-0ECE-4647-B8BA-FD80A9CA00F4")]
    3030  [Item("ReadOnlyItemSet", "Represents a read-only set of items.")]
    3131  public class ReadOnlyItemSet<T> : ReadOnlyObservableSet<T>, IItemSet<T> where T : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyItemSet(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyItemSet(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyItemSet(ReadOnlyItemSet<T> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

    r16692 r16723  
    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.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("BEAA9943-228E-4B99-9C07-CE77BA724C41")]
    3030  [Item("ReadOnlyKeyedItemCollection", "Represents a read-only keyed collection of items.")]
    3131  public class ReadOnlyKeyedItemCollection<TKey, TItem> : ReadOnlyObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ReadOnlyKeyedItemCollection(bool deserializing) : base(deserializing) { }
     49    protected ReadOnlyKeyedItemCollection(StorableConstructorFlag _) : base(_) { }
    5050    protected ReadOnlyKeyedItemCollection(ReadOnlyKeyedItemCollection<TKey, TItem> original, Cloner cloner) {
    5151      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ScopeList.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("D8670057-029C-449C-914C-0342A0DCB2C5")]
    2828  [Item("ScopeList", "Represents a list of scopes.")]
    2929  public sealed class ScopeList : ItemList<IScope> {
    3030    [StorableConstructor]
    31     private ScopeList(bool deserializing) : base(deserializing) { }
     31    private ScopeList(StorableConstructorFlag _) : base(_) { }
    3232    private ScopeList(ScopeList original, Cloner cloner) : base(original, cloner) { }
    3333    public ScopeList() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("758F5674-7D98-4F44-800E-9E6B0B646938")]
    2828  [Item("ValueParameterCollection", "Represents a collection of value parameters.")]
    2929  public class ValueParameterCollection : NamedItemCollection<IValueParameter> {
    3030    [StorableConstructor]
    31     protected ValueParameterCollection(bool deserializing) : base(deserializing) { }
     31    protected ValueParameterCollection(StorableConstructorFlag _) : base(_) { }
    3232    protected ValueParameterCollection(ValueParameterCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public ValueParameterCollection() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Collections/VariableCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("72180610-BA37-4A51-9EFD-D9ADD1061824")]
    2828  [Item("VariableCollection", "Represents a collection of variables.")]
    2929  public sealed class VariableCollection : NamedItemCollection<IVariable> {
    3030    [StorableConstructor]
    31     private VariableCollection(bool deserializing) : base(deserializing) { }
     31    private VariableCollection(StorableConstructorFlag _) : base(_) { }
    3232    private VariableCollection(VariableCollection original, Cloner cloner) : base(original, cloner) { }
    3333    public VariableCollection() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

    r16692 r16723  
    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;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("6FCBEAF5-62A1-48F9-B1A8-F81D4B15A4AE")]
    2929  [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
    3030  public class ComparisonConstraint : Constraint {
    3131    [StorableConstructor]
    32     protected ComparisonConstraint(bool deserializing) : base(deserializing) { }
     32    protected ComparisonConstraint(StorableConstructorFlag _) : base(_) { }
    3333    protected ComparisonConstraint(ComparisonConstraint original, Cloner cloner) : base(original, cloner) { }
    3434    public ComparisonConstraint() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/Constraint.cs

    r16692 r16723  
    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;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    29   [StorableClass]
     29  [StorableType("02F8AFE2-BF67-4378-9E38-B18FF4D63609")]
    3030  public abstract class Constraint : Item, IConstraint {
    3131    [StorableConstructor]
    32     protected Constraint(bool deserializing) : base(deserializing) { }
     32    protected Constraint(StorableConstructorFlag _) : base(_) { }
    3333    protected Constraint(Constraint original, Cloner cloner)
    3434      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

    r16692 r16723  
    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 HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Attic;
    2323namespace HeuristicLab.Core {
    24   [StorableClass]
     24  [StorableType("8518F185-8222-414D-8AAF-0273D7B09A0E")]
    2525  public class ConstraintOperation {
    2626    public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");
    … …  
    3939
    4040    [StorableConstructor]
    41     protected ConstraintOperation(bool deserializing) { }
     41    protected ConstraintOperation(StorableConstructorFlag _) { }
    4242    protected ConstraintOperation(int value, string name) {
    4343      this.value = value;

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs

    r16692 r16723  
    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;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("9E83A84E-39A1-4DEB-90EB-DEB5A457D77D")]
    2929  [Item("EqualityConstraint", "A constraint which checks for equality.")]
    3030  public class EqualityConstraint : Constraint {
    3131    [StorableConstructor]
    32     protected EqualityConstraint(bool deserializing) : base(deserializing) { }
     32    protected EqualityConstraint(StorableConstructorFlag _) : base(_) { }
    3333    protected EqualityConstraint(EqualityConstraint original, Cloner cloner) : base(original, cloner) { }
    3434    public EqualityConstraint() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/IConstraint.cs

    r16692 r16723  
    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 System;
    2323using System.Collections.Generic;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("070af09a-c6b5-4f2b-be2e-4c2c6732febd")]
    2628  public interface IConstraint : IItem {
    2729    bool Active { get; set; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs

    r16692 r16723  
    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;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    28   [StorableClass]
     28  [StorableType("0BE7E71A-DA13-440F-83C3-0AD15C9E519D")]
    2929  [Item("TypeCompatibilityConstraint", "A constraint that checks for compatible types.")]
    3030  public class TypeCompatibilityConstraint : Constraint {
    3131    [StorableConstructor]
    32     protected TypeCompatibilityConstraint(bool deserializing) : base(deserializing) { }
     32    protected TypeCompatibilityConstraint(StorableConstructorFlag _) : base(_) { }
    3333    protected TypeCompatibilityConstraint(TypeCompatibilityConstraint original, Cloner cloner) : base(original, cloner) { }
    3434    public TypeCompatibilityConstraint() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Engine.cs

    r16692 r16723  
    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.Threading;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    2929  [Item("Engine", "A base class for engines.")]
    30   [StorableClass]
     30  [StorableType("C6DD096E-726E-4AA7-B5CA-D19CB502E24E")]
    3131  public abstract class Engine : Executable, IEngine {
    3232    [Storable]
    … …  
    4949
    5050    [StorableConstructor]
    51     protected Engine(bool deserializing) : base(deserializing) { }
     51    protected Engine(StorableConstructorFlag _) : base(_) { }
    5252    protected Engine(Engine original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Executable.cs

    r16692 r16723  
    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 System.Threading.Tasks;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("Executable", "A base class for executables.")]
    31   [StorableClass]
     31  [StorableType("17DFB815-4CF8-49EB-BC4A-98059064DB31")]
    3232  public abstract class Executable : Item, IExecutable {
    3333    public static new Image StaticItemImage {
    … …  
    6868
    6969    [StorableConstructor]
    70     protected Executable(bool deserializing) : base(deserializing) { }
     70    protected Executable(StorableConstructorFlag _) : base(_) { }
    7171    protected Executable(Executable original, Cloner cloner)
    7272      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/ExecutionContext.cs

    r16692 r16723  
    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 System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    27   [StorableClass]
     27  [StorableType("83851945-1115-4C08-BD46-318A1FFC54E2")]
    2828  public sealed class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
    2929    [Storable]
    … …  
    5151
    5252    [StorableConstructor]
    53     private ExecutionContext(bool deserializing) { }
     53    private ExecutionContext(StorableConstructorFlag _) { }
    5454    private ExecutionContext(ExecutionContext original, Cloner cloner)
    5555      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/ExecutionState.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("ad36dbde-a72c-43ad-8bb4-67aaaef34b72")]
    2325  public enum ExecutionState {
    2426    Prepared,

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r12616 r16723  
    1919    </UpgradeBackupLocation>
    2020    <IsWebBootstrapper>true</IsWebBootstrapper>
    21     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     21    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2222    <TargetFrameworkProfile>
    2323    </TargetFrameworkProfile>
    … …  
    272272    </BootstrapperPackage>
    273273  </ItemGroup>
     274  <ItemGroup>
     275    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     276      <SpecificVersion>False</SpecificVersion>
     277      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     278      <Private>False</Private>
     279    </Reference>
     280  </ItemGroup>
    274281  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    275282  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs

    r16692 r16723  
    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 System;
    2323using HeuristicLab.Common;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("6d358590-409c-4fbb-944a-01f8e99be025")]
    2628  public interface IArc : IItem {
    2729    IVertex Source { get; }
    … …  
    3335  }
    3436
    35   public interface IArc<T> : IArc where T : class,IDeepCloneable {
     37  [StorableType("4acdc291-84ea-4da3-95b8-046f973db256")]
     38  public interface IArc<T> : IArc where T : class, IDeepCloneable {
    3639    T Data { get; set; }
    3740  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IDirectedGraph.cs

    r16692 r16723  
    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.Core {
     28  [StorableType("e79c962e-b662-4502-bc32-cac6a83e4e83")]
    2729  public interface IDirectedGraph : IItem {
    2830    IEnumerable<IVertex> Vertices { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IVertex.cs

    r16692 r16723  
    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.Core {
     28  [StorableType("f7a3227e-17b9-4af6-bf6d-0801cbdca286")]
    2729  public interface IVertex : IItem {
    2830    IEnumerable<IArc> InArcs { get; }
    … …  
    4446  }
    4547
     48  [StorableType("f856ed8e-1259-4949-9784-78f1f4da1abb")]
    4649  public interface IVertex<T> : IVertex where T : class, IDeepCloneable {
    4750    T Data { get; set; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("b1adf07a-2e52-4fc3-9975-813a391cd940")]
    2325  /// <summary>
    2426  /// Interface which represents an atomic operation.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Collections;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("2703977d-5991-4491-a2e5-a98914a45b34")]
    2628  public interface ICheckedItemCollection<T> : IItemCollection<T> where T : class, IItem {
    2729    event CollectionItemsChangedEventHandler<T> CheckedItemsChanged;

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/ICheckedItemList.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2323using HeuristicLab.Collections;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("ba4a82ca-92eb-47a1-95a7-f41f6ef470f4")]
    2628  public interface ICheckedItemList<T> : IItemList<T> where T : class, IItem {
    2729    event CollectionItemsChangedEventHandler<IndexedItem<T>> CheckedItemsChanged;

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs

    r16692 r16723  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2223
    2324namespace HeuristicLab.Core {
    24   public interface ICheckedMultiOperator<T> : IMultiOperator<T> where T : class,IOperator {
     25  [StorableType("c6eee993-706f-4390-bfac-1f779e45c448")]
     26  public interface ICheckedMultiOperator<T> : IMultiOperator<T> where T : class, IOperator {
    2527    new ICheckedItemList<T> Operators { get; }
    2628  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2021#endregion
    2122
    22 using System;
    2323
    2424namespace HeuristicLab.Core {
     25  [StorableType("10644c62-bd66-440d-8204-d0c724c9f109")]
    2526  public interface IConstrainedValueParameter<T> : IValueParameter<T> where T : class, IItem {
    2627    IItemSet<T> ValidValues { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IEngine.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("b87dd8e0-dbcd-4b7c-80cc-25e2890e46ad")]
    2325  public interface IEngine : IExecutable {
    2426    ILog Log { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IExecutable.cs

    r16692 r16723  
    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.Threading.Tasks;
    2525using HeuristicLab.Common;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Core {
     29  [StorableType("cd8822ef-1e2d-4aa1-ad33-7ec7546610f3")]
    2830  public interface IExecutable : IItem {
    2931    ExecutionState ExecutionState { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Common;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("90ba79ce-8166-4cc2-8871-0653b4dd59cc")]
    2527  /// <summary>
    2628  /// Interface which represents an execution context.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs

    r16692 r16723  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("f4b80054-f730-44c0-a0b9-35ab27cf29a2")]
    2325  public interface IFixedValueParameter : IValueParameter {
    2426    new IItem Value { get; }
    … …  
    2628  }
    2729
     30  [StorableType("93b6ff11-134d-4486-b9bf-9c6802ef3885")]
    2831  public interface IFixedValueParameter<T> : IFixedValueParameter, IValueParameter<T> where T : class, IItem {
    2932    new T Value { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IInstrumentedOperator.cs

    r16692 r16723  
    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.
    … …  
    2222#endregion
    2323
    24 using System.Collections;
    2524using System.Collections.Generic;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
     28  [StorableType("cf88d332-a2bb-4a6b-89df-2a6b858e09c7")]
    2829  public interface IInstrumentedOperator : IOperator {
    2930    IEnumerable<IOperator> BeforeExecutionOperators { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItem.cs

    r16692 r16723  
    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.Drawing;
    2424using HeuristicLab.Common;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Core {
     28  [StorableType("fc5d4359-76da-406b-b445-72d4f9b2277d")]
    2729  /// <summary>
    2830  /// Interface to represent (almost) every HeuristicLab object (an object, an operator,...).

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItemArray.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("f736943c-5b43-4c98-9128-304c794b931e")]
    2527  public interface IItemArray<T> : IObservableArray<T>, IItem where T : class, IItem { }
    2628}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItemCollection.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("9caf496c-e514-4280-bcc1-3ee092999129")]
    2527  public interface IItemCollection<T> : IObservableCollection<T>, IItem where T : class, IItem { }
    2628}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItemDictionary.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("7d77d9e1-bce1-4546-9efd-62834ea85d1c")]
    2527  public interface IItemDictionary<TKey, TValue> : IObservableDictionary<TKey, TValue>, IItem
    26     where TKey : class, IItem
    27     where TValue : class, IItem { }
     28      where TKey : class, IItem
     29      where TValue : class, IItem { }
    2830}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItemList.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("466747d2-6a73-495b-ac68-7b0199d0f830")]
    2527  public interface IItemList<T> : IObservableList<T>, IItemCollection<T>, IItem where T : class, IItem { }
    2628}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IItemSet.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("fda265c8-8012-4c0c-a6c5-aa6842287691")]
    2527  public interface IItemSet<T> : IObservableSet<T>, IItemCollection<T>, IItem where T : class, IItem { }
    2628}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IKeyedItemCollection.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Collections;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("17d0c55d-3fc0-48e8-8c6a-64b5362dabf3")]
    2527  public interface IKeyedItemCollection<TKey, TItem> : IObservableKeyedCollection<TKey, TItem>, IItemCollection<TItem>, IItem where TItem : class, IItem { }
    2628}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/ILog.cs

    r16692 r16723  
    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.Core {
     28  [StorableType("a4d1e626-50c1-422e-ad76-5a0182bd9491")]
    2729  public interface ILog : IItem {
    2830    IEnumerable<string> Messages { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("78e29fa3-e603-4a2e-a3e0-2dee459891f1")]
    2527  public interface ILookupParameter : IParameter {
    2628    string ActualName { get; set; }
    … …  
    3032  }
    3133
     34  [StorableType("61868c33-20be-4577-94bf-7efff9e9cf73")]
    3235  public interface ILookupParameter<T> : ILookupParameter where T : class, IItem {
    3336    new T ActualValue { get; set; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs

    r16692 r16723  
    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.
    … …  
    2222
    2323using System.Collections.Generic;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("31136bcb-7c35-404d-bae7-2f9c5f17b767")]
    2628  public interface IMultiOperator : IOperator {
    2729    IEnumerable<IOperator> Operators { get; }
    … …  
    2931    bool RemoveOperator(IOperator op);
    3032  }
    31   public interface IMultiOperator<T> : IMultiOperator where T : class,IOperator {
     33
     34  [StorableType("b2f95075-48df-43c8-b4a9-e404e357fabd")]
     35  public interface IMultiOperator<T> : IMultiOperator where T : class, IOperator {
    3236    new IItemList<T> Operators { get; }
    3337  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/INamedItem.cs

    r16692 r16723  
    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 System;
    2323using HeuristicLab.Common;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("4337aaa9-688c-43cb-b980-463cb1704e31")]
    2628  public interface INamedItem : IItem {
    2729    string Name { get; set; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IOperation.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using HeuristicLab.Common;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("72828f38-f8f6-48cd-b792-b415f3e70524")]
    2527  /// <summary>
    2628  /// Interface which represents an operation.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

    r16692 r16723  
    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 System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Core {
     27  [StorableType("c9c72e72-ad11-4683-a66f-7da5436990c7")]
    2628  /// <summary>
    2729  /// Interface to represent an operator.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs

    r16692 r16723  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23
    34/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     5 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    56 *
    67 * This file is part of HeuristicLab.
    … …  
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("00fd73de-0a22-44f1-9f0b-c286a873dac8")]
    2527  public interface IOperatorGraphOperator : IOperator {
    2628    OperatorGraph OperatorGraph { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IParameter.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("3fea6f51-6bb0-4bb5-a113-d071e2fe3b8c")]
    2527  public interface IParameter : INamedItem {
    2628    Type DataType { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("5d65ecdc-1659-488c-8a6f-0f630a2deeef")]
    2527  /// <summary>
    2628  /// An interface which represents an item which contains parameters.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IParameterizedNamedItem.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("c0d522cc-b7ce-4db6-9e93-0c8d158fb465")]
    2325  /// <summary>
    2426  /// An interface which represents an item which has a name and contains parameters.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IProgrammableItem.cs

    r16692 r16723  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("31aa1ebe-3c5b-4855-847c-54ab86729474")]
    2325  public interface IProgrammableItem { }
    2426}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IRandom.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("a25f7f50-5838-4312-862d-9ad950b616c5")]
    2325  /// <summary>
    2426  /// Represents an interface for random number generators.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IScope.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("450b2586-6164-4f3a-9acc-65a0f3442c9e")]
    2325  /// <summary>
    2426  /// Hierarchical container of variables (and of subscopes).

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IScopeTreeLookupParameter.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("5710751f-6af8-4bc8-b517-97218cb30d22")]
    2527  public interface IScopeTreeLookupParameter : ILookupParameter {
    2628    int Depth { get; set; }
    … …  
    2830  }
    2931
     32  [StorableType("4a2fead8-d21c-49a0-b1f3-aece5fd99407")]
    3033  public interface IScopeTreeLookupParameter<T> : IScopeTreeLookupParameter, ILookupParameter<ItemArray<T>> where T : class, IItem { }
    3134}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IStatefulItem.cs

    r16692 r16723  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("77e612a6-38e3-4075-9aac-17ef16c8cfe5")]
    2325  public interface IStatefulItem : IItem {
    2426    void InitializeState();

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs

    r16692 r16723  
     1using HEAL.Attic;
    12#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Core {
     24  [StorableType("d125528a-dfaa-46b1-9a5f-9a6443b7229c")]
    2325  public interface IValueLookupParameter : IValueParameter, ILookupParameter { }
    2426
     27  [StorableType("ed351d54-ee70-4f9f-8187-7507dcaeb919")]
    2528  public interface IValueLookupParameter<T> : IValueLookupParameter, IValueParameter<T>, ILookupParameter<T> where T : class, IItem { }
    2629}

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("e4920b59-6bf5-4c43-997c-7f5434cd98d2")]
    2527  public interface IValueParameter : IParameter {
    2628    IItem Value { get; set; }
    … …  
    3032  }
    3133
     34  [StorableType("645945d2-9cd7-45cd-8507-575b2ed53de4")]
    3235  public interface IValueParameter<T> : IValueParameter where T : class, IItem {
    3336    new T Value { get; set; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Interfaces/IVariable.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Core {
     26  [StorableType("f2bc871d-5bc4-4584-8dc4-db0ea7fb5b15")]
    2527  /// <summary>
    2628  /// Represents a variable which has a name and holds an IItem.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Item.cs

    r16692 r16723  
    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.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    2929  /// Represents the base class for all basic item types.
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("E7F13DE4-F9A2-4ADC-AB92-5BBA0588CD2D")]
    3232  [Item("Item", "Base class for all HeuristicLab items.")]
    3333  public abstract class Item : IItem {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected Item(bool deserializing) { }
     51    protected Item(StorableConstructorFlag _) { }
    5252    protected Item(Item original, Cloner cloner) {
    5353      cloner.RegisterClonedObject(original, this);

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Log.cs

    r16692 r16723  
    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.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Core {
    3030  [Item("Log", "A log for logging string messages.")]
    31   [StorableClass]
     31  [StorableType("8EF2479E-3C44-4631-BA0C-26C05AB13416")]
    3232  public sealed class Log : Item, ILog, IStorableContent {
    3333    public string Filename { get; set; }
    … …  
    5050
    5151    [StorableConstructor]
    52     private Log(bool deserializing) : base(deserializing) { }
     52    private Log(StorableConstructorFlag _) : base(_) { }
    5353    private Log(Log original, Cloner cloner)
    5454      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/NamedItem.cs

    r16692 r16723  
    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 System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Core {
    2727  [Item("NamedItem", "Base class for items which have a name and an optional description.")]
    28   [StorableClass]
     28  [StorableType("7492EDE5-CA7C-45D5-B5CE-8709BFAC9239")]
    2929  public abstract class NamedItem : Item, INamedItem {
    3030    [Storable]
    … …  
    6767
    6868    [StorableConstructor]
    69     protected NamedItem(bool deserializing) : base(deserializing) { }
     69    protected NamedItem(StorableConstructorFlag _) : base(_) { }
    7070    protected NamedItem(NamedItem original, Cloner cloner)
    7171      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/OperatorExecutionException.cs

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/OperatorGraph.cs

    r16692 r16723  
    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.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
    … …  
    3232  /// </summary>
    3333  [Item("Operator Graph", "Represents a graph of operators.")]
    34   [StorableClass]
     34  [StorableType("4F3EDAFB-5363-489B-A2E2-67AAC589CDE7")]
    3535  public class OperatorGraph : Item, IStorableContent {
    3636    public string Filename { get; set; }
    … …  
    7878
    7979    [StorableConstructor]
    80     protected OperatorGraph(bool deserializing) : base(deserializing) { }
     80    protected OperatorGraph(StorableConstructorFlag _) : base(_) { }
    8181    protected OperatorGraph(OperatorGraph original, Cloner cloner)
    8282      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

    r16692 r16723  
    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;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    … …  
    3131  /// </summary>
    3232  [Item("ParameterizedNamedItem", "A base class for items which have a name and contain parameters.")]
    33   [StorableClass]
     33  [StorableType("058C7952-437D-4EA0-9F12-23E8A67C5352")]
    3434  public abstract class ParameterizedNamedItem : NamedItem, IParameterizedNamedItem {
    3535    [Storable]
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ParameterizedNamedItem(bool deserializing) : base(deserializing) { }
     49    protected ParameterizedNamedItem(StorableConstructorFlag _) : base(_) { }
    5050    protected ParameterizedNamedItem(ParameterizedNamedItem original, Cloner cloner)
    5151      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/PersistenceContentManager.cs

    r16692 r16723  
    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.IO.Compression;
     22using System.Threading;
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Persistence.Default.Xml;
     25using HEAL.Attic;
     26using System;
    2527
    2628namespace HeuristicLab.Core {
    … …  
    2931
    3032    protected override IStorableContent LoadContent(string filename) {
    31       return XmlParser.Deserialize<IStorableContent>(filename);
     33      // first try to load using the new persistence format
     34      try {
     35        var ser = new ProtoBufSerializer();
     36        return (IStorableContent)ser.Deserialize(filename);
     37      } catch (Exception) {
     38        // try old format if new format fails
     39        return XmlParser.Deserialize<IStorableContent>(filename);
     40      }
    3241    }
    3342
    34     protected override void SaveContent(IStorableContent content, string filename, bool compressed) {
    35       XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
     43    protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) {
     44      var ser = new ProtoBufSerializer();
     45      ser.Serialize(content, filename, cancellationToken);
    3646    }
    3747  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Plugin.cs.frame

    r16692 r16723  
    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.
    … …  
    3131  [Plugin("HeuristicLab.Core", "3.3.15.$WCREV$")]
    3232  [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)]
     33  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3334  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3435  [PluginDependency("HeuristicLab.Common", "3.3")]

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Properties/AssemblyInfo.cs.frame

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Scope.cs

    r16692 r16723  
    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.Collections;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    3030  /// </summary>
    3131  [Item("Scope", "A scope which contains variables and sub-scopes.")]
    32   [StorableClass]
     32  [StorableType("57AAC5CA-2EEF-4ECB-80DA-1B8F3B750A2B")]
    3333  public sealed class Scope : NamedItem, IScope {
    3434    public static new Image StaticItemImage {
    … …  
    6060
    6161    [StorableConstructor]
    62     private Scope(bool deserializing) : base(deserializing) { }
     62    private Scope(StorableConstructorFlag _) : base(_) { }
    6363    private Scope(Scope original, Cloner cloner)
    6464      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/ThreadSafeLog.cs

    r16692 r16723  
    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.Collections.Generic;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
    2929  [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")]
    30   [StorableClass]
     30  [StorableType("0A124395-EB0B-4005-AE4C-C1828A3608CA")]
    3131  public sealed class ThreadSafeLog : Item, ILog, IStorableContent {
    3232    public string Filename { get; set; }
    … …  
    5050
    5151    [StorableConstructor]
    52     private ThreadSafeLog(bool deserializing) : base(deserializing) { }
     52    private ThreadSafeLog(StorableConstructorFlag _) : base(_) { }
    5353    private ThreadSafeLog(ThreadSafeLog original, Cloner cloner)
    5454      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Core/3.3/Variable.cs

    r16692 r16723  
    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.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Core {
    … …  
    3030  /// </summary>
    3131  [Item("Variable", "A variable which has a name and holds an IItem.")]
    32   [StorableClass]
     32  [StorableType("FF4ED8C3-C0A0-42F9-8EFF-3DC6AAD90EE7")]
    3333  public sealed class Variable : NamedItem, IVariable {
    3434    public override Image ItemImage {
    … …  
    5656
    5757    [StorableConstructor]
    58     private Variable(bool deserializing) : base(deserializing) { }
     58    private Variable(StorableConstructorFlag _) : base(_) { }
    5959    private Variable(Variable original, Cloner cloner)
    6060      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.