Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/19/19 11:05:52 (6 years ago)
Author:
gkronber
Message:

#2847: merged r16565:16796 from trunk/HeuristicLab.Algorithms.DataAnalysis to branch

Location:
branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs

    r16538 r16842  
    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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    … …  
    3737  [Item("Nearest Neighbour Classification (kNN)", "Nearest neighbour classification data analysis algorithm (wrapper for ALGLIB).")]
    3838  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 150)]
    39   [StorableClass]
     39  [StorableType("98161D6F-D977-45EA-B899-E47EE017865E")]
    4040  public sealed class NearestNeighbourClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4141    private const string KParameterName = "K";
    … …  
    7474
    7575    [StorableConstructor]
    76     private NearestNeighbourClassification(bool deserializing) : base(deserializing) { }
     76    private NearestNeighbourClassification(StorableConstructorFlag _) : base(_) { }
    7777    private NearestNeighbourClassification(NearestNeighbourClassification original, Cloner cloner)
    7878      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassificationSolution.cs

    r16538 r16842  
    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("NearestNeighbourClassificationSolution", "Represents a nearest neighbour solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("C336B1A1-A746-4DA9-A926-EC1CA4EFDB02")]
    3333  public sealed class NearestNeighbourClassificationSolution : ClassificationSolution, INearestNeighbourClassificationSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NearestNeighbourClassificationSolution(bool deserializing) : base(deserializing) { }
     41    private NearestNeighbourClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NearestNeighbourClassificationSolution(NearestNeighbourClassificationSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs

    r16538 r16842  
    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.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3232  /// Represents a nearest neighbour model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("A76C0823-3077-4ACE-8A40-E9B717C7DB60")]
    3535  [Item("NearestNeighbourModel", "Represents a nearest neighbour model for regression and classification.")]
    3636  public sealed class NearestNeighbourModel : ClassificationModel, INearestNeighbourModel {
    … …  
    6868
    6969    [StorableConstructor]
    70     private NearestNeighbourModel(bool deserializing)
    71       : base(deserializing) {
    72       if (deserializing)
    73         kdTree = new alglib.nearestneighbor.kdtree();
     70    private NearestNeighbourModel(StorableConstructorFlag _) : base(_) {
     71      kdTree = new alglib.nearestneighbor.kdtree();
    7472    }
    7573    private NearestNeighbourModel(NearestNeighbourModel original, Cloner cloner)
    … …  
    296294        return IsProblemDataCompatible(classificationProblemData, out errorMessage);
    297295
    298       throw new ArgumentException("The problem data is not a regression nor a classification problem data. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
     296      throw new ArgumentException("The problem data is not compatible with this nearest neighbour model. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
    299297    }
    300298

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegression.cs

    r16538 r16842  
    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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131
    … …  
    3636  [Item("Nearest Neighbour Regression (kNN)", "Nearest neighbour regression data analysis algorithm (wrapper for ALGLIB).")]
    3737  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 150)]
    38   [StorableClass]
     38  [StorableType("3F940BE0-4F44-4F7F-A3EE-E47423C7F22D")]
    3939  public sealed class NearestNeighbourRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4040    private const string KParameterName = "K";
    … …  
    7373
    7474    [StorableConstructor]
    75     private NearestNeighbourRegression(bool deserializing) : base(deserializing) { }
     75    private NearestNeighbourRegression(StorableConstructorFlag _) : base(_) { }
    7676    private NearestNeighbourRegression(NearestNeighbourRegression original, Cloner cloner)
    7777      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegressionSolution.cs

    r16538 r16842  
    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("NearestNeighbourRegressionSolution", "Represents a nearest neighbour solution for a regression problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("71C86C1A-C917-4CA4-A239-C167C1C793F8")]
    3333  public sealed class NearestNeighbourRegressionSolution : RegressionSolution, INearestNeighbourRegressionSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NearestNeighbourRegressionSolution(bool deserializing) : base(deserializing) { }
     41    private NearestNeighbourRegressionSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NearestNeighbourRegressionSolution(NearestNeighbourRegressionSolution original, Cloner cloner)
    4343      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.