..

isr-grammar/english/ToBI_GPR/ToBI_GPR.grm

@@ -8,7 +8,7 @@ $$S: tobi $all
 	| $naming
 	| $followMe;
 
-$all: $simpleTask $anotherSimpleTask $anotherSimpleTask;
+$all: $simpleTask $anotherSimpleTask;
 
 $anotherSimpleTask: $simpleTask
     | and $simpleTask
@@ -128,76 +128,68 @@ $locationCategory: appliance
 				| table;
 				
 $appliance: fridge
-			| stove
-			| microwave;
+			| sink
+			| TV
+			| plant;
 
-$shelf: bookshelf
-		| buffet
-		| bar
-		| side_board;
+$shelf: hanger
+	| shelf;
 		
-$bin: waste_bin;
+$bin: waste;
 
-$seat: sofa
-	| armchair
-	| stool
-	| couch
-	| bed
-	| foot_stool;
+$seat: couch
+		| side_table
+		| bar
+		| lounge
+		| bed
+		| couch_table
+		| armchair;
 
-$table: kitchen_table
-		| dinner_table
-		| couch_table;
+$table: desk
+		| dinnertable;
 
 $room: kitchen
 		| living_room
-		| bath_room
-		| dining_room
-		| bed_room
-		| office
-		| lobby
-		| corridor;
+		| dining_room;
 
 $object: $drink
-		| $bathroom_stuff
+		| $stuff
 		| $snack
 		| $food;
 		
 $objectCategory:  drink
 		| food
 		| snack
-		| bathroom_stuff;
+		| stuff;
 		
 
 $drink: coke
-	| seven_up
-	| lemon_tea
-	| pepsi
-	| mineral_water
-	| gatorade
-	| orange_juice
-	| apple_juice;
-
-$snack: crackers
-	| wafer
-	| candy
-	| cookies;
-
-$food: chili
-	| dough
-	| tomato_sauce
-	| soy_sauce
-	| tofu
-	| tea_box;
-
-$bathroom_stuff: cotton
-	| disinfectant
-	| hair_gel
-	| soap
-	| tooth_paste
-	| toilet_paper
-	| shampoo
-	| pad;
+	| redbull
+	| juice
+	| Beer
+	| Water
+	| Wine;
+
+$snack: cookies;
+
+$food: noodles
+	| peanuts
+	| chocolate
+	| hazelnuts;
+
+$stuff: bandaids
+	| matches
+	| cards
+	| flowers
+	| creme
+	| kleenex
+	| sponge
+	| bag
+	| headphone
+	| cube
+	| tape
+	| cup
+	| microphone;
 
 $determiner: the 
             | a
@@ -280,4 +272,4 @@ $stop: stop
 	| tobi stop here
 	| tobi stop here please
 	| tobi stop please;
-			
\ No newline at end of file
+