Fixed esvm at easysvm

shogun-toolbox · Aug 31, 2011 · 2e4b2b5 · 2e4b2b5
1 parent be81d77
commit 2e4b2b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/applications/easysvm/esvm/experiment.py b/applications/easysvm/esvm/experiment.py
@@ -182,8 +182,8 @@ def create_features(kname, examples, kparam, train_mode, preproc, seq_source, nu
         if train_mode:
             preproc = SortWordString()
             preproc.init(wf)
-        wf.add_preproc(preproc)
-        ret = wf.apply_preproc()
+        wf.add_preprocessor(preproc)
+        ret = wf.apply_preprocessors()
         assert(ret)
         feats['combined'].append_feature_obj(wf)
         feats['f0'] = wf
@@ -354,7 +354,7 @@ def train_and_test(trainex,trainlab,testex,C,kname,kparam, seq_source, nuc_con):
         kernel.init(feats_train, feats_test)
 
     kernel.set_optimization_type(SLOWBUTMEMEFFICIENT)
-    output = svm.classify().get_labels()
+    output = svm.apply().get_labels()
 
     return output
 

diff --git a/applications/easysvm/esvm/utils.py b/applications/easysvm/esvm/utils.py
@@ -52,17 +52,19 @@ def accuracy(output, labels_test):
 
 def calcroc(output, LTE):
     """The area under the receiver operating characteristic curve"""
-    pm=PerformanceMeasures(Labels(numpy.array(LTE)), Labels(numpy.array(output)))
+    pm=ROCEvaluation()
+    pm.evaluate(Labels(numpy.array(output)), Labels(numpy.array(LTE)))
 
     auROC=pm.get_auROC()
-    return auROC ;
+    return auROC
 
 def calcprc(output, LTE):
     """The area under the precision recall curve"""
-    pm=PerformanceMeasures(Labels(numpy.array(LTE)), Labels(numpy.array(output)))
+    pm=PRCEvaluation()
+    pm.evaluate(Labels(numpy.array(output)), Labels(numpy.array(LTE)))
 
     auPRC=pm.get_auPRC()
-    return auPRC ;
+    return auPRC
 
 
 def calcperf(output, LTE, perflist):