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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.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;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333using LibSVM;
    … …  
    3939  [Item("Support Vector Classification (SVM)", "Support vector machine classification data analysis algorithm (wrapper for libSVM).")]
    4040  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 110)]
    41   [StorableClass]
     41  [StorableType("F15289E4-B648-4A92-AB01-14D769A33967")]
    4242  public sealed class SupportVectorClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4343    private const string SvmTypeParameterName = "SvmType";
    … …  
    9999    #endregion
    100100    [StorableConstructor]
    101     private SupportVectorClassification(bool deserializing) : base(deserializing) { }
     101    private SupportVectorClassification(StorableConstructorFlag _) : base(_) { }
    102102    private SupportVectorClassification(SupportVectorClassification original, Cloner cloner)
    103103      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassificationSolution.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;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626
    … …  
    3030  /// </summary>
    3131  [Item("SupportVectorClassificationSolution", "Represents a support vector solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("81EC96ED-A900-4517-B4C0-0B4EA3ABB94A")]
    3333  public sealed class SupportVectorClassificationSolution : ClassificationSolution, ISupportVectorMachineSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private SupportVectorClassificationSolution(bool deserializing) : base(deserializing) { }
     41    private SupportVectorClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4242    private SupportVectorClassificationSolution(SupportVectorClassificationSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs

    r16243 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.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131using LibSVM;
    … …  
    3535  /// Represents a support vector machine model.
    3636  /// </summary>
    37   [StorableClass]
     37  [StorableType("669B0522-A27B-4DA6-B655-27C374D88C95")]
    3838  [Item("SupportVectorMachineModel", "Represents a support vector machine model.")]
    3939  public sealed class SupportVectorMachineModel : ClassificationModel, ISupportVectorMachineModel {
    … …  
    9292
    9393    [StorableConstructor]
    94     private SupportVectorMachineModel(bool deserializing) : base(deserializing) { }
     94    private SupportVectorMachineModel(StorableConstructorFlag _) : base(_) { }
    9595    private SupportVectorMachineModel(SupportVectorMachineModel original, Cloner cloner)
    9696      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs

    r15854 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.

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.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;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333using LibSVM;
    … …  
    3939  [Item("Support Vector Regression (SVM)", "Support vector machine regression data analysis algorithm (wrapper for libSVM).")]
    4040  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 110)]
    41   [StorableClass]
     41  [StorableType("645A21E5-EF07-46BF-AA04-A616165F0EF4")]
    4242  public sealed class SupportVectorRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4343    private const string SvmTypeParameterName = "SvmType";
    … …  
    106106    #endregion
    107107    [StorableConstructor]
    108     private SupportVectorRegression(bool deserializing) : base(deserializing) { }
     108    private SupportVectorRegression(StorableConstructorFlag _) : base(_) { }
    109109    private SupportVectorRegression(SupportVectorRegression original, Cloner cloner)
    110110      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegressionSolution.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;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626
    … …  
    3030  /// </summary>
    3131  [Item("SupportVectorRegressionSolution", "Represents a support vector solution for a regression problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("B23D2178-B9B5-4553-A633-DE359AB69BE9")]
    3333  public sealed class SupportVectorRegressionSolution : RegressionSolution, ISupportVectorMachineSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private SupportVectorRegressionSolution(bool deserializing) : base(deserializing) { }
     41    private SupportVectorRegressionSolution(StorableConstructorFlag _) : base(_) { }
    4242    private SupportVectorRegressionSolution(SupportVectorRegressionSolution original, Cloner cloner)
    4343      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.