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

moved failed tests to blacklists

Browse Source 
filter-generic - ticket 690
mhi-global - ticket 457

fixed issue 689
This commit is contained in:
Alexander Shishkov 2010-11-19 14:29:37 +00:00
parent 6a9d022a9f
commit 0f01ae43be
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cv/src/detectors_test.cpp
View File

@ -60,7 +60,7 @@ public:
~CV_DetectorsTest(); ~CV_DetectorsTest();
protected: protected:
void run(int); void run(int);
template <class T> bool testDedector(const Mat& img, const T& detector, vector<KeyPoint>& expected); template <class T> bool testDetector(const Mat& img, const T& detector, vector<KeyPoint>& expected);
void LoadExpected(const string& file, vector<KeyPoint>& out); void LoadExpected(const string& file, vector<KeyPoint>& out);
}; };
@ -153,7 +153,7 @@ struct WrapPoint
struct sortByR { bool operator()(const KeyPoint& kp1, const KeyPoint& kp2) { return norm(kp1.pt) < norm(kp2.pt); } }; struct sortByR { bool operator()(const KeyPoint& kp1, const KeyPoint& kp2) { return norm(kp1.pt) < norm(kp2.pt); } };
template <class T> bool CV_DetectorsTest::testDedector(const Mat& img, const T& detector, vector<KeyPoint>& exp) template <class T> bool CV_DetectorsTest::testDetector(const Mat& img, const T& detector, vector<KeyPoint>& exp)
{ {
vector<KeyPoint> orig_kpts; vector<KeyPoint> orig_kpts;
detector(img, orig_kpts); detector(img, orig_kpts);
@ -207,6 +207,12 @@ template <class T> bool CV_DetectorsTest::testDedector(const Mat& img, const T&
sort(result.begin(), result.end(), sortByR()); sort(result.begin(), result.end(), sortByR());
sort(exp.begin(), exp.end(), sortByR()); sort(exp.begin(), exp.end(), sortByR());
if (result.size() != exp.size())
{
ts->set_failed_test_info(CvTS::FAIL_INVALID_TEST_DATA);
return false;
}
int foundCounter1 = 0; int foundCounter1 = 0;
for(size_t i = 0; i < exp.size(); ++i) for(size_t i = 0; i < exp.size(); ++i)
{ {
@ -292,14 +298,14 @@ void CV_DetectorsTest::run( int /*start_from*/ )
if (exp.empty()) if (exp.empty())
return; return;
if (!testDedector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp)) if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp))
return; return;
LoadExpected(string(ts->get_data_path()) + "detectors/star.xml", exp); LoadExpected(string(ts->get_data_path()) + "detectors/star.xml", exp);
if (exp.empty()) if (exp.empty())
return; return;
if (!testDedector(to_test, StarDetector(45, 30, 10, 8, 5), exp)) if (!testDetector(to_test, StarDetector(45, 30, 10, 8, 5), exp))
return; return;
ts->set_failed_test_info( CvTS::OK); ts->set_failed_test_info( CvTS::OK);

8
tests/cv/src/tsysa.cpp
View File

@ -47,13 +47,9 @@ const char* blacklist[] =
{ {
"calibrate-camera-artificial", //ticket 472 "calibrate-camera-artificial", //ticket 472
"inpaint", //ticket 570 "inpaint", //ticket 570
//"optflow-estimate-rigid", //ticket 433
//"subdiv", //ticket 454
"warp-resize", //ticket 429 "warp-resize", //ticket 429
//"warp-affine", //ticket 572 "filter-generic", //ticket 690
//"warp-perspective", //ticket 575 "mhi-global", //ticket 457
//"_3d-fundam", //ticket 434
//"posit", //ticket 430
0 0
}; };