Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/robocup-speechrec

psConfig/tasks/navigationTask/navigationTask.conf

@@ -16,9 +16,9 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=person;
-jsgf=../../../psGrammar/person/person.jsgf;
-rsbscope=/speechrec/psa/person;
+name=name;
+jsgf=../../../psGrammar/tasks/navigationTask/name.jsgf;
+rsbscope=/speechrec/psa/name;
 bestpath=no;
 autoload=yes;
 

psConfig/tasks/restaurant/restaurant.conf

@@ -14,7 +14,7 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=GuideCommand;
+name=guidecommand;
 jsgf=../../../psGrammar/tasks/restaurant/guideCommand.jsgf;
 rsbscope=/speechrec/psa/guidecommand;
 bestpath=no;

psConfig/tasks/speechRecognition/speechRecognition.conf.2

+[main]
+startdb=43;
+uttdb=47;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+alsadevice=sysdefault; 
+
+[pocketsphinxinstance]
+name=speechRecognition;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/tasks/speechRecognition/speechRecognition.jsgf;
+rsbscope=/speechrec/psa/speechRecognition2;
+bestpath=no;
+autoload=yes;

psGrammar/tasks/gpsr/gpsr_Narrow.jsgf

@@ -45,7 +45,7 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 <NP_answer> = <N_answer>;
 
 
-<N_place> = (bedroom | chair | (kitchen trashbin) | fridge | bed | nightstand | closet | kitchen | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
+<N_place> = (bedroom | chair | (kitchen trashbin) | fridge | bed | nightstand | closet | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs) | kitchen);
 <N_object> = (apple | avocado | bowl | (chocolate sprinkles) | cloth | (dishwashing soap) | (kinder coke) | lemon | licorice | (little bananas) | macaroni | milk | (pineapple cookies) | paprika | plate | rice | smoothie | soap | sponge | (storage box) | (strawberry cookies) | tea | (toilet paper) | tuc | wafer | water);
 
 

psGrammar/tasks/navigationTask/name.jsgf

 #JSGF V1.0;
 grammar ToBI_person;
-public <statement> = <naming>;
+public <statement> = <naming> ;
 <naming> = [(my name is) | (i am)] <name>;
-<name> = Emma|Olivia|Sophia|Isabella|Ava|Mia|Emily|Abigail|Madison|Charlotte|Noah|Liam|Mason|Jacob|William|Ethan|Michael|Alexander|James|Daniel;
+<name> = emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel;
+