Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/AccuracyMaximizingThresholdsModelCreator.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    30   [StorableClass]
     30  [StorableType("5D9D21D0-F9A8-4145-80CF-2EE9FC0D884C")]
    3131  [Item("AccuracyMaximizingThresholdsModelCreator", "")]
    3232  public sealed class AccuracyMaximizingThresholdsModelCreator : Item, ISymbolicDiscriminantFunctionClassificationModelCreator {
    … …  
    3838    }
    3939    [StorableConstructor]
    40     private AccuracyMaximizingThresholdsModelCreator(bool deserializing) : base(deserializing) { }
     40    private AccuracyMaximizingThresholdsModelCreator(StorableConstructorFlag _) : base(_) { }
    4141    private AccuracyMaximizingThresholdsModelCreator(AccuracyMaximizingThresholdsModelCreator original, Cloner cloner) : base(original, cloner) { }
    4242    public AccuracyMaximizingThresholdsModelCreator() : base() { }

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/NearestNeighborModelCreator.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.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    31   [StorableClass]
     31  [StorableType("B96EB322-8027-48F7-AB5B-4E22546B74DD")]
    3232  [Item("NearestNeighborModelCreator", "")]
    3333  public sealed class NearestNeighborModelCreator : ParameterizedNamedItem, ISymbolicClassificationModelCreator {
    … …  
    4444
    4545    [StorableConstructor]
    46     private NearestNeighborModelCreator(bool deserializing) : base(deserializing) { }
     46    private NearestNeighborModelCreator(StorableConstructorFlag _) : base(_) { }
    4747    private NearestNeighborModelCreator(NearestNeighborModelCreator original, Cloner cloner) : base(original, cloner) { }
    4848    public NearestNeighborModelCreator()

  • trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/NormalDistributedThresholdsModelCreator.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    31   [StorableClass]
     31  [StorableType("87C4FF17-FC59-4D0F-80F5-2C84499E1222")]
    3232  [Item("NormalDistributedThresholdsModelCreator", "")]
    3333  public sealed class NormalDistributedThresholdsModelCreator : Item, ISymbolicDiscriminantFunctionClassificationModelCreator {
    … …  
    3939    }
    4040    [StorableConstructor]
    41     private NormalDistributedThresholdsModelCreator(bool deserializing) : base(deserializing) { }
     41    private NormalDistributedThresholdsModelCreator(StorableConstructorFlag _) : base(_) { }
    4242    private NormalDistributedThresholdsModelCreator(NormalDistributedThresholdsModelCreator original, Cloner cloner) : base(original, cloner) { }
    4343    public NormalDistributedThresholdsModelCreator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.