diff --git a/source/armarx/navigation/algorithms/astar/Planner2D.cpp b/source/armarx/navigation/algorithms/astar/Planner2D.cpp index 05e3e9be6f5486f1de7ba8cf50db84d564d2255a..73f1219a3c4fd8a7ea39fd5e6cc253a4d9b698bb 100644 --- a/source/armarx/navigation/algorithms/astar/Planner2D.cpp +++ b/source/armarx/navigation/algorithms/astar/Planner2D.cpp @@ -4,6 +4,7 @@ #include <cmath> #include <VirtualRobot/CollisionDetection/CollisionModel.h> +#include "ArmarXCore/core/logging/Logging.h" namespace armarx::navigation::algorithm::astar { @@ -71,7 +72,7 @@ namespace armarx::navigation::algorithm::astar { if (!hasParameter(s)) { - std::cout << "Warning, parameter " << s << " not set, returning 0" << std::endl; + ARMARX_WARNING << "Parameter " << s << " not set, returning 0"; return 0.0f; } return parameters[s]; diff --git a/source/armarx/navigation/global_planning/AStar.cpp b/source/armarx/navigation/global_planning/AStar.cpp index 6765a9088091820bb2b407c59fb84da69c9f2a96..276f1f3acbf60f4ea7c44c7723fa624ee31d498a 100644 --- a/source/armarx/navigation/global_planning/AStar.cpp +++ b/source/armarx/navigation/global_planning/AStar.cpp @@ -235,8 +235,8 @@ namespace armarx::navigation::global_planning smoothPlan.pop_back(); ARMARX_TRACE; - auto trajectory = - core::GlobalTrajectory::FromPath(start, conv::to3D(smoothPlan), goal, params.linearVelocity); + auto trajectory = core::GlobalTrajectory::FromPath( + start, conv::to3D(smoothPlan), goal, params.linearVelocity); // TODO(fabian.reister): resampling of trajectory @@ -262,8 +262,8 @@ namespace armarx::navigation::global_planning } } - ARMARX_IMPORTANT << "Resampled trajectory contains " << resampledTrajectory->points().size() - << " points"; + ARMARX_VERBOSE << "Resampled trajectory contains " << resampledTrajectory->points().size() + << " points"; resampledTrajectory->setMaxVelocity(params.linearVelocity); diff --git a/source/armarx/navigation/global_planning/SPFA.cpp b/source/armarx/navigation/global_planning/SPFA.cpp index 9f309e544aab1b38327fd06b0307b987857f99fc..17b1aaae7c201c19f878180b671e40bbf85bb3b0 100644 --- a/source/armarx/navigation/global_planning/SPFA.cpp +++ b/source/armarx/navigation/global_planning/SPFA.cpp @@ -94,8 +94,8 @@ namespace armarx::navigation::global_planning ARMARX_CHECK(scene.staticScene.has_value()); ARMARX_CHECK(scene.staticScene->distanceToObstaclesCostmap.has_value()); - algorithms::spfa::ShortestPathFasterAlgorithm planner(*scene.staticScene->distanceToObstaclesCostmap, - spfaParams); + algorithms::spfa::ShortestPathFasterAlgorithm planner( + *scene.staticScene->distanceToObstaclesCostmap, spfaParams); const Eigen::Vector2f goalPos = conv::to2D(goal.translation()); @@ -158,7 +158,8 @@ namespace armarx::navigation::global_planning // smoothPlan.pop_back(); ARMARX_TRACE; - auto trajectory = core::GlobalTrajectory::FromPath(start, wpts, goal, params.linearVelocity); + auto trajectory = + core::GlobalTrajectory::FromPath(start, wpts, goal, params.linearVelocity); // TODO(fabian.reister): resampling of trajectory @@ -183,8 +184,8 @@ namespace armarx::navigation::global_planning resampledTrajectory = trajectory; } - ARMARX_IMPORTANT << "Resampled trajectory contains " << resampledTrajectory->points().size() - << " points"; + ARMARX_VERBOSE << "Resampled trajectory contains " << resampledTrajectory->points().size() + << " points"; resampledTrajectory->setMaxVelocity(params.linearVelocity); diff --git a/source/armarx/navigation/global_planning/optimization/OrientationOptimizer.cpp b/source/armarx/navigation/global_planning/optimization/OrientationOptimizer.cpp index 94a42162c09f6ef52338f1e1b53356c65c2d9235..206bc90ba6d956c9cf0b405ff2ba1fd679406671 100644 --- a/source/armarx/navigation/global_planning/optimization/OrientationOptimizer.cpp +++ b/source/armarx/navigation/global_planning/optimization/OrientationOptimizer.cpp @@ -192,7 +192,7 @@ namespace armarx::navigation::global_planning::optimization // Run the solver! ceres::Solver::Options options; options.linear_solver_type = ceres::DENSE_QR; - options.minimizer_progress_to_stdout = true; + options.minimizer_progress_to_stdout = false; options.max_num_iterations = 100; options.function_tolerance = 0.01;