mirror of
https://github.com/opencv/opencv.git
synced 2025-06-20 10:00:51 +08:00
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
This commit is contained in:
parent
7c740b6a31
commit
56cae1b293
@ -1,42 +1,34 @@
|
|||||||
/*
|
/***********************************************************************
|
||||||
/*********************************************************************
|
* Software License Agreement (BSD License)
|
||||||
* Software License Agreement (BSD License)
|
*
|
||||||
*
|
* Copyright (c) 2015 Ippei Ito. All rights reserved.
|
||||||
* Copyright (c) 2015, Willow Garage, Inc.
|
*
|
||||||
* All rights reserved.
|
* THE BSD LICENSE
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
* are met:
|
* are met:
|
||||||
*
|
*
|
||||||
* * Redistributions of source code must retain the above copyright
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* copyright notice, this list of conditions and the following
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* disclaimer in the documentation and/or other materials provided
|
* documentation and/or other materials provided with the distribution.
|
||||||
* with the distribution.
|
*
|
||||||
* * Neither the name of the Willow Garage nor the names of its
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||||
* contributors may be used to endorse or promote products derived
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||||
* from this software without specific prior written permission.
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||||
*
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
*************************************************************************/
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*********************************************************************/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Authors: Ippei Ito
|
For OpenCV2.4/OpenCV3.0
|
||||||
|
|
||||||
for OpenCV2.4/OpenCV3.0
|
|
||||||
|
|
||||||
Test for Pull Request # 3829
|
Test for Pull Request # 3829
|
||||||
https://github.com/Itseez/opencv/pull/3829
|
https://github.com/Itseez/opencv/pull/3829
|
||||||
@ -434,7 +426,7 @@ public:
|
|||||||
// compare accuracies between the brute force matcher and the test target matcher
|
// compare accuracies between the brute force matcher and the test target matcher
|
||||||
if (average_accuracy < target_average_accuracy)
|
if (average_accuracy < target_average_accuracy)
|
||||||
{
|
{
|
||||||
ts->printf(cvtest::TS::LOG, "Bad average accuracy %f < %f while test %s %s query\n", average_accuracy, target_average_accuracy, flmatchername, tp.transname.c_str());
|
ts->printf(cvtest::TS::LOG, "Bad average accuracy %f < %f while test %s %s query\n", average_accuracy, target_average_accuracy, flmatchername.c_str(), tp.transname.c_str());
|
||||||
ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
|
ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user