fixed string list functions

shogun-toolbox · Apr 18, 2012 · 46fd9e4 · 46fd9e4
1 parent 6653329
commit 46fd9e4
Show file tree

Hide file tree

Showing 67 changed files with 191 additions and 74 deletions.
diff --git a/examples/undocumented/python_static/classifier_gmnpsvm.py b/examples/undocumented/python_static/classifier_gmnpsvm.py
@@ -30,5 +30,5 @@ def classifier_gmnpsvm (fm_train_real=traindat,fm_test_real=testdat,
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'GMNPSVM'
+	print('GMNPSVM')
 	classifier_gmnpsvm(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_gpbtsvm.py b/examples/undocumented/python_static/classifier_gpbtsvm.py
@@ -29,5 +29,5 @@ def classifier_gpbtsvm (fm_train_real=traindat,fm_test_real=testdat,
 	return result
 
 if __name__=='__main__':
-	print 'GPBTSVM'
+	print('GPBTSVM')
 	classifier_gpbtsvm(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_knn.py b/examples/undocumented/python_static/classifier_knn.py
@@ -23,5 +23,5 @@ def classifier_knn (fm_train_real=traindat,fm_test_real=testdat,
 	return result
 
 if __name__=='__main__':
-	print 'KNN'
+	print('KNN')
 	classifier_knn(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_lda.py b/examples/undocumented/python_static/classifier_lda.py
@@ -21,5 +21,5 @@ def classifier_lda (fm_train_real=traindat,fm_test_real=testdat,
 	return result
 
 if __name__=='__main__': 
-	print 'LDA'
+	print('LDA')
 	classifier_lda(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_libsvm.py b/examples/undocumented/python_static/classifier_libsvm.py
@@ -28,5 +28,5 @@ def classifier_libsvm (fm_train_real=traindat,fm_test_real=testdat,
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'LibSVM'
+	print('LibSVM')
 	classifier_libsvm(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_libsvmmulticlass.py b/examples/undocumented/python_static/classifier_libsvmmulticlass.py
@@ -30,5 +30,5 @@ def classifier_libsvm_multiclass (fm_train_real=traindat,fm_test_real=testdat,
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'LibSVMMultiClass'
+	print('LibSVMMultiClass')
 	classifier_libsvm_multiclass(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_libsvmoneclass.py b/examples/undocumented/python_static/classifier_libsvmoneclass.py
@@ -27,5 +27,5 @@ def classifier_libsvm_oneclass (fm_train_real=traindat,fm_test_real=testdat,
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'LibSVMOneClass'
+	print('LibSVMOneClass')
 	classifier_libsvm_oneclass(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_mpdsvm.py b/examples/undocumented/python_static/classifier_mpdsvm.py
@@ -30,5 +30,5 @@ def classifier_mpdsvm (fm_train_real=traindat,fm_test_real=testdat,
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'MPDSVM'
+	print('MPDSVM')
 	classifier_mpdsvm(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_perceptron.py b/examples/undocumented/python_static/classifier_perceptron.py
@@ -21,5 +21,5 @@ def classifier_perceptron (fm_train_real=traindat,fm_test_real=testdat,
 	result=sg('classify')
 	return result
 if __name__=='__main__':
-	print 'Perceptron'
+	print('Perceptron')
 	classifier_perceptron(*parameter_list[0])
diff --git a/examples/undocumented/python_static/classifier_svmlight.py b/examples/undocumented/python_static/classifier_svmlight.py
@@ -35,5 +35,5 @@ def classifier_svmlight (fm_train_dna=traindna,fm_test_dna=testdna,label_train_d
 	return result, kernel_matrix
 
 if __name__=='__main__':
-	print 'SVMLight'
+	print('SVMLight')
 	classifier_svmlight(*parameter_list[0])
diff --git a/examples/undocumented/python_static/clustering_hierarchical.py b/examples/undocumented/python_static/clustering_hierarchical.py
@@ -15,5 +15,5 @@ def clustering_hierarchical (fm_train=traindat, size_cache=10,merges=3):
 	return [merge_distance, pairs]
 
 if __name__=='__main__':
-	print 'Hierarchical'
+	print('Hierarchical')
 	clustering_hierarchical(*parameter_list[0])
diff --git a/examples/undocumented/python_static/clustering_kmeans.py b/examples/undocumented/python_static/clustering_kmeans.py
@@ -15,5 +15,5 @@ def clustering_kmeans (fm_train=traindat, size_cache=10,k=3,iter=1000):
 	return [radi, centers]
 
 if __name__=='__main__':
-	print 'KMeans'
+	print('KMeans')
 	clustering_kmeans(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_braycurtis.py b/examples/undocumented/python_static/distance_braycurtis.py
@@ -15,5 +15,5 @@ def distance_braycurtis (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'BrayCurtisDistance'
+	print('BrayCurtisDistance')
 	distance_braycurtis(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_canberra.py b/examples/undocumented/python_static/distance_canberra.py
@@ -17,5 +17,5 @@ def distance_canberra (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'CanberraMetric'
+	print('CanberraMetric')
 	distance_canberra(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_canberraword.py b/examples/undocumented/python_static/distance_canberraword.py
@@ -22,5 +22,5 @@ def distance_canberraword (fm_train_dna=traindna,fm_test_dna=testdna,order=3,
 	return dm
 
 if __name__=='__main__':
-	print 'CanberraWordDistance'
+	print('CanberraWordDistance')
 	distance_canberraword(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_chebyshew.py b/examples/undocumented/python_static/distance_chebyshew.py
@@ -15,5 +15,5 @@ def distance_chebyshew (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'ChebyshewMetric'
+	print('ChebyshewMetric')
 	distance_chebyshew(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_chisquare.py b/examples/undocumented/python_static/distance_chisquare.py
@@ -15,5 +15,5 @@ def distance_chisquare (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'ChiSquareDistance'
+	print('ChiSquareDistance')
 	distance_chisquare(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_cosine.py b/examples/undocumented/python_static/distance_cosine.py
@@ -15,5 +15,5 @@ def distance_cosine (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'CosineDistance'
+	print('CosineDistance')
 	distance_cosine(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_euclidian.py b/examples/undocumented/python_static/distance_euclidian.py
@@ -15,5 +15,5 @@ def distance_euclidian (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'EuclidianDistance'
+	print('EuclidianDistance')
 	distance_euclidian(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_geodesic.py b/examples/undocumented/python_static/distance_geodesic.py
@@ -15,5 +15,5 @@ def distance_geodesic (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'GeodesicMetric'
+	print('GeodesicMetric')
 	distance_geodesic(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_hammingword.py b/examples/undocumented/python_static/distance_hammingword.py
@@ -22,5 +22,5 @@ def distance_hammingword (fm_train_dna=traindna,fm_test_dna=testdna,order=3,
 	return dm
 
 if __name__=='__main__':
-	print 'HammingWordDistance'
+	print('HammingWordDistance')
 	distance_hammingword(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_jensen.py b/examples/undocumented/python_static/distance_jensen.py
@@ -15,5 +15,5 @@ def distance_jensen (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'JensenMetric'
+	print('JensenMetric')
 	distance_jensen(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_manhatten.py b/examples/undocumented/python_static/distance_manhatten.py
@@ -17,5 +17,5 @@ def distance_manhatten (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'ManhattanMetric'
+	print('ManhattanMetric')
 	distance_manhatten(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_manhattenword.py b/examples/undocumented/python_static/distance_manhattenword.py
@@ -23,5 +23,5 @@ def distance_manhattenword (fm_train_dna=traindna,fm_test_dna=testdna,order=3,
 	return dm
 
 if __name__=='__main__':
-	print 'ManhattanWordDistance'
+	print('ManhattanWordDistance')
 	distance_manhattenword(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_minkowski.py b/examples/undocumented/python_static/distance_minkowski.py
@@ -17,5 +17,5 @@ def distance_minkowski (fm_train_real=traindat,fm_test_real=testdat,k=3.):
 	return dm
 
 if __name__=='__main__':
-	print 'MinkowskiMetric'
+	print('MinkowskiMetric')
 	distance_minkowski(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distance_tanimoto.py b/examples/undocumented/python_static/distance_tanimoto.py
@@ -17,5 +17,5 @@ def distance_tanimoto (fm_train_real=traindat,fm_test_real=testdat):
 	return dm
 
 if __name__=='__main__':
-	print 'TanimotoDistance'
+	print('TanimotoDistance')
 	distance_tanimoto(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distribution_histogram.py b/examples/undocumented/python_static/distribution_histogram.py
@@ -27,5 +27,5 @@ def distribution_histogram(fm_train=traindna,fm_cube=cubedna,order=3,
 #	return sg('get_log_likelihood_sample')
 
 if __name__=='__main__':
-	print 'Histogram'
+	print('Histogram')
 	distribution_histogram(*parameter_list[0])
diff --git a/examples/undocumented/python_static/distribution_hmm.py b/examples/undocumented/python_static/distribution_hmm.py
@@ -20,6 +20,6 @@ def distribution_hmm(fm_train=traindna,fm_cube=cubedna,N=3,M=6,
 	return likelihood
 
 if __name__=='__main__':
-	print 'HMM'
+	print('HMM')
 	distribution_hmm(*parameter_list[0])
 
diff --git a/examples/undocumented/python_static/distribution_linearhmm.py b/examples/undocumented/python_static/distribution_linearhmm.py
@@ -28,5 +28,5 @@ def distribution_linearhmm (fm_train=traindna,fm_cube=cubedna,
 
 
 if __name__=='__main__':
-	print 'LinearHMM'
+	print('LinearHMM')
 	distribution_linearhmm(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_chi2.py b/examples/undocumented/python_static/kernel_chi2.py
@@ -17,5 +17,5 @@ def kernel_chi2 (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Chi2'
+	print('Chi2')
 	kernel_chi2(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_combined.py b/examples/undocumented/python_static/kernel_combined.py
@@ -8,7 +8,7 @@
 
 def kernel_combined(fm_train_real=traindat,fm_test_real=testdat,
 		 weight=1.,size_cache=10):
- 	sg('clean_kernel')
+	sg('clean_kernel')
 	sg('clean_features', 'TRAIN')
 	sg('clean_features', 'TEST')
 	sg('set_kernel', 'COMBINED', size_cache)
@@ -27,5 +27,5 @@ def kernel_combined(fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Combined'
+	print('Combined')
 	kernel_combined(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_commulongstring.py b/examples/undocumented/python_static/kernel_commulongstring.py
@@ -26,5 +26,5 @@ def kernel_commulongstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'CommUlongString'
+	print('CommUlongString')
 	kernel_commulongstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_commwordstring.py b/examples/undocumented/python_static/kernel_commwordstring.py
@@ -27,5 +27,5 @@ def kernel_commwordstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'CommWordString'
+	print('CommWordString')
 	kernel_commwordstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_const.py b/examples/undocumented/python_static/kernel_const.py
@@ -15,5 +15,5 @@ def kernel_const (fm_train_real=traindat,fm_test_real=testdat,c=23.,size_cache=1
 	return km
 
 if __name__=='__main__':
-	print 'Const'
+	print('Const')
 	kernel_const(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_diag.py b/examples/undocumented/python_static/kernel_diag.py
@@ -17,5 +17,5 @@ def kernel_diag (fm_train_real=traindat,fm_test_real=testdat,diag=23.,
 	return km
 
 if __name__=='__main__':
-	print 'Diag'
+	print('Diag')
 	kernel_diag(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_fixeddegreestring.py b/examples/undocumented/python_static/kernel_fixeddegreestring.py
@@ -17,5 +17,5 @@ def kernel_fixeddegreestring (fm_train_dna=traindna,fm_test_dna=testdna,degree=3
 	return km
 
 if __name__=='__main__':
-	print 'FixedDegreeString'
+	print('FixedDegreeString')
 	kernel_fixeddegreestring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_gaussian.py b/examples/undocumented/python_static/kernel_gaussian.py
@@ -16,5 +16,5 @@ def kernel_gaussian (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Gaussian'
+	print('Gaussian')
 	kernel_gaussian(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_gaussianshift.py b/examples/undocumented/python_static/kernel_gaussianshift.py
@@ -17,5 +17,5 @@ def kernel_gaussianshift (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'GaussianShift'
+	print('GaussianShift')
 	kernel_gaussianshift(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_linear.py b/examples/undocumented/python_static/kernel_linear.py
@@ -18,5 +18,5 @@ def kernel_linear (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Linear'
+	print('Linear')
 	kernel_linear(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_linearstring.py b/examples/undocumented/python_static/kernel_linearstring.py
@@ -18,5 +18,5 @@ def kernel_linearstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'LinearString'
+	print('LinearString')
 	kernel_linearstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_linearword.py b/examples/undocumented/python_static/kernel_linearword.py
@@ -18,5 +18,5 @@ def kernel_linearword (fm_train_word=trainword,fm_test_word=testword,
 	return km
 
 if __name__=='__main__':
-	print 'LinearWord'
+	print('LinearWord')
 	kernel_linearword(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_localalignmentstring.py b/examples/undocumented/python_static/kernel_localalignmentstring.py
@@ -18,5 +18,5 @@ def kernel_localalignmentstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'LocalAlignmentString'
+	print('LocalAlignmentString')
 	kernel_localalignmentstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_localityimprovedstring.py b/examples/undocumented/python_static/kernel_localityimprovedstring.py
@@ -20,5 +20,5 @@ def kernel_localityimprovedstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'LocalityImprovedString'
+	print('LocalityImprovedString')
 	kernel_localityimprovedstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_oligostring.py b/examples/undocumented/python_static/kernel_oligostring.py
@@ -18,5 +18,5 @@ def kernel_oligostring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'OligoString'
+	print('OligoString')
 	kernel_oligostring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_pluginestimatehistogram.py b/examples/undocumented/python_static/kernel_pluginestimatehistogram.py
@@ -33,5 +33,5 @@ def kernel_pluginestimatehistogram (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'PluginEstimate w/ HistogramWord'
+	print('PluginEstimate w/ HistogramWord')
 	kernel_pluginestimatehistogram(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_poly.py b/examples/undocumented/python_static/kernel_poly.py
@@ -18,5 +18,5 @@ def kernel_poly (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Poly'
+	print('Poly')
 	kernel_poly(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_polymatchstring.py b/examples/undocumented/python_static/kernel_polymatchstring.py
@@ -18,5 +18,5 @@ def kernel_polymatchstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'PolyMatchString'
+	print('PolyMatchString')
 	kernel_polymatchstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_polymatchword.py b/examples/undocumented/python_static/kernel_polymatchword.py
@@ -28,5 +28,5 @@ def kernel_polymatchword (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'PolyMatchWord'
+	print('PolyMatchWord')
 	kernel_polymatchword(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_salzbergstring.py b/examples/undocumented/python_static/kernel_salzbergstring.py
@@ -36,5 +36,5 @@ def kernel_salzbergstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'PluginEstimate w/ SalzbergWord'
+	print('PluginEstimate w/ SalzbergWord')
 	kernel_salzbergstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_sigmoid.py b/examples/undocumented/python_static/kernel_sigmoid.py
@@ -17,5 +17,5 @@ def kernel_sigmoid (fm_train_real=traindat,fm_test_real=testdat,
 	return km
 
 if __name__=='__main__':
-	print 'Sigmoid'
+	print('Sigmoid')
 	kernel_sigmoid(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_simplelocalityimprovedstring.py b/examples/undocumented/python_static/kernel_simplelocalityimprovedstring.py
@@ -20,5 +20,5 @@ def kernel_simplelocalityimprovedstring (fm_train_dna=traindna,fm_test_dna=testd
 	return km
 
 if __name__=='__main__':
-	print 'SimpleLocalityImprovedString'
+	print('SimpleLocalityImprovedString')
 	kernel_simplelocalityimprovedstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_weightedcommwordstring.py b/examples/undocumented/python_static/kernel_weightedcommwordstring.py
@@ -28,5 +28,5 @@ def kernel_weightedcommwordstring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'WeightedCommWordString'
+	print('WeightedCommWordString')
 	kernel_weightedcommwordstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_weighteddegreepositionstring.py b/examples/undocumented/python_static/kernel_weighteddegreepositionstring.py
@@ -18,5 +18,5 @@ def kernel_weighteddegreepositonstring (fm_train_dna=traindna,fm_test_dna=testdn
 	return km
 
 if __name__=='__main__':
-	print 'WeightedDegreePositionString'
+	print('WeightedDegreePositionString')
 	kernel_weighteddegreepositonstring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/kernel_weighteddegreestring.py b/examples/undocumented/python_static/kernel_weighteddegreestring.py
@@ -18,5 +18,5 @@ def kernel_weighteddegreestring (fm_train_dna=traindna,fm_test_dna=testdna,
 	return km
 
 if __name__=='__main__':
-	print 'WeightedDegreeString'
+	print('WeightedDegreeString')
 	kernel_weighteddegreestring(*parameter_list[0])
diff --git a/examples/undocumented/python_static/mkl_multiclass.py b/examples/undocumented/python_static/mkl_multiclass.py
@@ -39,5 +39,5 @@ def mkl_multiclass (fm_train_real=traindat,fm_test_real=testdat,
 	return result
 
 if __name__=='__main__':
-	print 'mkl_multiclass'
+	print('mkl_multiclass')
 	mkl_multiclass(*parameter_list[0])