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

replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-10-02 23:07:46 +04:00
parent d40a2c28c5
commit 06a13d9ba0
30 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/objdetect/perf/perf_cascadeclassifier.cpp
View File

@@ -11,17 +11,17 @@ typedef std::tr1::tuple<std::string, int> ImageName_MinSize_t;
typedef perf::TestBaseWithParam<ImageName_MinSize_t> ImageName_MinSize;
PERF_TEST_P(ImageName_MinSize, CascadeClassifierLBPFrontalFace,
testing::Combine(testing::Values( std::string("cv/shared/lena.jpg"),
std::string("cv/shared/1_itseez-0000247.jpg"),
std::string("cv/shared/1_itseez-0000289.jpg"),
std::string("cv/shared/1_itseez-0000492.jpg"),
std::string("cv/shared/1_itseez-0000573.jpg"),
std::string("cv/shared/1_itseez-0000803.jpg"),
std::string("cv/shared/1_itseez-0000892.jpg"),
std::string("cv/shared/1_itseez-0000984.jpg"),
std::string("cv/shared/1_itseez-0001238.jpg"),
std::string("cv/shared/1_itseez-0001438.jpg"),
std::string("cv/shared/1_itseez-0002524.jpg")),
testing::Combine(testing::Values( std::string("cv/shared/lena.png"),
std::string("cv/shared/1_itseez-0000247.png"),
std::string("cv/shared/1_itseez-0000289.png"),
std::string("cv/shared/1_itseez-0000492.png"),
std::string("cv/shared/1_itseez-0000573.png"),
std::string("cv/shared/1_itseez-0000803.png"),
std::string("cv/shared/1_itseez-0000892.png"),
std::string("cv/shared/1_itseez-0000984.png"),
std::string("cv/shared/1_itseez-0001238.png"),
std::string("cv/shared/1_itseez-0001438.png"),
std::string("cv/shared/1_itseez-0002524.png")),
testing::Values(24, 30, 40, 50, 60, 70, 80, 90)
)
)

12
modules/objdetect/test/test_latentsvmdetector.cpp
View File

@@ -76,7 +76,7 @@ bool CV_LatentSVMDetectorTest::isEqual(CvRect r1, CvRect r2, int eps)
void CV_LatentSVMDetectorTest::run( int /* start_from */)
{
string img_path = string(ts->get_data_path()) + "latentsvmdetector/cat.jpg";
string img_path = string(ts->get_data_path()) + "latentsvmdetector/cat.png";
string model_path = string(ts->get_data_path()) + "latentsvmdetector/models_VOC2007/cat.xml";
int numThreads = -1;
@@ -204,8 +204,8 @@ bool compareResults( const vector<LatentSvmDetector::ObjectDetection>& calc, con
void LatentSVMDetectorTest::run( int /* start_from */)
{
string img_path_cat = string(ts->get_data_path()) + "latentsvmdetector/cat.jpg";
string img_path_cars = string(ts->get_data_path()) + "latentsvmdetector/cars.jpg";
string img_path_cat = string(ts->get_data_path()) + "latentsvmdetector/cat.png";
string img_path_cars = string(ts->get_data_path()) + "latentsvmdetector/cars.png";
string model_path_cat = string(ts->get_data_path()) + "latentsvmdetector/models_VOC2007/cat.xml";
string model_path_car = string(ts->get_data_path()) + "latentsvmdetector/models_VOC2007/car.xml";
@@ -263,17 +263,17 @@ void LatentSVMDetectorTest::run( int /* start_from */)
if( !compareResults(detections1_cat, true_detections1_cat, 1, score_thr) )
{
std::cerr << "Results of detector1 are invalid on image cat.jpg" << std::endl;
std::cerr << "Results of detector1 are invalid on image cat.png" << std::endl;
ts->set_failed_test_info( cvtest::TS::FAIL_MISMATCH );
}
if( !compareResults(detections12_cat, true_detections12_cat, 1, score_thr) )
{
std::cerr << "Results of detector12 are invalid on image cat.jpg" << std::endl;
std::cerr << "Results of detector12 are invalid on image cat.png" << std::endl;
ts->set_failed_test_info( cvtest::TS::FAIL_MISMATCH );
}
if( !compareResults(detections12_cars, true_detections12_cars, 1, score_thr) )
{
std::cerr << "Results of detector12 are invalid on image cars.jpg" << std::endl;
std::cerr << "Results of detector12 are invalid on image cars.png" << std::endl;
ts->set_failed_test_info( cvtest::TS::FAIL_MISMATCH );
}
}