From 92714ac6e134d90255f95fdf53f2ce6958391755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnes=20Minareci?= <gminareci@techfak.uni-bielefeld.de>
Date: Wed, 26 Jun 2013 14:36:25 +0200
Subject: [PATCH] gprs grm angepasst

---
 pocketsphinxAdapter/grammar/gprs/gprs.jsgf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
index c4702dbf..f180b145 100644
--- a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
+++ b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
@@ -1,10 +1,11 @@
 #JSGF V1.0;
 grammar ToBI_GPRS;
-public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
+public <task> = [tobi] [(would | could) you] [please] <command> | [(would | could) you] <command> [please] [tobi] | [tobi] [(would | could) you] <command> [please] | [(would | could) you] [please] <command> [tobi];
 
 <command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>;
 
 <bring_command> = <bringVerb> [<person>] [<article>] <grab_object> [from | into | to] [<article>] [<location> | <person>];
+<bringFromTo_command> = <bringVerb> ([<article>] <grab_object> | this) from <location> [to | into] <second_location>;
 <goto_command> = <gotoVerb> <preposition> <location>;
 <follow_command> = <followVerb> <person>;
 <find_command> = <findVerb> [<article>] (<grab_object> | <person>) [in <location>];
@@ -30,6 +31,8 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 
 <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere;
 
+<second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere;
+
 <appliance_class> = stove | sink | fridge | tv_counter;
 <shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;
 <seat_class> = <seating_class>;
-- 
GitLab