Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding additional SmacPlanner tests #2036

Merged
merged 4 commits into from
Oct 12, 2020
Merged

Adding additional SmacPlanner tests #2036

merged 4 commits into from
Oct 12, 2020

Conversation

SteveMacenski
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Oct 12, 2020

Codecov Report

Merging #2036 into main will increase coverage by 0.24%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2036      +/-   ##
==========================================
+ Coverage   81.36%   81.61%   +0.24%     
==========================================
  Files         243      243              
  Lines       11790    11790              
==========================================
+ Hits         9593     9622      +29     
+ Misses       2197     2168      -29     
Flag Coverage Δ
#project 81.61% <0.00%> (+0.24%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
smac_planner/include/smac_planner/a_star.hpp 20.00% <ø> (ø)
...anner/include/smac_planner/costmap_downsampler.hpp 100.00% <ø> (ø)
smac_planner/include/smac_planner/node_basic.hpp 33.33% <0.00%> (ø)
nav2_recoveries/plugins/spin.cpp 88.00% <0.00%> (-5.34%) ⬇️
...av2_costmap_2d/src/footprint_collision_checker.cpp 88.09% <0.00%> (-2.39%) ⬇️
nav2_controller/src/nav2_controller.cpp 89.23% <0.00%> (-0.45%) ⬇️
nav2_navfn_planner/src/navfn.cpp 91.34% <0.00%> (+0.48%) ⬆️
smac_planner/src/a_star.cpp 93.56% <0.00%> (+4.72%) ⬆️
smac_planner/include/smac_planner/node_2d.hpp 92.85% <0.00%> (+7.14%) ⬆️
smac_planner/src/costmap_downsampler.cpp 94.00% <0.00%> (+10.00%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a71a5f2...ed65b45. Read the comment docs.

@SteveMacenski SteveMacenski merged commit 3ec1454 into main Oct 12, 2020
@SteveMacenski SteveMacenski deleted the smac_tests branch October 12, 2020 21:58
SteveMacenski added a commit that referenced this pull request Oct 13, 2020
…tor (#2032)

* Added a test with controller_frequency of 0. The controller should get a default frequency of 20.

* Add kinematic parameters test (#2031)

* Add kinematic parameters tests.

* Solve uncrustify error.

* [WIP fixing CI] changing gazebo base to my fork for testing (#2034)

* changing gazebo base to my fork for testing

* adding buffer header per TF2 API changes

* moving header to header

* Adding additional SmacPlanner tests (#2036)

* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions

* adding additional constants and smoothers tests (#2038)

* Added tests for different controller frequencies.

* Added a test with controller_frequency of 0. The controller should get a default frequency of 20.

* Added tests for different controller frequencies.

* Solve uncrustify issue.

Co-authored-by: Steve Macenski <[email protected]>
ryan-sandzimier pushed a commit to ryan-sandzimier/navigation2 that referenced this pull request Nov 4, 2020
* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions
ryan-sandzimier pushed a commit to ryan-sandzimier/navigation2 that referenced this pull request Nov 4, 2020
* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions
SteveMacenski added a commit that referenced this pull request Nov 4, 2020
* Fix memory leak (#1900)

* Fix memory leak in nav2_recoveries

* Fix recovery server memory leak (better interface)

* Fix costmap2d memory leak

* Fix nav2_navfn_planner memory leak

* Fix planner server and navfn planner memory leak

* Make all rclcpp::Node::SharedPtr argument passing const

* Fix controller server and DWB plugins memory leak

* Minor fixes

* Fix formatting errors

* Change all plugin interfaces to use weak_ptr intead of shared_ptr to parent rclcpp::Node

* Convert all SharedPtr to WeakPtr

* Check shared_ptr after lock and before dereferencing

* Smac/Hybrid-A* planner (#2021)

* adding smac_planner to navigation2 metapackage

* adding params to metapackage

* update config files

* adding navfn benchmark testing

* updates to costmap_2d for flexility

* update planner API for new changes

* adding ompl to underlay because ros2 master doesn't contain the rosdep key

* patching templated footprint collision checker

* fix typo

* updating readme config file

* Analytic expansion (#43)

* Use OMPL to generate heuristics

The calculation is run at every planning cycle. It does not seem to slow down
the planner - the calculation time seems to be quick enough that the
improvement in graph expansion accounts for it.

* Use OMPL to calculate analytic solution when near goal

* Make angles multiples of the bin size to stop looping behaviour

* Uncrustify

* Use faster std::sqrt function

* Fix analytic path so that the collision checker has coordinates to check!

* Pre-allocate variables in analytic path expansion

* Rename typedef to NodeGetter to more accurately describe function

* Use distance rather than heuristic to determine when to perform analytic expansion

Also force the analytic expansion to run on first iteration in case path is trivial.

* Move the check for motion model into the main A* loop

* Add copyright notices

* Remove comment about relaxing node match tolerances

The analytic expansion removes the need for this.

* Correctly reset node coordinates when aborting from analytic expansion

* Move analytic expansion logic to separate function

* Uncrustify

* Remove unneeded call to get goal coordinates

* Fix the calculation of intervals in the analytic path

Reserve the number of candidate nodes we are expecting.
Base calculations on intervals rather than points - makes distances between nodes work properly.

* Rescale heuristic so that analytic expansions are based on distance

* Repeatedly split analytic path in half when checking for collision

* Add parameter to control rate of analytic expansion attempts

* Uncrustify

* Fix incorrect type in templated function

* Cpplint

* Revert "Repeatedly split analytic path in half when checking for collision"

This reverts commit 94d9ee0.

There was a marginal speed gain (perhaps!) and the splitting approach made
the code harder to understand and maintain.

* Uncrustify

* Add doxygen comments

* Add parameter description for analytic expansion ratio

* Set lower limit of 2 on number of iterations between analytic expansions

* Reduce expected number of iterations because of analytic completion

* Refactor analytic expansion ratio calcs to make logic easier to understand

* add readme color

* fix linting

* ceil from floor (and speed up)

* a few updates

* fix smac tests

* fixing smoother test

* remove cost check - to be readded at another time

* working last test from debug issues

* Update README.md

* Update README.md

* adding getUseRadius API doxygen

Co-authored-by: James Ward <[email protected]>

* Adding additional SmacPlanner tests (#2036)

* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions

* adding additional constants and smoothers tests (#2038)

* Revert "Fix memory leak (#1900)"

This reverts commit 681ccfa.

* Changed WeakPtr to SharedPtr for compatibility with Foxy

Co-authored-by: Sarthak Mittal <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>
Co-authored-by: James Ward <[email protected]>
ruffsl pushed a commit to ruffsl/navigation2 that referenced this pull request Jul 2, 2021
* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions
ruffsl pushed a commit to ruffsl/navigation2 that referenced this pull request Jul 2, 2021
…tor (ros-navigation#2032)

* Added a test with controller_frequency of 0. The controller should get a default frequency of 20.

* Add kinematic parameters test (ros-navigation#2031)

* Add kinematic parameters tests.

* Solve uncrustify error.

* [WIP fixing CI] changing gazebo base to my fork for testing (ros-navigation#2034)

* changing gazebo base to my fork for testing

* adding buffer header per TF2 API changes

* moving header to header

* Adding additional SmacPlanner tests (ros-navigation#2036)

* adding some more tests to smac_planner

* addtl smac tests

* remove unused functions

* adding additional constants and smoothers tests (ros-navigation#2038)

* Added tests for different controller frequencies.

* Added a test with controller_frequency of 0. The controller should get a default frequency of 20.

* Added tests for different controller frequencies.

* Solve uncrustify issue.

Co-authored-by: Steve Macenski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant