Skip to content
Snippets Groups Projects
Commit 1a4eaa40 authored by Fabian Reister's avatar Fabian Reister
Browse files

reduced verbosity

parent 7bc679d8
No related branches found
No related tags found
1 merge request!28Draft: Dev -> Main
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <cmath> #include <cmath>
#include <VirtualRobot/CollisionDetection/CollisionModel.h> #include <VirtualRobot/CollisionDetection/CollisionModel.h>
#include "ArmarXCore/core/logging/Logging.h"
namespace armarx::navigation::algorithm::astar namespace armarx::navigation::algorithm::astar
{ {
...@@ -71,7 +72,7 @@ namespace armarx::navigation::algorithm::astar ...@@ -71,7 +72,7 @@ namespace armarx::navigation::algorithm::astar
{ {
if (!hasParameter(s)) 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 0.0f;
} }
return parameters[s]; return parameters[s];
......
...@@ -235,8 +235,8 @@ namespace armarx::navigation::global_planning ...@@ -235,8 +235,8 @@ namespace armarx::navigation::global_planning
smoothPlan.pop_back(); smoothPlan.pop_back();
ARMARX_TRACE; ARMARX_TRACE;
auto trajectory = auto trajectory = core::GlobalTrajectory::FromPath(
core::GlobalTrajectory::FromPath(start, conv::to3D(smoothPlan), goal, params.linearVelocity); start, conv::to3D(smoothPlan), goal, params.linearVelocity);
// TODO(fabian.reister): resampling of trajectory // TODO(fabian.reister): resampling of trajectory
...@@ -262,8 +262,8 @@ namespace armarx::navigation::global_planning ...@@ -262,8 +262,8 @@ namespace armarx::navigation::global_planning
} }
} }
ARMARX_IMPORTANT << "Resampled trajectory contains " << resampledTrajectory->points().size() ARMARX_VERBOSE << "Resampled trajectory contains " << resampledTrajectory->points().size()
<< " points"; << " points";
resampledTrajectory->setMaxVelocity(params.linearVelocity); resampledTrajectory->setMaxVelocity(params.linearVelocity);
......
...@@ -94,8 +94,8 @@ namespace armarx::navigation::global_planning ...@@ -94,8 +94,8 @@ namespace armarx::navigation::global_planning
ARMARX_CHECK(scene.staticScene.has_value()); ARMARX_CHECK(scene.staticScene.has_value());
ARMARX_CHECK(scene.staticScene->distanceToObstaclesCostmap.has_value()); ARMARX_CHECK(scene.staticScene->distanceToObstaclesCostmap.has_value());
algorithms::spfa::ShortestPathFasterAlgorithm planner(*scene.staticScene->distanceToObstaclesCostmap, algorithms::spfa::ShortestPathFasterAlgorithm planner(
spfaParams); *scene.staticScene->distanceToObstaclesCostmap, spfaParams);
const Eigen::Vector2f goalPos = conv::to2D(goal.translation()); const Eigen::Vector2f goalPos = conv::to2D(goal.translation());
...@@ -158,7 +158,8 @@ namespace armarx::navigation::global_planning ...@@ -158,7 +158,8 @@ namespace armarx::navigation::global_planning
// smoothPlan.pop_back(); // smoothPlan.pop_back();
ARMARX_TRACE; 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 // TODO(fabian.reister): resampling of trajectory
...@@ -183,8 +184,8 @@ namespace armarx::navigation::global_planning ...@@ -183,8 +184,8 @@ namespace armarx::navigation::global_planning
resampledTrajectory = trajectory; resampledTrajectory = trajectory;
} }
ARMARX_IMPORTANT << "Resampled trajectory contains " << resampledTrajectory->points().size() ARMARX_VERBOSE << "Resampled trajectory contains " << resampledTrajectory->points().size()
<< " points"; << " points";
resampledTrajectory->setMaxVelocity(params.linearVelocity); resampledTrajectory->setMaxVelocity(params.linearVelocity);
......
...@@ -192,7 +192,7 @@ namespace armarx::navigation::global_planning::optimization ...@@ -192,7 +192,7 @@ namespace armarx::navigation::global_planning::optimization
// Run the solver! // Run the solver!
ceres::Solver::Options options; ceres::Solver::Options options;
options.linear_solver_type = ceres::DENSE_QR; 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.max_num_iterations = 100;
options.function_tolerance = 0.01; options.function_tolerance = 0.01;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment