diff --git a/psConfig/tasks/restaurant/restaurant.conf b/psConfig/tasks/restaurant/restaurant.conf index 37ac750702285a89c061fa277b1b261832a0f2ac..090ae9149043ff44ee3b00257b12bc5084b24c93 100644 --- a/psConfig/tasks/restaurant/restaurant.conf +++ b/psConfig/tasks/restaurant/restaurant.conf @@ -20,26 +20,10 @@ rsbscope=/speechrec/psa/ordering; bestpath=no; autoload=yes; -[pocketsphinxinstance] -name=goTable; -jsgf=../../../psGrammar/tasks/restaurant/goTable.jsgf; -rsbscope=/speechrec/psa/go_table; -bestpath=no; -autoload=yes; -[pocketsphinxinstance] -name=table; -jsgf=../../../psGrammar/tasks/restaurant/table.jsgf; -rsbscope=/speechrec/psa/table; -bestpath=no; -autoload=yes; -[pocketsphinxinstance] -name=barLocation; -jsgf=../../../psGrammar/tasks/restaurant/barLocation.jsgf; -rsbscope=/speechrec/psa/bar_location; -bestpath=no; -autoload=yes; + + diff --git a/psGrammar/tasks/restaurant/order.jsgf b/psGrammar/tasks/restaurant/order.jsgf deleted file mode 100644 index 029661c1583ecb4459f0964e5bb085981d817141..0000000000000000000000000000000000000000 --- a/psGrammar/tasks/restaurant/order.jsgf +++ /dev/null @@ -1,11 +0,0 @@ -#JSGF V1.0; -grammar ordering; - -public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [please]); - -<objects> = (<drinks> | <combo> | <food>); -<combo> = ((<orderings> [and | with] <orderings> [ [and | with] <orderings> ])); -<orderings> = (<drinks> | <food>); - -<food> = ( (cereal) | (lemon) | (orange) | (bouillon) | (corn) | (noodles) | (pepper) | (salt) | (sauerkraut) |(seasoning_mix) | (tomatoes) | (cereal_bar_chocolate) | (cereal_bar_chocolate_banana) | (cracker) | (fruit_bar_apple) | (fruit_bar_forest_fruit) | (get_it) | (nut_fruit_mix) | (peanut_bits)); -<drinks> = ( (apple_juice) | (iso_drink) | (orange_juice) | (red_spritzer) | (sparkling_water) | (coke) | (lemon_juice) | (water) | (milk)); diff --git a/psGrammar/tasks/restaurant/order_apartment.jsgf b/psGrammar/tasks/restaurant/order_apartment.jsgf index fa75bb15a6ef01b3a58ccf82d25c4abdec34646b..939874adaa0b0702507b0661073ee69344f4170e 100644 --- a/psGrammar/tasks/restaurant/order_apartment.jsgf +++ b/psGrammar/tasks/restaurant/order_apartment.jsgf @@ -21,6 +21,7 @@ public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [plea (banana) | (pear) | (peach)| + (nothing)| (dishwasher tab)); <drinks> = ((milk) | (cup) | (coke) | (milo) | diff --git a/psGrammar/tasks/restaurant/order_new.jsgf b/psGrammar/tasks/restaurant/order_new.jsgf deleted file mode 100644 index 86b9eb5df8f81723691f271f99a495b999dc89d7..0000000000000000000000000000000000000000 --- a/psGrammar/tasks/restaurant/order_new.jsgf +++ /dev/null @@ -1,26 +0,0 @@ -#JSGF V1.0; -grammar ordering; - -public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [please]); - -<objects> = (<drinks> | <food>); - -<food> = ((tuna_fish_can) | - (tomato_soup_can) | - (sugar_box) | - (strawberry) | - (pudding_box) | - (potted_meat_can) | - (plum) | - (pear) | - (peach) | - (orange)| - (mustard_bottle)| - (lemon) | - (gelatin_box) | - (cracker_box) | - (chips_can) | - (bannana) | - (apple) ); - -<drinks> = ((master_chef_can) ); \ No newline at end of file