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

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.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs (modified) (2 diffs)

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

@@ -34 +34 @@
     public static SVM.Problem CreateSvmProblem(Dataset dataset, string targetVariable, IEnumerable<string> inputVariables, IEnumerable<int> rowIndices) {
       double[] targetVector =
-        dataset.GetEnumeratedVariableValues(targetVariable, rowIndices)
-        .ToArray();
+        dataset.GetDoubleValues(targetVariable, rowIndices).ToArray();
 
       SVM.Node[][] nodes = new SVM.Node[targetVector.Length][];
@@ -46 +45 @@
         int colIndex = 1; // make sure the smallest node index for SVM = 1
         foreach (var inputVariable in inputVariablesList) {
-          double value = dataset[row, dataset.GetVariableIndex(inputVariable)];
+          double value = dataset.GetDoubleValue(inputVariable, row);
           // SVM also works with missing values
           // => don't add NaN values in the dataset to the sparse SVM matrix representation