diff --git a/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp b/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp index 3f0b6585a8bea6a195f4406799613a86b0561844..40e5d9aa6c9006701d6fadaa12d17586a1fd404f 100644 --- a/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp +++ b/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp @@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(fmodTest) { float center = (max + min) / 2; - float result = math::MathUtils::angleModX(value + offset, center); + float result = armarx::math::MathUtils::angleModX(value + offset, center); ARMARX_INFO << VAROUT(result) << " value: " << value + offset; check_close(result, value, 0.001); } diff --git a/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp b/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp index 579c35d2261efee083ba561e3bc5e35d56528b7b..ebb9b863d36e761e30551e3960404105986639cd 100644 --- a/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp +++ b/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp @@ -286,18 +286,18 @@ BOOST_AUTO_TEST_CASE(TrajectoryControllerTest) BOOST_AUTO_TEST_CASE(TrajectoryControllerUnfoldingTest) { - BOOST_CHECK_LT(std::abs(math::MathUtils::AngleDelta(1.5 * M_PI, 0.25 * M_PI) / M_PI + math::MathUtils::AngleDelta(0.25 * M_PI, 1.5 * M_PI) / M_PI), 0.001); + BOOST_CHECK_LT(std::abs(armarx::math::MathUtils::AngleDelta(1.5 * M_PI, 0.25 * M_PI) / M_PI + armarx::math::MathUtils::AngleDelta(0.25 * M_PI, 1.5 * M_PI) / M_PI), 0.001); Ice::FloatSeq waypoints = {3 * M_PI, 2.5 * M_PI, -2 * M_PI}; Ice::FloatSeq trajPoints; float currentPoint = 0.0f; float step = 1.f; for (auto waypoint : waypoints) { - int direction = math::MathUtils::Sign(waypoint - currentPoint); + int direction = armarx::math::MathUtils::Sign(waypoint - currentPoint); while (std::abs(currentPoint - waypoint) > step) { currentPoint += step * direction; - trajPoints.push_back(math::MathUtils::angleModPI(currentPoint)); + trajPoints.push_back(armarx::math::MathUtils::angleModPI(currentPoint)); } } // ARMARX_INFO << VAROUT(trajPoints);