Merge pull request #970 from tue-robotics/fix/common_knowledge

update common knowledge
tue-robotics · Dec 21, 2019 · 7f53a0a · 7f53a0a
2 parents af4335b + 57d6b3d
commit 7f53a0a
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/robocup_knowledge/src/robocup_knowledge/environments/robotics_testlabs/common.py b/robocup_knowledge/src/robocup_knowledge/environments/robotics_testlabs/common.py
@@ -9,21 +9,18 @@
 locations = [
     {'name': 'couch_table',   'room': 'livingroom', 'category': 'table',   'manipulation': 'yes'},
     {'name': 'dinner_table',  'room': 'livingroom', 'category': 'table',   'manipulation': 'yes'},
-    {'name': 'bar',           'room': 'livingroom', 'category': 'table',   'manipulation': 'yes'},
     {'name': 'bookcase',      'room': 'livingroom', 'category': 'shelf',   'manipulation': 'yes'},
+    {'name': 'panda_table',   'room': 'livingroom', 'category': 'table',   'manipulation': 'yes'},
 
     {'name': 'cabinet',       'room': 'kitchen',    'category': 'shelf',   'manipulation': 'yes'},
     {'name': 'trashbin',      'room': 'kitchen',    'category': 'utility', 'manipulation': 'no'},
-    {'name': 'plant',         'room': 'kitchen',    'category': 'plant',   'manipulation': 'no'},
+    {'name': 'couch',         'room': 'kitchen',    'category': 'utility', 'manipulation': 'no'},
 
-    {'name': 'bed',           'room': 'bedroom',    'category': 'seat',    'manipulation': 'yes'},
-    {'name': 'nightstand',    'room': 'bedroom',    'category': 'table',   'manipulation': 'yes'},
-
-    {'name': 'flight_case',   'room': 'workshop',   'category': 'table',   'manipulation': 'no'},
-    {'name': 'battery_table', 'room': 'workshop',   'category': 'table',   'manipulation': 'no'},
     {'name': 'workbench',     'room': 'workshop',   'category': 'table',   'manipulation': 'yes'},
 
-    {'name': 'hallway_table', 'room': 'hallway',    'category': 'table',   'manipulation': 'yes'}
+    {'name': 'hallway_table', 'room': 'hallway',    'category': 'table',   'manipulation': 'yes'},
+    {'name': 'bar',           'room': 'hallway',    'category': 'table',   'manipulation': 'yes'},
+    {'name': 'paperbin',      'room': 'hallway',    'category': 'utility', 'manipulation': 'no'}
 ]
 
 location_rooms = list(set([ o["room"] for o in locations ]))