From 9cfafce191550786c34236260e8ac91f0b36dd8c Mon Sep 17 00:00:00 2001
From: skoester <skoester@techfak.uni-bielefeld.de>
Date: Thu, 23 Apr 2015 11:20:58 +0200
Subject: [PATCH] fixed some errors

---
 ps-grammar/gpsr/gpsr.jsgf                           | 9 ++++-----
 ps-grammar/speechRecognition/speechRecognition.jsgf | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ps-grammar/gpsr/gpsr.jsgf b/ps-grammar/gpsr/gpsr.jsgf
index deff6390..e5140198 100644
--- a/ps-grammar/gpsr/gpsr.jsgf
+++ b/ps-grammar/gpsr/gpsr.jsgf
@@ -8,7 +8,7 @@ public <task> = (<location_task> | <item_task> | <interact_task>);
 
 
 <locations> = [the] (kitchen | bathroom | corridor);
-<nav_commands> = (((move | go | navigate) to) | (get into) | exit | leave);
+<nav_commands> = (((move | go | navigate) to) | (get into) | from | exit | leave);
 <furniture> = (shelf | (diner table));
 
 
@@ -27,20 +27,19 @@ public <task> = (<location_task> | <item_task> | <interact_task>);
 <item_destination> = ( [<person>] [at | to] [<locations>]);
 
 
-<items> = ([the] (coffee | crackers));
+<items> = ([the] (coffee | crackers | milk));
 
 
 
 <interact_task> = ((<talk_with_person> | <interact_with_person>) [[(and | then)] <task>]);
 
 
-<talk_with_person> = <talk_commands> ((something about (<person> | <name>)) | (the day of the month));
+<talk_with_person> = <talk_commands> ((something about <person>) | (the day of the month));
 <talk_commands> = tell | report | answer | introduce;
 
 <interact_with_person> = (<memory_commands> [<pron>] [<person>] [(in front of you) | ([<noname>] [the] <locations>)]);
 
-<person> = [<noname> | <pron>] (yourself | person | him | her | them | he | she | (the person));
-<names> = (tobi);
+<person> = [<noname> | <pron>] (yourself | person | him | her | them | he | she | (the person) | tobi | mary | female | male);
 <talk_commands> = (((introduce | (tell something about)) <person>) | (the day of the month));
 <memory_commands> = follow | memorize | find;
 
diff --git a/ps-grammar/speechRecognition/speechRecognition.jsgf b/ps-grammar/speechRecognition/speechRecognition.jsgf
index 32ecfc63..5d969c2e 100644
--- a/ps-grammar/speechRecognition/speechRecognition.jsgf
+++ b/ps-grammar/speechRecognition/speechRecognition.jsgf
@@ -22,7 +22,7 @@ public <task> = <question1> | <question2> | <question3> | <question4> | <questio
 <question17> = which ty character said live longand prosper;
 <question18> = in which state would you find the city birmingham;
 <question19> = which hills divide england from scotland;
-<question20> = what continent has the fewest flowering plants,
+<question20> = what continent has the fewest flowering plants;
 <question21> = what is canadas national animal;
 <question22> = what is the alternative common name for a black leopard;
 <question23> = what in cornwall is the most southerly point of mainland britain;
-- 
GitLab