Ignore:
Timestamp:
07/07/19 23:40:10 (3 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
15 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3232  /// </summary>
    3333  [Item("ConstrainedValueParameter", "A parameter whose value has to be chosen from a set of valid values.")]
    34   [StorableClass]
     34  [StorableType("A9B43259-2687-4AE8-9803-B58CE01B81EE")]
    3535  public class ConstrainedValueParameter<T> : OptionalConstrainedValueParameter<T> where T : class, IItem {
    3636    public override T Value {
     
    4343
    4444    [StorableConstructor]
    45     protected ConstrainedValueParameter(bool deserializing) : base(deserializing) { }
     45    protected ConstrainedValueParameter(StorableConstructorFlag _) : base(_) { }
    4646    protected ConstrainedValueParameter(ConstrainedValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
    4747    public ConstrainedValueParameter() : base() { }
  • stable/HeuristicLab.Parameters/3.3/FixedValueParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3030  /// </summary>
    3131  [Item("FixedValueParameter", "A parameter whose value is defined in the parameter itself and cannot be set.")]
    32   [StorableClass]
     32  [StorableType("7787B99D-5F32-4639-B47A-76CB4D204392")]
    3333  public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class,IItem, new() {
    3434
     
    4141
    4242    [StorableConstructor]
    43     protected FixedValueParameter(bool deserializing) : base(deserializing) { }
     43    protected FixedValueParameter(StorableConstructorFlag _) : base(_) { }
    4444    protected FixedValueParameter(FixedValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
    4545
  • stable/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Parameters</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Parameters-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    105105  </PropertyGroup>
    106106  <ItemGroup>
     107    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     112    </Reference>
    107113    <Reference Include="System" />
    108114    <Reference Include="System.Core">
     
    110116    </Reference>
    111117    <Reference Include="System.Drawing" />
     118    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     120    </Reference>
    112121    <Reference Include="System.Xml.Linq">
    113122      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    120129  </ItemGroup>
    121130  <ItemGroup>
     131    <None Include="packages.config" />
    122132    <None Include="Plugin.cs.frame" />
    123133    <Compile Include="ConstrainedValueParameter.cs" />
  • stable/HeuristicLab.Parameters/3.3/LookupParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3131  /// </summary>
    3232  [Item("LookupParameter", "A parameter whose value is retrieved from or written to a scope.")]
    33   [StorableClass]
     33  [StorableType("84FE5F33-94B8-4E30-B1CB-CD15314FB83B")]
    3434  public class LookupParameter<T> : Parameter, IStatefulItem, ILookupParameter<T> where T : class, IItem {
    3535    [Storable]
     
    7878
    7979    [StorableConstructor]
    80     protected LookupParameter(bool deserializing)
    81       : base(deserializing) {
     80    protected LookupParameter(StorableConstructorFlag _) : base(_) {
    8281      cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
    8382      executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
  • stable/HeuristicLab.Parameters/3.3/OperatorParameter.cs

    r15584 r17097  
    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.Parameters {
     
    2929  /// </summary>
    3030  [Item("OperatorParameter", "A parameter which represents an operator.")]
    31   [StorableClass]
     31  [StorableType("59C86C8F-CAE1-45FE-A17C-837925284D93")]
    3232  public class OperatorParameter : OptionalValueParameter<IOperator> {
    3333    [StorableConstructor]
    34     protected OperatorParameter(bool deserializing) : base(deserializing) { }
     34    protected OperatorParameter(StorableConstructorFlag _) : base(_) { }
    3535    protected OperatorParameter(OperatorParameter original, Cloner cloner) : base(original, cloner) { }
    3636    public OperatorParameter() : base("Anonymous") { }
  • stable/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3232  /// </summary>
    3333  [Item("OptionalConstrainedValueParameter", "A parameter whose value has to be chosen from a set of valid values or is null.")]
    34   [StorableClass]
     34  [StorableType("9B2BFAE8-CD6E-499C-83A0-401B6CEE3A08")]
    3535  public class OptionalConstrainedValueParameter<T> : Parameter, IConstrainedValueParameter<T> where T : class, IItem {
    3636    public override Image ItemImage {
     
    8888    #region Constructors
    8989    [StorableConstructor]
    90     protected OptionalConstrainedValueParameter(bool deserializing) : base(deserializing) { }
     90    protected OptionalConstrainedValueParameter(StorableConstructorFlag _) : base(_) { }
    9191    protected OptionalConstrainedValueParameter(OptionalConstrainedValueParameter<T> original, Cloner cloner)
    9292      : base(original, cloner) {
  • stable/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3131  /// </summary>
    3232  [Item("OptionalValueParameter", "A parameter whose value is defined in the parameter itself or is null.")]
    33   [StorableClass]
     33  [StorableType("1A825EE0-3A72-458C-B621-7CE989EE2F0D")]
    3434  public class OptionalValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
    3535    public override Image ItemImage {
     
    104104    #region Constructors
    105105    [StorableConstructor]
    106     protected OptionalValueParameter(bool deserializing) : base(deserializing) { }
     106    protected OptionalValueParameter(StorableConstructorFlag _) : base(_) { }
    107107    protected OptionalValueParameter(OptionalValueParameter<T> original, Cloner cloner)
    108108      : base(original, cloner) {
  • stable/HeuristicLab.Parameters/3.3/Parameter.cs

    r15584 r17097  
    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.Parameters {
     
    3131  /// </summary>
    3232  [Item("Parameter", "A base class for parameters.")]
    33   [StorableClass]
     33  [StorableType("EB8A33BD-466A-4035-8544-8F86E5FDA458")]
    3434  public abstract class Parameter : NamedItem, IParameter {
    3535    public override Image ItemImage {
     
    7272
    7373    [StorableConstructor]
    74     protected Parameter(bool deserializing)
    75       : base(deserializing) {
     74    protected Parameter(StorableConstructorFlag _) : base(_) {
    7675    }
    7776    protected Parameter(Parameter original, Cloner cloner)
  • stable/HeuristicLab.Parameters/3.3/Plugin.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.Parameters/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.Parameters/3.3/ScopeParameter.cs

    r15584 r17097  
    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;
    23 using System.Threading;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2726
    2827namespace HeuristicLab.Parameters {
     
    3130  /// </summary>
    3231  [Item("ScopeParameter", "A parameter which represents the current scope.")]
    33   [StorableClass]
     32  [StorableType("6A25C2F9-B184-4870-88B4-C16BF8534BD4")]
    3433  public class ScopeParameter : LookupParameter<IScope> {
    3534    public new IScope ActualValue {
     
    3938
    4039    [StorableConstructor]
    41     protected ScopeParameter(bool deserializing) : base(deserializing) { }
     40    protected ScopeParameter(StorableConstructorFlag _) : base(_) { }
    4241    protected ScopeParameter(ScopeParameter original, Cloner cloner) : base(original, cloner) { }
    4342    public ScopeParameter()
  • stable/HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3232  /// </summary>
    3333  [Item("ScopeTreeLookupParameter", "A generic parameter representing instances of type T which are collected from or written to scope tree.")]
    34   [StorableClass]
     34  [StorableType("51F36637-C22C-4CDC-B34B-F49CA7896E35")]
    3535  public class ScopeTreeLookupParameter<T> : LookupParameter<ItemArray<T>>, IScopeTreeLookupParameter<T> where T : class, IItem {
    3636    [Storable]
     
    4848
    4949    [StorableConstructor]
    50     protected ScopeTreeLookupParameter(bool deserializing) : base(deserializing) { }
     50    protected ScopeTreeLookupParameter(StorableConstructorFlag _) : base(_) { }
    5151    protected ScopeTreeLookupParameter(ScopeTreeLookupParameter<T> original, Cloner cloner)
    5252      : base(original, cloner) {
  • stable/HeuristicLab.Parameters/3.3/ValueLookupParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3131  /// </summary>
    3232  [Item("ValueLookupParameter", "A parameter whose value is either defined in the parameter itself or is retrieved from or written to a scope.")]
    33   [StorableClass]
     33  [StorableType("B34BB41A-CF50-4275-9BCD-1861EBA7C58F")]
    3434  public class ValueLookupParameter<T> : LookupParameter<T>, IValueLookupParameter<T> where T : class, IItem {
    3535    public override Image ItemImage {
     
    8080    #region Constructors
    8181    [StorableConstructor]
    82     protected ValueLookupParameter(bool deserializing) : base(deserializing) { }
     82    protected ValueLookupParameter(StorableConstructorFlag _) : base(_) { }
    8383    protected ValueLookupParameter(ValueLookupParameter<T> original, Cloner cloner)
    8484      : base(original, cloner) {
  • stable/HeuristicLab.Parameters/3.3/ValueParameter.cs

    r15584 r17097  
    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.Parameters {
     
    3131  /// </summary>
    3232  [Item("ValueParameter", "A parameter whose value is defined in the parameter itself.")]
    33   [StorableClass]
     33  [StorableType("CB9B83B6-DE2B-45CC-AB0B-C551E1A6E0BD")]
    3434  public class ValueParameter<T> : OptionalValueParameter<T> where T : class, IItem {
    3535    public override T Value {
     
    4242
    4343    [StorableConstructor]
    44     protected ValueParameter(bool deserializing) : base(deserializing) { }
     44    protected ValueParameter(StorableConstructorFlag _) : base(_) { }
    4545    protected ValueParameter(ValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
    4646
  • stable/HeuristicLab.Parameters/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.