generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added CV_OUT to CvANN_MLP::predict

Browse Source 
python cv2 MLP sample done
This commit is contained in:
Alexander Mordvintsev 2011-08-14 04:32:27 +00:00
parent 622bd42224
commit a0af870719
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ml/include/opencv2/ml/ml.hpp
View File

@ -1926,7 +1926,7 @@ public:
CvANN_MLP_TrainParams params = CvANN_MLP_TrainParams(), CvANN_MLP_TrainParams params = CvANN_MLP_TrainParams(),
int flags=0 ); int flags=0 );
CV_WRAP virtual float predict( const cv::Mat& inputs, cv::Mat& outputs ) const; CV_WRAP virtual float predict( const cv::Mat& inputs, CV_OUT cv::Mat& outputs ) const;
#endif #endif
CV_WRAP virtual void clear(); CV_WRAP virtual void clear();

7
samples/python2/letter_recog.py
View File

@ -90,6 +90,7 @@ class SVM(LetterStatModel):
def predict(self, samples): def predict(self, samples):
return np.float32( [self.model.predict(s) for s in samples] ) return np.float32( [self.model.predict(s) for s in samples] )
class MLP(LetterStatModel): class MLP(LetterStatModel):
def __init__(self): def __init__(self):
self.model = cv2.ANN_MLP() self.model = cv2.ANN_MLP()
@ -109,10 +110,8 @@ class MLP(LetterStatModel):
self.model.train(samples, np.float32(new_responses), None, params = params) self.model.train(samples, np.float32(new_responses), None, params = params)
def predict(self, samples): def predict(self, samples):
pass ret, resp = self.model.predict(samples)
#return np.float32( [self.model.predict(s) for s in samples] ) return resp.argmax(-1)
if __name__ == '__main__': if __name__ == '__main__':