eegpsr updated

psConfig/tasks/gpsr2/gpsr2.conf

@@ -14,15 +14,16 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=report;
+name=Report;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
 jsgf=../../../psGrammar/tasks/gpsr/gpsr2_report.jsgf;
 rsbscope=/speechrec/psa/gpsr2report;
 bestpath=no;
 autoload=yes;
 
+
 [pocketsphinxinstance]
-name=questions;
+name=Questions;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
 jsgf=../../../psGrammar/tasks/speechRecognition/speechRecognition.jsgf;
 rsbscope=/speechrec/psa/speechRecognition;

psGrammar/tasks/gpsr/gpsr2.jsgf

@@ -48,9 +48,9 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 
 
 <N_place> = (bedroom | chair | bin | bed | (bathroom locker) | bathroom | (dining room) | shelf | (dinner table) | hall | (kitchen table) | kitchen | corridor);
-<N_object> = (milk | coke | (orange juice) | beer | apple | banana | orange | pear | lays | crackers | pringles | chocolate | cloth | detergent | sponge | brush | <N_random_object> );
+<N_object> = (milk | coke | (orange juice) | beer | apple | banana | orange | pear | lays | crackers | pringles | chocolate | cloth | detergent | sponge | brush | (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box));
 
-<N_random_object> = (<color> <object> | <shape> <object> | <color> <shape> <object> | <shape> <color> <object>);
+<N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
 <color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);
 <shape> = (round | angular | edgy | little | small | big | huge);
 <object> = object | thing | box;

psGrammar/tasks/gpsr/gpsr2_report.jsgf

 #JSGF V1.0;
 grammar speechRecognition;
 
-public <sentence> = blablas;
+public <sentence> = <Is_type> | <What_type> | <Where_type> | <Who_type> | <Which_type> | <Count_type> | <Descripe_type> ;
+
+<Is_type> = (is <person> <awake>) | (is the door between <room> and <room> <door_state>);
+
+<Which_type> = ((what | which) object is ((in <room>) | ((on | at | in) <place>)));
+
+<What_type> = (what (did | have) you <accomplish>) | (what are you <hold>) | (what <type> of object is ((<object>) | ([the <object>] (in <room>))))  | <asked_phrase> | <gender_phrase>;
+
+<gender_phrase> = (what gender is <person>);
+<asked_phrase> = (what did <person> ask you);
+
+<Where_type> = (where is [the] (<person> | <object>)) | (where did <person> <go>);
+
+<Who_type> = (who is in the <room>);
+
+<Count_type> =  (how many <persons> are in [the] <room>);
+
+<Descripe_type> = (describe the object at (<room> | <place>)) | (which <attributes> is the object ((in the <room>) | ((on | at | in) <place>)));
+
+<persons> = persons | people | humans;
+
+<attributes> = color | size;
+
+<person> = person | people | (anna | beth | carmen | jennifer | jessica | kimberly | kristina | laura | mary | sarah | alfred | charles | daniel | james | john | luis | paul | richard | robert | steve | person |(calling person) | me) | he | she ;
+
+<accomplish> = accomplished | do;
+<awake> = awake ;
+<go> = go | (went to) | (guide you);
+<room> = bedroom | bathroom | (dining room) | hall | kitchen | corridor;
+<door_state> = open | closed;
+<hold> = holding | carrying;
+<object> = milk | coke | (orange juice) | beer | apple | banana | orange | pear | lays | crackers | pringles | chocolate | cloth | detergent | sponge | brush | (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box);
+<type> = type | kind ;
+
+<place> = chair | table | bin | bed | (bathroom locker) | (dinner table) | (kitchen table);
+
+<N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
+<color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);
+<shape> = (round | angular | edgy | little | small | big | huge);
+