From 73cfc0e0f736245cf5dcb3683951cf07c2eefcff Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@TechFak.Uni-Bielefeld.DE>
Date: Mon, 14 Sep 2015 11:39:24 +0200
Subject: [PATCH] demoDynamic
---
ps-config/demos/demoDynamic.conf | 8 ++++----
ps-grammar/demos/commands.jsgf | 12 ++++++++++++
ps-grammar/demos/learning.jsgf | 2 +-
ps-grammar/demos/{ => old}/save.jsgf | 0
ps-grammar/demos/{ => old}/saveCommand.jsgf | 0
ps-grammar/demos/{ => old}/saveLocation.jsgf | 0
6 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 ps-grammar/demos/commands.jsgf
rename ps-grammar/demos/{ => old}/save.jsgf (100%)
rename ps-grammar/demos/{ => old}/saveCommand.jsgf (100%)
rename ps-grammar/demos/{ => old}/saveLocation.jsgf (100%)
diff --git a/ps-config/demos/demoDynamic.conf b/ps-config/demos/demoDynamic.conf
index e7c3353c..571add51 100644
--- a/ps-config/demos/demoDynamic.conf
+++ b/ps-config/demos/demoDynamic.conf
@@ -34,14 +34,14 @@ bestpath=no;
autoload=yes;
[pocketsphinxinstance]
-name=saveCommand;
-rsbscope=/speechrec/psa/saveCommand;
-jsgf=../../psGrammar/demos/saveCommand.jsgf;
+name=commands;
+rsbscope=/speechrec/psa/commands;
+jsgf=../../psGrammar/demos/commands.jsgf;
bestpath=no;
autoload=yes;
[pocketsphinxinstance]
-name=controlExecution;
+name=learning;
rsbscope=/speechrec/psa/learning;
jsgf=../../psGrammar/demos/learning.jsgf;
bestpath=no;
diff --git a/ps-grammar/demos/commands.jsgf b/ps-grammar/demos/commands.jsgf
new file mode 100644
index 00000000..00567c7e
--- /dev/null
+++ b/ps-grammar/demos/commands.jsgf
@@ -0,0 +1,12 @@
+#JSGF V1.0;
+grammar commands;
+
+public <command> = [tobi] ( <followMe> | <ordering> | <test> );
+
+<followMe> = (follow me);
+
+<test> = (execute test);
+
+<ordering> = (start ordering);
+
+
diff --git a/ps-grammar/demos/learning.jsgf b/ps-grammar/demos/learning.jsgf
index 1aa4a9e9..428df4ca 100644
--- a/ps-grammar/demos/learning.jsgf
+++ b/ps-grammar/demos/learning.jsgf
@@ -1,5 +1,5 @@
#JSGF V1.0;
-grammar saveLocation;
+grammar learning;
public <command> = [tobi] (<save> | <stop> );
diff --git a/ps-grammar/demos/save.jsgf b/ps-grammar/demos/old/save.jsgf
similarity index 100%
rename from ps-grammar/demos/save.jsgf
rename to ps-grammar/demos/old/save.jsgf
diff --git a/ps-grammar/demos/saveCommand.jsgf b/ps-grammar/demos/old/saveCommand.jsgf
similarity index 100%
rename from ps-grammar/demos/saveCommand.jsgf
rename to ps-grammar/demos/old/saveCommand.jsgf
diff --git a/ps-grammar/demos/saveLocation.jsgf b/ps-grammar/demos/old/saveLocation.jsgf
similarity index 100%
rename from ps-grammar/demos/saveLocation.jsgf
rename to ps-grammar/demos/old/saveLocation.jsgf
--
GitLab