Merge branch 'multiclass-ecoc' of git://github.com/pluskid/shogun

shogun-toolbox · May 4, 2012 · 25427d4 · 25427d4
2 parents 4aafbd1 + 64efd80
commit 25427d4
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/examples/undocumented/python_modular/classifier_multiclass_ecoc_random.py b/examples/undocumented/python_modular/classifier_multiclass_ecoc_random.py
@@ -0,0 +1,41 @@
+from tools.load import LoadMatrix
+lm=LoadMatrix()
+
+traindat = lm.load_numbers('../data/fm_train_real.dat')
+testdat  = lm.load_numbers('../data/fm_test_real.dat')
+label_traindat = lm.load_labels('../data/label_train_multiclass.dat')
+
+parameter_list = [[traindat,testdat,label_traindat,2.1,1,1e-5],[traindat,testdat,label_traindat,2.2,1,1e-5]]
+
+def classifier_multiclasslinearmachine_modular (fm_train_real=traindat,fm_test_real=testdat,label_train_multiclass=label_traindat,width=2.1,C=1,epsilon=1e-5):
+    from shogun.Features import RealFeatures, Labels
+    from shogun.Classifier import LibLinear, L2R_L2LOSS_SVC, LinearMulticlassMachine
+    from shogun.Classifier import ECOCStrategy, ECOCRandomSparseEncoder, ECOCRandomDenseEncoder, ECOCHDDecoder
+
+    feats_train = RealFeatures(fm_train_real)
+    feats_test  = RealFeatures(fm_test_real)
+
+    labels = Labels(label_train_multiclass)
+
+    classifier = LibLinear(L2R_L2LOSS_SVC)
+    classifier.set_epsilon(epsilon)
+    classifier.set_bias_enabled(True)
+
+    rnd_dense_strategy = ECOCStrategy(ECOCRandomDenseEncoder(), ECOCHDDecoder)
+    rnd_sparse_strategy = ECOCStrategy(ECOCRandomSparseEncoder(), ECOCHDDecoder)
+
+    dense_classifier = LinearMulticlassMachine(rnd_dense_strategy, feats_train, classifier, labels)
+    dense_classifier.train()
+    out_dense = dense_classifier.apply(feats_test).get_labels()
+
+    sparse_strategy = ECOCStrategy(rnd_sparse_strategy, ECOCHDDecoder())
+    sparse_classifier = LinearMulticlassMachine(sparse_strategy, feats_train, classifier, labels)
+    sparse_classifier.train()
+    out_sparse = sparse_classifier.apply(feats_test).get_labels()
+
+    return out_sparse, out_dense
+
+if __name__=='__main__':
+    print('MulticlassMachine')
+    classifier_multiclasslinearmachine_modular(*parameter_list[0])
+
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -68,6 +68,9 @@
 %rename(ECOCEncoder) CECOCEncoder;
 %rename(ECOCDecoder) CECOCDecoder;
 %rename(ECOCOVREncoder) CECOCOVREncoder;
+%rename(ECOCOVOEncoder) CECOCOVOEncoder;
+%rename(ECOCRandomSparseEncoder) CECOCRandomSparseEncoder;
+%rename(ECOCRandomDenseEncoder) CECOCRandomDenseEncoder;
 %rename(ECOCHDDecoder) CECOCHDDecoder;
 
 /* These functions return new Objects */
@@ -126,6 +129,9 @@
 %include <shogun/multiclass/ecoc/ECOCEncoder.h>
 %include <shogun/multiclass/ecoc/ECOCDecoder.h>
 %include <shogun/multiclass/ecoc/ECOCOVREncoder.h>
+%include <shogun/multiclass/ecoc/ECOCOVOEncoder.h>
+%include <shogun/multiclass/ecoc/ECOCRandomSparseEncoder.h>
+%include <shogun/multiclass/ecoc/ECOCRandomDenseEncoder.h>
 %include <shogun/multiclass/ecoc/ECOCHDDecoder.h>
 %include <shogun/multiclass/ecoc/ECOCStrategy.h>
 

diff --git a/src/interfaces/modular/Classifier_includes.i b/src/interfaces/modular/Classifier_includes.i
@@ -46,6 +46,9 @@
 
  #include <shogun/multiclass/ecoc/ECOCStrategy.h>
  #include <shogun/multiclass/ecoc/ECOCEncoder.h>
+ #include <shogun/multiclass/ecoc/ECOCOVOEncoder.h>
+ #include <shogun/multiclass/ecoc/ECOCRandomSparseEncoder.h>
+ #include <shogun/multiclass/ecoc/ECOCRandomDenseEncoder.h>
  #include <shogun/multiclass/ecoc/ECOCDecoder.h>
  #include <shogun/multiclass/ecoc/ECOCOVREncoder.h>
  #include <shogun/multiclass/ecoc/ECOCHDDecoder.h>