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:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Analysis

  • trunk/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/Allele.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.Analysis {
    … …  
    2929  /// </summary>
    3030  [Item("Allele", "Represents an allele of a solution which is used for allele analysis.")]
    31   [StorableClass]
     31  [StorableType("27AE2AD2-D4A3-4187-A773-CDA518B8B28A")]
    3232  public class Allele : Item {
    3333    private string id;
    … …  
    5555    #region Storing & Cloning
    5656    [StorableConstructor]
    57     protected Allele(bool deserializing) : base(deserializing) { }
     57    protected Allele(StorableConstructorFlag _) : base(_) { }
    5858    protected Allele(Allele original, Cloner cloner)
    5959      : base(original, cloner) {

  • trunk/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequency.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.Analysis {
    … …  
    2929  /// </summary>
    3030  [Item("AlleleFrequency", "Represents the frequency of an allele.")]
    31   [StorableClass]
     31  [StorableType("9769F3D4-9207-4CDC-B473-8C18301EF418")]
    3232  public class AlleleFrequency : Item {
    3333    private string id;
    … …  
    9191    #region Storing & Cloning
    9292    [StorableConstructor]
    93     protected AlleleFrequency(bool deserializing) : base(deserializing) { }
     93    protected AlleleFrequency(StorableConstructorFlag _) : base(_) { }
    9494    protected AlleleFrequency(AlleleFrequency original, Cloner cloner)
    9595      : base(original, cloner) {

  • trunk/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.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.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("AlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles.")]
    38   [StorableClass]
     38  [StorableType("FB4ABEB4-E94E-4B79-9356-8AC48D8F77BE")]
    3939  public abstract class AlleleFrequencyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4040    public virtual bool EnabledByDefault {
    … …  
    6868
    6969    [StorableConstructor]
    70     protected AlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     70    protected AlleleFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171    protected AlleleFrequencyAnalyzer(AlleleFrequencyAnalyzer<T> original, Cloner cloner) : base(original, cloner) { }
    7272    public AlleleFrequencyAnalyzer()

  • trunk/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollection.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.Analysis {
    … …  
    3131  /// </summary>
    3232  [Item("AlleleFrequencyCollection", "Represents a collection of allele frequencies.")]
    33   [StorableClass]
     33  [StorableType("7BDABB5B-1FA0-4592-8C06-399DBEABB1CB")]
    3434  public class AlleleFrequencyCollection : ReadOnlyItemCollection<AlleleFrequency> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AlleleFrequencyCollection(bool deserializing) : base(deserializing) { }
     40    protected AlleleFrequencyCollection(StorableConstructorFlag _) : base(_) { }
    4141    protected AlleleFrequencyCollection(AlleleFrequencyCollection original, Cloner cloner) : base(original, cloner) { }
    4242    public AlleleFrequencyCollection() : base() { }

  • trunk/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollectionHistory.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.Analysis {
    … …  
    3131  /// </summary>
    3232  [Item("AlleleFrequencyCollectionHistory", "Represents history values of allele frequencies collections.")]
    33   [StorableClass]
     33  [StorableType("4474E8A9-AA2C-4FED-A906-535DC2AC44A3")]
    3434  public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AlleleFrequencyCollectionHistory(bool deserializing) : base(deserializing) { }
     40    protected AlleleFrequencyCollectionHistory(StorableConstructorFlag _) : base(_) { }
    4141    protected AlleleFrequencyCollectionHistory(AlleleFrequencyCollectionHistory original, Cloner cloner) : base(original, cloner) { }
    4242    public AlleleFrequencyCollectionHistory() : base() { }
Note: See TracChangeset for help on using the changeset viewer.