potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

1. Input/OutputArray optimizations;

Browse Source 
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
This commit is contained in:
Vadim Pisarevsky
2015-04-07 16:44:26 +03:00
parent 44f112a9de
commit 052593c760
34 changed files with 888 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ml/test/test_mltests2.cpp
+7 -7
View File
@@ -472,19 +472,19 @@ void CV_MLBaseTest::save( const char* filename )
void CV_MLBaseTest::load( const char* filename )
{
if( modelName == CV_NBAYES )
model = StatModel::load<NormalBayesClassifier>( filename );
model = Algorithm::load<NormalBayesClassifier>( filename );
else if( modelName == CV_KNEAREST )
model = StatModel::load<KNearest>( filename );
model = Algorithm::load<KNearest>( filename );
else if( modelName == CV_SVM )
model = StatModel::load<SVM>( filename );
model = Algorithm::load<SVM>( filename );
else if( modelName == CV_ANN )
model = StatModel::load<ANN_MLP>( filename );
model = Algorithm::load<ANN_MLP>( filename );
else if( modelName == CV_DTREE )
model = StatModel::load<DTrees>( filename );
model = Algorithm::load<DTrees>( filename );
else if( modelName == CV_BOOST )
model = StatModel::load<Boost>( filename );
model = Algorithm::load<Boost>( filename );
else if( modelName == CV_RTREES )
model = StatModel::load<RTrees>( filename );
model = Algorithm::load<RTrees>( filename );
else
CV_Error( CV_StsNotImplemented, "invalid stat model name");
}