From a2e16879937c8ec55ad0f3dc6610f271e6046898 Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Fri, 17 Apr 2015 11:56:27 +0200
Subject: [PATCH] restaurant additions

---
 ps-config/restaurant/restaurant.conf |  7 +++++++
 ps-grammar/restaurant/goTable.jsgf   |  6 ++++++
 ps-grammar/restaurant/order.jsgf     | 12 ++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 ps-grammar/restaurant/goTable.jsgf

diff --git a/ps-config/restaurant/restaurant.conf b/ps-config/restaurant/restaurant.conf
index e503799a..6f55b9ae 100644
--- a/ps-config/restaurant/restaurant.conf
+++ b/ps-config/restaurant/restaurant.conf
@@ -19,6 +19,13 @@ rsbscope=/speechrec/psa/ordering;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=ordering;
+jsgf=../../psGrammar/restaurant/goTable.jsgf;
+rsbscope=/speechrec/psa/goTable;
+bestpath=no;
+autoload=yes;
+
 [pocketsphinxinstance]
 name=saveCommand;
 jsgf=../../psGrammar/restaurant/saveTable.jsgf;
diff --git a/ps-grammar/restaurant/goTable.jsgf b/ps-grammar/restaurant/goTable.jsgf
new file mode 100644
index 00000000..97167a22
--- /dev/null
+++ b/ps-grammar/restaurant/goTable.jsgf
@@ -0,0 +1,6 @@
+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [tobi] [please] [(take a oder from) | (go to)] <deliveryLocations> [please]);
+<deliveryLocations> = table <numberOfTable>;
+<numberOfTable> = one | two | three;
\ No newline at end of file
diff --git a/ps-grammar/restaurant/order.jsgf b/ps-grammar/restaurant/order.jsgf
index 855787cb..66e5aa60 100644
--- a/ps-grammar/restaurant/order.jsgf
+++ b/ps-grammar/restaurant/order.jsgf
@@ -1,13 +1,9 @@
 #JSGF V1.0;
 grammar restaurant_ordering;
 
-public <restaurant> = [tobi] [please] bring <objects> to <deliveryLocations>;
+public <restaurant> = [tobi] [one | a ] <objects> [please];
 
-<deliveryLocations> = table <numberOfTable>;
+<objects> = <drinks> | <combo>;
 
-<numberOfTable> = one | two | three;
-
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water;
-<snacks> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies);
+<drinks> = coke;
+<combo> = steak;
-- 
GitLab