From 9fe679e84fd4ad3a2ea7eea91715e7d5f5464d56 Mon Sep 17 00:00:00 2001
From: gminareci <gminareci@techfak.uni-bielefeld.de>
Date: Wed, 16 Jul 2014 15:56:13 +0200
Subject: [PATCH] changed gprs grammar and location grammar to add exit and
 entry door to exit class and add location everywhere for searching

---
 ps-grammar/gprs/gprs.jsgf         | 5 +++--
 ps-grammar/location/location.jsgf | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index aa5b03b9..31d53d1a 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -33,7 +33,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <food_class> = (noodle sauce) | (cat food) | dumplings | tacos; 
 <tool_class> = sponge | tape | (sole latex);
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | <exit_class> | exit | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
 <second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
@@ -42,9 +42,10 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <seat_class> = <seating_class>;
 <seating_class> = sofa | bed;
 <table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table);
-<door_class> = (exit door) | (entry door) | (room door);
+<door_class> = (room door);
 <room_class> = kitchen | living_room | bedroom | hallway;
 <utensil_class> = trash_bin;
+<exit_class> = (exit door) | (entry door);
 
 <preposition> = into | to | from;
 <further_preposition> = (on [top of]) | in | (next to) | at | near;
diff --git a/ps-grammar/location/location.jsgf b/ps-grammar/location/location.jsgf
index da0f9dd9..5b135e6a 100644
--- a/ps-grammar/location/location.jsgf
+++ b/ps-grammar/location/location.jsgf
@@ -6,15 +6,17 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class>;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | <exit_class> | <everywhere_class>;
 
 <appliance_class> = (coat rack) | kitchen_counter | fridge | bar;
 <shelf_class> = book_shelf | (food shelf);
 <seat_class> = <seating_class>;
 <seating_class> = sofa | bed;
 <table_class> = kitchen_table | desk | side_table | couch_table | (bedroom table);
-<door_class> = (exit door) | (entry door) | (room door);
+<door_class> = (room door);
 <utensil_class> = trash_bin;
+<exit_class> = (exit door) | (entry door);
+<everywhere_class> = everywhere;
 
 <room_class> = kitchen | living_room | bedroom | hallway;
 
-- 
GitLab