From 0aa84ff871e953ecabe786e6f4a60a5dd1cbd039 Mon Sep 17 00:00:00 2001
From: Christian Witte <cwitte@techfak.uni-bielefeld.de>
Date: Mon, 24 Mar 2014 14:47:59 +0100
Subject: [PATCH] basicFunctionalities grammar uodated

---
 .../basicFunctionalities.conf                     |  2 +-
 .../basicFunctionalities.conf~                    |  2 +-
 .../basicFunctionalities.jsgf                     | 15 +++++++++++----
 .../basicFunctionalities.jsgf~                    |  9 +++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~

diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf b/ps-config/basicFunctionalities/basicFunctionalities.conf
index 5777d75d..2340f14d 100644
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf
+++ b/ps-config/basicFunctionalities/basicFunctionalities.conf
@@ -6,7 +6,7 @@ timeout=8;
 openDeviceDirectly=yes;
 
 [pocketsphinxinstance]
-name=whatDidISay;
+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;
diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf~ b/ps-config/basicFunctionalities/basicFunctionalities.conf~
index 50c00279..5777d75d 100644
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf~
+++ b/ps-config/basicFunctionalities/basicFunctionalities.conf~
@@ -9,7 +9,7 @@ openDeviceDirectly=yes;
 name=whatDidISay;
 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/whatDidISay.jsgf;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
 rsbscope=/speechrec/psa/basicFunctionalities;
 bestpath=no;
 autoload=yes;
diff --git a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
index 485fff52..accab8af 100644
--- a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
+++ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
@@ -1,9 +1,16 @@
 #JSGF V1.0;
 grammar basicFunctionalities;
 
-public <basicFunctionalities> = <question1> | <question2> | <startServing> | <stop>;
+public <basicFunctionalities> = <question1> | <question2> | <question3> | <question4> | <question5> | <question6> | <question7> | <question8> | <question9> | <question10> | <startServing> | <stop>;
 <startServing> = continue;
 <stop> = stop;
-<question1> = what is your name;
-<question2> = how old are you;
-
+<question1> = question one;
+<question2> = question two;
+<question3> = question three;
+<question4> = question four;
+<question5> = question five;
+<question6> = question six;
+<question7> = question seven;
+<question8> = question eight;
+<question9> = question nine;
+<question10> = question ten;
diff --git a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~
new file mode 100644
index 00000000..485fff52
--- /dev/null
+++ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~
@@ -0,0 +1,9 @@
+#JSGF V1.0;
+grammar basicFunctionalities;
+
+public <basicFunctionalities> = <question1> | <question2> | <startServing> | <stop>;
+<startServing> = continue;
+<stop> = stop;
+<question1> = what is your name;
+<question2> = how old are you;
+
-- 
GitLab