Commit 761f76c8 authored by Maria Dimashova's avatar Maria Dimashova

fixed fails of cascade-detector and hog-detector tests (tickets 428, 432)

parent 099388bd
...@@ -347,7 +347,7 @@ int CV_DetectorTest::validate( int detectorIdx, vector<vector<Rect> >& objects ) ...@@ -347,7 +347,7 @@ int CV_DetectorTest::validate( int detectorIdx, vector<vector<Rect> >& objects )
} }
noPair += (int)count_if( map.begin(), map.end(), isZero ); noPair += (int)count_if( map.begin(), map.end(), isZero );
totalNoPair += noPair; totalNoPair += noPair;
if( noPair > valRects.size()*eps.noPair+1 ) if( noPair > cvRound(valRects.size()*eps.noPair)+1 )
break; break;
} }
if( imageIdx < (int)imageFilenames.size() ) if( imageIdx < (int)imageFilenames.size() )
...@@ -358,7 +358,7 @@ int CV_DetectorTest::validate( int detectorIdx, vector<vector<Rect> >& objects ) ...@@ -358,7 +358,7 @@ int CV_DetectorTest::validate( int detectorIdx, vector<vector<Rect> >& objects )
ts->printf( CvTS::LOG, msg ); ts->printf( CvTS::LOG, msg );
return CvTS::FAIL_BAD_ACCURACY; return CvTS::FAIL_BAD_ACCURACY;
} }
if ( totalNoPair > totalValRectCount*eps./*total*/noPair+1 ) if ( totalNoPair > cvRound(totalValRectCount*eps./*total*/noPair)+1 )
{ {
ts->printf( CvTS::LOG, "overrated count of rectangles without pair on all images set" ); ts->printf( CvTS::LOG, "overrated count of rectangles without pair on all images set" );
return CvTS::FAIL_BAD_ACCURACY; return CvTS::FAIL_BAD_ACCURACY;
......
...@@ -50,7 +50,7 @@ const char* blacklist[] = ...@@ -50,7 +50,7 @@ const char* blacklist[] =
"calibrate-camera-artificial", //ticket 472 "calibrate-camera-artificial", //ticket 472
//"calibrate-camera-cpp", //ticket 564 //"calibrate-camera-cpp", //ticket 564
//"calibrate-stereo-c", //ticket 565 //"calibrate-stereo-c", //ticket 565
"cascade-detector", //ticket 432 //"cascade-detector", //ticket 432
"chessboard-detector", //ticket 569 "chessboard-detector", //ticket 569
"chessboard-subpixel", //ticket 473 "chessboard-subpixel", //ticket 473
//"color-luv", //ticket 502 //"color-luv", //ticket 502
...@@ -65,7 +65,7 @@ const char* blacklist[] = ...@@ -65,7 +65,7 @@ const char* blacklist[] =
//"hist-backproj", //ticket 579 //"hist-backproj", //ticket 579
//"hist-bayesianprob", //ticket 619 //"hist-bayesianprob", //ticket 619
//"hist-backprojpatch", //ticket 620 //"hist-backprojpatch", //ticket 620
"hog-detector", //ticket 428 //"hog-detector", //ticket 428
"inpaint", //ticket 570 "inpaint", //ticket 570
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment