From f5c7ff282c41dbe0d7ed46cbbd29f78b1b11ca26 Mon Sep 17 00:00:00 2001
From: pvonneumanncosel <pvonneumanncosel@techfak.uni-bielefeld.de>
Date: Mon, 21 May 2018 23:58:19 +0200
Subject: [PATCH] reorganized gpsr eegpsr grammar and updated config and
 created gpsall grammar and config

---
 psConfig/tasks/eegpsr/eegpsr.conf          |  34 +++--
 psConfig/tasks/gpsr/gpsr.conf              |  32 ++--
 psGrammar/tasks/eegpsr/beacons.jsgf        |  13 --
 psGrammar/tasks/eegpsr/commands_cat1.jsgf  |  76 ----------
 psGrammar/tasks/eegpsr/commands_cat1E.jsgf |  77 ----------
 psGrammar/tasks/eegpsr/commands_cat1I.jsgf |  85 -----------
 psGrammar/tasks/eegpsr/commands_cat2.jsgf  | 164 ---------------------
 psGrammar/tasks/eegpsr/rooms.jsgf          |  14 --
 psGrammar/tasks/gpsr/commands.jsgf         | 121 ---------------
 9 files changed, 38 insertions(+), 578 deletions(-)
 delete mode 100644 psGrammar/tasks/eegpsr/beacons.jsgf
 delete mode 100644 psGrammar/tasks/eegpsr/commands_cat1.jsgf
 delete mode 100644 psGrammar/tasks/eegpsr/commands_cat1E.jsgf
 delete mode 100644 psGrammar/tasks/eegpsr/commands_cat1I.jsgf
 delete mode 100644 psGrammar/tasks/eegpsr/commands_cat2.jsgf
 delete mode 100644 psGrammar/tasks/eegpsr/rooms.jsgf
 delete mode 100644 psGrammar/tasks/gpsr/commands.jsgf

diff --git a/psConfig/tasks/eegpsr/eegpsr.conf b/psConfig/tasks/eegpsr/eegpsr.conf
index d27af5d5..f77a42ca 100644
--- a/psConfig/tasks/eegpsr/eegpsr.conf
+++ b/psConfig/tasks/eegpsr/eegpsr.conf
@@ -9,40 +9,48 @@ alsadevice=sysdefault;
 [pocketsphinxinstance]
 name=Commands;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/eegpsr/commands_cat2.jsgf;
+jsgf=../../../psGrammar/tasks/gpsr/eegpsr2.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=confirm;
+name=Questions;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/confirm/confirm.jsgf;
-rsbscope=/speechrec/psa/confirm;
+jsgf=../../../psGrammar/tasks/gpsr/questions.jsgf;
+rsbscope=/speechrec/psa/questions;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=stop;
+name=room;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/gpsr/stop.jsgf;
-rsbscope=/speechrec/psa/stop;
+jsgf=../../../psGrammar/tasks/gpsr/rooms.jsgf;
+rsbscope=/speechrec/psa/room;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=room;
+name=beacon;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/eegpsr/rooms.jsgf;
-rsbscope=/speechrec/psa/room;
+jsgf=../../../psGrammar/tasks/gpsr/beacons.jsgf;
+rsbscope=/speechrec/psa/beacon;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=beacon;
+name=confirm;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/eegpsr/beacons.jsgf;
-rsbscope=/speechrec/psa/beacon;
+jsgf=../../../psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=stop;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/confirm/stop.jsgf;
+rsbscope=/speechrec/psa/stop;
 bestpath=no;
 autoload=yes;
 
diff --git a/psConfig/tasks/gpsr/gpsr.conf b/psConfig/tasks/gpsr/gpsr.conf
index 570493f6..57c62b09 100644
--- a/psConfig/tasks/gpsr/gpsr.conf
+++ b/psConfig/tasks/gpsr/gpsr.conf
@@ -9,7 +9,7 @@ alsadevice=sysdefault;
 [pocketsphinxinstance]
 name=Commands;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/gpsr/commands.jsgf;
+jsgf=../../../psGrammar/tasks/gpsr/gpsr2.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;
@@ -22,6 +22,22 @@ rsbscope=/speechrec/psa/questions;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=room;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/tasks/gpsr/rooms.jsgf;
+rsbscope=/speechrec/psa/room;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=beacon;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/tasks/gpsr/beacons.jsgf;
+rsbscope=/speechrec/psa/beacon;
+bestpath=no;
+autoload=yes;
+
 [pocketsphinxinstance]
 name=confirm;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
@@ -46,19 +62,5 @@ rsbscope=/speechrec/psa/person;
 bestpath=no;
 autoload=yes;
 
