From d2573061b88a4d57b93d485c2e84b92809636a2c Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Wed, 2 Apr 2014 14:47:50 +0200
Subject: [PATCH] gprs grammar

---
 ps-grammar/gprs/gprs.jsgf         | 28 +++++++++++++++-------------
 ps-grammar/location/location.jsgf | 16 ++++++++--------
 ps-grammar/object/object.jsgf     | 10 +++++-----
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index d5980a58..5dfc701d 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -26,24 +26,26 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <personal_pronoun> = him | her | me;
 <person_name> = james|john|robert|michael|william|david|richard|charles|linda|thomas|mary|patricia|joseph|dorothy|barbara|susan|jennifer|maria|elizabeth|margaret;
 
-<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff | item | beverage;
-<cleaningstuff_class> = deodorant | toothpaste | cleaner | fresh_discs | sponge;
-<drink_class> = fanta | milk;
-<snack_class> = cookies;
-<food_class> = tomato_sauce | peanut_butter | chicken_noodles | marmalade | veggie_noodles | garlic_sauce; 
+<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class> | <tool_class> | tool | bathroom_stuff | (bathroom stuff) | drink | snack | object | food | something | stuff | item | beverage;
+<bathroom_class> = shower_gel | hair_gel;
+<drink_class> = orange_juice | fruit_juice | ice_tea | coffee | beer;
+<snack_class> = chokolates | chewing_gum | peanuts;
+<food_class> = noodle_sauce | cat_food | dumplings | tacos; 
+<tool_class> = sponge | tape | sole_latex;
 
-<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 | apartment | furniture;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
-<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 | apartment;
+<second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
-<appliance_class> = stove | sink | fridge | tv_counter;
-<shelf_class> = sideboard;
+<appliance_class> = coat_rack | kitchen_counter | fridge | bar;
+<shelf_class> = book_shelf | food_shelf;
 <seat_class> = <seating_class>;
-<seating_class> = bench | bed | sofa | armchair;
-<table_class> = hallway_table | side_table | kitchen_table | dinner_table | couch_table | bedsidetable;
-<door_class> = exit | entry;
+<seating_class> = sofa | bed;
+<table_class> = kitchen_table | desk | side_table | couch_table |bedroom_table;
+<door_class> = exit_door | entry_door | room_door;
 <room_class> = kitchen | living_room | bed_room | hallway;
-<utensil_class> = hanger | umbrella_stand | trash_bin | plant;
+<utensil_class> = trash_bin;
+
 <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 908faa85..6f9ef07b 100644
--- a/ps-grammar/location/location.jsgf
+++ b/ps-grammar/location/location.jsgf
@@ -6,14 +6,14 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class>;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class>;
 
-<appliance_class> = stove | sink | fridge | tv_counter;
-<shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;
+<appliance_class> = coat_rack | kitchen_counter | fridge | bar;
+<shelf_class> = book_shelf | food_shelf;
 <seat_class> = <seating_class>;
-<seating_class> = bench | bed | sofa | armchair;
-<table_class> = hallway_table | side_table | kitchen_table | dinner_table | couch_table | bedsidetable;
-<room_class> = kitchen | living_room | bed_room | hallway;
-<utensil_class> = hanger | umbrella_stand | trash_bin | plant;
-<door_class> = exit | entry;
+<seating_class> = sofa | bed;
+<table_class> = kitchen_table | desk | side_table | couch_table |bedroom_table;
+<door_class> = exit_door | entry_door | room_door;
+<utensil_class> = trash_bin;
+
 <preposition> = into | (on [top of]) | in | ([next] to) | at | near | in | from;
diff --git a/ps-grammar/object/object.jsgf b/ps-grammar/object/object.jsgf
index 910ae35b..2daebccd 100644
--- a/ps-grammar/object/object.jsgf
+++ b/ps-grammar/object/object.jsgf
@@ -3,12 +3,12 @@ grammar ToBI_object;
 public <statement> = [<verb>] [<article>] <object> [please];
 
 <object> = <grab_object>;
-<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class>;
+<grab_object> = <bathroom_class> | <drink_class> | <snack_class> | <food_class>;
 
-<cleaningstuff_class> = deodorant | toothpaste | cleaner | fresh_discs | sponge;
-<drink_class> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | apple_juice | milk;
-<snack_class> = chocolate | cookies | drops | cracker;
-<food_class> = tomato_sauce | peanut_butter | chicken_noodles | marmalade | veggie_noodles | garlic_sauce; 
+<bathroom_class> = shower_gel | hair_gel;
+<drink_class> = orange_juice | fruit_juice | ice_tea | coffee | beer;
+<snack_class> = chokolates | chewing_gum | peanuts;
+<food_class> = noodle_sauce | cat_food | dumplings | tacos; 
 
 <verb> = bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize;
 <article> = the | an | some | a | this;
-- 
GitLab