1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

ts: refactor OpenCV tests

- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
This commit is contained in:
Alexander Alekhin
2017-11-05 13:48:40 +00:00
parent f1e50ecab3
commit 4a297a2443
435 changed files with 2009 additions and 2378 deletions
+6 -2
View File
@@ -43,8 +43,7 @@
//#define GENERATE_TESTDATA
using namespace cv;
using namespace std;
namespace opencv_test { namespace {
int str_to_svm_type(String& str)
{
@@ -89,6 +88,7 @@ int str_to_ann_train_method( String& str )
return -1;
}
#if 0
int str_to_ann_activation_function(String& str)
{
if (!str.compare("IDENTITY"))
@@ -104,6 +104,7 @@ int str_to_ann_activation_function(String& str)
CV_Error(CV_StsBadArg, "incorrect ann activation function string");
return -1;
}
#endif
void ann_check_data( Ptr<TrainData> _data )
{
@@ -373,6 +374,8 @@ int str_to_margin_type( String& str )
CV_Error( CV_StsBadArg, "incorrect svmsgd margin type string" );
return -1;
}
}
// ---------------------------------- MLBaseTest ---------------------------------------------------
CV_MLBaseTest::CV_MLBaseTest(const char* _modelName)
@@ -700,4 +703,5 @@ void CV_MLBaseTest::load( const char* filename )
CV_Error( CV_StsNotImplemented, "invalid stat model name");
}
} // namespace
/* End of file. */