From c3dc63ac2fb341548be8b03b6b845c078ec01080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sarah=20Schr=C3=B6der?=
<saschroeder@techfak.uni-bielefeld.de>
Date: Mon, 20 Mar 2017 10:54:12 +0100
Subject: [PATCH] extended grammar for helpmecarry task
---
psConfig/tasks/helpmecarry.conf | 4 ++--
.../helpmecarry/helpmecarry_commands.jsgf | 16 +++++++++++++++
.../helpmecarry/helpmecarry_commands_old.jsgf | 20 +++++++++++++++++++
.../helpmecarry_meetPerson.jsgf | 0
psGrammar/tasks/helpmecarry_commands.jsgf | 15 --------------
5 files changed, 38 insertions(+), 17 deletions(-)
create mode 100644 psGrammar/tasks/helpmecarry/helpmecarry_commands.jsgf
create mode 100644 psGrammar/tasks/helpmecarry/helpmecarry_commands_old.jsgf
rename psGrammar/tasks/{ => helpmecarry}/helpmecarry_meetPerson.jsgf (100%)
delete mode 100644 psGrammar/tasks/helpmecarry_commands.jsgf
diff --git a/psConfig/tasks/helpmecarry.conf b/psConfig/tasks/helpmecarry.conf
index 0046a925..486b7938 100644
--- a/psConfig/tasks/helpmecarry.conf
+++ b/psConfig/tasks/helpmecarry.conf
@@ -8,14 +8,14 @@ alsadevice=sysdefault;
[pocketsphinxinstance]
name=name;
-jsgf=../../psGrammar/tasks/helpmecarry_meetPerson.jsgf;
+jsgf=../../psGrammar/tasks/helpmecarry/helpmecarry_meetPerson.jsgf;
rsbscope=/speechrec/psa/helpmecarry/person;
bestpath=no;
autoload=yes;
[pocketsphinxinstance]
name=command;
-jsgf=../../psGrammar/tasks/helpmecarry_commands.jsgf;
+jsgf=../../psGrammar/tasks/helpmecarry/helpmecarry_commands.jsgf;
rsbscope=/speechrec/psa/helpmecarry/command;
bestpath=no;
autoload=yes;
diff --git a/psGrammar/tasks/helpmecarry/helpmecarry_commands.jsgf b/psGrammar/tasks/helpmecarry/helpmecarry_commands.jsgf
new file mode 100644
index 00000000..45aec50d
--- /dev/null
+++ b/psGrammar/tasks/helpmecarry/helpmecarry_commands.jsgf
@@ -0,0 +1,16 @@
+#JSGF V1.0;
+grammar ToBI_commands;
+
+public <statement> = [<robot>] [please] <command> [please] [<robot>];
+
+<robot> = (tobi | robot | biron);
+
+<command> = (<follow> | <stop> | <goto> | <take>);
+
+<follow> = (follow | come with )[me];
+<stop> = ((((stop [following me]) | wait) [here]) | here is the car );
+<goto> = (go to [the] <place>);
+<take> = (take | bring) ((this [bag]) | the groceries) to [the] <place>;
+
+<place> = (place one | place two | door | start);
+
diff --git a/psGrammar/tasks/helpmecarry/helpmecarry_commands_old.jsgf b/psGrammar/tasks/helpmecarry/helpmecarry_commands_old.jsgf
new file mode 100644
index 00000000..a3d07aad
--- /dev/null
+++ b/psGrammar/tasks/helpmecarry/helpmecarry_commands_old.jsgf
@@ -0,0 +1,20 @@
+#JSGF V1.0;
+grammar ToBI_commands;
+
+public <statement> = [<robot>] [please] <command> [please] [<robot>];
+
+<robot> = (tobi | robot | biron);
+
+<command> = (<follow> | <stop> | <goto> | <deliver> | <find>);
+
+<follow> = (follow [me] | come [with me] | let us go) [to the car];
+<stop> = (((stop | wait) [following me] [here]) | ((we (arrived at| are at | reached) | here is) [the] (car | goal)));
+<goto> = (go | drive) [back] to <location>;
+<deliver> = (bring | deliver | take) [the] <bag> to <location>;
+<find> = (find | search for| ask | look for) <name> in <location> [and ask (him | her) to help us];
+
+<bag> = (bag | groceries);
+<name> = (michael | lucarelli | dombrowski | anna | beth | victoria);
+<location> = (<room> | <room> <precisePlace> | <precisePlace> | <precisePlace> in <room>);
+<room> = [the] (kitchen | bath room | living room | bed room);
+<precisePlace> = [the] (table | sofa | couch | shelf);
diff --git a/psGrammar/tasks/helpmecarry_meetPerson.jsgf b/psGrammar/tasks/helpmecarry/helpmecarry_meetPerson.jsgf
similarity index 100%
rename from psGrammar/tasks/helpmecarry_meetPerson.jsgf
rename to psGrammar/tasks/helpmecarry/helpmecarry_meetPerson.jsgf
diff --git a/psGrammar/tasks/helpmecarry_commands.jsgf b/psGrammar/tasks/helpmecarry_commands.jsgf
deleted file mode 100644
index b1744501..00000000
--- a/psGrammar/tasks/helpmecarry_commands.jsgf
+++ /dev/null
@@ -1,15 +0,0 @@
-#JSGF V1.0;
-grammar ToBI_commands;
-
-public <statement> = [<robot>] [please] <command> [please] [<robot>];
-
-<robot> = (tobi | robot | biron);
-
-<command> = (<follow> | <stop> | <goto>);
-
-<follow> = (follow [me]);
-<stop> = (stop | wait) [here];
-<goto> = (go to [the] <place>);
-
-<place> = (place one | place two | door | start);
-
--
GitLab