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:
12 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/NeuralNetwork/NeuralNetworkClassification.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    … …  
    3838  [Item("Neural Network Classification (NN)", "Neural network classification data analysis algorithm (wrapper for ALGLIB). Further documentation: http://www.alglib.net/dataanalysis/neuralnetworks.php")]
    3939  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 130)]
    40   [StorableClass]
     40  [StorableType("8D44A55B-B162-42D6-A761-A420F4D107C4")]
    4141  public sealed class NeuralNetworkClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4242    private const string DecayParameterName = "Decay";
    … …  
    108108
    109109    [StorableConstructor]
    110     private NeuralNetworkClassification(bool deserializing) : base(deserializing) { }
     110    private NeuralNetworkClassification(StorableConstructorFlag _) : base(_) { }
    111111    private NeuralNetworkClassification(NeuralNetworkClassification original, Cloner cloner)
    112112      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassificationSolution.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("NeuralNetworkClassificationSolution", "Represents a neural network solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("7B08B27F-66B6-47C8-946E-51B28F603B43")]
    3333  public sealed class NeuralNetworkClassificationSolution : ClassificationSolution, INeuralNetworkClassificationSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NeuralNetworkClassificationSolution(bool deserializing) : base(deserializing) { }
     41    private NeuralNetworkClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NeuralNetworkClassificationSolution(NeuralNetworkClassificationSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    … …  
    3838  [Item("Neural Network Ensemble Classification (NN)", "Neural network ensemble classification data analysis algorithm (wrapper for ALGLIB). Further documentation: http://www.alglib.net/dataanalysis/mlpensembles.php")]
    3939  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 140)]
    40   [StorableClass]
     40  [StorableType("21B48D73-B907-4710-854A-C549F8C66CFF")]
    4141  public sealed class NeuralNetworkEnsembleClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4242    private const string EnsembleSizeParameterName = "EnsembleSize";
    … …  
    119119
    120120    [StorableConstructor]
    121     private NeuralNetworkEnsembleClassification(bool deserializing) : base(deserializing) { }
     121    private NeuralNetworkEnsembleClassification(StorableConstructorFlag _) : base(_) { }
    122122    private NeuralNetworkEnsembleClassification(NeuralNetworkEnsembleClassification original, Cloner cloner)
    123123      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassificationSolution.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("NeuralNetworkEnsembleClassificationSolution", "Represents a neural network ensemble solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("7D834C91-2790-44B6-97A4-BC7409D869FD")]
    3333  public sealed class NeuralNetworkEnsembleClassificationSolution : ClassificationSolution, INeuralNetworkEnsembleClassificationSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NeuralNetworkEnsembleClassificationSolution(bool deserializing) : base(deserializing) { }
     41    private NeuralNetworkEnsembleClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NeuralNetworkEnsembleClassificationSolution(NeuralNetworkEnsembleClassificationSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleModel.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 neural network ensembel model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("51B29670-27BD-405C-A521-39814E4BD857")]
    3535  [Item("NeuralNetworkEnsembleModel", "Represents a neural network ensemble for regression and classification.")]
    3636  public sealed class NeuralNetworkEnsembleModel : ClassificationModel, INeuralNetworkEnsembleModel {
    … …  
    5050    private double[] classValues;
    5151    [StorableConstructor]
    52     private NeuralNetworkEnsembleModel(bool deserializing)
    53       : base(deserializing) {
    54       if (deserializing)
    55         mlpEnsemble = new alglib.mlpensemble();
     52    private NeuralNetworkEnsembleModel(StorableConstructorFlag _) : base(_) {
     53      mlpEnsemble = new alglib.mlpensemble();
    5654    }
    5755    private NeuralNetworkEnsembleModel(NeuralNetworkEnsembleModel original, Cloner cloner)
    … …  
    146144        return IsProblemDataCompatible(classificationProblemData, out errorMessage);
    147145
    148       throw new ArgumentException("The problem data is not a regression nor a classification problem data. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
     146      throw new ArgumentException("The problem data is not compatible with this neural network ensemble. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
    149147    }
    150148
    … …  
    155153      return new NeuralNetworkEnsembleClassificationSolution(this, new ClassificationEnsembleProblemData(problemData));
    156154    }
    157    
     155
    158156    #region persistence
    159157    [Storable]
    … …  
    185183      }
    186184    }
    187     [Storable(AllowOneWay = true)]
     185    [Storable(OldName = "MultiLayerPerceptronEnsembleDfdnet")]
    188186    private double[] MultiLayerPerceptronEnsembleDfdnet {
    189187      set {
    … …  
    199197      }
    200198    }
    201     [Storable(AllowOneWay = true)]
     199    [Storable(OldName = "MultiLayerPerceptronEnsembleNeurons")]
    202200    private double[] MultiLayerPerceptronEnsembleNeurons {
    203201      set { mlpEnsemble.innerobj.network.neurons = value; }
    204202    }
    205     [Storable(AllowOneWay = true)]
     203    [Storable(OldName = "MultiLayerPerceptronEnsembleSerializedMlp")]
    206204    private double[] MultiLayerPerceptronEnsembleSerializedMlp {
    207205      set {
    … …  
    209207      }
    210208    }
    211     [Storable(AllowOneWay = true)]
     209    [Storable(OldName = "MultiLayerPerceptronStuctinfo")]
    212210    private int[] MultiLayerPerceptronStuctinfo {
    213211      set {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegression.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    … …  
    3838  [Item("Neural Network Ensemble Regression (NN)", "Neural network ensemble regression data analysis algorithm (wrapper for ALGLIB). Further documentation: http://www.alglib.net/dataanalysis/mlpensembles.php")]
    3939  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 140)]
    40   [StorableClass]
     40  [StorableType("FD50BD78-3586-4C31-87AE-5490E717F4E7")]
    4141  public sealed class NeuralNetworkEnsembleRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4242    private const string EnsembleSizeParameterName = "EnsembleSize";
    … …  
    119119
    120120    [StorableConstructor]
    121     private NeuralNetworkEnsembleRegression(bool deserializing) : base(deserializing) { }
     121    private NeuralNetworkEnsembleRegression(StorableConstructorFlag _) : base(_) { }
    122122    private NeuralNetworkEnsembleRegression(NeuralNetworkEnsembleRegression original, Cloner cloner)
    123123      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegressionSolution.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("NeuralNetworkEnsembleRegressionSolution", "Represents a neural network ensemble solution for a regression problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("46257A3C-9052-4390-98D1-14A6FBF51C8A")]
    3333  public sealed class NeuralNetworkEnsembleRegressionSolution : RegressionSolution, INeuralNetworkEnsembleRegressionSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NeuralNetworkEnsembleRegressionSolution(bool deserializing) : base(deserializing) { }
     41    private NeuralNetworkEnsembleRegressionSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NeuralNetworkEnsembleRegressionSolution(NeuralNetworkEnsembleRegressionSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkModel.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 neural network model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("AEB9B960-FCA6-4A6D-BD5F-27BCE9CC5BEA")]
    3535  [Item("NeuralNetworkModel", "Represents a neural network for regression and classification.")]
    3636  public sealed class NeuralNetworkModel : ClassificationModel, INeuralNetworkModel {
    … …  
    4848    private double[] classValues;
    4949    [StorableConstructor]
    50     private NeuralNetworkModel(bool deserializing)
    51       : base(deserializing) {
    52       if (deserializing)
    53         multiLayerPerceptron = new alglib.multilayerperceptron();
     50    private NeuralNetworkModel(StorableConstructorFlag _) : base(_) {
     51      multiLayerPerceptron = new alglib.multilayerperceptron();
    5452    }
    5553    private NeuralNetworkModel(NeuralNetworkModel original, Cloner cloner)
    … …  
    149147        return IsProblemDataCompatible(classificationProblemData, out errorMessage);
    150148
    151       throw new ArgumentException("The problem data is not a regression nor a classification problem data. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
     149      throw new ArgumentException("The problem data is not compatible with this neural network. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
    152150    }
    153151

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    … …  
    3838  [Item("Neural Network Regression (NN)", "Neural network regression data analysis algorithm (wrapper for ALGLIB). Further documentation: http://www.alglib.net/dataanalysis/neuralnetworks.php")]
    3939  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 130)]
    40   [StorableClass]
     40  [StorableType("F9EEA27B-43FF-4296-A4B9-CC024CD1778C")]
    4141  public sealed class NeuralNetworkRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4242    private const string DecayParameterName = "Decay";
    … …  
    108108
    109109    [StorableConstructor]
    110     private NeuralNetworkRegression(bool deserializing) : base(deserializing) { }
     110    private NeuralNetworkRegression(StorableConstructorFlag _) : base(_) { }
    111111    private NeuralNetworkRegression(NeuralNetworkRegression original, Cloner cloner)
    112112      : base(original, cloner) {

  • branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegressionSolution.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("NeuralNetworkRegressionSolution", "Represents a neural network solution for a regression problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("E1E1B29A-B87A-4BCA-9A2C-83DA8AD7B9D9")]
    3333  public sealed class NeuralNetworkRegressionSolution : RegressionSolution, INeuralNetworkRegressionSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private NeuralNetworkRegressionSolution(bool deserializing) : base(deserializing) { }
     41    private NeuralNetworkRegressionSolution(StorableConstructorFlag _) : base(_) { }
    4242    private NeuralNetworkRegressionSolution(NeuralNetworkRegressionSolution original, Cloner cloner)
    4343      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.