Merge pull request #310 from tue-robotics/fix/pickup-maps-to-pick-up-…

…action fix(gpsr): let pickup command map to a pick-up action
tue-robotics · Jun 6, 2017 · 837d387 · 837d387
2 parents 1ecfa00 + a8a6ee8
commit 837d387
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/robocup_knowledge/src/robocup_knowledge/environments/robotics_testlabs/challenge_gpsr.py b/robocup_knowledge/src/robocup_knowledge/environments/robotics_testlabs/challenge_gpsr.py
@@ -38,7 +38,7 @@
 V_GUIDE -> guide | escort | take | lead | accompany
 
 DET -> the | a | an | some
-MANIPULATION_AREA_DESCRIPTIONS -> on top of | at | in | on
+MANIPULATION_AREA_DESCRIPTIONS -> on top of | at | in | on | from
 """
 
 for room in common.location_rooms:
@@ -95,9 +95,9 @@
 ###############################################################################
 
 grammar += """
-V_PICKUP -> get | grasp | take | pick up
+V_PICKUP -> get | grasp | take | pick up | grab
 
-VP["action": "find", "object": {"type": X}, "location": {"id": Y}] -> V_PICKUP DET OBJECT_NAMES[X] MANIPULATION_AREA_LOCATIONS[Y]
+VP["action": "pick-up", "object": {"type": X}, "location": {"id": Y}] -> V_PICKUP DET OBJECT_NAMES[X] MANIPULATION_AREA_LOCATIONS[Y]
 """
 
 ###############################################################################