From 7e95df716db656b9889e0175802c035bf476ee15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnes=20Minareci?= <gminareci@techfak.uni-bielefeld.de> Date: Fri, 28 Jun 2013 12:54:15 +0200 Subject: [PATCH] grammatik an die testsaetze angepasst --- pocketsphinxAdapter/grammar/gprs/gprs.jsgf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf index 8ca1916c..74ebe199 100644 --- a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf +++ b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf @@ -2,19 +2,19 @@ grammar ToBI_GPRS; public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi]; -<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <pointat_command> | <learn_command> | <show_command>; +<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <pointat_command> | <learn_command> | <cleanup_command> | <show_command>; -<bring_command> = <bringVerb> [<person>] [<article>] <grab_object> [<preposition> [<article>] [<location> | <person>]] [(to|into) [<article>] <second_location>]; -<goto_command> = <gotoVerb> [<further_preposition> | <preposition>] <location>; +<bring_command> = (<bringVerb> [<person>] [<article>] <grab_object> [<preposition> [<article>] [<location> | <person>]] [(to|into) [<article>] <second_location>]) | (<bringVerb> [<article>] <person> <preposition> <article> <location>); +<goto_command> = <gotoVerb> [<further_preposition> | <preposition>] [<article>] <location>; <follow_command> = <followVerb> <person>; -<find_command> = <findVerb> [<article>] (<grab_object> | <person>) [in <location>]; +<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>; +<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; -<findVerb> = find | search [for] | check [for] | acquire | attain | obtain; +<bringVerb> = bring | carry | retrieve | fetch | get | give | put | attend | deliver | convey | gather | (pick up) | take | lead | grasp; +<findVerb> = find | (search [for]) | (check [for]) | acquire | attain | obtain | (look for); <pointatVerb> = (point at) | denote | direct | indicate | suggest; <showVerb> = show | demonstrate | present; <gotoVerb> = go | approach | move | run | travel | ride; @@ -26,13 +26,13 @@ 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> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff; +<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff | item; <cleaningstuff_class> = deodorant | toothpaste | cleaner | fresh_discs | sponge; <drink_class> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | apple_juice | milk; <snack_class> = chocolate | cookies | drops | cracker; <food_class> = tomato_sauce | peanut_butter | chicken_noodles | marmalade | veggie_noodles | garlic_sauce; -<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 | everywhere | apartment; +<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 | everywhere | apartment | furniture; <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 | everywhere | apartment; -- GitLab