diff --git a/ps-config/demo/demoCentralLab.conf b/ps-config/demo/demoCentralLab.conf index 6f19a0fba5ade4e90e695e14157e497eb86cfbaf..cbd4b7c56d0c0388df9e77a8b7455b8c6c20db0f 100644 --- a/ps-config/demo/demoCentralLab.conf +++ b/ps-config/demo/demoCentralLab.conf @@ -36,6 +36,6 @@ name=sfbreview; hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k; dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic; jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/sfb/review.jsgf; -rsbscope=/speechrec/psa/review; +rsbscope=/speechrec/psa/sfbreview; bestpath=no; autoload=yes; diff --git a/ps-grammar/dictionary/tobiDic.dic b/ps-grammar/dictionary/tobiDic.dic index 3e7aa4f387282ade989ca190f38e6c70ceb2d336..1d98464b28359d646c65c4acdddccc9e27ac3580 100644 --- a/ps-grammar/dictionary/tobiDic.dic +++ b/ps-grammar/dictionary/tobiDic.dic @@ -94493,6 +94493,7 @@ prine P R AY N pring P R IH NG pringle P R IH NG G AH L pringle's P R IH NG G AH L Z +pringles P R IH NG G AH L Z prinkey P R IH NG K IY prinos P R IY N OW S prins P R IH N Z diff --git a/ps-grammar/sfb/review.jsgf b/ps-grammar/sfb/review.jsgf index 43e0f41f638cf7f1759abdd3900f0233dab66711..753d36d6fff761695075c71263b9175d27363084 100644 --- a/ps-grammar/sfb/review.jsgf +++ b/ps-grammar/sfb/review.jsgf @@ -1,7 +1,13 @@ #JSGF V1.0; grammar A4_inspection; -public <review> = [tobi] [please] ( <teach> | <stop> ) [please] [tobi]; +public <review> = [tobi] [please] (<follow> | <observe> | <teach> | <locate> | <list> | <leave> | <stop> ) [please] [tobi]; +<follow> = ( follow me [into the elevator] ) | (observe) | (watch) ; +<observe> = (start observing | ([take a] look [(at this | here)])); +<leave> = leave; <stop> = (stop [observing | it]); <teach> = ( (this is [a | an | the] ) | ( these are [the] ) ) <object>; -<object> = ( milk | apple | box ); +<locate> = ( ( where is [a | an | the] ) | ( where are [the] ) ) ( <object> | <furniture> ); +<list> = ( which objects do you know ) | ( list [the] objects ); +<furniture> = [other] ( shelf | cupboard | table | chair | armchair | sofa | stool | dresser | closet ); +<object> = [other] ( pringles | apple | milk | biscuits | book );