Skip to content

Commit

Permalink
fixed examples and removed 'xrange' from class_list.cpp.py
Browse files Browse the repository at this point in the history
  • Loading branch information
gsomix committed Apr 6, 2012
1 parent 3e38b9e commit 708770a
Show file tree
Hide file tree
Showing 171 changed files with 318 additions and 317 deletions.
Expand Up @@ -24,9 +24,9 @@ def classifier_averaged_perceptron_modular (fm_train_real=traindat,fm_test_real=

perceptron.set_features(feats_test)
out_labels = perceptron.apply().get_labels()
#print out_labels
#print(out_labels)
return perceptron, out_labels

if __name__=='__main__':
print 'AveragedPerceptron'
print('AveragedPerceptron')
classifier_averaged_perceptron_modular(*parameter_list[0])
Expand Up @@ -23,5 +23,5 @@ def classifier_conjugateindex_modular (fm_train_real=traindat,fm_test_real=testd
return ci, res

if __name__=='__main__':
print 'ConjugateIndex'
print('ConjugateIndex')
classifier_conjugateindex_modular(*parameter_list[0])
Expand Up @@ -24,5 +24,5 @@ def classifier_custom_kernel_modular(C=1,dim=7):
return svm,out

if __name__=='__main__':
print 'custom_kernel'
print('custom_kernel')
classifier_custom_kernel_modular(*parameter_list[0])
Expand Up @@ -73,7 +73,7 @@ def classifier_domainadaptationsvm_modular(fm_train_dna=traindna,fm_test_dna=tes

#####################################

#print "obtaining DA SVM from previously trained SVM"
#print("obtaining DA SVM from previously trained SVM")

feats_train2 = StringCharFeatures(fm_train_dna, DNA)
feats_test2 = StringCharFeatures(fm_test_dna, DNA)
Expand All @@ -89,5 +89,5 @@ def classifier_domainadaptationsvm_modular(fm_train_dna=traindna,fm_test_dna=tes
return out #,dasvm TODO

if __name__=='__main__':
print 'SVMLight'
print('SVMLight')
classifier_domainadaptationsvm_modular(*parameter_list[0])
Expand Up @@ -20,5 +20,5 @@ def classifier_gaussiannaivebayes_modular(fm_train_real=traindat,fm_test_real=te
return gnb, gnb_train, output

if __name__=='__main__':
print 'GaussianNaiveBayes'
print('GaussianNaiveBayes')
classifier_gaussiannaivebayes_modular(*parameter_list[0])
Expand Up @@ -27,5 +27,5 @@ def classifier_gmnpsvm_modular (fm_train_real=traindat,fm_test_real=testdat,labe
out=svm.apply(feats_test).get_labels()
return out,kernel
if __name__=='__main__':
print 'GMNPSVM'
print('GMNPSVM')
classifier_gmnpsvm_modular(*parameter_list[0])
Expand Up @@ -30,5 +30,5 @@ def classifier_gpbtsvm_modular (fm_train_real=traindat,fm_test_real=testdat,labe


if __name__=='__main__':
print 'GPBTSVM'
print('GPBTSVM')
classifier_gpbtsvm_modular(*parameter_list[0])
Expand Up @@ -25,5 +25,5 @@ def classifier_knn_modular(fm_train_real=traindat,fm_test_real=testdat,label_tra
return knn,knn_train,output,multiple_k

if __name__=='__main__':
print 'KNN'
print('KNN')
classifier_knn_modular(*parameter_list[0])
Expand Up @@ -35,6 +35,6 @@ def classifier_larank_modular (fm_train_real=traindat,fm_test_real=testdat,label


if __name__=='__main__':
print 'LaRank'
print('LaRank')
classifier_larank_modular(*parameter_list[0])

Expand Up @@ -26,5 +26,5 @@ def classifier_lda_modular (fm_train_real=traindat,fm_test_real=testdat,label_tr
return lda,lda.apply().get_labels()

if __name__=='__main__':
print 'LDA'
print('LDA')
classifier_lda_modular(*parameter_list[0])
Expand Up @@ -33,7 +33,7 @@ def classifier_liblinear_modular(fm_train_real, fm_test_real,


if __name__=='__main__':
print 'LibLinear'
print('LibLinear')
classifier_liblinear_modular(*parameter_list[0])


Expand Up @@ -26,4 +26,4 @@
kernel.init(feats_train, feats_test);
out=svm.apply().get_labels();
testerr=mean(sign(out)!=testlab)
print testerr
print(testerr)
Expand Up @@ -30,5 +30,5 @@ def classifier_libsvm_modular (fm_train_real=traindat,fm_test_real=testdat,label
return predictions, svm, predictions.get_labels()

if __name__=='__main__':
print 'LibSVM'
print('LibSVM')
classifier_libsvm_modular(*parameter_list[0])
Expand Up @@ -28,5 +28,5 @@ def classifier_libsvmmulticlass_modular (fm_train_real=traindat,fm_test_real=tes
return predictions, svm, predictions.get_labels()

if __name__=='__main__':
print 'LibSVMMultiClass'
print('LibSVMMultiClass' )
classifier_libsvmmulticlass_modular(*parameter_list[0])
Expand Up @@ -27,5 +27,5 @@ def classifier_libsvmoneclass_modular (fm_train_real=traindat,fm_test_real=testd
return predictions, svm, predictions.get_labels()

if __name__=='__main__':
print 'LibSVMOneClass'
print('LibSVMOneClass')
classifier_libsvmoneclass_modular(*parameter_list[0])
Expand Up @@ -30,5 +30,5 @@ def classifier_mpdsvm_modular (fm_train_real=traindat,fm_test_real=testdat,label
return predictions, svm, predictions.get_labels()

if __name__=='__main__':
print 'MPDSVM'
print('MPDSVM')
classifier_mpdsvm_modular(*parameter_list[0])
Expand Up @@ -23,5 +23,5 @@ def classifier_multiclassliblinear_modular (fm_train_real=traindat,fm_test_real=
return out

if __name__=='__main__':
print 'MulticlassLibLinear'
print('MulticlassLibLinear')
classifier_multiclassliblinear_modular(*parameter_list[0])
Expand Up @@ -26,5 +26,5 @@ def classifier_multiclasslinearmachine_modular (fm_train_real=traindat,fm_test_r
return out

if __name__=='__main__':
print 'MulticlassMachine'
print('MulticlassMachine')
classifier_multiclasslinearmachine_modular(*parameter_list[0])
Expand Up @@ -28,5 +28,5 @@ def classifier_multiclassmachine_modular (fm_train_real=traindat,fm_test_real=te
return out

if __name__=='__main__':
print 'MulticlassMachine'
print('MulticlassMachine')
classifier_multiclassmachine_modular(*parameter_list[0])
Expand Up @@ -23,5 +23,5 @@ def classifier_multiclassocas_modular (fm_train_real=traindat,fm_test_real=testd
return out

if __name__=='__main__':
print 'MulticlassOCAS'
print('MulticlassOCAS')
classifier_multiclassocas_modular(*parameter_list[0])
Expand Up @@ -27,5 +27,5 @@ def classifier_perceptron_modular (fm_train_real=traindat,fm_test_real=testdat,l
return perceptron, out_labels

if __name__=='__main__':
print 'Perceptron'
print('Perceptron')
classifier_perceptron_modular(*parameter_list[0])
Expand Up @@ -32,5 +32,5 @@ def classifier_subgradientsvm_modular(fm_train_real, fm_test_real,
return labels, svm

if __name__=='__main__':
print 'SubGradientSVM'
print('SubGradientSVM')
classifier_subgradientsvm_modular(*parameter_list[0])
Expand Up @@ -16,7 +16,7 @@ def classifier_svmlight_batch_linadd_modular(fm_train_dna, fm_test_dna,
try:
from shogun.Classifier import SVMLight
except ImportError:
print 'No support for SVMLight available.'
print('No support for SVMLight available.')
return

feats_train=StringCharFeatures(DNA)
Expand All @@ -37,7 +37,7 @@ def classifier_svmlight_batch_linadd_modular(fm_train_dna, fm_test_dna,

kernel.init(feats_train, feats_test)

#print 'SVMLight Objective: %f num_sv: %d' % \
#print('SVMLight Objective: %f num_sv: %d' % \)
# (svm.get_objective(), svm.get_num_support_vectors())
svm.set_batch_computation_enabled(False)
svm.set_linadd_enabled(False)
Expand All @@ -49,5 +49,5 @@ def classifier_svmlight_batch_linadd_modular(fm_train_dna, fm_test_dna,


if __name__=='__main__':
print 'SVMlight batch'
print('SVMlight batch')
classifier_svmlight_batch_linadd_modular(*parameter_list[0])
Expand Up @@ -54,5 +54,5 @@ def classifier_svmlight_linear_term_modular(fm_train_dna=traindna,fm_test_dna=te
return out,kernel

if __name__=='__main__':
print 'SVMLight'
print('SVMLight')
classifier_svmlight_linear_term_modular(*parameter_list[0])
Expand Up @@ -13,7 +13,7 @@ def classifier_svmlight_modular (fm_train_dna=traindat,fm_test_dna=testdat,label
try:
from shogun.Classifier import SVMLight
except ImportError:
print 'No support for SVMLight available.'
print('No support for SVMLight available.')
return

feats_train=StringCharFeatures(DNA)
Expand All @@ -35,5 +35,5 @@ def classifier_svmlight_modular (fm_train_dna=traindat,fm_test_dna=testdat,label
svm.apply().get_labels()
return kernel
if __name__=='__main__':
print 'SVMLight'
print('SVMLight')
classifier_svmlight_modular(*parameter_list[0])
Expand Up @@ -35,5 +35,5 @@ def classifier_svmlin_modular (fm_train_real=traindat,fm_test_real=testdat,label


if __name__=='__main__':
print 'SVMLin'
print('SVMLin')
classifier_svmlin_modular(*parameter_list[0])
Expand Up @@ -33,5 +33,5 @@ def classifier_svmocas_modular (fm_train_real=traindat,fm_test_real=testdat,labe
return predictions, svm, predictions.get_labels()

if __name__=='__main__':
print 'SVMOcas'
print('SVMOcas')
classifier_svmocas_modular(*parameter_list[0])
Expand Up @@ -34,5 +34,5 @@ def classifier_svmsgd_modular (fm_train_real=traindat,fm_test_real=testdat,label


if __name__=='__main__':
print 'SVMSGD'
print('SVMSGD')
classifier_svmsgd_modular(*parameter_list[0])
Expand Up @@ -43,6 +43,6 @@ def clustering_gmm_modular (fm_train=generated,n=2,min_cov=1e-9,max_iter=1000,mi
return est_gmm

if __name__=='__main__':
print 'GMM'
print('GMM')
clustering_gmm_modular(*parameter_list[0])

Expand Up @@ -24,5 +24,5 @@ def clustering_hierarchical_modular (fm_train=traindat,merges=3):
return hierarchical,out_distance,out_cluster

if __name__=='__main__':
print 'Hierarchical'
print('Hierarchical')
clustering_hierarchical_modular(*parameter_list[0])
Expand Up @@ -29,6 +29,6 @@ def clustering_kmeans_modular (fm_train=traindat,k=3):
return out_centers, kmeans

if __name__=='__main__':
print 'KMeans'
print('KMeans')
clustering_kmeans_modular(*parameter_list[0])

2 changes: 1 addition & 1 deletion examples/undocumented/python_modular/converter_diffusionmaps_modular.py 100755 → 100644
Expand Up @@ -22,6 +22,6 @@ def converter_diffusionmaps_modular(data,t):


if __name__=='__main__':
print 'DiffusionMaps'
print('DiffusionMaps')
converter_diffusionmaps_modular(*parameter_list[0])

Expand Up @@ -20,6 +20,6 @@ def converter_hessianlocallylinearembedding_modular(data,k):


if __name__=='__main__':
print 'HessianLocallyLinearEmbedding'
print('HessianLocallyLinearEmbedding')
converter_hessianlocallylinearembedding_modular(*parameter_list[0])

Expand Up @@ -22,6 +22,6 @@ def converter_isomap_modular(data):


if __name__=='__main__':
print 'Isomap'
print('Isomap')
converter_isomap_modular(*parameter_list[0])

Expand Up @@ -23,6 +23,6 @@ def converter_kernellocallylinearembedding_modular(data,k):


if __name__=='__main__':
print 'KernelLocallyLinearEmbedding'
print('KernelLocallyLinearEmbedding')
converter_kernellocallylinearembedding_modular(*parameter_list[0])

Expand Up @@ -20,6 +20,6 @@ def converter_kernellocaltangentspacealignment_modular(data,k):


if __name__=='__main__':
print 'KernelLocalTangentSpaceAlignment'
print('KernelLocalTangentSpaceAlignment')
converter_kernellocaltangentspacealignment_modular(*parameter_list[0])

2 changes: 1 addition & 1 deletion examples/undocumented/python_modular/converter_laplacianeigenmaps_modular.py 100755 → 100644
Expand Up @@ -21,6 +21,6 @@ def converter_laplacianeigenmaps_modular(data,k):


if __name__=='__main__':
print 'LaplacianEigenmaps'
print('LaplacianEigenmaps')
converter_laplacianeigenmaps_modular(*parameter_list[0])

Expand Up @@ -20,6 +20,6 @@ def converter_linearlocaltangentspacealignment_modular(data,k):


if __name__=='__main__':
print 'LinearLocalTangentSpaceAlignment'
print('LinearLocalTangentSpaceAlignment')
converter_linearlocaltangentspacealignment_modular(*parameter_list[0])

Expand Up @@ -21,6 +21,6 @@ def converter_localitypreservingprojections_modular(data,k):


if __name__=='__main__':
print 'LocalityPreservingProjections'
print('LocalityPreservingProjections')
converter_localitypreservingprojections_modular(*parameter_list[0])

2 changes: 1 addition & 1 deletion examples/undocumented/python_modular/converter_locallylinearembedding_modular.py 100755 → 100644
Expand Up @@ -20,6 +20,6 @@ def converter_locallylinearembedding_modular(data,k):


if __name__=='__main__':
print 'LocallyLinearEmbedding'
print('LocallyLinearEmbedding')
converter_locallylinearembedding_modular(*parameter_list[0])

2 changes: 1 addition & 1 deletion examples/undocumented/python_modular/converter_localtangentspacealignment_modular.py 100755 → 100644
Expand Up @@ -20,6 +20,6 @@ def converter_localtangentspacealignment_modular(data,k):


if __name__=='__main__':
print 'LocalTangentSpaceAlignment'
print('LocalTangentSpaceAlignment')
converter_localtangentspacealignment_modular(*parameter_list[0])

2 changes: 1 addition & 1 deletion examples/undocumented/python_modular/converter_multidimensionalscaling_modular.py 100755 → 100644
Expand Up @@ -30,5 +30,5 @@ def converter_multidimensionalscaling_modular(data):
return numpy.linalg.norm(distance_matrix_after-distance_matrix_before)/numpy.linalg.norm(distance_matrix_before)

if __name__=='__main__':
print 'MultidimensionalScaling'
print('MultidimensionalScaling')
converter_multidimensionalscaling_modular(*parameter_list[0])
Expand Up @@ -25,5 +25,5 @@ def converter_stochasticproximityembedding_modular(data, k):
return features

if __name__=='__main__':
print 'StochasticProximityEmbedding'
print('StochasticProximityEmbedding')
converter_stochasticproximityembedding_modular(*parameter_list[0])
Expand Up @@ -24,6 +24,6 @@ def distance_braycurtis_modular (fm_train_real=traindat,fm_test_real=testdat):
return distance,dm_train,dm_test

if __name__=='__main__':
print 'BrayCurtisDistance'
print('BrayCurtisDistance')
distance_braycurtis_modular(*parameter_list[0])

Expand Up @@ -21,5 +21,5 @@ def distance_canberra_modular (fm_train_real=traindat,fm_test_real=testdat):
return distance,dm_train,dm_test

if __name__=='__main__':
print 'CanberaMetric'
print('CanberaMetric')
distance_canberra_modular(*parameter_list[0])
Expand Up @@ -36,5 +36,5 @@ def distance_canberraword_modular (fm_train_dna=traindna,fm_test_dna=testdna,ord
return distance,dm_train,dm_test

if __name__=='__main__':
print 'CanberraWordDistance'
print('CanberraWordDistance')
distance_canberraword_modular(*parameter_list[0])
Expand Up @@ -23,5 +23,5 @@ def distance_chebyshew_modular (fm_train_real=traindat,fm_test_real=testdat):
return distance,dm_train,dm_test

if __name__=='__main__':
print 'ChebyshewMetric'
print('ChebyshewMetric')
distance_chebyshew_modular(*parameter_list[0])
Expand Up @@ -21,5 +21,5 @@ def distance_chisquare_modular (fm_train_real=traindat,fm_test_real=testdat):
return distance,dm_train,dm_test

if __name__=='__main__':
print 'ChiSquareDistance'
print('ChiSquareDistance')
distance_chisquare_modular(*parameter_list[0])
Expand Up @@ -23,5 +23,5 @@ def distance_cosine_modular (fm_train_real=traindat,fm_test_real=testdat):
return distance,dm_train,dm_test

if __name__=='__main__':
print 'CosineDistance'
print('CosineDistance')
distance_cosine_modular(*parameter_list[0])

0 comments on commit 708770a

Please sign in to comment.