From 7f193d967c88190c506d29df9c04cc86b68cf111 Mon Sep 17 00:00:00 2001
From: Svenja Koesters <skoester@techfak.uni-bielefeld.de>
Date: Thu, 26 Mar 2015 12:41:32 +0100
Subject: [PATCH] updated ps-config/grammar

---
 .../speechRecognition/speechRecognition.conf      |  1 -
 .../speechRecognition/speechRecognition.jsgf      | 15 +++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ps-config/speechRecognition/speechRecognition.conf b/ps-config/speechRecognition/speechRecognition.conf
index ffc65d36..904b9898 100644
--- a/ps-config/speechRecognition/speechRecognition.conf
+++ b/ps-config/speechRecognition/speechRecognition.conf
@@ -7,7 +7,6 @@ openDeviceDirectly=yes;
 
 [pocketsphinxinstance]
 name=speechRecognition;
-hmm=../../../pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
 dict=../../psGrammar/dictionary/tobiDic.dic;
 jsgf=../../psGrammar/speechRecognition/speechRecognition.jsgf;
 rsbscope=/speechrec/psa/speechRecognition;
diff --git a/ps-grammar/speechRecognition/speechRecognition.jsgf b/ps-grammar/speechRecognition/speechRecognition.jsgf
index 543b4008..5db272c1 100644
--- a/ps-grammar/speechRecognition/speechRecognition.jsgf
+++ b/ps-grammar/speechRecognition/speechRecognition.jsgf
@@ -1,8 +1,15 @@
 #JSGF V1.0;
 grammar speechRecognition;
 
-public <statement> = (<blah> | <yes> | <no>);
+public <task> = <question1> | <question2> | <question3> | <question4> | <question5> | <question6> | <question7> | <question8> | <question9> | <question10>;
 
-<blah> = blah;
-<yes> = yes;  
-<no> = no; 
+<question1> = what time is it;
+<question2> = what is your name;
+<question3> = what is the capital of brazil;
+<question4> = in which year was robo cup founded;
+<question5> = how many rings has the olympic flag;
+<question6> = what is the answer to the ultimate question about life the universe and everything;
+<question7> = what is the worlds most popular green vegetable;
+<question8> = what is the oldest drug used on earth;
+<question9> = which insect has the best eyesight;
+<question10> = who lives in a pineapple under the sea;
-- 
GitLab