Merge branch 'master' of rcs:robocup-speechrec

isr-grammar/english/ToBI_DEMO_CHALLENGE/ToBI_DEMO_CHALLENGE.grm

@@ -2,41 +2,17 @@ $$S: $confirm_yes
 	| $confirm_no
 	| $feeling
 	| $pain
-	| $smalltalk_time
-	| $smalltalk_joke
-	| $smalltalk_room;
-	
-$MR: can you get a medical report from
-		|get a medical report of
-		|get a medical report from
-		|get a medical report of
-		|go and get a medical report of;	
-		
-$name: James
-	| John
-	| Robert
-	| William
-	| David
-	| Richard
-	| Michael
-	| Charles
-	| Joseph
-	| Thomas
-	| Mary
-	| Patricia
-	| Linda
-	| Barbara
-	| Elizabeth
-	| Jennifer
-	| Maria
-	| Susan
-	| Margaret
-	| Dorothy;
-	
-$gettingMR: tobi $MR $name
-		|please tobi $MR $name
-		| please $MR $name
-		| $MR $name;
+	| $smalltalk
+	| $gettingMR;
+
+$MR: get me a medical report from;
+
+$name_william: William;
+
+$gettingMR: tobi $MR $name_william
+		| please tobi $MR $name_william
+		| please $MR $name_william
+		| $MR $name_william;
 
 $injury: deflection
 		| cut;
@@ -66,25 +42,19 @@ $pleaseUtterance: please tell me
 		| would you tell me
 		| will you tell me;
 
-$smalltalk_joke: joke
-		| $pleaseUtterance a joke
-		| $pleaseUtterance the time
-		| tobi $pleaseUtterance tell me a joke
-		| tobi tell me a joke
-		| tobi joke;
+$smalltalk: $time | $weather;
 
-$smalltalk_room: where is the room
-		| $pleaseUtterance  where this room is
-		| tobi where is the room
-		| tobi $pleaseUtterance  where this room is;
-		
-		
-$smalltalk_time: what time is it		
+$time: what time is it
 		| $pleaseUtterance what time it is
 		| tobi tell me what time it is
 		| tobi $pleaseUtterance what time it is
-		| tobi time;		
-		
+		| tobi time;
+
+$weather: what is the weather
+		| $pleaseUtterance what weather it is
+		| tobi tell me what weather it is
+		| tobi $pleaseUtterance what weather it is
+		| tobi weather;
 
 $confirm_yes: tobi please
 		| tobi yes
@@ -98,11 +68,10 @@ $confirm_yes: tobi please
 		| this is correct
 		| tobi this is correct
 		| yes;
-		
+
 $confirm_no: tobi no
 	| tobi no thanks
 	| no tobi
 	| no
 	| no thanks tobi
 	| no thanks;
-				
\ No newline at end of file

isr-grammar/english/ToBI_RESTAURANT/ToBI_RESTAURANT.grm

@@ -43,8 +43,7 @@ $followMe: tobi follow me
            | keep up
            | tobi keep up;
 
-$stop: stop 
-		| tobi stop
+$stop: tobi stop
 		| tobi please stop 
 		| tobi stop this;
 
@@ -78,9 +77,9 @@ $ordering:
 	| ordering;
 
 $deliveryLocations:
-	| first table
-	| second table
-	| third table;
+	| place a
+	| place b
+	| place c;
 
 $savePlaceLeft:
 	| save the place to the left