Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00
parent bd0e0b5800
commit f666bd221f
47 changed files with 457 additions and 436 deletions
--- a/samples/python2/letter_recog.py
+++ b/samples/python2/letter_recog.py
@@ -88,7 +88,7 @@ class SVM(LetterStatModel):
        self.model.train(samples, responses, params = params)

    def predict(self, samples):
-        return np.float32( [self.model.predict(s) for s in samples] )
+        return self.model.predict_all(samples).ravel()


 class MLP(LetterStatModel):