Changeset 6740 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork

Timestamp:

09/12/11 13:48:31 (13 years ago)

Author:

mkommend

Message:

#1597, #1609, #1640:

• Corrected TableFileParser to handle empty rows correctly.
• Refactored DataSet to store values in List<List> instead of a two-dimensional array.
• Enable importing and storing string and datetime values.
• Changed data access methods in dataset and adapted all concerning classes.
• Changed interpreter to store the variable values for all rows during the compilation step.

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork

Files:

• NeuralNetworkClassification.cs (modified) (1 diff)
• NeuralNetworkEnsembleClassification.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs

@@ -192 +192 @@
       int nRows = inputMatrix.GetLength(0);
       int nFeatures = inputMatrix.GetLength(1) - 1;
-      double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
+      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
       int nClasses = classValues.Count();
       // map original class values to values [0..nClasses-1]

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs

@@ -178 +178 @@
       int nRows = inputMatrix.GetLength(0);
       int nFeatures = inputMatrix.GetLength(1) - 1;
-      double[] classValues = dataset.GetVariableValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
+      double[] classValues = dataset.GetDoubleValues(targetVariable).Distinct().OrderBy(x => x).ToArray();
       int nClasses = classValues.Count();
       // map original class values to values [0..nClasses-1]