Skip to content

Commit

Permalink
DOC TRIV: delete trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
slivingston committed Apr 29, 2016
1 parent edab7b2 commit 280135a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/usersguide/dubins_traffic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ vehicles, also known as e-agents (where ``e'' abbreviates ``environment''). ::

python $FMRBENCHMARK/domains/dubins_traffic/trial-runner.py -f mydata.json $(rospack find dubins_traffic_utils)/examples/trialsconf/mc-small-4grid-agents2.json

This will cause trial data to be saved to the file ``mydata.json`` in the local directory from where the above command is executed.
This will cause trial data to be saved to the file ``mydata.json`` in the local directory from where the above command is executed.

The Gazebo server is launched without a GUI frontend, which is also known as
running headless.
running headless.
A local viewer can be launched using ::

gzclient
Expand Down
11 changes: 11 additions & 0 deletions domains/dubins_traffic/dubins_traffic_utils/include/roadnet.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,17 @@ double RoadNetwork::get_mindist( size_t idx, double x, double y ) const
Eigen::Vector4d road = mapped_segment( idx );
Eigen::Vector2d pt( x, y );
return ((road.segment<2>(0) + road.segment<2>(2))/2.0 - pt).norm();
// road(2) -= road(0);
// road(3) -= road(1);
// pt -= road.segment<2>(0);
// if (road.segment<2>(2).dot( pt ) < 0) {
// return pt.norm();
// } else if (pt.dot( road.segment<2>(2) - pt ) < 0) {
// return (road.segment<2>(2) - pt).norm();
// } else {
// Eigen::Vector2d unitv = road.segment<2>(2)/road.segment<2>(2).norm();
// return (pt - pt.dot( unitv )*unitv).norm();
// }
}

std::string RoadNetwork::get_segment_str( size_t idx ) const
Expand Down

0 comments on commit 280135a

Please sign in to comment.