Grammars now tested and corrected

pocketsphinxAdapter/grammar/bironLeave/bironLeave.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar BIRON_Leave;
 public <statement> = [biron] [please] leave [please] [biron];

pocketsphinxAdapter/grammar/bironLeave/bironLeave.jsgf~

+#JSGF V1.0;
+grammar BIRON_Leave;
+public <statement> = [biron] [please] leave [please] [biron];

pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_cleanUp;
 public <task> = [tobi] [please] <command> [please] [tobi];
 
-<command> = <cleanUp> | <stop>;
-<cleanUp> = [start] ((clean  [the <rooms>] | tidy) (the apartment | up)) | (cleaning [the <rooms>]);
-<stop> = stop;
-<rooms> = kitchen | bathroom | bedroom | living_room | dining_room | office | lobby | registration table | waste | bin | sideboard | corridor;
+<command> = <cleanUp>;
+<cleanUp> = (clean | tidy) [up] [the] [<rooms>];
+<rooms> = kitchen | bathroom | bedroom | living_room | dining_room | office;

pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf~

+#JSGF V1.0;
+grammar ToBI_cleanUp;
+public <task> = [tobi] [please] <command> [please] [tobi];
+
+<command> = <cleanUp>;
+<cleanUp> = (clean | tidy) [up] [the] [<rooms>];
+<rooms> = kitchen | bathroom | bedroom | living_room | dining_room | office;

pocketsphinxAdapter/grammar/cocktailparty/cocktailparty.jsgf

-#JSGF V1.0;
-grammar ToBI_GPR;
-public <statement> = <naming> | <objectPhrase>;
-
-<naming> = [(my name is) | (i am)] <name>; 
-<name> = James | John | Robert | William | David | Richard | Michael | Charles | Joseph | Thomas | Mary | Patricia | Linda | Barbara | Elizabeth | Jennifer | Maria | Susan | Margaret | Dorothy;
-
-<objectPhrase> = [get | bring] [the | an | some | a] <objects>;
-<objects> = milk | cocoa | cookies;

pocketsphinxAdapter/grammar/confirm/confirm.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_confirm;
 public <confirm> = [tobi] (<confirm_yes> | <confirm_no>) [tobi];
 <confirm_yes> =  ([please] yes [please]) | ([that is] correct);
-<confirm_no> = (no [thanks]) | ([that is] not correct); 
+<confirm_no> = ([that is] not correct) | (no [thanks]); 

pocketsphinxAdapter/grammar/confirm/confirm.jsgf~

+#JSGF V1.0;
+grammar ToBI_confirm;
+public <confirm> = [tobi] (<confirm_yes> | <confirm_no>) [tobi];
+<confirm_yes> =  ([please] yes [please]) | ([that is] correct);
+<confirm_no> = ([that is] not correct) | (no [thanks]); 

pocketsphinxAdapter/grammar/followMe/followMe.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_followMe;
 public <statement> = [tobi] [please] (<followMe> | <elevator> | <closer>) [please] [tobi];
 
 <followMe> = follow me [into the elevator];
-<elevator> = [(this is) | (lets go into)] [an | the] elevator;
+<elevator> = [(this is) | ([lets] go into)] [an | the] elevator;
 <closer> = come (closer | close);
 

pocketsphinxAdapter/grammar/followMe/followMe.jsgf~

+#JSGF V1.0;
+grammar ToBI_followMe;
+public <statement> = [tobi] [please] (<followMe> | <elevator> | <closer>) [please] [tobi];
+
+<followMe> = follow me [into the elevator];
+<elevator> = [(this is) | ([lets] go into)] [an | the] elevator;
+<closer> = come (closer | close);
+

pocketsphinxAdapter/grammar/gprs/gprs.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_GPRS;
 public <task> = [tobi] [please] <command> [please] [tobi];
 
 <command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>;

pocketsphinxAdapter/grammar/gprs/gprs.jsgf~

+#JSGF V1.0;
+grammar ToBI_GPRs;
+public <task> = [tobi] [please] <command> [please] [tobi];
+
+<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>;
+
+<bring_command> = <bringVerb> [<person>] <grab_object> [from | into | to] [<location> | <person>];
+<goto_command> = <gotoVerb> <preposition> <location>;
+<follow_command> = <followVerb> <person>;
+<find_command> = <findVerb> (<grab_object> | <person>) [in <location>];
+<put_command> = <putVerb> <grab_object> <preposition> <location>;
+<learn_command> = <learnVerb> [the | a | an | this] (<person> | <location>);
+
+<bringVerb> = bring | carry | retrieve | fetch | get | give;
+<findVerb> = find | search for;
+<putVerb> = put;
+<gotoVerb> = go;
+<followVerb> = follow;
+<learnVerb> = learn | remember | memorize;
+
+<person> = <personal_pronoun> | <person_name> | (the | a | this) (person | man | woman | guy | girl | boy | human | robot);
+<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> = [the | an | a | some | this] (<medicine_class> | <stuff_class> | <drink_class> | <snack_class> | medicine | stuff | drink | snack | object);
+<stuff_class> = matches | cards | flowers | sponge | bag | cube | headphone | cup | tape | microphone;
+<medicine_class> = bandaids | creme | kleenex;
+<drink_class> = coke | beer | wine | redbull | water | juice;
+<snack_class> = cookies | peanuts | chocolate | hazelnuts | noodles;
+
+<location> = [the | an | a | this] (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration);
+<appliance_class> = fridge | sink | tv;
+<shelf_class> = hanger | shelf;
+<seat_class> = couch | lounge | bed | armchair;
+<table_class> = desk | dinnertable | side_table | couch_table | bar;
+<bin_class> = waste;
+<decoration_class> = plant | poster;
+<room_class> = kitchen | living_room | dining_room;
+<preposition> = (on [top]) | in | ([next] to) | at | near | in | into | from;

