From 02488c5cbb6f350701f0c18ec21bcc086eb92bd5 Mon Sep 17 00:00:00 2001 From: OrestChura Date: Tue, 8 Dec 2020 02:44:01 +0300 Subject: [PATCH] Moved G-API output to the first place of arguments in comparison functions --- modules/gapi/perf/common/gapi_video_perf_tests_inl.hpp | 8 ++++---- modules/gapi/test/common/gapi_core_tests_inl.hpp | 6 +++--- modules/gapi/test/common/gapi_video_tests_common.hpp | 14 +++++++------- modules/gapi/test/common/gapi_video_tests_inl.hpp | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/gapi/perf/common/gapi_video_perf_tests_inl.hpp b/modules/gapi/perf/common/gapi_video_perf_tests_inl.hpp index d1c81a9..189a09c 100644 --- a/modules/gapi/perf/common/gapi_video_perf_tests_inl.hpp +++ b/modules/gapi/perf/common/gapi_video_perf_tests_inl.hpp @@ -44,7 +44,7 @@ PERF_TEST_P_(BuildOptFlowPyramidPerfTest, TestPerformance) outMaxLevelGAPI = static_cast(outMaxLevelSc[0]); // Comparison ////////////////////////////////////////////////////////////// - compareOutputPyramids(outOCV, outGAPI); + compareOutputPyramids(outGAPI, outOCV); SANITY_CHECK_NOTHING(); } @@ -74,7 +74,7 @@ PERF_TEST_P_(OptFlowLKPerfTest, TestPerformance) } // Comparison ////////////////////////////////////////////////////////////// - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); SANITY_CHECK_NOTHING(); } @@ -109,7 +109,7 @@ PERF_TEST_P_(OptFlowLKForPyrPerfTest, TestPerformance) } // Comparison ////////////////////////////////////////////////////////////// - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); SANITY_CHECK_NOTHING(); } @@ -147,7 +147,7 @@ PERF_TEST_P_(BuildPyr_CalcOptFlow_PipelinePerfTest, TestPerformance) } // Comparison ////////////////////////////////////////////////////////////// - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); SANITY_CHECK_NOTHING(); } diff --git a/modules/gapi/test/common/gapi_core_tests_inl.hpp b/modules/gapi/test/common/gapi_core_tests_inl.hpp index 0e2d5ad..2a34fbe 100644 --- a/modules/gapi/test/common/gapi_core_tests_inl.hpp +++ b/modules/gapi/test/common/gapi_core_tests_inl.hpp @@ -18,10 +18,10 @@ namespace opencv_test namespace { template -inline bool compareVectorsAbsExact(const std::vector& outOCV, - const std::vector& outGAPI) +inline bool compareVectorsAbsExact(const std::vector& outGAPI, + const std::vector& outOCV) { - return AbsExactVector().to_compare_f()(outOCV, outGAPI); + return AbsExactVector().to_compare_f()(outGAPI, outOCV); } } diff --git a/modules/gapi/test/common/gapi_video_tests_common.hpp b/modules/gapi/test/common/gapi_video_tests_common.hpp index da26aa0..29a27a5 100644 --- a/modules/gapi/test/common/gapi_video_tests_common.hpp +++ b/modules/gapi/test/common/gapi_video_tests_common.hpp @@ -390,26 +390,26 @@ inline GComputation runOCVnGAPIOptFlowPipeline(TestFunctional&, #endif // HAVE_OPENCV_VIDEO -inline void compareOutputPyramids(const BuildOpticalFlowPyramidTestOutput& outOCV, - const BuildOpticalFlowPyramidTestOutput& outGAPI) +inline void compareOutputPyramids(const BuildOpticalFlowPyramidTestOutput& outGAPI, + const BuildOpticalFlowPyramidTestOutput& outOCV) { GAPI_Assert(outGAPI.maxLevel == outOCV.maxLevel); GAPI_Assert(outOCV.maxLevel >= 0); size_t maxLevel = static_cast(outOCV.maxLevel); for (size_t i = 0; i <= maxLevel; i++) { - EXPECT_TRUE(AbsExact().to_compare_f()(outOCV.pyramid[i], outGAPI.pyramid[i])); + EXPECT_TRUE(AbsExact().to_compare_f()(outGAPI.pyramid[i], outOCV.pyramid[i])); } } template -inline bool compareVectorsAbsExactForOptFlow(std::vector outOCV, std::vector outGAPI) +inline bool compareVectorsAbsExactForOptFlow(std::vector outGAPI, std::vector outOCV) { - return AbsExactVector().to_compare_f()(outOCV, outGAPI); + return AbsExactVector().to_compare_f()(outGAPI, outOCV); } -inline void compareOutputsOptFlow(const OptFlowLKTestOutput& outOCV, - const OptFlowLKTestOutput& outGAPI) +inline void compareOutputsOptFlow(const OptFlowLKTestOutput& outGAPI, + const OptFlowLKTestOutput& outOCV) { EXPECT_TRUE(compareVectorsAbsExactForOptFlow(outGAPI.nextPoints, outOCV.nextPoints)); EXPECT_TRUE(compareVectorsAbsExactForOptFlow(outGAPI.statuses, outOCV.statuses)); diff --git a/modules/gapi/test/common/gapi_video_tests_inl.hpp b/modules/gapi/test/common/gapi_video_tests_inl.hpp index 627c654..099fb6a 100644 --- a/modules/gapi/test/common/gapi_video_tests_inl.hpp +++ b/modules/gapi/test/common/gapi_video_tests_inl.hpp @@ -27,7 +27,7 @@ TEST_P(BuildOptFlowPyramidTest, AccuracyTest) runOCVnGAPIBuildOptFlowPyramid(*this, params, outOCV, outGAPI); - compareOutputPyramids(outOCV, outGAPI); + compareOutputPyramids(outGAPI, outOCV); } TEST_P(OptFlowLKTest, AccuracyTest) @@ -44,7 +44,7 @@ TEST_P(OptFlowLKTest, AccuracyTest) runOCVnGAPIOptFlowLK(*this, inPts, params, outOCV, outGAPI); - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); } TEST_P(OptFlowLKTestForPyr, AccuracyTest) @@ -63,7 +63,7 @@ TEST_P(OptFlowLKTestForPyr, AccuracyTest) runOCVnGAPIOptFlowLKForPyr(*this, in, params, withDeriv, outOCV, outGAPI); - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); } TEST_P(BuildPyr_CalcOptFlow_PipelineTest, AccuracyTest) @@ -86,7 +86,7 @@ TEST_P(BuildPyr_CalcOptFlow_PipelineTest, AccuracyTest) runOCVnGAPIOptFlowPipeline(*this, params, outOCV, outGAPI, inPts); - compareOutputsOptFlow(outOCV, outGAPI); + compareOutputsOptFlow(outGAPI, outOCV); } #ifdef HAVE_OPENCV_VIDEO -- 2.7.4