From d22adf62f725486114827f125ec28adb5cd3be33 Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Tue, 2 Jul 2019 12:35:02 +0200
Subject: [PATCH] demoDyn: object grammars

---
 psConfig/demos/demoDynamic.conf   |  7 +++++++
 psGrammar/demos/demoDynamic.jsgf  |  7 +++----
 psGrammar/object/lab_objects.jsgf | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 psGrammar/object/lab_objects.jsgf

diff --git a/psConfig/demos/demoDynamic.conf b/psConfig/demos/demoDynamic.conf
index 76b3a0c1..ebbd89c4 100644
--- a/psConfig/demos/demoDynamic.conf
+++ b/psConfig/demos/demoDynamic.conf
@@ -20,6 +20,13 @@ jsgf=../../psGrammar/confirm/stop.jsgf;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=objects;
+rsbscope=/speechrec/psa/objects;
+jsgf=../../psGrammar/object/lab_objects.jsgf;
+bestpath=no;
+autoload=yes;
+
 [pocketsphinxinstance]
 name=learning;
 rsbscope=/speechrec/psa/learning;
diff --git a/psGrammar/demos/demoDynamic.jsgf b/psGrammar/demos/demoDynamic.jsgf
index d18b5afd..7769d61a 100644
--- a/psGrammar/demos/demoDynamic.jsgf
+++ b/psGrammar/demos/demoDynamic.jsgf
@@ -18,10 +18,9 @@ public <command> = [<robot>] ( <introduce> | <save> | <wave> | <goTo> | <followM
 <search> = ( search for [a] [waving] person);
 <describe> = (tell me what you see);
 <difference> = (spot the difference);
-<bring> = ((bring) [the] <bringObject> (to a waving person));
-<bringObject> = (coke | drink | beer | object);
-<take> = handover | (take the <takeObject> from me);
-<takeObject> = (coke | drink | beer | object);
+<bring> = (deliver [an object]);
+<take> = (handover);
+<pick> = (grasp [an object]);
 
 <ordering> = (start taking orders) | (take my order);
 <learn> = (learn a person);
diff --git a/psGrammar/object/lab_objects.jsgf b/psGrammar/object/lab_objects.jsgf
new file mode 100644
index 00000000..e6b947ea
--- /dev/null
+++ b/psGrammar/object/lab_objects.jsgf
@@ -0,0 +1,16 @@
+#JSGF V1.0;
+grammar ToBI_object;
+public <statement> = [<verb>] [<article>] <objects> [please];
+
+<objects> = <object>;
+<object> = <grab_object>;
+
+<grab_object> = <cleaning_class> | <food_class> | (cleaning stuff) | drinks | snacks | object | food | something | stuff | item | beverage | things;
+
+<cleaning_class> = cloth | soap | sponge;
+<food_class> = salt | apple | pringles | cereals | cornflakes | peas | (coconut milk); 
+
+<verb> = (bring me) | bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize;
+<article> = the | an | some | a | this;
+
+
-- 
GitLab