updatet dictionary and grammar for gpsr

ps-grammar/gpsr/gpsr.jsgf

@@ -4,29 +4,28 @@ grammar ToBI_GPSR;
 public <task> = <location_task> | <item_task> | <interact_task>;
 
 
-<location_task> = <nav_commands> [the] [<locations>]  [<furniture>] [[(and | then)] <task>];
+<location_task> = <nav_commands> [the] <locations> [[(and | then)] <task>];
 
-<nav_commands> = ((move | go | navigate) to) | (get into) | from | exit | leave;
-<locations> = [the] (kitchen | bathroom | corridor | desk);
-<furniture> = shelf | ([dinner|kitchen] table) | bin | locker;
+<nav_commands> = (move to) | (go to) | (navigate to) | (get into) | from | exit | leave | (in the) | (at the);
+<locations> = cupboard | couchtable | cabinet | tv | couch | kitchencounter | stove | fridge |  sink | trashbin | bartable | small_table |  coathanger | bed | left_beside_table | right_beside_table | counter | left_bookcase | right_bookcase | dinnertable | desk | livingroom | kitchen | hall | bedroom | office;
 
 
 
 <item_task> = (<interact_item> | <move_item> | <transport_item> ) [[(and | then)] <task>];
 
 
-<interact_item> = <search_commands> [the] <items> [[and] (<move_item> | <item_destination>)];
+<interact_item> = <search_commands> (the | a) <items> [[and] ((<move_commands> [it | them]) | <item_destination>)];
 <search_commands> = identify | detect | find | count;
 
-<move_item> = <move_commands> (([the | this] <items>) | it | them );
+<move_item> = <move_commands> ([the | this] <items>);
 <move_commands> = get | take | grasp ;
 
-<transport_item> = [and] <transport_commands> [<pron>] [<items> | <person>] [<item_destination>];
-<transport_commands> = (bring | carry | retrieve) [<noname>];
-<item_destination> = [<noname>] [<pron>] [<locations>];
+<transport_item> = <transport_commands> ((it | them | this) | ([a | the | this] <items>) | ([it | this] [to] [the] <per>)) [<item_destination>];
+<transport_commands> = bring | carry | retrieve;
+<item_destination> = [in | at | to] [the] <locations>;
 
 
-<items> = [<pron>] (coffee | crackers | milk | chocolate | coke | sponge);
+<items> = [the | a] (coffee | crackers | milk | chocolate | coke | sponge);