Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/config/cocktailparty/cocktailparty.conf

@@ -17,7 +17,7 @@ autoload=yes;
 name=object;
 hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
 dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/object/object.jsgf;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/cocktailparty/object.jsgf;
 rsbscope=/speechrec/psa/object;
 bestpath=no;
 autoload=yes;

pocketsphinxAdapter/grammar/bironLeave/bironLeave.jsgf

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

pocketsphinxAdapter/grammar/cocktailparty/object.jsgf

+#JSGF V1.0;
+grammar ToBI_object;
+public <statement> = <objectPhrase>;
+
+<objectPhrase> = [<verb>] [<article>] <objects>;
+<objects> = milk | cocoa | cookies;
+
+<verb> = bring | carry | retrieve | fetch | get | give;
+<article> = the | an | some | a;

pocketsphinxAdapter/grammar/leave/leave.jsgf

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

pocketsphinxAdapter/grammar/person/person.jsgf

@@ -2,5 +2,4 @@
 grammar ToBI_person;
 public <statement> = <naming>;
 <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;
+<name> = james | john | robert | william | david | richard | michael | charles | joseph | thomas | mary | patricia | linda | barbara | elizabeth | jennifer | maria | susan | margaret | dorothy;