Merge branch 'master' of https://gitlab.ub.uni-bielefeld.de/CLF/Robocup/robocup-speechrec

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;
+
+
 
 
 

psGrammar/tasks/restaurant/order.jsgf

-#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));

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) | 

psGrammar/tasks/restaurant/order_new.jsgf

-#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