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/RunCollectionModification/Calculator.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.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Optimization {
    3434
    35   [StorableClass]
     35  [StorableType("6C41AF6F-5F02-4510-B1B5-222651C4021B")]
    3636  public class Calculator : IDeepCloneable {
    3737
    … …  
    5454
    5555    [StorableConstructor]
    56     protected Calculator(bool deserializing) { }
     56    protected Calculator(StorableConstructorFlag _) { }
    5757    public Calculator() { }
    5858    protected Calculator(Calculator original, Cloner cloner) {

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.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 System.Linq;
    25 using System.Text;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3130
    3231namespace HeuristicLab.Optimization {
    … …  
    3433    "Creates several levels from the distribution of a certain result accross a run collection and " +
    3534    "assigns a discretized value. Non-existing numbers as well as NaN and infinities are excluded from the caluclation.")]
    36   [StorableClass]
     35  [StorableType("6EFD185F-FE23-4E23-90F0-63CB9D38E57D")]
    3736  public class RunCollectionDiscretizer : ParameterizedNamedItem, IRunCollectionModifier {
    3837
    … …  
    6968      #region Construction & Cloning
    7069    [StorableConstructor]
    71     protected RunCollectionDiscretizer(bool deserializing) : base(deserializing) { }
     70    protected RunCollectionDiscretizer(StorableConstructorFlag _) : base(_) { }
    7271    protected RunCollectionDiscretizer(RunCollectionDiscretizer original, Cloner cloner)
    7372      : base(original, cloner) {

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.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 System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2624using HeuristicLab.Common;
    2725using HeuristicLab.Core;
    2826using HeuristicLab.Data;
    2927using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    3129
    3230namespace HeuristicLab.Optimization {
    3331
    3432  [Item("RunCollection Formula Modifier", "Modifies a RunCollection by adding results using the given formula.")]
    35   [StorableClass]
     33  [StorableType("EEE365F2-8BEB-41C6-9DE6-94CA8FAC5108")]
    3634  public class RunCollectionFormulaModifer : ParameterizedNamedItem, IRunCollectionModifier {
    3735
    … …  
    5250    #region Construction & Cloning
    5351    [StorableConstructor]
    54     protected RunCollectionFormulaModifer(bool deserializing) : base(deserializing) { }
     52    protected RunCollectionFormulaModifer(StorableConstructorFlag _) : base(_) { }
    5553    protected RunCollectionFormulaModifer(RunCollectionFormulaModifer original, Cloner cloner)
    5654      : base(original, cloner) {

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.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
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    … …  
    2726using HeuristicLab.Data;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    3029
    3130namespace HeuristicLab.Optimization {
    3231
    3332  [Item("RunCollection Group Creater", "Regroups existing runs according to equal values in GroupBy and prefixes them according to their value in Prefix.")]
    34   [StorableClass]
     33  [StorableType("5D3A55DE-DC75-4932-B3D2-2C59810143A5")]
    3534  public class RunCollectionGroupCreater : ParameterizedNamedItem, IRunCollectionModifier {
    3635   
    … …  
    4847    #region Construction & Cloning
    4948    [StorableConstructor]
    50     protected RunCollectionGroupCreater(bool deserializing) : base(deserializing) { }
     49    protected RunCollectionGroupCreater(StorableConstructorFlag _) : base(_) { }
    5150    protected RunCollectionGroupCreater(RunCollectionGroupCreater original, Cloner cloner) : base(original, cloner) { }
    5251    public RunCollectionGroupCreater() {

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.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.Optimization {
    2828  [Item("RunCollection Run Remover", "Removes all currently visible runs. Use the filtering tab to selectively remove runs.")]
    29   [StorableClass]
     29  [StorableType("F66D03A7-6BF8-4DB5-9341-B1BFAA8AA023")]
    3030  public class RunCollectionRunRemover : ParameterizedNamedItem, IRunCollectionModifier {
    3131
    3232    #region Construction & Cloning
    3333    [StorableConstructor]
    34     protected RunCollectionRunRemover(bool deserializing) : base(deserializing) { }
     34    protected RunCollectionRunRemover(StorableConstructorFlag _) : base(_) { }
    3535    protected RunCollectionRunRemover(RunCollectionRunRemover original, Cloner cloner) : base(original, cloner) {}
    3636    public RunCollectionRunRemover() {}

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.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 System.Linq;
    25 using System.Text;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3130
    3231namespace HeuristicLab.Optimization {
    3332  [Item("RunCollection Sorter", "Sorts a run collection according the specified key variable.")]
    34   [StorableClass]
     33  [StorableType("0F64D1D2-8934-4697-B997-A8072ADB4CF3")]
    3534  public class RunCollectionSorter : ParameterizedNamedItem, IRunCollectionModifier {
    3635
    … …  
    4847    #region Construction & Cloning
    4948    [StorableConstructor]
    50     protected RunCollectionSorter(bool deserializing) : base(deserializing) { }
     49    protected RunCollectionSorter(StorableConstructorFlag _) : base(_) { }
    5150    protected RunCollectionSorter(RunCollectionSorter original, Cloner cloner)
    5251      : base(original, cloner) {
    … …  
    8079    }
    8180
     81    [StorableType("824092f4-863b-4ba8-ac0a-98f871876a6e")]
    8282    private class ValueComparer : IComparer<IComparable> {
    8383

  • trunk/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.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
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using HeuristicLab.Common;
    2725using HeuristicLab.Core;
    2826using HeuristicLab.Data;
    2927using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    3129
    3230namespace HeuristicLab.Optimization {
    3331
    3432  [Item("RunCollection Value Remover", "Modifies a RunCollection by removing results or parameters.")]
    35   [StorableClass]
     33  [StorableType("300726A9-3E81-4F8E-A11F-4A5B3CDCA796")]
    3634  public class RunCollectionValueRemover : ParameterizedNamedItem, IRunCollectionModifier {
    3735   
    … …  
    4644    #region Construction & Cloning   
    4745    [StorableConstructor]
    48     protected RunCollectionValueRemover(bool deserializing) : base(deserializing) { }
     46    protected RunCollectionValueRemover(StorableConstructorFlag _) : base(_) { }
    4947    protected RunCollectionValueRemover(RunCollectionValueRemover original, Cloner cloner)
    5048      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.