From 1c139812e0e21dc6df91827ba0f17cf8cff04c52 Mon Sep 17 00:00:00 2001 From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de> Date: Wed, 2 Apr 2014 17:41:49 +0200 Subject: [PATCH] fixed grammars --- ps-grammar/gprs/gprs.jsgf | 20 ++++++++++---------- ps-grammar/location/location.jsgf | 10 ++++++---- ps-grammar/object/object.jsgf | 11 ++++++----- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf index 1388de9f..e9f7abae 100644 --- a/ps-grammar/gprs/gprs.jsgf +++ b/ps-grammar/gprs/gprs.jsgf @@ -26,23 +26,23 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi]; <personal_pronoun> = him | her | me; <person_name> = james|john|robert|michael|william|david|richard|charles|linda|thomas|mary|patricia|joseph|dorothy|barbara|susan|jennifer|maria|elizabeth|margaret; -<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class> | <tool_class> | tool | bathroom_stuff | (bathroom stuff) | drink | snack | object | food | something | stuff | item | beverage | things; -<bathroom_class> = shower_gel | hair_gel; -<drink_class> = orange_juice | fruit_juice | ice_tea | coffee | beer; -<snack_class> = chokolates | chewing_gum | peanuts; -<food_class> = noodle_sauce | cat_food | dumplings | tacos; -<tool_class> = sponge | tape | sole_latex; +<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class> | <tool_class> | tool | (bathroom stuff) | drink | snack | object | food | something | stuff | item | beverage | things; +<bathroom_class> = (shower gel) | (hair gel); +<drink_class> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer; +<snack_class> = chocolates | (chewing gum) | peanuts; +<food_class> = (noodle sauce) | (cat food) | dumplings | tacos; +<tool_class> = sponge | tape | (sole latex); <location> = <appliance_class> | <shelf_class> | <seat_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> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture; -<appliance_class> = coat_rack | kitchen_counter | fridge | bar; -<shelf_class> = book_shelf | food_shelf; +<appliance_class> = (coat rack) | kitchen_counter | fridge | bar; +<shelf_class> = book_shelf | (food shelf); <seat_class> = <seating_class>; <seating_class> = sofa | bed; -<table_class> = kitchen_table | desk | side_table | couch_table |bedroom_table; -<door_class> = exit_door | entry_door | room_door; +<table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table); +<door_class> = (exit door) | (entry door) | (room door); <room_class> = kitchen | living_room | bed_room | hallway; <utensil_class> = trash_bin; diff --git a/ps-grammar/location/location.jsgf b/ps-grammar/location/location.jsgf index 6f9ef07b..99ca6b1c 100644 --- a/ps-grammar/location/location.jsgf +++ b/ps-grammar/location/location.jsgf @@ -8,12 +8,14 @@ public <statement> = <locationPhrase> [please]; <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class>; -<appliance_class> = coat_rack | kitchen_counter | fridge | bar; -<shelf_class> = book_shelf | food_shelf; +<appliance_class> = (coat rack) | kitchen_counter | fridge | bar; +<shelf_class> = book_shelf | (food shelf); <seat_class> = <seating_class>; <seating_class> = sofa | bed; -<table_class> = kitchen_table | desk | side_table | couch_table |bedroom_table; -<door_class> = exit_door | entry_door | room_door; +<table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table); +<door_class> = (exit door) | (entry door) | (room door); <utensil_class> = trash_bin; +<room_class> = kitchen | living_room | bed_room | 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 2daebccd..44498ca9 100644 --- a/ps-grammar/object/object.jsgf +++ b/ps-grammar/object/object.jsgf @@ -3,12 +3,13 @@ grammar ToBI_object; public <statement> = [<verb>] [<article>] <object> [please]; <object> = <grab_object>; -<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class>; +<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class> | <tool_class>; -<bathroom_class> = shower_gel | hair_gel; -<drink_class> = orange_juice | fruit_juice | ice_tea | coffee | beer; -<snack_class> = chokolates | chewing_gum | peanuts; -<food_class> = noodle_sauce | cat_food | dumplings | tacos; +<bathroom_class> = (shower gel) | (hair gel); +<drink_class> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer; +<snack_class> = chocolates | (chewing gum) | peanuts; +<food_class> = (noodle sauce) | (cat food) | dumplings | tacos; +<tool_class> = sponge | tape | (sole latex); <verb> = bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize; <article> = the | an | some | a | this; -- GitLab