diff --git a/modules/objdetect/test/test_arucodetection.cpp b/modules/objdetect/test/test_arucodetection.cpp index aee147c58f..5d20cd4fd3 100644 --- a/modules/objdetect/test/test_arucodetection.cpp +++ b/modules/objdetect/test/test_arucodetection.cpp @@ -247,7 +247,7 @@ void CV_ArucoDetectionPerspective::run(int) { aruco::ArucoDetector detector(aruco::getPredefinedDictionary(aruco::DICT_6X6_250), params); // detect from different positions - for(double distance = 0.1; distance < 0.7; distance += 0.2) { + for(double distance : {0.1, 0.3, 0.5, 0.7}) { for(int pitch = 0; pitch < 360; pitch += (distance == 0.1? 60:180)) { for(int yaw = 70; yaw <= 120; yaw += 40){ int currentId = iter % 250; diff --git a/modules/objdetect/test/test_boarddetection.cpp b/modules/objdetect/test/test_boarddetection.cpp index d3859920fc..ed940069fb 100644 --- a/modules/objdetect/test/test_boarddetection.cpp +++ b/modules/objdetect/test/test_boarddetection.cpp @@ -51,7 +51,7 @@ void CV_ArucoBoardPose::run(int) { aruco::DetectorParameters detectorParameters = detector.getDetectorParameters(); // for different perspectives - for(double distance = 0.2; distance <= 0.4; distance += 0.15) { + for(double distance : {0.2, 0.35}) { for(int yaw = -55; yaw <= 50; yaw += 25) { for(int pitch = -55; pitch <= 50; pitch += 25) { vector tmpIds; @@ -162,7 +162,7 @@ void CV_ArucoRefine::run(int) { aruco::DetectorParameters detectorParameters = detector.getDetectorParameters(); // for different perspectives - for(double distance = 0.2; distance <= 0.4; distance += 0.2) { + for(double distance : {0.2, 0.4}) { for(int yaw = -60; yaw < 60; yaw += 30) { for(int pitch = -60; pitch <= 60; pitch += 30) { aruco::GridBoard gridboard(Size(3, 3), 0.02f, 0.005f, detector.getDictionary()); diff --git a/modules/objdetect/test/test_charucodetection.cpp b/modules/objdetect/test/test_charucodetection.cpp index ef044c893b..63b28d8e5f 100644 --- a/modules/objdetect/test/test_charucodetection.cpp +++ b/modules/objdetect/test/test_charucodetection.cpp @@ -109,7 +109,7 @@ void CV_CharucoDetection::run(int) { Mat distCoeffs(5, 1, CV_64FC1, Scalar::all(0)); // for different perspectives - for(double distance = 0.2; distance <= 0.4; distance += 0.2) { + for(double distance : {0.2, 0.4}) { for(int yaw = -55; yaw <= 50; yaw += 25) { for(int pitch = -55; pitch <= 50; pitch += 25) { @@ -213,7 +213,7 @@ void CV_CharucoPoseEstimation::run(int) { Mat distCoeffs(5, 1, CV_64FC1, Scalar::all(0)); // for different perspectives - for(double distance = 0.2; distance <= 0.3; distance += 0.1) { + for(double distance : {0.2, 0.25}) { for(int yaw = -55; yaw <= 50; yaw += 25) { for(int pitch = -55; pitch <= 50; pitch += 25) { @@ -332,7 +332,7 @@ void CV_CharucoDiamondDetection::run(int) { detector.setCharucoParameters(charucoParameters); // for different perspectives - for(double distance = 0.2; distance <= 0.3; distance += 0.1) { + for(double distance : {0.2, 0.22}) { for(int yaw = -50; yaw <= 50; yaw += 25) { for(int pitch = -50; pitch <= 50; pitch += 25) {