Changeset 2290 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SVMHelper.cs

Timestamp:

08/14/09 19:56:04 (15 years ago)

Author:

gkronber

Message:

• introduced a variablename to index mapping for SVM models (to make sure we can use the model for prediction in the model analyzer)
• added support to enable and disable algorithms in the dispatcher and removed DispatcherBase
• fixed bugs when calculating variable impacts and reading the final model of GP algorithms

#722 (IModel should provide a Predict() method to get predicted values for an input vector)

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SVMHelper.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SVMHelper.cs

@@ -9 +9 @@
 namespace HeuristicLab.SupportVectorMachines {
   public class SVMHelper {
+
     public static SVM.Problem CreateSVMProblem(Dataset dataset, int targetVariable, int start, int end) {
+      return CreateSVMProblem(dataset, targetVariable, Enumerable.Range(0, dataset.Columns).ToDictionary<int, int>(x => x), start, end);
+    }
+
+    public static SVM.Problem CreateSVMProblem(Dataset dataset, int targetVariable, Dictionary<int, int> columnMapping, int start, int end) {
       int rowCount = end - start;
       List<int> skippedFeatures = new List<int>();
@@ -24 +29 @@
       for (int i = 0; i < rowCount; i++) {
         double value = dataset.GetValue(start + i, targetVariable);
-          targetVector[i] = value;
+        targetVector[i] = value;
       }
-      targetVector = targetVector.Where(x=> !double.IsNaN(x)).ToArray();
+      targetVector = targetVector.Where(x => !double.IsNaN(x)).ToArray();
 
       SVM.Node[][] nodes = new SVM.Node[targetVector.Length][];
@@ -34 +39 @@
         tempRow = new List<SVM.Node>();
         for (int col = 0; col < dataset.Columns; col++) {
-          if (!skippedFeatures.Contains(col) && col!=targetVariable) {
+          if (!skippedFeatures.Contains(col) && col != targetVariable && columnMapping.ContainsKey(col)) {
             double value = dataset.GetValue(start + row, col);
             if (!double.IsNaN(value))
-              tempRow.Add(new SVM.Node(col + 1, value));
+              tempRow.Add(new SVM.Node(columnMapping[col], value));
           }
         }