gprs grammatik angepasst

pocketsphinxAdapter/grammar/gprs/gprs.jsgf

@@ -12,7 +12,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <learn_command> = <learnVerb> [<article>] (<person> | <location>);
 
 <bringVerb> = bring | carry | retrieve | fetch | get | give;
-<findVerb> = find | search for;
+<findVerb> = find | search [for];
 <putVerb> = put;
 <gotoVerb> = go;
 <followVerb> = follow;
@@ -22,7 +22,7 @@ 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);
+<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff;
 <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;

pocketsphinxAdapter/grammar/location/location.jsgf

@@ -6,7 +6,7 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<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;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class>;
 
 <appliance_class> = stove | sink | fridge | tv_counter;
 <shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;

pocketsphinxAdapter/grammar/object/object.jsgf

@@ -3,7 +3,8 @@ grammar ToBI_object;
 public <statement> = [<verb>] [<article>] <object> [please];
 
 <object> = <grab_object>;
-<grab_object> = (<cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something);
+<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class>;
+
 <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;