Skip to content

Commit a9e850a

Browse files
committed
End of 9/6 breakfast push
1 parent 8f3fb36 commit a9e850a

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

ada_feeding/config/ada_feeding_action_servers_custom.yaml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ ada_feeding_action_servers:
33
ros__parameters:
44
bed_side_table_1:
55
AcquireFood.tree_kwargs.resting_joint_positions:
6-
- -2.3098698682948524
7-
- 3.8010784248610583
8-
- 1.0663586623445815
9-
- -1.065310242402444
10-
- -1.617327609992979
11-
- 0.6628209810624257
6+
- -1.9742708245801905
7+
- 4.351335975603268
8+
- 2.402486621524538
9+
- -1.4118327739602847
10+
- -1.3491792461550807
11+
- 1.540612458474102
1212
MoveAbovePlate.tree_kwargs.joint_positions:
1313
- -1.7328340996338412
1414
- 3.736167069083685
@@ -19,39 +19,39 @@ ada_feeding_action_servers:
1919
MoveFromMouth.tree_kwargs.linear_speed_near_mouth: 0.08
2020
MoveFromMouth.tree_kwargs.max_linear_speed_to_staging_configuration: 0.15
2121
MoveFromMouth.tree_kwargs.staging_configuration_position:
22-
- -0.47929521732544705
23-
- -0.26231768456047105
24-
- 0.1742878774263848
22+
- -0.6109420738668799
23+
- -0.24799759167785157
24+
- 0.0942584547149716
2525
MoveFromMouth.tree_kwargs.staging_configuration_quat_xyzw:
26-
- 0.184862034899018
27-
- -0.7378718130938825
28-
- -0.5805804120742961
29-
- 0.2903404908210032
26+
- 0.2621832250631512
27+
- -0.6907568951627083
28+
- -0.5983303390024652
29+
- 0.31002527914648387
3030
MoveToMouth.tree_kwargs.linear_speed_near_mouth: 0.06
3131
MoveToMouth.tree_kwargs.max_linear_speed: 0.14
3232
MoveToMouth.tree_kwargs.plan_distance_from_mouth:
3333
- 0.03
3434
- 0.0
3535
- -0.01
3636
MoveToRestingPosition.tree_kwargs.goal_configuration:
37-
- -2.3098698682948524
38-
- 3.8010784248610583
39-
- 1.0663586623445815
40-
- -1.065310242402444
41-
- -1.617327609992979
42-
- 0.6628209810624257
37+
- -1.9742708245801905
38+
- 4.351335975603268
39+
- 2.402486621524538
40+
- -1.4118327739602847
41+
- -1.3491792461550807
42+
- 1.540612458474102
4343
MoveToStagingConfiguration.tree_kwargs.goal_configuration:
44-
- -1.183331421902614
45-
- 4.2885399686797445
46-
- 2.1657695506620276
47-
- -1.104379348226125
48-
- -2.363773314022492
49-
- 1.5785932635183215
44+
- -1.0047984287458824
45+
- 4.508188973273992
46+
- 2.2923571872826005
47+
- -1.1029737318027815
48+
- -1.9923925705337435
49+
- 1.4542831622619845
5050
planning_scene_namespace_to_use: bedside_90
5151
custom_namespaces:
5252
- bed_side_table_1
5353
- wheelchair_side_table_1
54-
namespace_to_use: bed_side_table_1
54+
namespace_to_use: wheelchair_side_table_1
5555
wheelchair_side_table_1:
5656
AcquireFood.tree_kwargs.resting_joint_positions:
5757
- -0.8280291806000825
@@ -61,21 +61,21 @@ ada_feeding_action_servers:
6161
- -2.0505759824492493
6262
- -2.372504753972425
6363
MoveAbovePlate.tree_kwargs.joint_positions:
64-
- -0.5770869679329681
65-
- 3.171525785293957
66-
- 1.6737963456406377
67-
- -8.70344133844546
68-
- 4.307685700072433
69-
- 4.030485518005465
64+
- 6.287224789921019
65+
- 3.2078419814988224
66+
- 1.7965574192489302
67+
- -2.434146813195618
68+
- -2.044120213650788
69+
- -3.4778364486043634
7070
MoveFromMouth.tree_kwargs.staging_configuration_position:
71-
- -0.03253809815928135
72-
- 0.003391738416497574
73-
- 0.6737637286360625
71+
- -0.04176333829204201
72+
- -0.013361840990676293
73+
- 0.6550329967835355
7474
MoveFromMouth.tree_kwargs.staging_configuration_quat_xyzw:
75-
- 0.24354785741083615
76-
- 0.6469348048158075
77-
- 0.6556294915485885
78-
- 0.30382522818269014
75+
- 0.20371659964371583
76+
- 0.5466933816006899
77+
- 0.7438886692841525
78+
- 0.32596862004533184
7979
MoveToRestingPosition.tree_kwargs.goal_configuration:
8080
- -0.8280291806000825
8181
- 4.496595700416659
@@ -84,10 +84,10 @@ ada_feeding_action_servers:
8484
- -2.0505759824492493
8585
- -2.372504753972425
8686
MoveToStagingConfiguration.tree_kwargs.goal_configuration:
87-
- -0.8280291806000825
88-
- 4.496595700416659
89-
- 4.380693065563648
90-
- -5.540779085891504
91-
- -2.0505759824492493
92-
- -2.372504753972425
87+
- -0.8868827104248798
88+
- 4.783664758535134
89+
- 4.740997722078757
90+
- -5.73581635411373
91+
- -1.5646135320081687
92+
- -2.6207236181088254
9393
planning_scene_namespace_to_use: seated_90

start.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
)
6565
parser.add_argument(
6666
"--policy",
67-
default="linucb_noposthoc",
67+
default="constant",
6868
help=(
6969
"`constant`, `color`, `random`, `random_noposthoc`, `greedy`, `greedy_noposthoc`, "
7070
"`egreedy`, `egreedy_noposthoc`, `linucb`, or `linucb_noposthoc` (default `constant`). "
@@ -291,7 +291,7 @@ async def main(args: argparse.Namespace, pwd: str) -> None:
291291
"sudo ./src/ada_feeding/configure_lovelace.sh",
292292
(
293293
"ros2 launch ada_feeding ada_feeding_launch.xml "
294-
f"use_estop:={'false' if args.dev else 'true'} run_web_bridge:=false policy:={args.policy} action:=0"
294+
f"use_estop:={'false' if args.dev else 'true'} run_web_bridge:=false policy:={args.policy} action:=1"
295295
),
296296
],
297297
"browser": [

0 commit comments

Comments
 (0)