Skip to content

Commit 2672231

Browse files
authored
Create Planner Benchmark, set planner to RRT* (#204)
* Switch default to RRT* * Switch default to Anytime Path Shortening w/ RRTConnect * [WIP] add planner benchmark * Finalized planner benchmark * Add timeout, improve logging * Run pre-commit * Revert to RRT*, percolate updated allowed planning time into AcquireFood
1 parent cdd0bb9 commit 2672231

9 files changed

+395
-6
lines changed

Diff for: ada_feeding/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ install(PROGRAMS
3636
scripts/ada_watchdog.py
3737
scripts/dummy_ft_sensor.py
3838
scripts/joint_state_latency.py
39+
scripts/planner_benchmark.py
3940
scripts/robot_state_service.py
4041
scripts/save_image.py
4142
DESTINATION lib/${PROJECT_NAME}

Diff for: ada_feeding/ada_feeding/behaviors/moveit2/moveit2_plan.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def blackboard_inputs(
9393
] = None,
9494
ignore_violated_path_constraints: Union[BlackboardKey, bool] = False,
9595
pipeline_id: Union[BlackboardKey, str] = "ompl",
96-
planner_id: Union[BlackboardKey, str] = "RRTConnectkConfigDefault",
96+
planner_id: Union[BlackboardKey, str] = "RRTstarkConfigDefault",
9797
allowed_planning_time: Union[BlackboardKey, float] = 0.5,
9898
max_velocity_scale: Union[BlackboardKey, float] = 0.1,
9999
max_acceleration_scale: Union[BlackboardKey, float] = 0.1,
@@ -538,6 +538,7 @@ def get_path_len(
538538
for point in path.points:
539539
curr_pos = np.array(point.positions)
540540
seg_len = np.abs(curr_pos - prev_pos)
541+
seg_len = np.minimum(seg_len, 2 * np.pi - seg_len)
541542
if j6_i is not None:
542543
j6_len = seg_len[j6_i]
543544
seg_len[j6_i] = 0.0

Diff for: ada_feeding/ada_feeding/trees/acquire_food_tree.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(
9292
max_velocity_scaling_to_resting_configuration: Optional[float] = 0.8,
9393
max_acceleration_scaling_to_resting_configuration: Optional[float] = 0.8,
9494
pickle_goal_path: Optional[str] = None,
95-
allowed_planning_time_for_move_above: float = 2.0,
95+
allowed_planning_time_for_move_above: float = 0.5,
9696
allowed_planning_time_for_move_into: float = 0.5,
9797
allowed_planning_time_to_resting_configuration: float = 0.5,
9898
allowed_planning_time_for_recovery: float = 0.5,

Diff for: ada_feeding/ada_feeding/trees/move_from_mouth_tree.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(
6969
orientation_constraint_to_end_configuration_tolerances: Optional[
7070
List[float]
7171
] = None,
72-
planner_id: str = "RRTConnectkConfigDefault",
72+
planner_id: str = "RRTstarkConfigDefault",
7373
allowed_planning_time_to_staging_configuration: float = 0.5,
7474
allowed_planning_time_to_end_configuration: float = 0.5,
7575
max_linear_speed_to_staging_configuration: float = 0.05,

Diff for: ada_feeding/ada_feeding/trees/move_to_configuration_with_ft_thresholds_tree.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848
tolerance_joint: float = 0.001,
4949
weight_joint: float = 1.0,
5050
pipeline_id: str = "ompl",
51-
planner_id: str = "RRTConnectkConfigDefault",
51+
planner_id: str = "RRTstarkConfigDefault",
5252
allowed_planning_time: float = 0.5,
5353
max_velocity_scaling_factor: float = 0.1,
5454
max_acceleration_scaling_factor: float = 0.1,

Diff for: ada_feeding/ada_feeding/trees/move_to_configuration_with_wheelchair_wall_tree.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(
6161
goal_configuration_tolerance: float = 0.001,
6262
orientation_constraint_quaternion: Optional[List[float]] = None,
6363
orientation_constraint_tolerances: Optional[List[float]] = None,
64-
planner_id: str = "RRTConnectkConfigDefault",
64+
planner_id: str = "RRTstarkConfigDefault",
6565
allowed_planning_time: float = 0.5,
6666
max_velocity_scaling_factor: float = 0.1,
6767
force_threshold: float = 4.0,

Diff for: ada_feeding/ada_feeding/trees/move_to_pose_tree.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(
5858
cartesian_max_step: float = 0.0025,
5959
cartesian_fraction_threshold: float = 0.0,
6060
pipeline_id: str = "ompl",
61-
planner_id: str = "RRTConnectkConfigDefault",
61+
planner_id: str = "RRTstarkConfigDefault",
6262
allowed_planning_time: float = 0.5,
6363
max_velocity_scaling_factor: float = 0.1,
6464
max_acceleration_scaling_factor: float = 0.1,

Diff for: ada_feeding/data/.placeholder

Whitespace-only changes.

0 commit comments

Comments
 (0)