pocketsphinxAdapter/grammar/gprsPerson/gprsPerson.jsgf

+#JSGF V1.0;
+grammar ToBI_GPRSperson;
+public <statement> = <phrase>;
+
+<phrase> = [<verb>] <person>;
+
+<verb> = follow | learn | remember | memorize | find | search for | get | take | bring | go to;
+<person> = <personal_pronoun> | <person_name>;
+<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;
+

pocketsphinxAdapter/grammar/gprsPerson/gprsPerson.jsgf~

+#JSGF V1.0;
+grammar ToBI_GPRSperson;
+public <statement> = <phrase>;
+
+<phrase> = [<verb>] <person>;
+
+<verb> = follow | learn | remember | memorize | find | search for | get | take | bring | go to;
+<person> = <personal_pronoun> | <person_name>;
+<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;
+

pocketsphinxAdapter/grammar/leave/leave.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
-public <statement> = [tobi] [please] leave [please] [tobi] [the elevator];
+grammar ToBI_leave;
+public <statement> = [tobi] [please] leave [the elevator] [please] [tobi];

pocketsphinxAdapter/grammar/leave/leave.jsgf~

+#JSGF V1.0;
+grammar ToBI_leave;
+public <statement> = [tobi] [please] leave [the elevator] [please] [tobi];

pocketsphinxAdapter/grammar/location/location.jsgf

+#JSGF V1.0;
+grammar ToBI_location;
+public <statement> = <locationPhrase>;
+
+<locationPhrase> = [<verb>] [<preposition>] [the | this] <location>;
+<location> = fridge | sink | tv | hanger | shelf | couch | lounge | bed | armchair | desk | dinnertable | side_table | couch_table | bar | waste | plant | poster | kitchen | living_room | dining_room;
+
+<verb> = go | search | learn | remember | memorize;
+<preposition> = (on [top]) | in | ([next] to) | at | near | in | into | from;

pocketsphinxAdapter/grammar/location/location.jsgf~

+#JSGF V1.0;
+grammar ToBI_location;
+public <statement> = <locationPhrase>;
+
+<locationPhrase> = [<verb>] [<preposition>] [the | this] <location>;
+<location> = fridge | sink | tv | hanger | shelf | couch | lounge | bed | armchair | desk | dinnertable | side_table | couch_table | bar | waste | plant | poster | kitchen | living_room | dining_room;
+
+<verb> = go | search | learn | remember | memorize;
+<preposition> = (on [top]) | in | ([next] to) | at | near | in | into | from;

pocketsphinxAdapter/grammar/object/object.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_object;
 public <statement> = <objectPhrase>;
 
-<objectPhrase> = [get | bring] [the | an | some | a] <objects>;
+<objectPhrase> = [<verb>] [<article>] <objects>;
 <objects> = matches | cards | flowers | sponge | bag | cube | headphone | cup | tape | microphone | 
 		bandaids | creme | kleenex | 
 		coke | beer | wine | redbull | water | juice | 
 		cookies | peanuts | chocolate | hazelnuts | noodles;
+
+<verb> = bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize;
+<article> = the | an | some | a | this;

pocketsphinxAdapter/grammar/object/object.jsgf~

+#JSGF V1.0;
+grammar ToBI_GPR;
+public <statement> = <objectPhrase>;
+
+<objectPhrase> = [<verb>] [<article>] <objects>;
+<objects> = matches | cards | flowers | sponge | bag | cube | headphone | cup | tape | microphone | 
+		bandaids | creme | kleenex | 
+		coke | beer | wine | redbull | water | juice | 
+		cookies | peanuts | chocolate | hazelnuts | noodles;
+
+<verb> = bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize;
+<article> = the | an | some | a | this;

pocketsphinxAdapter/grammar/person/person.jsgf

 #JSGF V1.0;
-grammar ToBI_GPR;
+grammar ToBI_person;
 public <statement> = <naming>;
 <naming> = [(my name is) | (i am)] <name>;
 <name> = James | John | Robert | William | David | Richard | Michael | Charles | Joseph | Thomas