Blob Blame History Raw
From fb626d9ff159685e8051e751a11ee71ffef13b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sun, 30 Apr 2017 11:12:29 +0200
Subject: [PATCH 1/2] Fix 'TypeError: slice indices must be integers or None or
 have an __index__ method'

---
 .../python_modular/multiclass_c45classifiertree_modular.py            | 4 ++--
 examples/undocumented/python_modular/stochasticgbmachine_modular.py   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/undocumented/python_modular/multiclass_c45classifiertree_modular.py b/examples/undocumented/python_modular/multiclass_c45classifiertree_modular.py
index 2b48b44..79b8878 100644
--- a/examples/undocumented/python_modular/multiclass_c45classifiertree_modular.py
+++ b/examples/undocumented/python_modular/multiclass_c45classifiertree_modular.py
@@ -25,8 +25,8 @@ def multiclass_c45classifiertree_modular(train=traindat,test=testdat,labels=labe
 
 	# divide train dataset into training and validation subsets in the ratio 2/3 to 1/3
 	subset=int32(random.permutation(feats_train.get_num_vectors()))
-	vsubset=subset[1:subset.size/3]
-	trsubset=subset[1+subset.size/3:subset.size]
+	vsubset=subset[1:int(subset.size/3)]
+	trsubset=subset[1+int(subset.size/3):subset.size]
 
 	# C4.5 Tree formation using training subset
 	train_labels.add_subset(trsubset)
diff --git a/examples/undocumented/python_modular/stochasticgbmachine_modular.py b/examples/undocumented/python_modular/stochasticgbmachine_modular.py
index e1acf8f..df8285f 100644
--- a/examples/undocumented/python_modular/stochasticgbmachine_modular.py
+++ b/examples/undocumented/python_modular/stochasticgbmachine_modular.py
@@ -31,8 +31,8 @@ def stochasticgbmachine_modular(train=traindat,train_labels=label_traindat,ft=fe
 	s=StochasticGBMachine(cart,loss,500,0.01,0.6)
 
 	# train
-	feats.add_subset(np.int32(p[0:num]))
-	labels.add_subset(np.int32(p[0:num]))
+	feats.add_subset(np.int32(p[0:int(num)]))
+	labels.add_subset(np.int32(p[0:int(num)]))
 	s.set_labels(labels)
 	s.train(feats)
 	feats.remove_subset()

From de18ed08c09c471d6cae09346c955455e085a71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sun, 30 Apr 2017 11:16:45 +0200
Subject: [PATCH 2/2] Fix 'IndexError: only integers, slices (`:`), ellipsis
 (`...`), numpy.newaxis (`None`) and integer or boolean arrays are valid
 indices'

---
 examples/undocumented/python_modular/classifier_larank_modular.py     | 4 ++--
 .../undocumented/python_modular/classifier_multiclassocas_modular.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/undocumented/python_modular/classifier_larank_modular.py b/examples/undocumented/python_modular/classifier_larank_modular.py
index 893c178..b3d3166 100644
--- a/examples/undocumented/python_modular/classifier_larank_modular.py
+++ b/examples/undocumented/python_modular/classifier_larank_modular.py
@@ -18,8 +18,8 @@ def classifier_larank_modular (num_vec,num_class,distance,C=0.9,num_threads=1,nu
 	fm_train=array(random.randn(num_class,num_vec))
 	fm_test=array(random.randn(num_class,num_vec))
 	for i in range(len(label_train)):
-		fm_train[label_train[i],i]+=distance
-		fm_test[label_test[i],i]+=distance
+		fm_train[label_train[i],int(i)]+=distance
+		fm_test[label_test[i],int(i)]+=distance
 
 	feats_train=RealFeatures(fm_train)
 	feats_test=RealFeatures(fm_test)
diff --git a/examples/undocumented/python_modular/classifier_multiclassocas_modular.py b/examples/undocumented/python_modular/classifier_multiclassocas_modular.py
index 3f0cbb9..14e716a 100644
--- a/examples/undocumented/python_modular/classifier_multiclassocas_modular.py
+++ b/examples/undocumented/python_modular/classifier_multiclassocas_modular.py
@@ -21,8 +21,8 @@ def classifier_multiclassocas_modular (num_vec=10,num_class=3,distance=15,width=
 	fm_train=array(random.randn(num_class,num_vec))
 	fm_test=array(random.randn(num_class,num_vec))
 	for i in range(len(label_train)):
-		fm_train[label_train[i],i]+=distance
-		fm_test[label_test[i],i]+=distance
+		fm_train[label_train[i],int(i)]+=distance
+		fm_test[label_test[i],int(i)]+=distance
 
 	feats_train=RealFeatures(fm_train)
 	feats_test=RealFeatures(fm_test)