diff --git a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf index c4702dbfdbdde85e05ed73e41b21524403027073..f180b145e45b953398b3df775d38064993e33ae8 100644 --- a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf +++ b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf @@ -1,10 +1,11 @@ #JSGF V1.0; grammar ToBI_GPRS; -public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi]; +public <task> = [tobi] [(would | could) you] [please] <command> | [(would | could) you] <command> [please] [tobi] | [tobi] [(would | could) you] <command> [please] | [(would | could) you] [please] <command> [tobi]; <command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>; <bring_command> = <bringVerb> [<person>] [<article>] <grab_object> [from | into | to] [<article>] [<location> | <person>]; +<bringFromTo_command> = <bringVerb> ([<article>] <grab_object> | this) from <location> [to | into] <second_location>; <goto_command> = <gotoVerb> <preposition> <location>; <follow_command> = <followVerb> <person>; <find_command> = <findVerb> [<article>] (<grab_object> | <person>) [in <location>]; @@ -30,6 +31,8 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi]; <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere; +<second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere; + <appliance_class> = stove | sink | fridge | tv_counter; <shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet; <seat_class> = <seating_class>;