Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/robocup-speechrec

ps-config/robotZoo/robotZoo.conf~ → ps-config/robotZoo/roboZoo.conf

@@ -4,20 +4,21 @@ uttdb=35;
 silence=400;
 timeout=8;
 openDeviceDirectly=yes;
+
 [pocketsphinxinstance]
-name=followMe;
+name=confirm;
 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/followMe/followMe.jsgf;
-rsbscope=/speechrec/psa/followMe;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/robotZoo/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=confirm;
+name=roboZoo;
 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/followMe/confirm.jsgf;
-rsbscope=/speechrec/psa/confirm;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/robotZoo/roboZoo.jsgf;
+rsbscope=/speechrec/psa/roboZoo;
 bestpath=no;
 autoload=yes;

ps-config/robotZoo/robotZoo.conf

-[main]
-startdb=30;
-uttdb=35;
-silence=400;
-timeout=8;
-openDeviceDirectly=yes;
-
-[pocketsphinxinstance]
-name=confirm;
-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/followMe/confirm.jsgf;
-rsbscope=/speechrec/psa/confirm;
-bestpath=no;
-autoload=yes;

ps-grammar/robotZoo/confirm.jsgf

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

ps-grammar/robotZoo/roboZoo.jsgf

+#JSGF V1.0;
+grammar ToBI_roboZoo;
+
+public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> ) [tobi];
+
+<biron> =  biron;
+<andi> = andreas; 
+<leon> = leon;
+<kai> = kai;