Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
44 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Data

  • trunk/HeuristicLab.Data/3.3

  • trunk/HeuristicLab.Data/3.3/BoolArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("BoolArray", "Represents an array of boolean values.")]
    29   [StorableClass]
     29  [StorableType("CBDDC242-3F94-4CA0-B2A8-E3B10F07DFB8")]
    3030  public class BoolArray : StringConvertibleArray<bool> {
    3131    [StorableConstructor]
    32     protected BoolArray(bool deserializing) : base(deserializing) { }
     32    protected BoolArray(StorableConstructorFlag _) : base(_) { }
    3333    protected BoolArray(BoolArray original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/BoolMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("BoolMatrix", "Represents a matrix of boolean values.")]
    30   [StorableClass]
     30  [StorableType("A6456658-0B85-4C63-A6DA-FA82EB861B70")]
    3131  public class BoolMatrix : ValueTypeMatrix<bool>, IStringConvertibleMatrix {
    3232    [StorableConstructor]
    33     protected BoolMatrix(bool deserializing) : base(deserializing) { }
     33    protected BoolMatrix(StorableConstructorFlag _) : base(_) { }
    3434    protected BoolMatrix(BoolMatrix original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/BoolValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Data {
    3030  [Item("BoolValue", "Represents a boolean value.")]
    31   [StorableClass]
     31  [StorableType("EC318C04-84C2-4DDA-881D-B2890093162E")]
    3232  public class BoolValue : ValueTypeValue<bool>, IComparable, IStringConvertibleValue {
    3333    public static new Image StaticItemImage {
     
    3535    }
    3636
     37    [StorableConstructor]
     38    public BoolValue(StorableConstructorFlag _) : base(_) { }
    3739    protected BoolValue(BoolValue original, Cloner cloner)
    3840      : base(original, cloner) {
    3941    }
    4042    public BoolValue() : base() { }
    41     [StorableConstructor]
    42     public BoolValue(bool value)
    43       : base(value) {
    44       //mkommend: Be aware that the base call refers to the storable ctor => the value is set explicitly in the ctor body.
    45       //          This should not affect the persistence, because first the ctor is called and afterwards the values are set by reflection.
    46       this.value = value;
    47     }
     43    public BoolValue(bool value) : base(value) { }
    4844
    4945    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Data/3.3/Comparison.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("Comparison", "Represents a comparison.")]
    30   [StorableClass]
     30  [StorableType("2753AB02-748C-47C8-8D55-A1C43A57DF7D")]
    3131  public class Comparison : ValueTypeValue<ComparisonType>, IComparable {
    3232    public static new Image StaticItemImage {
     
    3535
    3636    [StorableConstructor]
    37     protected Comparison(bool deserializing) : base(deserializing) { }
     37    protected Comparison(StorableConstructorFlag _) : base(_) { }
    3838    protected Comparison(Comparison original, Cloner cloner)
    3939      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/ComparisonType.cs

    r15583 r16565  
     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.Data {
     24  [StorableType("7438132e-ed9d-47ef-9e29-278b0e4ca048")]
    2325  public enum ComparisonType {
    2426    Less,
  • trunk/HeuristicLab.Data/3.3/DateTimeValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("DateTimeValue", "Represents a date and time value.")]
    29   [StorableClass]
     29  [StorableType("1D9B8F20-F460-481F-BE4A-4A8616DA14B5")]
    3030  public class DateTimeValue : ValueTypeValue<DateTime>, IComparable, IStringConvertibleValue {
    3131    [StorableConstructor]
    32     protected DateTimeValue(bool deserializing) : base(deserializing) { }
     32    protected DateTimeValue(StorableConstructorFlag _) : base(_) { }
    3333    protected DateTimeValue(DateTimeValue original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/DoubleArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("DoubleArray", "Represents an array of double values.")]
    29   [StorableClass]
     29  [StorableType("BFB2A7A4-A79B-462D-99FE-488484891361")]
    3030  public class DoubleArray : StringConvertibleArray<double> {
    3131    [StorableConstructor]
    32     protected DoubleArray(bool deserializing) : base(deserializing) { }
     32    protected DoubleArray(StorableConstructorFlag _) : base(_) { }
    3333    protected DoubleArray(DoubleArray original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/DoubleMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("DoubleMatrix", "Represents a matrix of double values.")]
    30   [StorableClass]
     30  [StorableType("EFF3CA0C-100C-4DD4-9EFF-2EF3CB0DE793")]
    3131  public class DoubleMatrix : ValueTypeMatrix<double>, IStringConvertibleMatrix {
    3232    [StorableConstructor]
    33     protected DoubleMatrix(bool deserializing) : base(deserializing) { }
     33    protected DoubleMatrix(StorableConstructorFlag _) : base(_) { }
    3434    protected DoubleMatrix(DoubleMatrix original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/DoubleRange.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    28   [StorableClass]
     28  [StorableType("884665C1-FE7A-4022-8A7A-8ECFF7358146")]
    2929  [Item("DoubleRange", "Represents a range of values betweent start and end.")]
    3030  public class DoubleRange : StringConvertibleValueTuple<DoubleValue, DoubleValue> {
     
    4343
    4444    [StorableConstructor]
    45     protected DoubleRange(bool deserializing) : base(deserializing) { }
     45    protected DoubleRange(StorableConstructorFlag _) : base(_) { }
    4646    protected DoubleRange(DoubleRange original, Cloner cloner)
    4747      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/DoubleValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Data {
    3030  [Item("DoubleValue", "Represents a double value.")]
    31   [StorableClass]
     31  [StorableType("E9F7C52B-4D05-4C3A-BA2A-FC4C55B4388A")]
    3232  public class DoubleValue : ValueTypeValue<double>, IComparable, IStringConvertibleValue {
    3333    public static new Image StaticItemImage {
     
    3636
    3737    [StorableConstructor]
    38     protected DoubleValue(bool deserializing) : base(deserializing) { }
     38    protected DoubleValue(StorableConstructorFlag _) : base(_) { }
    3939    protected DoubleValue(DoubleValue original, Cloner cloner)
    4040      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/EnumValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("EnumValue", "An abstract base class for representing values of enum types.")]
    30   [StorableClass]
     30  [StorableType("1D2E4514-1B3B-4498-9A1F-3D90C69635CA")]
    3131  public sealed class EnumValue<T> : ValueTypeValue<T>, IComparable<EnumValue<T>> where T : struct, IComparable {
    3232    public static new Image StaticItemImage {
     
    4949
    5050    [StorableConstructor]
    51     private EnumValue(bool deserializing) : base(deserializing) { }
     51    private EnumValue(StorableConstructorFlag _) : base(_) { }
    5252    private EnumValue(EnumValue<T> original, Cloner cloner)
    5353      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/FormatPatterns.cs

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

    r15934 r16565  
    1919    </UpgradeBackupLocation>
    2020    <IsWebBootstrapper>true</IsWebBootstrapper>
    21     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     21    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2222    <TargetFrameworkProfile>
    2323    </TargetFrameworkProfile>
     
    108108  </PropertyGroup>
    109109  <ItemGroup>
     110    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     115    </Reference>
    110116    <Reference Include="System" />
    111117    <Reference Include="System.Core">
     
    114120    <Reference Include="System.Data" />
    115121    <Reference Include="System.Drawing" />
     122    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     123      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     124    </Reference>
    116125    <Reference Include="System.Xml" />
    117126  </ItemGroup>
    118127  <ItemGroup>
     128    <None Include="packages.config" />
    119129    <None Include="Plugin.cs.frame" />
    120130    <Compile Include="BoolArray.cs" />
  • trunk/HeuristicLab.Data/3.3/IntArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("IntArray", "Represents an array of integer values.")]
    29   [StorableClass]
     29  [StorableType("B9E18852-D23D-4BF7-8971-04572EB0C2A2")]
    3030  public class IntArray : StringConvertibleArray<int> {
    3131    [StorableConstructor]
    32     protected IntArray(bool deserializing) : base(deserializing) { }
     32    protected IntArray(StorableConstructorFlag _) : base(_) { }
    3333    protected IntArray(IntArray original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/IntMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("IntMatrix", "Represents a matrix of integer values.")]
    30   [StorableClass]
     30  [StorableType("DF97EDF8-EF27-4FA2-988A-1C7FA05C4525")]
    3131  public class IntMatrix : ValueTypeMatrix<int>, IStringConvertibleMatrix {
    3232    [StorableConstructor]
    33     protected IntMatrix(bool deserializing) : base(deserializing) { }
     33    protected IntMatrix(StorableConstructorFlag _) : base(_) { }
    3434    protected IntMatrix(IntMatrix original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/IntRange.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    28   [StorableClass]
     28  [StorableType("99F14850-864C-46FE-A048-04E3DA1D4B02")]
    2929  [Item("IntRange", "Represents a range of values betweent start and end.")]
    3030  public class IntRange : StringConvertibleValueTuple<IntValue, IntValue> {
     
    4343
    4444    [StorableConstructor]
    45     protected IntRange(bool deserializing) : base(deserializing) { }
     45    protected IntRange(StorableConstructorFlag _) : base(_) { }
    4646    protected IntRange(IntRange original, Cloner cloner)
    4747      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/IntValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Data {
    3030  [Item("IntValue", "Represents an integer value.")]
    31   [StorableClass]
     31  [StorableType("1C4F4173-5D67-44CA-8711-53437BB9F7C4")]
    3232  public class IntValue : ValueTypeValue<int>, IComparable, IStringConvertibleValue {
    3333    public static new Image StaticItemImage {
     
    3636
    3737    [StorableConstructor]
    38     protected IntValue(bool deserializing) : base(deserializing) { }
     38    protected IntValue(StorableConstructorFlag _) : base(_) { }
    3939    protected IntValue(IntValue original, Cloner cloner)
    4040      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using HeuristicLab.Common;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Data {
     26  [StorableType("27217641-0839-4757-b8f6-6422114b096d")]
    2527  public interface IStringConvertibleArray : IContent, IValueTypeArray {
    2628    bool Validate(string value, out string errorMessage);
  • trunk/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Data {
     28  [StorableType("5da53526-d2cd-4f2c-bbc9-de34b457892c")]
    2729  public interface IStringConvertibleMatrix : IContent {
    2830    int Rows { get; set; }
  • trunk/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using System;
    2323using HeuristicLab.Common;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Data {
     27  [StorableType("092ea088-1b35-4215-aebd-ee9731856d94")]
    2628  public interface IStringConvertibleValue : IContent {
    2729    bool ReadOnly { get; }
  • trunk/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleValueTuple.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121using HeuristicLab.Core;
     22using HEAL.Attic;
     23
    2224namespace HeuristicLab.Data {
     25  [StorableType("691961d0-d8ff-436d-a4df-01abeed6e5af")]
    2326  public interface IStringConvertibleValueTuple : IItem {
    2427    IStringConvertibleValue Item1 { get; }
  • trunk/HeuristicLab.Data/3.3/Interfaces/IValueTypeArray.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Data {
     32  [StorableType("548de1d4-69b4-40b4-ba37-e770575f7315")]
    3133  public interface IValueTypeArray : IItem, IEnumerable {
    3234    bool ReadOnly { get; }
     
    4446  }
    4547
     48  [StorableType("f9db5740-1c4f-4f62-a9a8-84b32a461ea8")]
    4649  public interface IValueTypeArray<T> : IValueTypeArray, IEnumerable<T> where T : struct {
    4750    T this[int index] { get; set; }
  • trunk/HeuristicLab.Data/3.3/Path Types/DirectoryValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("DirectoryValue", "Represents the path to a directory.")]
    29   [StorableClass]
     29  [StorableType("AFB5A3C6-7FC8-45C6-A3B9-F3B3414A4CAB")]
    3030  public class DirectoryValue : PathValue {
    3131    [StorableConstructor]
    32     protected DirectoryValue(bool deserializing) : base(deserializing) { }
     32    protected DirectoryValue(StorableConstructorFlag _) : base(_) { }
    3333    protected DirectoryValue(DirectoryValue original, Cloner cloner) : base(original, cloner) { }
    3434    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Data/3.3/Path Types/FileValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("FileValue", "Represents the path to a file.")]
    29   [StorableClass]
     29  [StorableType("55D686E9-29B7-41C2-8693-D1CA6E792765")]
    3030  public class FileValue : PathValue {
    3131    [Storable]
     
    4141
    4242    [StorableConstructor]
    43     protected FileValue(bool deserializing) : base(deserializing) { }
     43    protected FileValue(StorableConstructorFlag _) : base(_) { }
    4444    protected FileValue(FileValue original, Cloner cloner)
    4545      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/Path Types/PathValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("PathValue", "Represents a path.")]
    29   [StorableClass]
     29  [StorableType("293B9A98-76C4-47E1-900D-67B8480BCBD6")]
    3030  public abstract class PathValue : Item {
    3131
     
    4646
    4747    [StorableConstructor]
    48     protected PathValue(bool deserializing) : base(deserializing) { }
     48    protected PathValue(StorableConstructorFlag _) : base(_) { }
    4949    protected PathValue(PathValue original, Cloner cloner)
    5050      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/Path Types/TextFileValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Data {
    2727  [Item("TextFile", "Represents the content and path to a text file.")]
    28   [StorableClass]
     28  [StorableType("19F5012B-6139-4113-A015-1C920A59E5AF")]
    2929  public class TextFileValue : FileValue {
    3030    [StorableConstructor]
    31     protected TextFileValue(bool deserializing) : base(deserializing) { }
     31    protected TextFileValue(StorableConstructorFlag _) : base(_) { }
    3232    protected TextFileValue(TextFileValue original, Cloner cloner)
    3333      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/PercentArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("PercentArray", "Represents an array of double values in percent.")]
    29   [StorableClass]
     29  [StorableType("8ED7F07C-1DE7-4782-90C0-50395627F8A0")]
    3030  public class PercentArray : DoubleArray {
    3131    [StorableConstructor]
    32     protected PercentArray(bool deserializing) : base(deserializing) { }
     32    protected PercentArray(StorableConstructorFlag _) : base(_) { }
    3333    protected PercentArray(PercentArray original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/PercentMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("PercentMatrix", "Represents a matrix of double values in percent.")]
    30   [StorableClass]
     30  [StorableType("A140221B-1990-46FF-BA82-630DF48AB1B7")]
    3131  public class PercentMatrix : DoubleMatrix {
    3232    [StorableConstructor]
    33     protected PercentMatrix(bool deserializing) : base(deserializing) { }
     33    protected PercentMatrix(StorableConstructorFlag _) : base(_) { }
    3434    protected PercentMatrix(PercentMatrix original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/PercentValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Data {
    2828  [Item("PercentValue", "Represents a double value in percent.")]
    29   [StorableClass]
     29  [StorableType("FC4406A2-54A1-4D9D-AE6A-AB98895ECE64")]
    3030  public class PercentValue : DoubleValue {
    3131    [Storable(DefaultValue = false)]
     
    4545
    4646    [StorableConstructor]
    47     protected PercentValue(bool deserializing) : base(deserializing) { }
     47    protected PercentValue(StorableConstructorFlag _) : base(_) { }
    4848    protected PercentValue(PercentValue original, Cloner cloner)
    4949      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/Plugin.cs.frame

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

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

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Data {
    3333  [Item("StringArray", "Represents an array of strings.")]
    34   [StorableClass]
     34  [StorableType("E226B187-2D74-4112-A91E-830B0408D1BF")]
    3535  public class StringArray : Item, IEnumerable<string>, IStringConvertibleArray {
    3636    private const int maximumToStringLength = 100;
     
    109109
    110110    [StorableConstructor]
    111     protected StringArray(bool deserializing) : base(deserializing) { }
     111    protected StringArray(StorableConstructorFlag _) : base(_) { }
    112112    protected StringArray(StringArray original, Cloner cloner)
    113113      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/StringConvertibleArray.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("StringConvertibleArray", "Represents an array of string convertible values.")]
    30   [StorableClass]
     30  [StorableType("68FCA40B-4ACF-4D7A-B4FA-67DBA481125E")]
    3131  public abstract class StringConvertibleArray<T> : ValueTypeArray<T>, IStringConvertibleArray where T : struct {
    3232    [StorableConstructor]
    33     protected StringConvertibleArray(bool deserializing) : base(deserializing) { }
     33    protected StringConvertibleArray(StorableConstructorFlag _) : base(_) { }
    3434    protected StringConvertibleArray(StringConvertibleArray<T> original, Cloner cloner)
    3535      : base(original, cloner) { }
  • trunk/HeuristicLab.Data/3.3/StringConvertibleValueTuple.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    29   [StorableClass]
     29  [StorableType("06A7697C-2C25-49AF-95A2-DDB14D2F7B81")]
    3030  [Item("StringConvertibleValueTuple<,>", "A generic abstract base class for representing multiple values of a string convertible value.")]
    3131  public abstract class StringConvertibleValueTuple<T, U> : Item, IStringConvertibleValueTuple
     
    5151
    5252    [StorableConstructor]
    53     protected StringConvertibleValueTuple(bool deserializing)
    54       : base(deserializing) {
     53    protected StringConvertibleValueTuple(StorableConstructorFlag _) : base(_) {
    5554    }
    5655    protected StringConvertibleValueTuple(StringConvertibleValueTuple<T, U> original, Cloner cloner)
  • trunk/HeuristicLab.Data/3.3/StringMatrix.cs

    r16280 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Data {
    3333  [Item("StringMatrix", "Represents a matrix of strings.")]
    34   [StorableClass]
     34  [StorableType("0BFE5727-D2CF-418C-94BE-A8A0BBA195D8")]
    3535  public class StringMatrix : Item, IEnumerable<string>, IStringConvertibleMatrix {
    3636    private const int maximumToStringLength = 100;
     
    143143
    144144    [StorableConstructor]
    145     protected StringMatrix(bool deserializing) : base(deserializing) { }
     145    protected StringMatrix(StorableConstructorFlag _) : base(_) { }
    146146    protected StringMatrix(StringMatrix original, Cloner cloner)
    147147      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/StringValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("StringValue", "Represents a string.")]
    30   [StorableClass]
     30  [StorableType("1091C8E5-4480-447C-8EB3-AA260C59976D")]
    3131  public class StringValue : Item, IComparable, IStringConvertibleValue {
    3232    public static new Image StaticItemImage {
     
    5656
    5757    [StorableConstructor]
    58     protected StringValue(bool deserializing) : base(deserializing) { }
     58    protected StringValue(StorableConstructorFlag _) : base(_) { }
    5959    protected StringValue(StringValue original, Cloner cloner)
    6060      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/TimeSpanValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Data {
    3030  [Item("TimeSpanValue", "Represents a duration of time.")]
    31   [StorableClass]
     31  [StorableType("03DA3BC6-4041-4444-ACF1-AEEAE2EF6AB5")]
    3232  public class TimeSpanValue : ValueTypeValue<TimeSpan>, IComparable, IStringConvertibleValue {
    3333    [StorableConstructor]
    34     protected TimeSpanValue(bool deserializing) : base(deserializing) { }
     34    protected TimeSpanValue(StorableConstructorFlag _) : base(_) { }
    3535    protected TimeSpanValue(TimeSpanValue original, Cloner cloner)
    3636      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/TriangularMatrix.cs

    r15932 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Data {
    3030  [Item("TriangularMatrix", "Represents a lower triangular matrix.")]
    31   [StorableClass]
     31  [StorableType("5C09A4FC-887E-4C40-8926-81325C09FA67")]
    3232  public class TriangularMatrix<T> : ValueTypeMatrix<T>, IStringConvertibleMatrix where T : struct {
    3333    [Storable]
     
    4848
    4949    [StorableConstructor]
    50     protected TriangularMatrix(bool deserializing) : base(deserializing) { }
     50    protected TriangularMatrix(StorableConstructorFlag _) : base(_) { }
    5151
    5252    protected TriangularMatrix(TriangularMatrix<T> original, Cloner cloner) : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/ValueTypeArray.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Data {
    3333  [Item("ValueTypeArray", "An abstract base class for representing arrays of value types.")]
    34   [StorableClass]
     34  [StorableType("6A05E421-E015-44A8-959F-5711CF9400A9")]
    3535  public abstract class ValueTypeArray<T> : Item, IValueTypeArray<T> where T : struct {
    3636    private const int maximumToStringLength = 100;
     
    112112
    113113    [StorableConstructor]
    114     protected ValueTypeArray(bool deserializing) : base(deserializing) { }
     114    protected ValueTypeArray(StorableConstructorFlag _) : base(_) { }
    115115    protected ValueTypeArray(ValueTypeArray<T> original, Cloner cloner)
    116116      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Data {
    3333  [Item("ValueTypeMatrix", "An abstract base class for representing matrices of value types.")]
    34   [StorableClass]
     34  [StorableType("4EDE6858-4628-4F21-8F27-A45C59C2DE36")]
    3535  public abstract class ValueTypeMatrix<T> : Item, IEnumerable<T> where T : struct {
    3636    private const int maximumToStringLength = 100;
     
    141141
    142142    [StorableConstructor]
    143     protected ValueTypeMatrix(bool deserializing) : base(deserializing) { }
     143    protected ValueTypeMatrix(StorableConstructorFlag _) : base(_) { }
    144144    protected ValueTypeMatrix(ValueTypeMatrix<T> original, Cloner cloner)
    145145      : base(original, cloner) {
  • trunk/HeuristicLab.Data/3.3/ValueTypeValue.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Data {
    2929  [Item("ValueTypeValue", "An abstract base class for representing values of value types.")]
    30   [StorableClass]
     30  [StorableType("A78FF29D-A796-463F-A93F-2528A382D99E")]
    3131  public abstract class ValueTypeValue<T> : Item where T : struct {
    3232    public static new Image StaticItemImage {
     
    5454
    5555    [StorableConstructor]
    56     protected ValueTypeValue(bool deserializing) : base(deserializing) { }
     56    protected ValueTypeValue(StorableConstructorFlag _) : base(_) { }
    5757    protected ValueTypeValue(ValueTypeValue<T> original, Cloner cloner)
    5858      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.