[TeamTalk 95]: [632] TeamTalk: Added search and explore to grammar
tk@edam.speech.cs.cmu.edu
tk at edam.speech.cs.cmu.edu
Sat Jun 9 23:20:32 EDT 2007
An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070609/64c08064/attachment.html
-------------- next part --------------
Modified: TeamTalk/Agents/boeingLib/coralshared/win32dep.h
===================================================================
--- TeamTalk/Agents/boeingLib/coralshared/win32dep.h 2007-05-29 21:31:15 UTC (rev 631)
+++ TeamTalk/Agents/boeingLib/coralshared/win32dep.h 2007-06-10 03:20:30 UTC (rev 632)
@@ -1,17 +1,17 @@
-#ifndef __WIN32DEP_H__
-#define __WIN32DEP_H__
-
-#ifdef WIN32
-
-// win32 dependencies
-
-#include <winsock2.h>
-
-#define strncasecmp(s1, s2, n) _strnicmp((s1), (s2), (n))
-#define sleep(x) Sleep(1000*(x))
-
-int gettimeofday (struct timeval *tv, void* tz);
+#ifndef __WIN32DEP_H__
+#define __WIN32DEP_H__
+#ifdef WIN32
+
+// win32 dependencies
+
+#include <winsock2.h>
+
+#define strncasecmp(s1, s2, n) _strnicmp((s1), (s2), (n))
+#define sleep(x) Sleep(1000*(x))
+
+int gettimeofday (struct timeval *tv, void* tz);
+
template<class C> C round(C x) {
C major = floor(x);
C minor = x-major;
@@ -19,10 +19,10 @@
if(major >=0) return major+1;
else return major-1;
else return major;
-}
-
-#define _USE_MATH_DEFINES
-
-#endif
-#endif
-
+}
+
+#define _USE_MATH_DEFINES
+
+#endif
+#endif
+
Deleted: TeamTalk/Resources/DecoderConfig/Dictionary/classwords.dict
===================================================================
--- TeamTalk/Resources/DecoderConfig/Dictionary/classwords.dict 2007-05-29 21:31:15 UTC (rev 631)
+++ TeamTalk/Resources/DecoderConfig/Dictionary/classwords.dict 2007-06-10 03:20:30 UTC (rev 632)
@@ -1,146 +0,0 @@
-ALEX_RUDNICKY AE L AX K S R AX D N IH K IY
-ANTOINE_RAUX AA N T W AA N R AO K S
-APRIL EY P R AX L
-AUGUST AA G AX S T
-AUGUST(2) AO G AX S T
-A_M EY EH M
-CECILY_HEINER S EH S IX L IY HH AY N AXR
-CHRIS_COLOHAN K R IH S K OW L AA AX N
-DAN_BOHUS D AE N B AA AX S
-DECEMBER D IX S EH M B AXR
-EIGHT EY T
-EIGHTEENTH EY T IY N TH
-EIGHTH EY T TH
-EIGHTH(2) EY TH
-EIGHTY_TWO_TWENTY EY DX IY T UW T W EH N IY
-EIGHT_TWO_TWO_ZERO EY T T UW T UW Z IH R OW
-ELEVEN IX L EH V AX N
-ELEVEN(2) IY L EH V AX N
-ELEVENTH IX L EH V AX N TH
-ELEVENTH(2) IY L EH V AX N TH
-FEBRUARY F EH B AX W EH R IY
-FEBRUARY(2) F EH B R UW W EH R IY
-FEBRUARY(3) F EH B UW W EH R IY
-FEBRUARY(4) F EH B Y AX W EH R IY
-FEBRUARY(5) F EH B Y UW W EH R IY
-FIFTEENTH F IX F T IY N TH
-FIFTEEN_OH_FIVE F IH F T IY N OW F AY V
-FIFTEEN_OH_SEVEN F IH F T IY N OW S EH V AX N
-FIFTEEN_ZERO_FIVE F IH F T IY N Z IH R OW F AY V
-FIFTEEN_ZERO_SEVEN F IH F T IY N Z IH R OW S EH V AX N
-FIFTH F IH F TH
-FIFTH(2) F IH TH
-FIRST F ER S T
-FIVE F AY V
-FORTY_FIVE_THIRTEEN F AO R DX IY F AY V TH ER T IY N
-FORTY_SIX_THIRTY_TWO F AO R DX IY S IH K S TH ER DX IY T UW
-FORTY_SIX_TWENTY_FIVE F AO R DX IY S IH K S T W EH N IY F AY V
-FORTY_SIX_TWENTY_THREE F AO R DX IY S IH K S T W EH N IY TH R IY
-FOUR F AO R
-FOURTEENTH F AO R T IY N TH
-FOURTH F AO R TH
-FOUR_FIVE_ONE_THREE F AO R F AY V HH W AH N TH R IY
-FOUR_SIX_THREE_TWO F AO R S IH K S TH R IY T UW
-FOUR_SIX_TWO_FIVE F AO R S IH K S T UW F AY V
-FOUR_SIX_TWO_THREE F AO R S IH K S T UW TH R IY
-FRIDAY F R AY D EY
-FRIDAY(2) F R AY DX IY
-GUEST G EH S T
-JANUARY JH AE N Y UW EH R IY
-JULY JH AX L AY
-JULY(2) JH UW L AY
-JUNE JH UW N
-JUNE_SISON JH UW N S IH S AX N
-MARCH M AA R CH
-MAY M EY
-MONDAY M AH N D EY
-MONDAY(2) M AH N D IY
-NEWELL_SIMON N UW AX L S AY M AX N
-NEWELL_SIMON_HALL N UW AX L S AY M AX N HH AO L
-NINE N AY N
-NINETEENTH N AY N T IY N TH
-NINTH N AY N TH
-NOON N UW N
-NOVEMBER N OW V EH M B AXR
-OCTOBER AA K T OW B AXR
-ONE HH W AH N
-ONE(2) W AH N
-ONE_FIVE_OH_FIVE HH W AH N F AY V OW F AY V
-ONE_FIVE_OH_SEVEN HH W AH N F AY V OW S EH V AX N
-ONE_FIVE_ZERO_FIVE HH W AH N F AY V Z IH R OW F AY V
-ONE_FIVE_ZERO_SEVEN HH W AH N F AY V Z IH R OW S EH V AX N
-P_M P IY EH M
-RIDY_LIE R AY D IY L AY
-SATURDAY S AE DX AXR DX IY
-SATURDAY(2) S AE T IH D EY
-SECOND S EH K AX N
-SECOND(2) S EH K AX N D
-SEPTEMBER S EH P T EH M B AXR
-SEVEN S EH V AX N
-SEVENTEENTH S EH V AX N T IY N TH
-SEVENTH S EH V AX N TH
-SEVENTY_TWO_TWENTY S EH V AX N IY T UW T W EH N IY
-SEVEN_TWO_TWO_ZERO S EH V AX N T UW T UW Z IH R OW
-SIX S IH K S
-SIXTEENTH S IH K S T IY N TH
-SIXTEENTH(2) S IX K S T IY N TH
-SIXTH S IH K S TH
-SUNDAY S AH N D EY
-SUNDAY(2) S AH N D IY
-TEN T EH N
-TENTH T EH N TH
-THIRD TH ER D
-THIRTEENTH TH ER T IY N TH
-THIRTIETH TH ER DX IY AX TH
-THIRTIETH(2) TH ER DX IY IX TH
-THIRTY_FIRST TH ER DX IY F ER S T
-THIRTY_FIVE_OH_NINE TH ER DX IY F AY V OW N AY N
-THIRTY_FIVE_OH_ONE TH ER DX IY F AY V OW HH W AH N
-THIRTY_FIVE_ZERO_ONE TH ER DX IY F AY V Z IH R OW HH W AH N
-THIRTY_THREE_OH_FIVE TH ER DX IY TH R IY OW F AY V
-THIRTY_THREE_ZERO_FIVE TH ER DX IY TH R IY Z IH R OW F AY V
-THOMAS_HARRIS T AA M AX S HH EH R IX S
-THREE TH R IY
-THREE_FIVE_OH_NINE TH R IY F AY V OW N AY N
-THREE_FIVE_OH_ONE TH R IY F AY V OW HH W AH N
-THREE_FIVE_ZERO_NINE TH R IY F AY V Z IH R OW N AY N
-THREE_FIVE_ZERO_ONE TH R IY F AY V Z IH R OW HH W AH N
-THREE_OH_OH_ONE TH R IY OW OW HH W AH N
-THREE_THOUSAND_ONE TH R IY TH AW Z AX N HH W AH N
-THREE_THREE_OH_FIVE TH R IY TH R IY OW F AY V
-THREE_THREE_ZERO_FIVE TH R IY TH R IY Z IH R OW F AY V
-THREE_ZERO_ZERO_ONE TH R IY Z IH R OW Z IH R OW HH W AH N
-THURSDAY TH ER Z D EY
-THURSDAY(2) TH ER Z D IY
-TODAY T AX D EY
-TODAY(2) T UW D EY
-TOMORROW T AX M AA R OW
-TOMORROW(2) T UW M AA R OW
-TUESDAY T UW Z D EY
-TUESDAY(2) T UW Z D IY
-TUESDAY(3) T Y UW Z D EY
-TWELFTH T W EH L F TH
-TWELVE T W EH L V
-TWENTIETH T W EH N IY AX TH
-TWENTIETH(2) T W EH N IY IX TH
-TWENTIETH(3) T W EH N T IY AX TH
-TWENTIETH(4) T W EH N T IY IX TH
-TWENTY_EIGHTH T W EH N IY EY T TH
-TWENTY_FIFTH T W EH N IY F IH F TH
-TWENTY_FIRST T W EH N IY F ER S T
-TWENTY_FIVE_OH_SEVEN T W EH N IY F AY V OW S EH V AX N
-TWENTY_FIVE_ZERO_SEVEN T W EH N IY F AY V Z IH R OW S EH V AX N
-TWENTY_FOURTH T W EH N IY F AO R TH
-TWENTY_NINTH T W EH N IY N AY N TH
-TWENTY_SECOND T W EH N IY S EH K AX N
-TWENTY_SEVENTH T W EH N IY S EH V AX N TH
-TWENTY_SIXTH T W EH N IY S IH K S TH
-TWENTY_THIRD T W EH N IY TH ER D
-TWO T UW
-TWO_FIVE_OH_SEVEN T UW F AY V OW S EH V AX N
-TWO_FIVE_ZERO_SEVEN T UW F AY V Z IH R OW S EH V AX N
-WEAN W IY N
-WEAN_HALL W IY N HH AO L
-WEDNESDAY W EH N Z D EY
-WEDNESDAY(2) W EH N Z D IY
-YITAO_SUN Y IH T EY OW S AH N
Added: TeamTalk/Resources/DecoderConfig/Dictionary/hand.dict
===================================================================
--- TeamTalk/Resources/DecoderConfig/Dictionary/hand.dict (rev 0)
+++ TeamTalk/Resources/DecoderConfig/Dictionary/hand.dict 2007-06-10 03:20:30 UTC (rev 632)
@@ -0,0 +1 @@
+ALPHIE AE L F IY
Deleted: TeamTalk/Resources/DecoderConfig/Dictionary/noise.dict.reduced_phoneset
===================================================================
--- TeamTalk/Resources/DecoderConfig/Dictionary/noise.dict.reduced_phoneset 2007-05-29 21:31:15 UTC (rev 631)
+++ TeamTalk/Resources/DecoderConfig/Dictionary/noise.dict.reduced_phoneset 2007-06-10 03:20:30 UTC (rev 632)
@@ -1,23 +0,0 @@
-++AE++ AE
-++AH++ AA
-++BACKGROUND++ +BACKGROUND+
-++BREATH++ +BREATH+
-++CLICKS++ +CLICKS+
-++COUGH++ +COUGH+
-++EH++ EH
-++ER++ ER
-++FEED++ +FEED+
-++LAUGH++ +LAUGH+
-++MM++ M
-++MUMBLE++ +BACKGROUND+
-++NOISE++ +NOISE+
-++NOISE(2)++ +NOISE(2)+
-++CU_NOISE++ +NOISE(3)+
-++MIT_NOISE++ +NOISE(4)+
-++OH++ OW
-++SMACK++ +SMACK+
-++UH++ +UH+
-++UHUH++ +UHUH+
-++UH_NOISE++ +UH+
-++UM++ +UM+
-++UM_NOISE++ +UM+
Modified: TeamTalk/Resources/Grammar/TeamTalkTask-template.gra
===================================================================
--- TeamTalk/Resources/Grammar/TeamTalkTask-template.gra 2007-05-29 21:31:15 UTC (rev 631)
+++ TeamTalk/Resources/Grammar/TeamTalkTask-template.gra 2007-06-10 03:20:30 UTC (rev 632)
@@ -17,6 +17,14 @@
([RobotName])
;
+[HumanExploreCommand]
+ (explore)
+;
+
+[HumanSearchCommand]
+ (search)
+;
+
[HumanFollowCommand]
(*[RobotName] FOLLOW [OBJ-Robot])
@@ -175,6 +183,7 @@
(move)
(go)
(drive)
+ (return)
;
[MoveToGoal]
@@ -350,7 +359,10 @@
###################################################################
[Cancel]
- (cancel *COMMAND)
+ (CANCEL *COMMAND)
+CANCEL
+ (cancel)
+ (quit)
COMMAND
(*that command)
(that)
Modified: TeamTalk/Resources/Grammar/TeamTalkTask.forms
===================================================================
--- TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-05-29 21:31:15 UTC (rev 631)
+++ TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-06-10 03:20:30 UTC (rev 632)
@@ -1,11 +1,11 @@
###################################################################
#
-# ZAP Grammar
+# TeamTalk Grammar
#
# Written by: June Sison
#
# This is the forms file corresponding to the phoenix grammar for
-# the Zap system
+# the TeamTalk system
#
#
# HISTORY -------------------------------------------------------
@@ -30,6 +30,8 @@
[HumanFollowCommand]
[HumanPauseCommand]
[HumanContinueCommand]
+ [HumanExploreCommand]
+ [HumanSearchCommand]
;
FUNCTION: Features
More information about the TeamTalk-developers
mailing list