Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs

    r14843 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("a94d15c5-f146-4a6f-92ba-4217b1df4daa")]
    4141  public sealed class NeuralNetworkClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4242    private const string DecayParameterName = "Decay";
    … …  
    115115    public NeuralNetworkClassification()
    116116      : base() {
    117       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { 
    118         (IntValue)new IntValue(0).AsReadOnly(), 
    119         (IntValue)new IntValue(1).AsReadOnly(), 
     117      var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     118        (IntValue)new IntValue(0).AsReadOnly(),
     119        (IntValue)new IntValue(1).AsReadOnly(),
    120120        (IntValue)new IntValue(2).AsReadOnly() });
    121121      var selectedHiddenLayerValue = (from v in validHiddenLayerValues

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassificationSolution.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    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("d49a080c-82d0-4e94-b538-b5b137674e00")]
    3333  public sealed class NeuralNetworkClassificationSolution : ClassificationSolution, INeuralNetworkClassificationSolution {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs

    r14843 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("4c744749-c133-41fb-b098-f1ca2f7213e7")]
    4141  public sealed class NeuralNetworkEnsembleClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4242    private const string EnsembleSizeParameterName = "EnsembleSize";

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassificationSolution.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    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("35d10454-d0a0-4257-b065-d92b278b7c2f")]
    3333  public sealed class NeuralNetworkEnsembleClassificationSolution : ClassificationSolution, INeuralNetworkEnsembleClassificationSolution {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleModel.cs

    r14843 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3232  /// Represents a neural network ensembel model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("0d6dfe68-7903-4f2f-af46-e71ae2fbaf2d")]
    3535  [Item("NeuralNetworkEnsembleModel", "Represents a neural network ensemble for regression and classification.")]
    3636  public sealed class NeuralNetworkEnsembleModel : ClassificationModel, INeuralNetworkEnsembleModel {

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegression.cs

    r14843 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("2b8bff18-1fd5-443b-b370-f529ca9afecf")]
    4141  public sealed class NeuralNetworkEnsembleRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4242    private const string EnsembleSizeParameterName = "EnsembleSize";
    … …  
    125125    public NeuralNetworkEnsembleRegression()
    126126      : base() {
    127       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { 
    128         (IntValue)new IntValue(0).AsReadOnly(), 
    129         (IntValue)new IntValue(1).AsReadOnly(), 
     127      var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     128        (IntValue)new IntValue(0).AsReadOnly(),
     129        (IntValue)new IntValue(1).AsReadOnly(),
    130130        (IntValue)new IntValue(2).AsReadOnly() });
    131131      var selectedHiddenLayerValue = (from v in validHiddenLayerValues

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegressionSolution.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    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("6006f404-fefe-4568-9297-9edfdd5a951b")]
    3333  public sealed class NeuralNetworkEnsembleRegressionSolution : RegressionSolution, INeuralNetworkEnsembleRegressionSolution {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkModel.cs

    r14843 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3232  /// Represents a neural network model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("6aed3009-9bad-4459-ac5c-6b4ad4e682d6")]
    3535  [Item("NeuralNetworkModel", "Represents a neural network for regression and classification.")]
    3636  public sealed class NeuralNetworkModel : ClassificationModel, INeuralNetworkModel {
    … …  
    112112
    113113    public override IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {
    114       double[,] inputData = dataset.ToArray( allowedInputVariables, rows);
     114      double[,] inputData = dataset.ToArray(allowedInputVariables, rows);
    115115
    116116      int n = inputData.GetLength(0);

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs

    r14843 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("a7a3987c-f555-4c79-b22c-a2d50b42884f")]
    4141  public sealed class NeuralNetworkRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4242    private const string DecayParameterName = "Decay";
    … …  
    115115    public NeuralNetworkRegression()
    116116      : base() {
    117       var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] { 
    118         (IntValue)new IntValue(0).AsReadOnly(), 
    119         (IntValue)new IntValue(1).AsReadOnly(), 
     117      var validHiddenLayerValues = new ItemSet<IntValue>(new IntValue[] {
     118        (IntValue)new IntValue(0).AsReadOnly(),
     119        (IntValue)new IntValue(1).AsReadOnly(),
    120120        (IntValue)new IntValue(2).AsReadOnly() });
    121121      var selectedHiddenLayerValue = (from v in validHiddenLayerValues

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegressionSolution.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    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("0c766f7e-ba57-4f9d-b4e3-6ed7dc4c57dc")]
    3333  public sealed class NeuralNetworkRegressionSolution : RegressionSolution, INeuralNetworkRegressionSolution {
    3434
Note: See TracChangeset for help on using the changeset viewer.