diff --git a/isr-grammar/english/ToBI_GPR/ToBI_GPR.grm b/isr-grammar/english/ToBI_GPR/ToBI_GPR.grm index 12f314e880d5af4ae52e3ddace629ca9b1d9cc92..d65e98889f4b1f8a55f2a8d17d80359b0c31a1f7 100644 --- a/isr-grammar/english/ToBI_GPR/ToBI_GPR.grm +++ b/isr-grammar/english/ToBI_GPR/ToBI_GPR.grm @@ -6,11 +6,11 @@ $robot_name: tobi; $start: $command $connect $command $connect $command | $command $connect $command | $command - | $question + | $grm_question | $confirm_yes - | $confirm_no; + | $confirm_no; -$question: question to do; +$grm_question: question to do; $connect: and | then | and then; @@ -18,15 +18,15 @@ $command: $bring_command | $get_command | $find_command | $leave_command $put_command | $go_command | $follow_command | $learn_person_command | $stop_command | $wait_command; -$bring_command: $bringVerb $person $grm_article $grep_object $praeposition $location | - $bringVerb $person $grm_article $grep_object; -$get_command: $getVerb $grm_article $grep_object $praeposition $grm_article $location | - $getVerb $grm_article $grep_object; -$find_command: $findVerb $grm_article $grep_object in $grm_article $location | - $findVerb $grm_article $grep_object; -$leave_command: $leaveVerb $grm_article $room_class; -$put_command: $putVerb $grm_article $grep_object $on_in $grm_article $location; -$go_command: $goVerb $to_into $grm_article $location; +$bring_command: $bringVerb $person $grep_object $praeposition $location | + $bringVerb $person $grep_object; +$get_command: $getVerb $grep_object $praeposition $location | + $getVerb $grep_object; +$find_command: $findVerb $grep_object in $location | + $findVerb $grep_object; +$leave_command: $leaveVerb $room_class; +$put_command: $putVerb $grep_object $on_in $location; +$go_command: $goVerb $to_into $location; $follow_command: $followVerb $person; $learn_person_command: $learnVerb $person; $stop_command: $stopVerb; @@ -39,7 +39,14 @@ $person_name: James | John | Robert | Michael | William | David | Richard $personal_pronoun: him | her | me | it; -$grm_article: a | the; +$the_a_some: $grm_a | $grm_the | $grm_some; +$the_a: $grm_a | $grm_the; +$the_an: $grm_an | $grm_the; +$the_some: $grm_the | $grm_some; +$grm_a: a; +$grm_an: an; +$grm_the: the; +$grm_some: some; $to_into: to | into; $on_in: on | in; $praeposition: from | to ; @@ -52,33 +59,46 @@ $putVerb: put ; $goVerb: go ; $followVerb: follow ; -$grep_object: $medicine_class | $stuff_class | $drink_class | $snack_class | $food_class - | medicine | stuff | drink | snack | food; +$grep_object: $medicine_class | $stuff_class | $drink_class | $snack_class | + $the_a_some medicine | $the_some stuff | $the_a drink | $the_a snack | + medicine | stuff | + + $food_class | + $the_a food | + food; + +$stuff_class: $the_some matches | $the_some cards | $the_some flowers | $the_a sponge | + $the_a bag | cards | flowers | $the_a cube | + $the_a headphone | $the_a tape | $the_a cup | $the_a microphone; + +$medicine_class: $the_some bandaids | $the_a_some creme | $the_a_some kleenex | + bandaids | creme; + +$drink_class: $the_a_some coke | $grm_a redbull | $the_a_some juice | $the_a_some Beer | + $the_a_some Water | $the_a_some Wine; + +$snack_class: $the_some cookies | cookies; +$food_class: $the_some noodles | $the_some peanuts | $the_some chocolate | $the_some hazelnuts; -$stuff_class: matches | cards | flowers | sponge | bag | headphone | cube | - tape | cup | microphone; -$medicine_class: bandaids | creme | kleenex; -$drink_class: coke | redbull | juice | Beer | Water | Wine; -$snack_class: cookies; -$food_class: noodles | peanuts | chocolate | hazelnuts; - -$location: $appliance_class | $shelf_class | $seat_class | $table_class | $bin_class - | appliance | shelf | seat | table | bin +$location: $appliance_class | $shelf_class | $seat_class | $table_class | $bin_class + | $the_an appliance | $the_a shelf | $the_a seat | $the_a table | $the_a bin | $decoration_class | $room_class - | decoration | room; + | $the_a decoration | $the_a room; + +$appliance_class: $grm_the fridge | $grm_the sink | $the_a TV; +$shelf_class: $the_a hanger | $the_a shelf; +$seat_class: $the_a couch | $grm_the lounge | $the_a bed | $the_an armchair; +$table_class: $the_a desk | $the_a dinnertable | $the_a side_table | $the_a couch_table | + $the_a bar | $the_a couch_table; -$appliance_class: fridge | sink | TV | plant; -$shelf_class: hanger | shelf; -$seat_class: couch | lounge | bed | armchair; -$table_class: desk | dinnertable | side_table | couch_table | - bar | lounge | couch_table | armchair; -$bin_class: waste; -$decoration_class: plant | poster; -$room_class: kitchen | living_room | dining_room; +$bin_class: $the_a waste; +$decoration_class: $the_a plant | $the_a poster; +$room_class: $the_a kitchen | $the_a living_room | $the_a dining_room; $learnVerb: remember | memorize; $stopVerb: stop; $waitVerb: wait; + $confirm_yes: $robot_name please | $robot_name yes | $robot_name yes please | yes $robot_name | yes please $robot_name | yes please | correct | correct $robot_name | $robot_name correct | this is correct | $robot_name this is correct | yes;