-[pocketsphinxinstance]
-name=room;
-dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/eegpsr/rooms.jsgf;
-rsbscope=/speechrec/psa/room;
-bestpath=no;
-autoload=yes;
 
-[pocketsphinxinstance]
-name=beacon;
-dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/eegpsr/beacons.jsgf;
-rsbscope=/speechrec/psa/beacon;
-bestpath=no;
-autoload=yes;
 
diff --git a/psGrammar/tasks/eegpsr/beacons.jsgf b/psGrammar/tasks/eegpsr/beacons.jsgf
deleted file mode 100644
index 3d9726e3..00000000
--- a/psGrammar/tasks/eegpsr/beacons.jsgf
+++ /dev/null
@@ -1,13 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = [<talking>] <beacon>;
-
-<talking> = <verb> | (the [exact] (beacon | location | place) is the) | it is the | at the;
-
-<verb> = (<V_meet> | <V_describe>) [the (person | persons)] at the;
-
-<V_meet>      = meet | contact | get to know | get acquainted with;
-<V_describe>  = describe;
-
-<beacon> = (living table) | sofa | (comfy chair) | fridge | kitchen counter | sink | stove | cabinet | bar;
diff --git a/psGrammar/tasks/eegpsr/commands_cat1.jsgf b/psGrammar/tasks/eegpsr/commands_cat1.jsgf
deleted file mode 100644
index d7c56431..00000000
--- a/psGrammar/tasks/eegpsr/commands_cat1.jsgf
+++ /dev/null
@@ -1,76 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = ([please | (could you [please]) | (robot please) | tobi | pepper | (tobi please)] <VP1> [([and|then] <VP2>)] [([and|then] <VP3>)]);
-
-
-<VP1> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP2> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-
-<VP_trans> = <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <deliverObjToMe>;
-<VP_bitrans> = <takeObjFromPlcmt> | <placeObjOnPlcmt> | <findPrsInBeac> | <findObjInRoom> | <guidePrsToLoc>;
-<VP_tritrans> = <deliverObjToNameAtBeac>;
-
-
-<goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
-<findObj> = <V_find> <NP_object>;
-<talkInfo> = <V_talk> <NP_talk>;
-<answerQuestion> = <V_answer> <NP_answer>;
-<findPrs> = <V_find> (<NP_name>);
-<followPrs> = <V_follow> <NP_personalpron>;
-<deliverObjToMe> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_me>;
-
-
-<takeObjFromPlcmt> = <V_take> <NP_object> <fromLocPrep> <NP_placement>;
-<placeObjOnPlcmt> = <V_place> (<NP_objectpron> | <NP_object>) <placePrep> <NP_placement>;
-<findPrsInBeac> = <V_find> (<NP_name>) (<inLocPrep> | <atLocPrep>) (<NP_room> | <NP_beacon>);
-<findObjInRoom> = <V_find> (<NP_object>) <inLocPrep> <NP_room>;
-<guidePrsToLoc> = <V_guide> <NP_personalpron> <toLocPrep> (<NP_room> | <NP_beacon>);
-
-
-<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <inLocPrep> <NP_beacon>;
-
-
-<V_take> = retrieve | take | get | grasp | (pick up);
-<V_place> = leave | set | put | place;
-<V_deliver> = bring | deliver | give | (hand [over]);
-<V_go> = go | navigate | enter;
-<V_find> = find | locate | (look for) | spot | pinpoint;
-<V_talk> = tell | say;
-<V_answer> = answer;
-<V_follow> = follow | ((come | go) (behind | after)) | accompany;
-<V_guide> = guide | escort | take | lead | accompany | conduct;
-
-
-<NP_object> = (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
-<NP_objectpron> = (<N_objectpron>);
-<NP_placement> = (the <N_placement>);
-<NP_beacon> = (the <N_beacon>);
-<NP_room> = (the <N_room>);
-<NP_me> = (<N_me>);
-<NP_name> = (a <N_name>) | (<N_name>);
-<NP_talk> = <N_talk>;
-<NP_answer> = <N_answer>;
-<NP_personalpron> = <N_personalpron>;
-
-
-
-<N_object>    = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | (orange (juice | drink)) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water;
-<N_objectpron> = it;
-<N_placement> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar;
-<N_beacon> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar | exit;
-<N_room> = corridor | livingroom | kitchen | bathroom;
-<N_me>        = me;
-<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (whether you dream or not on electric sheep) |(a joke);
-<N_answer> = (a question);
-<N_personalpron> = them | her | him;
-<N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
-
-
-<deliverPrep> = to;
-<placePrep> = on;
-<inLocPrep> = in | at;
-<atLocPrep> = at;
-<fromLocPrep> = from;
-<toLocPrep> = to;
diff --git a/psGrammar/tasks/eegpsr/commands_cat1E.jsgf b/psGrammar/tasks/eegpsr/commands_cat1E.jsgf
deleted file mode 100644
index db2da4f5..00000000
--- a/psGrammar/tasks/eegpsr/commands_cat1E.jsgf
+++ /dev/null
@@ -1,77 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = ([please | (could you [please]) | (robot please) | tobi | pepper | (tobi please)] <VP1> [([and|then] <VP2>)] [([and|then] <VP3>)] [([and|then] <VP4>)]);
-
-
-<VP1> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP2> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP4> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-
-<VP_trans> = <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <deliverObjToMe>;
-<VP_bitrans> = <takeObjFromPlcmt> | <placeObjOnPlcmt> | <findPrsInBeac> | <findObjInRoom> | <guidePrsToLoc>;
-<VP_tritrans> = <deliverObjToNameAtBeac>;
-
-
-<goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
-<findObj> = <V_find> <NP_object>;
-<talkInfo> = <V_talk> <NP_talk>;
-<answerQuestion> = <V_answer> <NP_answer>;
-<findPrs> = <V_find> (<NP_name>);
-<followPrs> = <V_follow> <NP_personalpron>;
-<deliverObjToMe> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_me>;
-
-
-<takeObjFromPlcmt> = <V_take> <NP_object> <fromLocPrep> <NP_placement>;
-<placeObjOnPlcmt> = <V_place> (<NP_objectpron> | <NP_object>) <placePrep> <NP_placement>;
-<findPrsInBeac> = <V_find> (<NP_name>) (<inLocPrep> | <atLocPrep>) (<NP_room> | <NP_beacon>);
-<findObjInRoom> = <V_find> (<NP_object>) <inLocPrep> <NP_room>;
-<guidePrsToLoc> = <V_guide> <NP_personalpron> <toLocPrep> (<NP_room> | <NP_beacon>);
-
-
-<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> (<inLocPrep> | <atLocPrep>) <NP_beacon>;
-
-
-<V_take> = retrieve | take | get | grasp | (pick up);
-<V_place> = leave | set | put | place;
-<V_deliver> = bring | deliver | give | (hand [over]);
-<V_go> = go | navigate | enter;
-<V_find> = find | locate | (look for) | spot | pinpoint;
-<V_talk> = tell | say;
-<V_answer> = answer;
-<V_follow> = follow | ((come | go) (behind | after)) | accompany;
-<V_guide> = guide | escort | take | lead | accompany | conduct;
-
-
-<NP_object> = (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
-<NP_objectpron> = (<N_objectpron>);
-<NP_placement> = (the <N_placement>);
-<NP_beacon> = (the <N_beacon>);
-<NP_room> = (the <N_room>);
-<NP_me> = (<N_me>);
-<NP_name> = (a <N_name>) | (<N_name>);
-<NP_talk> = <N_talk>;
-<NP_answer> = <N_answer>;
-<NP_personalpron> = <N_personalpron>;
-
-
-
-<N_object>    = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | (orange (juice | drink)) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water;
-<N_objectpron> = it;
-<N_placement> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar;
-<N_beacon> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar | exit;
-<N_room> = corridor | livingroom | kitchen | bathroom;
-<N_me>        = me;
-<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (whether you dream or not on electric sheep) |(a joke);
-<N_answer> = (a question);
-<N_personalpron> = them | her | him;
-<N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
-
-
-<deliverPrep> = to;
-<placePrep> = on;
-<inLocPrep> = in | at;
-<atLocPrep> = at;
-<fromLocPrep> = from;
-<toLocPrep> = to;
diff --git a/psGrammar/tasks/eegpsr/commands_cat1I.jsgf b/psGrammar/tasks/eegpsr/commands_cat1I.jsgf
deleted file mode 100644
index 5b0914d9..00000000
--- a/psGrammar/tasks/eegpsr/commands_cat1I.jsgf
+++ /dev/null
@@ -1,85 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = ([please | (could you [please]) | (robot please) | tobi | pepper | (tobi please)] <VP1> [([and|then] <VP2>)] [([and|then] <VP3>)]);
-
-
-<VP1> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP2> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-
-<VP_trans> = <talk> | <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <deliverObjToMe> | <findCat> | <guidePrs> | <takeObj>;
-<VP_bitrans> = <takeObjFromPlcmt> | <takeCatFromPlcmt> | <placeObjOnPlcmt> | <placeCatOnPlcmt> | <placeObjToRoom> | <findPrsInBeac> | <findObjInRoom> | <guidePrsToLoc>;
-<VP_tritrans> = <deliverObjToNameAtBeac>;
-
-<talk> = (speak | (say something));
-
-<goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
-<findObj> = <V_find> <NP_object>;
-<findCat> = <V_find> <NP_category>;
-<talkInfo> = <V_talk> <NP_talk>;
-<answerQuestion> = <V_answer> <NP_answer>;
-<findPrs> = <V_find> (<NP_name>);
-<followPrs> = <V_follow> <NP_personalpron>;
-<deliverObjToMe> = <V_deliver> <NP_objectpron> <deliverPrep> (<NP_name> | <NP_me>);
-<guidePrs> = <V_escort> <NP_personalpron>;
-<takeObj> = <V_take> <NP_object>;
-
-
-<takeObjFromPlcmt> = <V_take> <NP_object> <fromLocPrep> <NP_placement>;
-<takeCatFromPlcmt> = <V_take> <NP_category> <fromLocPrep> <NP_placement>;
-<placeObjOnPlcmt> = <V_place> (<NP_objectpron> | <NP_object>) <placePrep> <NP_placement>;
-<placeCatOnPlcmt> = <V_place> <NP_category> <placePrep> <NP_placement>;
-<placeObjToRoom> = <V_place> (<NP_objectpron> | <NP_object>) (in | to) <NP_room>;
-<findPrsInBeac> = <V_find> (<NP_name>) (<inLocPrep> | <atLocPrep>) (<NP_room> | <NP_beacon>);
-<findObjInRoom> = <V_find> (<NP_object>) <inLocPrep> <NP_room>;
-<guidePrsToLoc> = <V_guide> <NP_personalpron> <toLocPrep> (<NP_room> | <NP_beacon>);
-
-
-<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <inLocPrep> <NP_beacon>;
-
-
-<V_take> = retrieve | take | get | grasp | (pick up);
-<V_place> = leave | set | put | place;
-<V_deliver> = bring | deliver | give | (hand [over]);
-<V_go> = go | navigate | enter;
-<V_find> = find | locate | (look for) | spot | pinpoint;
-<V_talk> = tell | say;
-<V_answer> = answer;
-<V_follow> = follow | ((come | go) (behind | after)) | accompany;
-<V_guide> = guide | escort | take | lead | accompany | conduct;
-<V_escort> = escort;
-
-
-<NP_object> = (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
-<NP_objectpron> = (<N_objectpron>);
-<NP_placement> = (the <N_placement>);
-<NP_beacon> = (the <N_beacon>);
-<NP_room> = (the <N_room>);
-<NP_me> = (<N_me>);
-<NP_name> = (a <N_name>) | (<N_name>);
-<NP_talk> = <N_talk>;
-<NP_answer> = <N_answer>;
-<NP_personalpron> = <N_personalpron>;
-<NP_category> = (the | a) <N_category>;
-
-
-
-<N_object> = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | (orange (juice | drink)) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water;
-<N_objectpron> = it;
-<N_placement> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar;
-<N_beacon> = (living table) | sofa | (comfy chair) | fridge | (kitchencounter) | sink | stove | cabinet | bar | exit;
-<N_room> = corridor | livingroom | kitchen | bathroom;
-<N_me>        = me;
-<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (whether you dream or not on electric sheep) |(a joke);
-<N_answer> = (a question);
-<N_personalpron> = them | her | him;
-<N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
-<N_category> = container | food | (cleaning stuff) | drink | cutlery | snack;
-
-<deliverPrep> = to;
-<placePrep> = on;
-<inLocPrep> = in | at;
-<atLocPrep> = at;
-<fromLocPrep> = from;
-<toLocPrep> = to;
diff --git a/psGrammar/tasks/eegpsr/commands_cat2.jsgf b/psGrammar/tasks/eegpsr/commands_cat2.jsgf
deleted file mode 100644
index a7934879..00000000
--- a/psGrammar/tasks/eegpsr/commands_cat2.jsgf
+++ /dev/null
@@ -1,164 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = [could you | robot | tobi] [please] <VP1>;
-
-<VP1> 		= (<VP_quintrans> | <VP_quatrans> | <VP_tritrans> | <VP_bitrans> | <VP_trans>);
-
-<VP_trans> = <countPpl> | <greetKid> | <followPerAtLoc> | <accompanyPerAtLoc> | <guidePerAtLoc>;
-
-<VP_bitrans> = <guideKidInRm> | <followNameAtLoc> | <followNameInRm> | <greetKidInRm> | <countPplDsc> | <greetNameInRm> | <greetGenDsc> | <countPplInRm> | <describePostAtLoc> | <guidePerAtLocToLoc> | <accompanyKidInRm> | <accompanyNameInRm> | <accompanyNameAtLoc> | <followKidInRm> | <accompanyPerAtLocToLoc>;
-
-<VP_tritrans> = <guideNameFromLoctoLoc> | <offerSmtToNameInRm> | <offerSmtToPplDsc> |<offerSmtToPplInRm> | <guideNameInRmToRm> | <greetGenColOut> | <greetGenDscInRm> | <meetNameAtLocThenFindInRm> | <countPplInRmDsc> | <countPplDscInRm> | <describePostAtLocToPAtLoc> | <followGenDscInRm> | <accompanyKidInRmToRm> | <accompanyAppGenInRm> | <accompanyNameFromLoctoLoc> | <accompanyNameInRmToRm> | <bringSmtToKidInRm> | <guideInRmToRm> | <guideAppGenInRm>;
-
-<VP_quatrans> = <meetNameAtLocFindInRmLoc> | <guideGenColOutInRm> | <greetGenColOutInRm> | <bringSmtToGenDscInRm> | <followGenColOutInRm> | <guideAppGenInRmToRm> | <accompanyGenColOutInRm> | <accompanyAppGenInRmToRm> | <offerSmtToPplDscInRm>;
-
-<VP_quintrans> = <bringSmtToGenColOutInRm> | <guideGenColOutInRmToRm> | <accompanyGenColOutInRmToRm>;
-
-<greetKidInRm>              = <V_greet> the <NP_child> in the <NP_room>;
-
-<greetGenDscInRm>           = <V_greet> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
-
-<greetGenColOutInRm>        = <V_greet> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
-
-<greetKid>                  = <V_greet> the <NP_child>;
-
-<greetGenDsc>               = <V_greet> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>);
-
-<greetGenColOut>            = <V_greet> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>);
-
-<greetNameInRm>             = <V_greet> <NP_name> in the <NP_room>;
-
-<meetNameAtLocThenFindInRm> = <V_remember> <NP_name> at the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo>;
-
-<meetNameAtLocFindInRmLoc>  = <V_remember> <NP_name> at the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo> <NP_beaconTwo>;
-
-<countPplInRm>              = <V_count> <NP_genderagepersonplural> [there are] in the <NP_room>;
-
-<countPplInRmDsc>           = <V_count> <NP_genderagepersonplural> [there are] in the <NP_room> are (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wearing <NP_color> | dressed in <NP_color>);
-
-<countPplDscInRm>           = <V_count> <NP_genderagepersonplural> [are] (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wearing <NP_color> | dressed in <NP_color>) [there are] in the <NP_room>;
-
-<countPpl>                  = <V_count> <NP_genderagepersonplural> there are;
-
-<countPplDsc>               = <V_count> <NP_genderagepersonplural> [are] (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wearing <NP_color> | dressed in <NP_color>) [there are];
-
-<describePostAtLoc>         = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) [(looks like | to me)];
-
-<describePostAtLocToPAtLoc> = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) to the person at the <NP_beaconTwo>;
-
-<offerSmtToPplInRm>         = <V_offer> something to <NP_offer> to all the <NP_genderagepersonplural> in the <NP_room>;
-
-<offerSmtToPplDscInRm>      = <V_offer> something to <NP_offer> to all the <NP_genderagepersonplural> (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wearing <NP_color> | dressed in <NP_color>) in the <NP_room>;
-
-<offerSmtToPplDsc>          = <V_offer> something to <NP_offer> to all the <NP_genderagepersonplural> <NP_gestureAdditional>;
-
-<offerSmtToNameInRm>        = <V_offer> something to <NP_offer> to <NP_name> in the <NP_room>;
-
-<bringSmtToKidInRm>         = <V_deliver> the <NP_object> to the <NP_child> in the <NP_roomTwo>;
-
-<bringSmtToGenDscInRm>      = <V_deliver> the <NP_object> to the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_roomTwo>;
-
-<bringSmtToGenColOutInRm>   = <V_deliver> the <NP_object> to the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_roomTwo>;
-
-<guideInRmToRm>             = <V_guide> the <NP_child> in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
-
-<guideAppGenInRmToRm>       = <V_guide> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
-
-<guideGenColOutInRmToRm>    = <V_guide> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
-
-<guidePerAtLocToLoc>        = <V_guide> the person at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exitTwo>);
-
-<guidePerAtLoc>             = <V_guide> the person at the <NP_beacon>;
-
-<guideNameInRmToRm>         = <V_guide> [the] <NP_name> in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
-
-<guideKidInRm>              = <V_guide> the <NP_child> in the <NP_room>;
-
-<guideAppGenInRm>           = <V_guide> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
-
-<guideGenColOutInRm>        = <V_guide> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
-
-<guideNameFromLoctoLoc>     = <V_guide> [the] <NP_name> from the <NP_beacon> to the (<NP_beaconTwo> | <NP_exitTwo>);
-
-<followKidInRm>             = <V_follow> the <NP_child> in the <NP_room>;
-
-<followGenDscInRm>          = <V_follow> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
-
-<followGenColOutInRm>       = <V_follow> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
-
-<followPerAtLoc>            = <V_follow> the person at the <NP_beacon>;
-
-<followNameInRm>            = <V_follow> [the] <NP_name> in the <NP_room>;
-
-<followNameAtLoc>           = <V_follow> [the] <NP_name> at the <NP_beacon>;
-
-<accompanyKidInRmToRm>       = <V_accompany> the <NP_child> in the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
-<accompanyKidInRm>           = <V_accompany> the <NP_child> in the <NP_room>;
-<accompanyAppGenInRmToRm>    = <V_accompany> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
-<accompanyAppGenInRm>        = <V_accompany> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
-<accompanyGenColOutInRmToRm> = <V_accompany> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
-<accompanyGenColOutInRm>     = <V_accompany> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
-<accompanyPerAtLocToLoc>     = <V_accompany> the person at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exit>);
-<accompanyPerAtLoc>          = <V_accompany> the person at the <NP_beacon>;
-<accompanyNameInRmToRm>      = <V_accompany> [the] <NP_name> (from | in) the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
-<accompanyNameInRm>          = <V_accompany> [the] <NP_name> in the <NP_room>;
-<accompanyNameFromLoctoLoc>  = <V_accompany> [the] <NP_name> from the <NP_beacon> to the (<NP_beaconTwo> | <NP_exit>);
-<accompanyNameAtLoc>         = <V_accompany> [the] <NP_name> at the <NP_beacon>;
-
-
-<V_greet>     = greet | salute | handshake | say hello to | introduce yourself to;
-<V_remember>      = meet | contact | get to know | get acquainted with;
-<V_count>     = tell me how many;
-<V_describe>  = tell me how | describe;
-<V_offer>     = offer;
-<V_deliver>     = bring;
-<V_follow>    = follow | come behind | come after | go behind | go after;
-<V_guide>     = guide | escort | take | lead | conduct;
-<V_accompany> = accompany;
-
-<NP_genderagepersonplural>  = <N_genderagepersonplural>;
-<NP_genderpersonsingular>   = <N_genderpersonsingular>;
-<NP_property> 		        = <N_property>;
-<NP_poseperson> 		= <N_poseperson>;
-<NP_postureAdditional>   		        = <N_postureAdditional>;
-<NP_gestureAdditional>   		        = <N_gestureAdditional>;
-<NP_color>     		        = <N_color>;
-<NP_outfitplural>	        = <N_outfitplural> ;
-<NP_outfitbottom>         = <N_outfitbottom>;
-<NP_outfitsingular>       = <N_outfitsingular>;
-<NP_accessory>   	        = <N_accessory>;
-<NP_name> 		            = <N_name>;
-<NP_beacon> 		        = <N_beacon>;
-<NP_beaconTwo> 	        = <N_beaconTwo>;
-<NP_room> 		            = <N_room> ;
-<NP_roomTwo> 		        = <N_roomTwo> ;
-<NP_object> 		        = <N_object>;
-<NP_child>                  = <N_child>;
-<NP_exit>                   = <N_exit>;
-<NP_exitTwo>                   = <N_exitTwo>;
-<NP_offer>                  = <N_offer>;
-
-
-<N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
-<N_beacon> 			    = (living table) | sofa | (comfy chair) | fridge | kitchen counter | sink | stove | cabinet | bar;
-<N_beaconTwo> 		    = (living table) | sofa | (comfy chair) | fridge | kitchen counter | sink | stove | cabinet | bar;
-<N_room> 		    	    = corridor | (living room) | kitchen | bath room;
-<N_roomTwo> 			    = corridor | (living room) | kitchen | bath room;
-<N_object>    = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | orange (juice | drink) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water;
-
-<N_exit>                    = exit;
-<N_exitTwo>                    = exit;
-<N_child>                   = child;
-<N_genderagepersonplural>   = people | children | elders | men | women;
-<N_genderpersonsingular>	= man | woman | person;
-<N_property> 			    = tallest | smallest | oldest | youngest | slimmest | fattest;
-<N_poseperson> 					= (person sitting) | (person standing) | (person lying down);
-<N_postureAdditional>   			    = standing | sitting | lying down;
-<N_gestureAdditional>   			    = waving | raising their left arm | raising their right arm | rising left arm | rising right arm | pointing left | pointing right | pointing to the left | pointing to the right;
-<N_color>     			    = blue | yellow | black | white | red | orange | gray;
-<N_outfitplural>   	    = t shirts | shirts | blouses | shoes | sweaters | pants | coats | jackets;
-<N_outfitsingular>      = t shirt | shirt | blouse | sweater | coat | jacket;
-<N_outfitbottom>        = shoes | pants;
-<N_accessory>   		    = a hat | glasses | a necklace | a tie | earrings;
-<N_offer>                = eat | drink;
diff --git a/psGrammar/tasks/eegpsr/rooms.jsgf b/psGrammar/tasks/eegpsr/rooms.jsgf
deleted file mode 100644
index f65a90e0..00000000
--- a/psGrammar/tasks/eegpsr/rooms.jsgf
+++ /dev/null
@@ -1,14 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = [<talking>] <room>;
-
-<talking> = <verb> | (the [exact] (room | location | place) is the) | the [room is] | is it the;
-
-<verb> = <V_greet> [the (person | persons)] in the | <V_guide> [the (person | persons)] (to | at | in) the | <V_accompany> [the (person | persons)] (to | at | in) the;
-
-<V_greet>     = greet | salute | handshake | say hello to | introduce yourself to;
-<V_guide>     = guide | escort | take | lead | conduct;
-<V_accompany> = accompany;
-
-<room> = corridor | (living room) | kitchen | bath room;
diff --git a/psGrammar/tasks/gpsr/commands.jsgf b/psGrammar/tasks/gpsr/commands.jsgf
deleted file mode 100644
index d2b747f1..00000000
--- a/psGrammar/tasks/gpsr/commands.jsgf
+++ /dev/null
@@ -1,121 +0,0 @@
-#JSGF V1.0;
-grammar speechRecognition;
-
-public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2>)] [([and|then] <VP3>)]);
-
-<VP1> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP2> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-<VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
-
-<VP_trans> = <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <meetName> | <takeObj>;
-<VP_bitrans> = <placeObjOnPlcmt> | <bringMeObj> | <deliverObjToMe> | <findPrsInRoom> | <countObjOnPlcmt> | <findObjInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPrsInfoInLoc> | <countPrsInRoom> | <tellObjPropOnPlcmt> | <guidePrsToBeacon>; 
-<VP_tritrans> = <deliverObjToGestPrsInRoom> | <deliverObjToNameAtBeac> | <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> | <guideNameFromBeacToBeac> | <bringMeObjFromPlcmt> | <tellCatPropOnPlcmt> | <guideNameToBeacFindAtBeac>;
-
-
-<goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
-<findObj> = <V_find> <NP_object>;
-<talkInfo> = <V_talk> <NP_talk>;
-<answerQuestion> = <V_answer> <NP_answer>;
-<findPrs> = <V_find> (<NP_gestperson> | <NP_genderperson> | <NP_poseperson>);
-<followPrs> = <V_follow> <NP_personalpron>;
-<meetName> = <V_meet> <NP_name>;
-<takeObj> = <V_take> <NP_object>;
-
-
-<takeObjFromPlcmt> = <V_take>  <NP_object> <fromLocPrep> (<NP_room> | <NP_placement>);
-<placeObjOnPlcmt> = <V_place> (<NP_object> | <NP_objectpron>) <placePrep>  <NP_placement>;
-<bringMeObj>    = <V_bring> <NP_me> <NP_object>;
-<deliverObjToMe> = <V_deliver> (<NP_object> | <NP_objectpron>) <deliverPrep> <NP_me>;
-<findPrsInRoom> = <V_find> (<NP_gestperson> | <NP_genderperson> | <NP_poseperson>) <inLocPrep> <NP_room>;
-<findObjInRoom> = <V_find> (<NP_object> | <NP_category>) <inLocPrep> <NP_room>;
-<meetPrsAtBeac> = <V_meet> <NP_name> <atLocPrep> <NP_beacon>;
-<followPrsToRoom> = <V_follow> <NP_personalpron> <toLocPrep> <NP_roomTwo>;
-<guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beaconTwo>;
-<countObjOnPlcmt> = <V_count> (<NP_object> | <NP_category>) there are <placePrep> <NP_placement>;
-<countPrsInRoom> = <V_count> people in <NP_room> <arePrep> (<NP_posture> | <NP_genderpersonplural>);
-<tellPrsInfoInLoc> = <V_tell> me <NP_personinfo> of the person <LocPrep> (<NP_room> | <NP_beacon>);
-<tellObjPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> object <onLocPrep> <NP_placement>;
-
-
-<deliverObjToGestPrsInRoom> = <V_deliver> <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_roomTwo>;
-<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beaconTwo>;
-<talkInfoToGestPrsInRoom> = <V_talk> <NP_talk> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
-<answerToGestPrsInRoom> = <V_answer> <NP_answer> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
-<followNameFromBeacToRoom> = <V_follow> <NP_name> <fromLocPrep> <NP_beacon> <toLocPrep> <NP_roomTwo>;
-<guideNameFromBeacToBeac> = <V_guide> <NP_name> <fromLocPrep> <NP_beacon> <toLocPrep> <NP_beaconTwo>;
-<guideNameToBeacFindAtBeac> = <V_guide> <NP_name> <toLocPrep> <NP_beaconTwo> you (may | can | will) find (them | him | her) <atLocPrep> <NP_beacon>;
-<bringMeObjFromPlcmt> = <V_bring> <NP_me> <NP_object> <fromLocPrep> <NP_placement>;
-<tellCatPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> <NP_category> <onLocPrep> <NP_placement>;
-
-
-<V_take>    = bring | take | get | grasp | (pick up);
-<V_place>   = put | place;
-<V_deliver> = bring | give | deliver;
-<V_bring> = bring | give;
-<V_go> = go | navigate;
-<V_find> = find | locate | (look for);
-<V_talk> = tell | say;
-<V_answer> = answer;
-<V_follow> = follow;
-<V_meet> = meet;
-<V_guide> = guide | escort | take | lead | accompany;
-<V_tell> = tell;
-<V_count> = tell me how many;
-
-
-<NP_object>    = (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
-<NP_objectpron> = (<N_objectpron>);
-<NP_category> = (the <N_category>) | <N_category>;
-<NP_objectprop> = (the <N_objectprop>);
-<NP_placement> = (the <N_placement>);
-<NP_placementTwo> = (the <N_placementTwo>);
-<NP_beacon> = (the <N_beacon>);
-<NP_beaconTwo> = (the <N_beaconTwo>);
-<NP_room> = (the <N_room>);
-<NP_roomTwo> = (the <N_roomTwo>);
-<NP_me>        = (<N_me>);
-<NP_gestperson> = (the <N_gestperson>) | (a <N_gestperson>);
-<NP_poseperson> = (a <N_poseperson>);
-<NP_genderperson> = (a <N_genderperson>);
-<NP_genderpersonplural> = (<N_genderpersonplural>);
-<NP_name> = <N_name>;
-<NP_talk> = <N_talk>;
-<NP_answer> = <N_answer>;
-<NP_personalpron> = <N_personalpron>;
-<NP_personinfo> = (the <N_personinfo>);
-<NP_posture> = <N_posture>;
-
-
-<N_object>    = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | orange (juice | drink) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water;
-<N_category> = care | drink | (cleaning stuff) | container | food | snack | cutlery;
-<N_room> = corridor | (living room) | kitchen | bath room;
-<N_roomTwo> = corridor | (living room) | kitchen | bath room;
-<N_placement> = (living table) | sofa | (comfy chair) | fridge | kitchencounter | sink | stove | cabinet | bar;
-<N_placementTwo> = (living table) | sofa | (comfy chair) | fridge | kitchencounter | sink | stove | cabinet | bar;
-<N_beacon> = (living table) | sofa | (comfy chair) | fridge | kitchencounter | sink | stove | cabinet | bar;
-<N_beaconTwo> = (living table) | sofa | (comfy chair) | fridge | kitchencounter | sink | stove | cabinet | bar;
-<N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
-<N_objectpron> = it;
-<N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest;
-<N_me>        = me;
-<N_gestperson> = (person waving) | (person (raising | rising) [their] (left|right) arm) | (person pointing to the (left|right)) | (person calling);
-<N_poseperson> = (person sitting) | (person standing) | (person lying down);
-<N_genderperson> = man | woman | boy | girl | (male person) | (female person);
-<N_genderpersonplural> = men | women | boys | girls | male | female;
-<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (a joke);
-<N_answer> = (a question);
-<N_personalpron> = them | her | him;
-<N_personinfo> = name | gender | pose;
-<N_posture> = sitting | standing | lying down;
-
-
-<deliverPrep> = to;
-<placePrep> = on;
-<inLocPrep> = in;
-<fromLocPrep> = from;
-<toLocPrep> = to;
-<atLocPrep> = at;
-<talkPrep> = to;
-<LocPrep> = in | at;
-<onLocPrep> = on;
-<arePrep> = are;
-- 
GitLab