Fix/fix perceptron issues (#4146)

shogun-toolbox · Feb 5, 2018 · daa95fa · daa95fa
1 parent 91adea7
commit daa95fa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 88 deletions.
diff --git a/data b/data
diff --git a/examples/meta/src/binary/perceptron.sg b/examples/meta/src/binary/perceptron.sg
@@ -10,26 +10,24 @@ BinaryLabels labels_train(f_labels_train)
 BinaryLabels labels_test(f_labels_test)
 #![create_features]
 
-#![set_parameters]
-real learn_rate = 1.0
-int max_iter = 1000
-#![set_parameters]
-
 #![create_instance]
+real learn_rate=1.0
+int max_iter=1000
 Perceptron perceptron(features_train, labels_train)
 perceptron.set_learn_rate(learn_rate)
 perceptron.set_max_iter(max_iter)
 #![create_instance]
 
 #![train_and_apply]
 perceptron.train()
-BinaryLabels labels_predict = perceptron.apply_binary(features_test)
+perceptron.set_features(features_test)
+Labels labels_predict = perceptron.apply()
 #![train_and_apply]
 
-#![extract_weights_bias]
-RealVector w = perceptron.get_w()
-real b = perceptron.get_bias()
-#![extract_weights_bias]
+#![extract_weights]
+RealVector weights = perceptron.get_w()
+real bias = perceptron.get_bias()
+#![extract_weights]
 
 #![evaluate_accuracy]
 AccuracyMeasure eval()

diff --git a/examples/meta/src/neural_nets/classification_perceptron.sg b/examples/meta/src/neural_nets/classification_perceptron.sg
diff --git a/examples/undocumented/python/classifier_perceptron.py b/examples/undocumented/python/classifier_perceptron.py