Free cookie consent management tool by TermsFeed Policy Generator

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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Optimization

  • stable/HeuristicLab.Optimization/3.3/Results/IResult.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 System;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Optimization {
     27  [StorableType("e05050f3-5f92-4245-b733-7097d496e781")]
    2628  /// <summary>
    2729  /// Represents a result which has a name and a data type and holds an IItem.

  • stable/HeuristicLab.Optimization/3.3/Results/IResultParameter.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 System;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Optimization {
     27  [StorableType("af5d3f60-6f3a-4a44-a906-688ac8296fe3")]
    2628  public interface IResultParameter : ILookupParameter {
    2729    string ResultCollectionName { get; set; }
    … …  
    2931  }
    3032
     33  [StorableType("803e6ad6-dd9d-497a-ad1c-7cd3dc5b0d3c")]
    3134  public interface IResultParameter<T> : ILookupParameter<T>, IResultParameter where T : class, IItem {
    3235    T DefaultValue { get; set; }

  • stable/HeuristicLab.Optimization/3.3/Results/Result.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.Optimization {
    … …  
    3131  /// </summary>
    3232  [Item("Result", "A result which has a name and a data type and holds an IItem.")]
    33   [StorableClass]
     33  [StorableType("219051C0-9D62-4CDE-9BA1-32233C81B678")]
    3434  public sealed class Result : NamedItem, IResult, IStorableContent {
    3535    public string Filename { get; set; }
    … …  
    7676
    7777    [StorableConstructor]
    78     private Result(bool deserializing) : base(deserializing) { }
     78    private Result(StorableConstructorFlag _) : base(_) { }
    7979    private Result(Result original, Cloner cloner)
    8080      : base(original, cloner) {

  • stable/HeuristicLab.Optimization/3.3/Results/ResultCollection.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.Optimization {
    28   [StorableClass]
     28  [StorableType("959230E3-C51B-4EC0-BDB2-0B0D71F5A6E3")]
    2929  [Item("ResultCollection", "Represents a collection of results.")]
    3030  public class ResultCollection : NamedItemCollection<IResult> {
    … …  
    3333    public ResultCollection(IEnumerable<IResult> collection) : base(collection) { }
    3434    [StorableConstructor]
    35     protected ResultCollection(bool deserializing) : base(deserializing) { }
     35    protected ResultCollection(StorableConstructorFlag _) : base(_) { }
    3636    protected ResultCollection(ResultCollection original, Cloner cloner)
    3737      : base(original, cloner) {

  • stable/HeuristicLab.Optimization/3.3/Results/ResultParameter.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.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("ResultParameter", "A parameter whose value is written to a result collection.")]
    32   [StorableClass]
     32  [StorableType("CF10EF50-82B6-4A98-82C0-3C5ECED48904")]
    3333  public sealed class ResultParameter<T> : LookupParameter<T>, IResultParameter<T> where T : class, IItem {
    3434    public override Image ItemImage { get { return VSImageLibrary.Exception; } }
    … …  
    6161
    6262    [StorableConstructor]
    63     private ResultParameter(bool deserializing) : base(deserializing) { }
     63    private ResultParameter(StorableConstructorFlag _) : base(_) { }
    6464    private ResultParameter(ResultParameter<T> original, Cloner cloner)
    6565      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.