Changeset 1870

Timestamp:

05/20/09 12:59:31 (16 years ago)

Author:

gkronber

Message:

adapted SVMEvaluator to work with simple evaluators of plugin Modeling. #635

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorEvaluator.cs (modified) (2 diffs)

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

@@ -43 +43 @@
       AddVariableInfo(new VariableInfo("SVMRangeTransform", "The applied transformation during the learning the model", typeof(SVMRangeTransform), VariableKind.In));
 
-      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(ItemList), VariableKind.New | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("Values", "Target vs predicted values", typeof(DoubleMatrixData), VariableKind.New | VariableKind.Out));
     }
 
@@ -60 +60 @@
       SVM.Problem scaledProblem = SVM.Scaling.Scale(problem, rangeTransform);
 
-      ItemList predictedValues = new ItemList();
-      ItemList row;
+      double[,] values = new double[end-start, 2];
       for (int i = 0; i < end - start; i++) {
-        row = new ItemList();
-        row.Add(new DoubleData(SVM.Prediction.Predict(model, scaledProblem.X[i])));
-        row.Add(new DoubleData(dataset.Samples[(start + i) * dataset.Columns + targetVariable]));
-        predictedValues.Add(row);
+        values[i,0] = SVM.Prediction.Predict(model, scaledProblem.X[i]);
+        values[i,1] = dataset.Samples[(start + i) * dataset.Columns + targetVariable];
       }
 
-      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("Values"), predictedValues));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("Values"), new DoubleMatrixData(values)));
       return null;
     }