From 4b49b99ee5579827b65c7075a3012fb6b232f5cd Mon Sep 17 00:00:00 2001
From: Leon Ziegler <lziegler@techfak.uni-bielefeld.de>
Date: Fri, 20 Jun 2014 12:13:41 +0200
Subject: [PATCH] fixed grammar locations
---
.../basicFunctionalities.conf | 4 ++--
.../basicFunctionalities.conf~ | 15 ------------
ps-config/cleanUp/cleanUp.conf | 8 +++----
ps-config/cocktailparty/cocktailparty.conf | 12 +++++-----
ps-config/demo/demoCentralLab.conf | 16 ++++++-------
ps-config/demoChallange/demoChallange.conf | 8 +++----
ps-config/demoChallenge/demoChallenge.conf | 8 +++----
.../emergencySituation.conf | 4 ++--
.../fireInTheApartment.conf | 4 ++--
ps-config/followMe/followMe.conf | 8 +++----
ps-config/gprs/gprs.conf | 24 +++++++++----------
ps-config/inspection/inspection.conf | 8 +++----
.../inspectionRobot1/inspectionRobot1.conf | 4 ++--
.../inspectionRobot2/inspectionRobot2.conf | 4 ++--
ps-config/openChallange/openChallange.conf | 4 ++--
ps-config/openChallenge/openChallenge.conf | 16 ++++++-------
ps-config/restaurant/restaurant.conf | 8 +++----
ps-config/robotZoo/roboZoo.conf | 16 ++++++-------
ps-grammar/install_pocketsphinx.sh | 4 ++--
19 files changed, 80 insertions(+), 95 deletions(-)
delete mode 100644 ps-config/basicFunctionalities/basicFunctionalities.conf~
diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf b/ps-config/basicFunctionalities/basicFunctionalities.conf
index 153cff4e..74ea9630 100644
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf
+++ b/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;
diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf~ b/ps-config/basicFunctionalities/basicFunctionalities.conf~
deleted file mode 100644
index 2340f14d..00000000
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf~
+++ /dev/null
@@ -1,15 +0,0 @@
-[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;
diff --git a/ps-config/cleanUp/cleanUp.conf b/ps-config/cleanUp/cleanUp.conf
index df598dce..738ecf8a 100644
--- a/ps-config/cleanUp/cleanUp.conf
+++ b/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;
diff --git a/ps-config/cocktailparty/cocktailparty.conf b/ps-config/cocktailparty/cocktailparty.conf
index 490fa9bf..b003e552 100644
--- a/ps-config/cocktailparty/cocktailparty.conf
+++ b/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;
diff --git a/ps-config/demo/demoCentralLab.conf b/ps-config/demo/demoCentralLab.conf
index 2e56fdd5..e7cf7402 100644
--- a/ps-config/demo/demoCentralLab.conf
+++ b/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;
diff --git a/ps-config/demoChallange/demoChallange.conf b/ps-config/demoChallange/demoChallange.conf
index c080edff..a28449f6 100644
--- a/ps-config/demoChallange/demoChallange.conf
+++ b/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;
diff --git a/ps-config/demoChallenge/demoChallenge.conf b/ps-config/demoChallenge/demoChallenge.conf
index 03bc15f4..d2a829c0 100644
--- a/ps-config/demoChallenge/demoChallenge.conf
+++ b/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;
diff --git a/ps-config/emergencySituation/emergencySituation.conf b/ps-config/emergencySituation/emergencySituation.conf
index dd78d650..7abd2dee 100644
--- a/ps-config/emergencySituation/emergencySituation.conf
+++ b/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;
diff --git a/ps-config/fireInTheApartment/fireInTheApartment.conf b/ps-config/fireInTheApartment/fireInTheApartment.conf
index dd78d650..7abd2dee 100644
--- a/ps-config/fireInTheApartment/fireInTheApartment.conf
+++ b/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;
diff --git a/ps-config/followMe/followMe.conf b/ps-config/followMe/followMe.conf
index fffc5f3d..d8807dd7 100644
--- a/ps-config/followMe/followMe.conf
+++ b/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;
diff --git a/ps-config/gprs/gprs.conf b/ps-config/gprs/gprs.conf
index 6e84e394..9282c65a 100644
--- a/ps-config/gprs/gprs.conf
+++ b/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;
diff --git a/ps-config/inspection/inspection.conf b/ps-config/inspection/inspection.conf
index 53a8ee61..58ad05a8 100644
--- a/ps-config/inspection/inspection.conf
+++ b/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;
diff --git a/ps-config/inspectionRobot1/inspectionRobot1.conf b/ps-config/inspectionRobot1/inspectionRobot1.conf
index a221a061..294b65e5 100644
--- a/ps-config/inspectionRobot1/inspectionRobot1.conf
+++ b/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;
diff --git a/ps-config/inspectionRobot2/inspectionRobot2.conf b/ps-config/inspectionRobot2/inspectionRobot2.conf
index fe08675c..05621928 100644
--- a/ps-config/inspectionRobot2/inspectionRobot2.conf
+++ b/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;
diff --git a/ps-config/openChallange/openChallange.conf b/ps-config/openChallange/openChallange.conf
index dd78d650..7abd2dee 100644
--- a/ps-config/openChallange/openChallange.conf
+++ b/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;
diff --git a/ps-config/openChallenge/openChallenge.conf b/ps-config/openChallenge/openChallenge.conf
index d8c43be5..e0ca0479 100644
--- a/ps-config/openChallenge/openChallenge.conf
+++ b/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;
diff --git a/ps-config/restaurant/restaurant.conf b/ps-config/restaurant/restaurant.conf
index 4c592348..894b77b2 100644
--- a/ps-config/restaurant/restaurant.conf
+++ b/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;
diff --git a/ps-config/robotZoo/roboZoo.conf b/ps-config/robotZoo/roboZoo.conf
index 7fa62381..83ee3d1d 100644
--- a/ps-config/robotZoo/roboZoo.conf
+++ b/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;
diff --git a/ps-grammar/install_pocketsphinx.sh b/ps-grammar/install_pocketsphinx.sh
index 767f361b..af35fa5e 100755
--- a/ps-grammar/install_pocketsphinx.sh
+++ b/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
--
GitLab