Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Optimization

  • trunk/HeuristicLab.Optimization/3.3/Termination/ComparisonTerminator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("ComparisonTerminator", "An termination criterion which compares two values.")]
    32   [StorableClass]
     32  [StorableType("4059C985-CA18-4C95-AC1C-BA8AAE64AD98")]
    3333  public class ComparisonTerminator<T> : ThresholdTerminator<T> where T : class, IItem, IComparable, IStringConvertibleValue, new() {
    3434    public ILookupParameter<T> ComparisonValueParameter {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected ComparisonTerminator(bool deserializing) : base(deserializing) { }
     48    protected ComparisonTerminator(StorableConstructorFlag _) : base(_) { }
    4949    [StorableHook(HookType.AfterDeserialization)]
    5050    private void AfterDeserialization() {

  • trunk/HeuristicLab.Optimization/3.3/Termination/ExecutionTimeTerminator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("ExecutionTimeTerminator", "A termination criterion based on execution time of an algorithm.")]
    30   [StorableClass]
     30  [StorableType("7BBF7D6F-C41C-4826-963B-5ED9544F8391")]
    3131  public class ExecutionTimeTerminator : ThresholdTerminator<TimeSpanValue> {
    3232
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ExecutionTimeTerminator(bool deserializing) : base(deserializing) { }
     37    protected ExecutionTimeTerminator(StorableConstructorFlag _) : base(_) { }
    3838    protected ExecutionTimeTerminator(ExecutionTimeTerminator original, Cloner cloner)
    3939      : base(original, cloner) {

  • trunk/HeuristicLab.Optimization/3.3/Termination/MultiTerminator.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.
    … …  
    2929using HeuristicLab.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Optimization {
    3434  [Item("MultiTerminator", "A multi operator, containing termination criteria.")]
    35   [StorableClass]
     35  [StorableType("E03CCB0D-C76C-4DBC-94C5-8FED50E25D26")]
    3636  public sealed class MultiTerminator : CheckedMultiOperator<ITerminator>, ITerminator {
    3737    public static new Image StaticItemImage {
    … …  
    4444
    4545    [StorableConstructor]
    46     private MultiTerminator(bool deserializing) : base(deserializing) { }
     46    private MultiTerminator(StorableConstructorFlag _) : base(_) { }
    4747    private MultiTerminator(MultiTerminator original, Cloner cloner) : base(original, cloner) { }
    4848    public override IDeepCloneable Clone(Cloner cloner) { return new MultiTerminator(this, cloner); }

  • trunk/HeuristicLab.Optimization/3.3/Termination/SingleObjectiveQualityTerminator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Optimization {
    2828  [Item("SingleObjectiveQualityTerminator", "A termination criterion which uses a quality parameter (eg. current best quality) for termination.")]
    29   [StorableClass]
     29  [StorableType("A32469FB-7370-46E3-AB7F-EAF8053AF105")]
    3030  public class SingleObjectiveQualityTerminator : ComparisonTerminator<DoubleValue> {
    3131    [StorableConstructor]
    32     protected SingleObjectiveQualityTerminator(bool deserializing) : base(deserializing) { }
     32    protected SingleObjectiveQualityTerminator(StorableConstructorFlag _) : base(_) { }
    3333    protected SingleObjectiveQualityTerminator(SingleObjectiveQualityTerminator original, Cloner cloner)
    3434      : base(original, cloner) { }

  • trunk/HeuristicLab.Optimization/3.3/Termination/TerminationOperator.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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization {
    3030  [Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
    31   [StorableClass]
     31  [StorableType("FD4B77FF-4C9D-45D9-8CDF-F5F5EE2664F7")]
    3232  public sealed class TerminationOperator : InstrumentedOperator, ITerminationBasedOperator {
    3333    public ILookupParameter<ITerminator> TerminatorParameter {
    … …  
    5454
    5555    [StorableConstructor]
    56     private TerminationOperator(bool deserializing) : base(deserializing) { }
     56    private TerminationOperator(StorableConstructorFlag _) : base(_) { }
    5757    private TerminationOperator(TerminationOperator original, Cloner cloner)
    5858      : base(original, cloner) {

  • trunk/HeuristicLab.Optimization/3.3/Termination/Terminator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Optimization {
    3232  [Item("Terminator", "A base class for all termination criteria.")]
    33   [StorableClass]
     33  [StorableType("E5DC984C-95B3-40F1-9D35-7B6E90A26B8A")]
    3434  public abstract class Terminator : SingleSuccessorOperator, ITerminator {
    3535    public static new Image StaticItemImage {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected Terminator(bool deserializing) : base(deserializing) { }
     44    protected Terminator(StorableConstructorFlag _) : base(_) { }
    4545    protected Terminator(Terminator original, Cloner cloner) : base(original, cloner) { }
    4646

  • trunk/HeuristicLab.Optimization/3.3/Termination/ThresholdTerminator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization {
    3030  [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
    31   [StorableClass]
     31  [StorableType("E5D99104-54B2-471D-B27A-07CC737804A6")]
    3232  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, IStringConvertibleValue, new() {
    3333    [Storable]
    … …  
    5252
    5353    [StorableConstructor]
    54     protected ThresholdTerminator(bool deserializing) : base(deserializing) { }
     54    protected ThresholdTerminator(StorableConstructorFlag _) : base(_) { }
    5555    [StorableHook(HookType.AfterDeserialization)]
    5656    private void AfterDeserialization() {
Note: See TracChangeset for help on using the changeset viewer.