diff --git a/ps-grammar/cleanUp/cleanUp.jsgf b/ps-grammar/cleanUp/cleanUp.jsgf index b01bbe52fc5d472a2261a3bd90e99182d2b08048..eff33fb2585a1e7b935a3e9049334c10fa8ae1bd 100644 --- a/ps-grammar/cleanUp/cleanUp.jsgf +++ b/ps-grammar/cleanUp/cleanUp.jsgf @@ -4,4 +4,4 @@ public <task> = [tobi] [please] <command> [please] [tobi]; <command> = <cleanUp>; <cleanUp> = (clean | tidy) [up] [the] <rooms>; -<rooms> = kitchen | hallway | bedroom | living_room; +<rooms> = kitchen | hallway | bedroom | (living room); diff --git a/ps-grammar/cocktailparty/object.jsgf b/ps-grammar/cocktailparty/object.jsgf index 0d700eeb3ff38aaecaf559370901db43f3aa80dc..6afce5e3c4277e9e8244d82bf3fd2cee6961168f 100644 --- a/ps-grammar/cocktailparty/object.jsgf +++ b/ps-grammar/cocktailparty/object.jsgf @@ -3,7 +3,7 @@ grammar ToBI_object; public <statement> = <objectPhrase>; <objectPhrase> = [<verb>] [<personal_pronoun>] [<article>] <objects>; -<objects> = (apple) | (hair gel) | (cookies) | (coffee) | (beer); +<objects> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water; <personal_pronoun> = me; <verb> = bring | carry | retrieve | fetch | get | give; diff --git a/ps-grammar/commands/commands.jsgf b/ps-grammar/commands/commands.jsgf index 419ebb786ae43b97c2b7632142ccf757ff7f0540..446ff54e794b672a8adc98c7762f2aac9514ca03 100644 --- a/ps-grammar/commands/commands.jsgf +++ b/ps-grammar/commands/commands.jsgf @@ -3,11 +3,11 @@ grammar ToBI_shellgame; public <statement> = [tobi] [please] <command> [please] [tobi]; <command> = <introduce> | <abilities> | <play> | <follow> | <door> | <leave> | <finish> | <observe>; -<introduce> = introduce [yourself]; -<abilities> = tell your abilities | list your abilities; -<play> = let us play | lets play; -<follow> = follow [me]; -<door> = recognize [a] door; -<leave> = leave | go back | we are done; -<finish> = lets call it a day; -<observe> = (observe | start observing ); +<introduce> = (introduce [yourself]); +<abilities> = (tell your abilities) | (list your abilities); +<play> = (let us play) | (lets play); +<follow> = (follow [me]); +<door> = (recognize [a] door); +<leave> = leave | (go back) | (we are done); +<finish> = (lets call it a day); +<observe> = (observe) | (start observing ); diff --git a/ps-grammar/confirm/confirm.jsgf b/ps-grammar/confirm/confirm.jsgf index 5e90506a9c4fa9ce66980c4c44c34f0aff8d015d..3f5b9b73716214a8b841ff25d7680cbb69522cad 100644 --- a/ps-grammar/confirm/confirm.jsgf +++ b/ps-grammar/confirm/confirm.jsgf @@ -5,6 +5,6 @@ public <confirm> = <confirm_yes> | <confirm_no>; <confirm_yes> = <robot> <yes_words>; <confirm_no> = <robot> <no_words>; -<yes_words> = (yes | confirmed); +<yes_words> = (yes) | (confirmed); <no_words> = (no); -<robot> = (tobi | robot | biron); +<robot> = (tobi) | (robot) | (biron); diff --git a/ps-grammar/followMe/confirm.jsgf b/ps-grammar/followMe/confirm.jsgf index 99397ba3098e576f215c6f42e543c94c61f5d574..30e4fa8ede83ed9583ed0e14f7cb6b50cda7f89a 100644 --- a/ps-grammar/followMe/confirm.jsgf +++ b/ps-grammar/followMe/confirm.jsgf @@ -1,5 +1,5 @@ #JSGF V1.0; grammar ToBI_confirm; public <confirm> = [tobi] (<confirm_yes> | <confirm_no>) [tobi]; -<confirm_yes> = follow me |([please] yes [please]); +<confirm_yes> = follow me | ([please] yes [please]); <confirm_no> = no [thanks]; diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf index 4966811b652073c67e79fbaec251a6c0390307d6..4abcb8d77f7800a9fc1f9cd8f3301d2d32dcf1fc 100644 --- a/ps-grammar/gprs/gprs.jsgf +++ b/ps-grammar/gprs/gprs.jsgf @@ -6,14 +6,14 @@ public <task> = [<robot_name>] [(would | could) you] [please] <command> [please] <command> = <bring_command> | <goto_command> | <find_command> | <follow_command> | <cleanup_command> | <show_command> | <pointat_command>; -<bring_command> = (<bringVerb> [<person>] [<article>] <grab_object> [<preposition> [<article>] <location>] [(to|into) [<article>] <second_location>]) | (<bringVerb> [<article>] <person> <preposition> <article> <location>); -<goto_command> = <gotoVerb> <preposition> ([<article>] <location>); -<follow_command> = <followVerb> <person>; -<find_command> = <findVerb> [<article>] (<grab_object> | <person>) [in [<article>] <location>]; -<pointat_command> = <pointatVerb> [<article>] <location>; -<learn_command> = <learnVerb> [<article>] (<person> | <location>); -<cleanup_command> = <cleanupVerb> [<article> <room_class>]; -<show_command> = <showVerb> [<person>] (([<article>] <grab_object>) | ([the (path|way) to] [<article>] <location>)); +<bring_command> = (<bringVerb> [<person>] [<article>] <grab_object> [<preposition> [<article>] <location>] [((to|into) [<article>] <second_location>)]) | (<bringVerb> [<article>] <person> <preposition> <article> <location>); +<goto_command> = (<gotoVerb> <preposition> ([<article>] <location>)); +<follow_command> = (<followVerb> <person>); +<find_command> = (<findVerb> [<article>] (<grab_object> | <person>) [in [<article>] <location>]); +<pointat_command> = (<pointatVerb> [<article>] <location>); +<learn_command> = (<learnVerb> [<article>] (<person> | <location>)); +<cleanup_command> = (<cleanupVerb> [<article> <room_class>]); +<show_command> = (<showVerb> [<person>] (([<article>] <grab_object>)) | (([the (path|way) to] [<article>] <location>))); <bringVerb> = bring | carry | retrieve | fetch | get | give | put | attend | deliver | convey | gather | (pick up) | take | lead | grasp; <findVerb> = detect | find | (search [for]) | (check [for]) | acquire | attain | obtain | (look for); @@ -30,19 +30,19 @@ public <task> = [<robot_name>] [(would | could) you] [please] <command> [please] <grab_object> = <cleaning_class> | <drink_class> | <snack_class> | <food_class> | tool | (bathroom stuff) | cleaning_stuff | drinks | drink | snacks | snack | object | food | something | stuff | item | beverage | things; <cleaning_class> = brush | detergent | shampoo | sponge | toothpaste; -<drink_class> = (orange juice) | beer | cola | chocolate_milk | energy_drink | grape_juice | milk | water; -<snack_class> = chocolate_cookies | chips | biscuits | bread | pringles | (strawberry cookies); -<food_class> = baby_food | crackers | coffee | yeast | noodles | beans; +<drink_class> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water; +<snack_class> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies); +<food_class> = (baby food) | crackers | coffee | yeast | noodles | beans; <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <door_class> | <exit_class> | exit | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture; -<second_location> = <appliance_class> | <shelf_class> | <seat_class> | <room_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture; +<second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture; <appliance_class> = waste_bin | fridge | stove; <shelf_class> = bar | side_board | (right side_table) | (left side_table); <seat_class> = <seating_class>; <seating_class> = sofa | armchair | bed; -<table_class> = kitchen_table | hallway_table | dinner_table | couch_table ; +<table_class> = (kitchen table) | hallway_table | dinner_table | couch_table ; <door_class> = (room door); <room_class> = kitchen | living_room | bedroom | hallway; <exit_class> = (exit door) | (entry door); diff --git a/ps-grammar/location/location.jsgf b/ps-grammar/location/location.jsgf index 225266629611c9d566fd7f54dc0bee7bb13a8073..a204d1fbab61865d297bcee9182c49e879a2e58e 100644 --- a/ps-grammar/location/location.jsgf +++ b/ps-grammar/location/location.jsgf @@ -2,22 +2,22 @@ grammar ToBI_location; public <statement> = <locationPhrase> [please]; -<locationPhrase> = [<verb>] [<preposition>] [the | this] <location>; +<locationPhrase> = ([<verb>] [<preposition>]) [(the | this)] <location>; <verb> = go | search | learn | remember | memorize; <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <door_class> | <exit_class> | <everywhere_class>; -<appliance_class> = waste_bin | fridge | stove; -<shelf_class> = bar | side_board | (right side_table) | (left side_table); +<appliance_class> = (waste bin) | fridge | stove; +<shelf_class> = bar | (side board) | (right sidetable | (left sidetable); <seat_class> = <seating_class>; <seating_class> = sofa | armchair | bed; -<table_class> = kitchen_table | hallway_table | dinner_table | couch_table ; +<table_class> = (kitchen table) | (hallway table) | (dinner table) | (couch table) ; <door_class> = (room door); -<utensil_class> = trash_bin; +<utensil_class> = (trash bin); <exit_class> = (exit door) | (entry door); <everywhere_class> = everywhere; -<room_class> = kitchen | living_room | bedroom | hallway; +<room_class> = kitchen | (living room) | bedroom | hallway; <preposition> = into | (on [top of]) | in | ([next] to) | at | near | in | from; diff --git a/ps-grammar/object/object.jsgf b/ps-grammar/object/object.jsgf index f7c6bbf4a46dc295844a60ff2e1e4d2b548fac3b..22fe31488cf6d5badc9f1ff9c5d0f238c138df71 100644 --- a/ps-grammar/object/object.jsgf +++ b/ps-grammar/object/object.jsgf @@ -3,11 +3,11 @@ grammar ToBI_object; public <statement> = [<verb>] [<article>] <object> [please]; <object> = <grab_object>; -<grab_object> = <cleaning_class> | <drink_class> | <snack_class> | <food_class> | tool | (bathroom stuff) | cleaning_stuff | drinks | snacks | object | food | something | stuff | item | beverage | things; +<grab_object> = <cleaning_class> | <drink_class> | <snack_class> | <food_class> | tool | (bathroom stuff) | (cleaning stuff) | drinks | snacks | object | food | something | stuff | item | beverage | things; <cleaning_class> = brush | detergent | shampoo | sponge | toothpaste; -<drink_class> = (orange juice) | beer | cola | chocolate_milk | energy_drink | grape_juice | milk | water; -<snack_class> = chocolate_cookies | chips | biscuits | bread | pringles | (strawberry cookies); -<food_class> = baby_food | crackers | coffee | yeast | noodles | beans; +<drink_class> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water; +<snack_class> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies); +<food_class> = (baby food) | crackers | coffee | yeast | noodles | beans; diff --git a/ps-grammar/restaurant/ordering.jsgf b/ps-grammar/restaurant/ordering.jsgf index 005cd88eeea51aa97bafaa22b3b96add000fb554..855787cbf4aa42c1ee203cc61cb40db5de3b008c 100644 --- a/ps-grammar/restaurant/ordering.jsgf +++ b/ps-grammar/restaurant/ordering.jsgf @@ -9,5 +9,5 @@ public <restaurant> = [tobi] [please] bring <objects> to <deliveryLocations>; <objects> = <drinks> | <snacks>; -<drinks> = (orange juice) | beer | cola | chocolate_milk | energy_drink | grape_juice | milk | water; -<snacks> = chocolate_cookies | chips | biscuits | bread | pringles | (strawberry cookies); \ No newline at end of file +<drinks> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water; +<snacks> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies); diff --git a/ps-grammar/restaurant/otherCommand.jsgf b/ps-grammar/restaurant/otherCommand.jsgf index abf79d1cc39575059ea2f37b3213540da76eeafb..ccda561c7fb64fff5adca2c9f5a63208d03d0b27 100644 --- a/ps-grammar/restaurant/otherCommand.jsgf +++ b/ps-grammar/restaurant/otherCommand.jsgf @@ -2,7 +2,7 @@ grammar restaurant_save_command; public <restaurant> = [tobi] [please] (<followMe> | <stop> | <ordering> | <save>); -<save> = save [[the | a] location]; +<save> = save [([the | a]) location]; <followMe> = (follow me) | (come [(with me) | here]) | (keep up); <ordering> = ordering; <stop> = stop [this]; diff --git a/ps-grammar/room/room.jsgf b/ps-grammar/room/room.jsgf index 1632754c332372cc3d01c2edee4e7bd504c24c7b..72b92a597651f438fca3957534ff11f7b781be52 100644 --- a/ps-grammar/room/room.jsgf +++ b/ps-grammar/room/room.jsgf @@ -2,4 +2,4 @@ grammar ToBI_room; public <statement> = <rooms>; -<rooms> = [the] (living_room | bedroom | hallway | kitchen); +<rooms> = [the] ((living room) | bedroom | hallway | kitchen);