fixed grammar locations

ps-config/basicFunctionalities/basicFunctionalities.conf

@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=basicFunctionalities;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/basicFunctionalities/basicFunctionalities.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
 rsbscope=/speechrec/psa/basicFunctionalities;
 bestpath=no;
 autoload=yes;

ps-config/basicFunctionalities/basicFunctionalities.conf~

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

ps-config/cleanUp/cleanUp.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=cleanUp;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/cleanUp/cleanUp.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/cleanUp/cleanUp.jsgf;
 rsbscope=/speechrec/psa/cleanUp;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/cocktailparty/cocktailparty.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=person;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/person/person.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/person/person.jsgf;
 rsbscope=/speechrec/psa/person;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=object;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/cocktailparty/object.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/cocktailparty/object.jsgf;
 rsbscope=/speechrec/psa/object;
 bestpath=no;
 autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/demo/demoCentralLab.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=shellgame;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/shellgame/shellgame.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/shellgame/shellgame.jsgf;
 rsbscope=/speechrec/psa/shellgame;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=commands;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/commands/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/commands/commands.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;
@@ -34,8 +34,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=sfbreview;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/sfb/review.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/sfb/review.jsgf;
 rsbscope=/speechrec/psa/sfbreview;
 bestpath=no;
 autoload=yes;

ps-config/demoChallange/demoChallange.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=demoChallange;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/demoChallange/demoChallange.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/demoChallange/demoChallange.jsgf;
 rsbscope=/speechrec/psa/demoChallange;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/demoChallenge/demoChallenge.conf

@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=commands;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/demoChallenge/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/demoChallenge/commands.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;

ps-config/emergencySituation/emergencySituation.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/fireInTheApartment/fireInTheApartment.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/followMe/followMe.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=followMe;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/followMe/followMe.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/followMe/followMe.jsgf;
 rsbscope=/speechrec/psa/followMe;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/followMe/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/followMe/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/gprs/gprs.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=gprs;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/gprs/gprs.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/gprs/gprs.jsgf;
 rsbscope=/speechrec/psa/gprs;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=gprsPerson;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/gprsPerson/gprsPerson.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/gprsPerson/gprsPerson.jsgf;
 rsbscope=/speechrec/psa/gprsPerson;
 bestpath=no;
 autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=location;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/location/location.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/location/location.jsgf;
 rsbscope=/speechrec/psa/location;
 bestpath=no;
 autoload=yes;
@@ -34,8 +34,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=object;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/object/object.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/object/object.jsgf;
 rsbscope=/speechrec/psa/object;
 bestpath=no;
 autoload=yes;
@@ -43,8 +43,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
@@ -52,8 +52,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=basicFunctionalities;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/basicFunctionalities/basicFunctionalities.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
 rsbscope=/speechrec/psa/basicFunctionalities;
 bestpath=no;
 autoload=yes;

ps-config/inspection/inspection.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=leave;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/leave/leave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/leave/leave.jsgf;
 rsbscope=/speechrec/psa/leave;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=bironLeave;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/bironLeave/bironLeave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/bironLeave/bironLeave.jsgf;
 rsbscope=/speechrec/psa/bironLeave;
 bestpath=no;
 autoload=yes;

ps-config/inspectionRobot1/inspectionRobot1.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=leave;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/leave/leave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/leave/leave.jsgf;
 rsbscope=/speechrec/psa/leave;
 bestpath=no;
 autoload=yes;

ps-config/inspectionRobot2/inspectionRobot2.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=bironLeave;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/bironLeave/bironLeave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/bironLeave/bironLeave.jsgf;
 rsbscope=/speechrec/psa/bironLeave;
 bestpath=no;
 autoload=yes;

ps-config/openChallange/openChallange.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/openChallenge/openChallenge.conf

@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=commands;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/commands/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/commands/commands.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;
@@ -26,8 +26,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=sfbreview;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/sfb/review.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/sfb/review.jsgf;
 rsbscope=/speechrec/psa/sfbreview;
 bestpath=no;
 autoload=yes;
@@ -35,8 +35,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=rsm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/rsm/rsm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/rsm/rsm.jsgf;
 rsbscope=/speechrec/psa/rsm;
 bestpath=no;
 autoload=yes;

ps-config/restaurant/restaurant.conf

@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=restaurant;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/restaurant/restaurant.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/restaurant/restaurant.jsgf;
 rsbscope=/speechrec/psa/restaurant;
 bestpath=no;
 autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

ps-config/robotZoo/roboZoo.conf

@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
 [pocketsphinxinstance]
 name=confirm;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=roboZoo;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/roboZoo.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/roboZoo.jsgf;
 rsbscope=/speechrec/psa/roboZoo;
 bestpath=no;
 autoload=yes;
@@ -26,8 +26,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=Ask4Task;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/Ask4Task.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/Ask4Task.jsgf;
 rsbscope=/speechrec/psa/Ask4Task;
 bestpath=no;
 autoload=yes;
@@ -35,8 +35,8 @@ autoload=yes;
 [pocketsphinxinstance]
 name=person;
 hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/person/person.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/person/person.jsgf;
 rsbscope=/speechrec/psa/person;
 bestpath=no;
 autoload=yes;

ps-grammar/install_pocketsphinx.sh

@@ -9,12 +9,12 @@ if [ ! -n "$prefix" ]; then
         exit 1
 fi
 
-mkdir -p ${prefix}/share/SpeechRec/psConfig
+mkdir -p ${prefix}/share/SpeechRec/psGrammar
 
 for i in `ls` 
 do
   if [ -d $i ]
-    then cp -r $i ${prefix}/share/SpeechRec/psConfig
+    then cp -r $i ${prefix}/share/SpeechRec/psGrammar
   fi
 done