From 52dd95dfeff5ab05e287c1d51d74d859cf68a703 Mon Sep 17 00:00:00 2001 From: Linus Schwarz <linus.schwarz@uni-bielfeld.de> Date: Wed, 7 Jun 2023 17:37:45 +0200 Subject: [PATCH] Fixed syntax errors in gpsr23alternate grammar and changed names to match command generator --- psGrammar/person/person.jsgf | 3 ++- psGrammar/tasks/gpsr/gpsr23alternate.jsgf | 28 +++++++---------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/psGrammar/person/person.jsgf b/psGrammar/person/person.jsgf index 43c48a13..4fbd5d44 100644 --- a/psGrammar/person/person.jsgf +++ b/psGrammar/person/person.jsgf @@ -2,4 +2,5 @@ grammar ToBI_person; public <statement> = <naming> ; <naming> = [(my name is) | (i am)] <name>; -<name> = sophia | isabella | emma | olivia | ava | emily | abigail | madison | mia | chloe | james | john | robert | michael | william | david | richard | charles | joseph | thomas; +<name_old> = sophia | isabella | emma | olivia | ava | emily | abigail | madison | mia | chloe | james | john | robert | michael | william | david | richard | charles | joseph | thomas; +<name> = alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william; \ No newline at end of file diff --git a/psGrammar/tasks/gpsr/gpsr23alternate.jsgf b/psGrammar/tasks/gpsr/gpsr23alternate.jsgf index f9cd00c4..b045a592 100644 --- a/psGrammar/tasks/gpsr/gpsr23alternate.jsgf +++ b/psGrammar/tasks/gpsr/gpsr23alternate.jsgf @@ -1,40 +1,28 @@ #JSGF V1.0; -# This grammar tries to restrict task combinations by checking available and required references to places, items and persons. It doesn't work yet and is not worth continuing right now. grammar speechRecognition; public <sentence> = [could you | robot | tobi] [please] <command>; -command = (<cmdfndppl> | <cmdfndobj> | <cmdguide> | <cmdfollow> | <cmdfollowout> | <cmdincomplete> | <cmdman> | <complexman> | <cmdpartyhost>); +<command> = (<cmdfndppl> | <cmdfndobj> | <cmdguide> | <cmdfollow> | <cmdfollowout> | <cmdincomplete> | <cmdman> | <complexman> | <cmdpartyhost>); - -#Base commands <cmdfndppl> = <tellPrsInfoInLoc> | <countPrsInRoom>; <cmdfndobj> = <findObjInRoom> | <countObjOnPlcmt> | <tellCatPropOnPlcmt> | <tellObjPropOnPlcmt>; -<cmdguide> = <guideNameFromBeacToBeac> - | (<meetPrsAtBeac> and <guidePrsToBeacon>) - | (<goToLoc> <meetName> and <guidePrsToBeacon>); +<cmdguide> = <guideNameFromBeacToBeac> | (<meetPrsAtBeac> and <guidePrsToBeacon>) | (<goToLoc> <meetName> and <guidePrsToBeacon>); -<cmdfollow> = <followNameFromBeacToRoom> - | (<meetPrsAtBeac> and (<followPrs> | <followPrsToRoom>)) - | (<goToLoc> <meetName> and (<followPrs> | <followPrsToRoom>)); +<cmdfollow> = <followNameFromBeacToRoom> | (<meetPrsAtBeac> and (<followPrs> | <followPrsToRoom>)) | (<goToLoc> <meetName> and (<followPrs> | <followPrsToRoom>)); <cmdfollowout> = <meetPrsAtBeac> <followPrs> and (<goToLoc> | <guidePrsBack>); -<cmdincomplete> = noGrammarMatch; - -<cmdman> = <bringMeObjFromPlcmt> - | (<takefrom> and (<deliverObjPronToMe> | <deliverObjToNameAtBeac>)) - | (<takefrom> and <placeObjPronOnPlcmt>); - -<complexman> = noGrammarMatch; +<cmdincomplete> = skyler; -<cmdpartyhost> = noGrammarMatch; +<cmdman> = <bringMeObjFromPlcmt> | (<takeObjFromPlcmt> and (<deliverObjPronToMe> | <deliverObjToNameAtBeac>)) | (<takeObjFromPlcmt> and <placeObjPronOnPlcmt>); +<complexman> = skyler; -#Tasks the command consists out of +<cmdpartyhost> = skyler; <goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>); @@ -160,4 +148,4 @@ command = (<cmdfndppl> | <cmdfndobj> | <cmdguide> | <cmdfollow> | <cmdfollowout> <N_beacon> = fridge | sink | dishwasher | (easy chair) | (arm chair) | (kitchen table) | workstation; <N_beaconTwo> = fridge | sink | dishwasher | (easy chair) | (arm chair) | (kitchen table) | workstation; <N_name_old> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin; -<N_name> = amelia | angel | ava | charlie | charlotte | hunter | max | mia | olivia | parker | sam | jack | noah | oliver | thomas | william; +<N_name> = alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william; \ No newline at end of file -- GitLab