From 867cdeca0ebde7a14a5e170f51c4572703c9c880 Mon Sep 17 00:00:00 2001
From: Tobias Schumacher <tschumacher@techfak.uni-bielefeld.de>
Date: Thu, 25 Feb 2016 14:21:31 +0100
Subject: [PATCH] adding navigationTask

---
 psConfig/exercise/tschumacher.conf            | 30 +++++++++++++++----
 .../tasks/navigationTask/navigationTask.conf  | 15 ++++++++++
 psGrammar/exercise/confirm.jsgf               | 10 +++++++
 psGrammar/exercise/tschumacher.jsgf           | 12 ++++++++
 .../tasks/navigationTask/navigationTask.jsgf  |  6 ++++
 5 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 psConfig/tasks/navigationTask/navigationTask.conf
 create mode 100644 psGrammar/exercise/confirm.jsgf
 create mode 100644 psGrammar/tasks/navigationTask/navigationTask.jsgf

diff --git a/psConfig/exercise/tschumacher.conf b/psConfig/exercise/tschumacher.conf
index 29182433..9c6abe31 100644
--- a/psConfig/exercise/tschumacher.conf
+++ b/psConfig/exercise/tschumacher.conf
@@ -3,11 +3,29 @@ startdb=43;
 uttdb=47;
 silence=400;
 timeout=8;
-openDeviceDirectly=yes
+openDeviceDirectly=yes;
+
+#[pocketsphinxinstance]
+#name=confirm;
+#jsgf=../../psGrammar/confirm/confirm.jsgf;
+#rsbscope=/speechrec/psa/confirm;
+#bestpath=no;
+#autoload=yes;
+
+#[pocketsphinxinstance]
+#name=tschumacher;
+#jsgf=../../psGrammar/exercise/tschumacher.jsgf;
+#rsbscope=/speechrec/psa/tschumacher;
+#bestpath=no;
+#autoload=yes;
 
 [pocketsphinxinstance]
-name=ToBiToDoor;
-jsgf=../../psGrammer/exercise/TobiToDoor.conf
-rsbscope=/speechrec/psa/ToBiToDoor
-bestpath=no
-autoload=yes
+name=tschumacher;
+jsgf=../../psGrammar/exercise/tschumacher.jsgf;
+rsbscope=/speechrec/psa/tschumacher;
+bestpath=no;
+autoload=yes;
+
+
+
+
diff --git a/psConfig/tasks/navigationTask/navigationTask.conf b/psConfig/tasks/navigationTask/navigationTask.conf
new file mode 100644
index 00000000..2ab95211
--- /dev/null
+++ b/psConfig/tasks/navigationTask/navigationTask.conf
@@ -0,0 +1,15 @@
+[main]
+startdb=43;
+uttdb=47;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=navigationTask;
+hmm=../../../../pocketsphinx/model/en-us/en-us;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/tasks/navigationTask/navigationTask.jsgf;
+rsbscope=/speechrec/psa/navigationTask;
+bestpath=no;
+autoload=yes;
diff --git a/psGrammar/exercise/confirm.jsgf b/psGrammar/exercise/confirm.jsgf
new file mode 100644
index 00000000..3f5b9b73
--- /dev/null
+++ b/psGrammar/exercise/confirm.jsgf
@@ -0,0 +1,10 @@
+#JSGF V1.0;
+grammar ToBI_confirm;
+public <confirm> = <confirm_yes> | <confirm_no>;
+
+<confirm_yes> = <robot> <yes_words>;
+<confirm_no> = <robot> <no_words>; 
+
+<yes_words> = (yes) | (confirmed);
+<no_words> = (no);
+<robot> = (tobi) | (robot) | (biron);
diff --git a/psGrammar/exercise/tschumacher.jsgf b/psGrammar/exercise/tschumacher.jsgf
index e69de29b..fb11fe33 100644
--- a/psGrammar/exercise/tschumacher.jsgf
+++ b/psGrammar/exercise/tschumacher.jsgf
@@ -0,0 +1,12 @@
+#JSGF V1.0;
+grammar tschumacher;
+
+public <statement> =  (<calc>|<hello>);
+<hello> = (hello world);
+<calc> = (<number1> <todo> <number2>);
+<name> = ([tobi]|[biron]);
+<todo> = (<plus>|<minus>);
+<number1> = (null|one|two|three|four|five|six|seven|eight|nine);
+<plus> = (plus);
+<minus> = (minus);
+<number2> = (null|one|two|three|four|five|six|seven|eight|nine);
diff --git a/psGrammar/tasks/navigationTask/navigationTask.jsgf b/psGrammar/tasks/navigationTask/navigationTask.jsgf
new file mode 100644
index 00000000..6a8a2e58
--- /dev/null
+++ b/psGrammar/tasks/navigationTask/navigationTask.jsgf
@@ -0,0 +1,6 @@
+#JSGF V1.0;
+grammar navigationTask;
+
+public <navigation> = tobi [please] (<stop>|<continue>);
+<stop> = stop [this];
+<continue> = continue;
-- 
GitLab