From e65e7a34ac63917506a116277f1a4b8f6d439803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnes=20Minareci?= <gminareci@techfak.uni-bielefeld.de>
Date: Tue, 25 Jun 2013 09:41:47 +0200
Subject: [PATCH] cleanup cocktailparty und dictonary an die neuen drinks und
 raueme angepasst

---
 pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf      | 2 +-
 pocketsphinxAdapter/grammar/cocktailparty/object.jsgf | 5 +++--
 pocketsphinxAdapter/grammar/dictionary/tobiDic.dic    | 8 ++++++++
 pocketsphinxAdapter/grammar/location/location.jsgf    | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf b/pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf
index 1af0b6c2..b01bbe52 100644
--- a/pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf
+++ b/pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf
@@ -4,4 +4,4 @@ public <task> = [tobi] [please] <command> [please] [tobi];
 
 <command> = <cleanUp>;
 <cleanUp> = (clean | tidy) [up] [the] <rooms>;
-<rooms> = kitchen | bathroom | bedroom | living_room | dining_room | office;
+<rooms> = kitchen | hallway | bedroom | living_room;
diff --git a/pocketsphinxAdapter/grammar/cocktailparty/object.jsgf b/pocketsphinxAdapter/grammar/cocktailparty/object.jsgf
index 79943100..0a221180 100644
--- a/pocketsphinxAdapter/grammar/cocktailparty/object.jsgf
+++ b/pocketsphinxAdapter/grammar/cocktailparty/object.jsgf
@@ -2,8 +2,9 @@
 grammar ToBI_object;
 public <statement> = <objectPhrase>;
 
-<objectPhrase> = [<verb>] [<article>] <objects>;
-<objects> = milk | cocoa | cookies;
+<objectPhrase> = [<verb>] [<personal_pronoun>] [<article>] <objects>;
+<objects> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | milk | apple_juice;
 
+<personal_pronoun> = me;
 <verb> = bring | carry | retrieve | fetch | get | give;
 <article> = the | an | some | a;
diff --git a/pocketsphinxAdapter/grammar/dictionary/tobiDic.dic b/pocketsphinxAdapter/grammar/dictionary/tobiDic.dic
index 829338e7..bbb8638d 100644
--- a/pocketsphinxAdapter/grammar/dictionary/tobiDic.dic
+++ b/pocketsphinxAdapter/grammar/dictionary/tobiDic.dic
@@ -4959,6 +4959,7 @@ applauding	AH P L AO D IH NG
 applauds	AH P L AO D Z
 applause	AH P L AO Z
 apple	AE P AH L
+apple_juice AE P AH L JH UW S
 apple's	AE P AH L Z
 appleans	AH P L IY N Z
 applebaum	AE P AH L B AW M
@@ -9785,6 +9786,8 @@ beeping	B IY P IH NG
 beeps	B IY P S
 beer	B IH R
 beer's	B IY R Z
+beer_bottle	B IH R B AO T AH L
+beer_can B IH R K AE N
 beerbower	B IH R B OW ER
 beerman	B IH R M AH N
 beers	B IH R Z
@@ -20926,6 +20929,7 @@ choate	CH OW T
 chock	CH AA K
 chocolat	CH AA K L AH T
 chocolate	CH AO K L AH T
+chocolate_milk	CH AO K L AH T M IH L K
 chocolates	CH AO K L AH T S
 chocolatology	CH AA K L AH T AA L AH JH IY
 chodorow	CH OW D ER OW
@@ -37658,6 +37662,7 @@ energizer	EH N ER JH AY Z ER
 energizes	EH N ER JH AY Z IH Z
 energizing	EH N ER JH AY Z IH NG
 energy	EH N ER JH IY
+energy_drink	EH N ER JH IY D R IH NG K
 energy's	EH N ER JH IY Z
 enerson	EH N ER S AH N
 enex	IY N AH K S
@@ -86273,6 +86278,8 @@ oran	AO R AA N
 orand	AO R AH N D
 orange	AO R AH N JH
 orange(2)	AO R IH N JH
+orange_juice	AO R AH N JH JH UW S
+orange_juice(2)	AO R IH N JH JH UW S
 orangeburg	AO R AH N JH B ER G
 oranges	AO R AH N JH AH Z
 oranges(2)	AO R IH N JH IH Z
@@ -108116,6 +108123,7 @@ sevareid	S EH V AH R AY D
 sevcik	S EH V S IH K
 seve	S EH V EY
 seven	S EH V AH N
+seven_up	S EH V AH N AH P
 seven's	S EH V AH N Z
 sevenfold	S EH V AH N F OW L D
 sevens	S EH V AH N Z
diff --git a/pocketsphinxAdapter/grammar/location/location.jsgf b/pocketsphinxAdapter/grammar/location/location.jsgf
index 2dfe2217..ef485000 100644
--- a/pocketsphinxAdapter/grammar/location/location.jsgf
+++ b/pocketsphinxAdapter/grammar/location/location.jsgf
@@ -13,5 +13,5 @@ public <statement> = <locationPhrase> [please];
 <table_class> = desk | dinnertable | side_table | couch_table | bar;
 <bin_class> = waste;
 <decoration_class> = plant | poster;
-<room_class> = kitchen | living_room | dining_room;
+<room_class> = kitchen | living_room | hallway | bedroom;
 <preposition> = (on [top of]) | in | ([next] to) | at | near | in | into | from;
-- 
GitLab