From tk at edam.speech.cs.cmu.edu Mon Oct 1 11:57:06 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 1 Oct 2007 11:57:06 -0400 Subject: [TeamTalk 259]: [795] trunk/TeamTalk/Libraries/boeingLib: Importing updates from brett & co . Message-ID: <200710011557.l91Fv664017561@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071001/5ea2800e/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Libraries/boeingLib/Makefile =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/Makefile 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/Makefile 2007-10-01 15:57:04 UTC (rev 795) @@ -25,13 +25,13 @@ # Compilation options #======================================================================# -CC := g++-4.1 +CC := g++ # CFlags base CFLAGS += -Wall -D_GNU_SOURCE CFLAGS += $(CPU) CFLAGS += -ffast-math -CFLAGS += -g -O3 +CFLAGS += -g -O3 -fPIC # uncomment to turn off asserts # CFLAGS += -DNDEBUG @@ -95,7 +95,7 @@ # start with empty libraries -LIBS += $(MATH_LIBS) $(COMPRESS_LIBS) $(SCTP_LIBS) +LIBS += $(MATH_LIBS) $(COMPRESS_LIBS) $(SCTP_LIBS) $(THREAD_LIBS) # Each module will add to this @@ -162,13 +162,13 @@ install: all_real @echo "Installing to $(INSTALLDIR)" @echo "Coping library files to $(INSTALLDIR_LIB)" - + @if [ ! -d $(INSTALLDIR_LIB) ] ; then \ echo "Creating $(INSTALLDIR_LIB)"; \ mkdir $(INSTALLDIR_LIB) ; \ fi; @cp $(LIB)/* $(INSTALLDIR_LIB) - + @if [ ! -d $(INSTALLDIR_INCLUDE) ] ; then \ echo "Creating $(INSTALLDIR_INCLUDE)"; \ mkdir $(INSTALLDIR_INCLUDE) ; \ Modified: trunk/TeamTalk/Libraries/boeingLib/Makefile.config =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/Makefile.config 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/Makefile.config 2007-10-01 15:57:04 UTC (rev 795) @@ -1,4 +1,4 @@ # Directory where lib and include directories will be placed # For system wide usual use /usr/local/ -INSTALLDIR=~/rCommerce/software/external/boeingLib +INSTALLDIR=~/software/external/boeingLib Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.cc 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.cc 2007-10-01 15:57:04 UTC (rev 795) @@ -111,14 +111,14 @@ int new_major_dim, unsigned char *raw_map) const { bool changed = false; - int j=0; + int j=0, k=0; for(int i=0; i>8; char run_value = (char) (map[i]&0x000000FF); - int run_terminus = j+run_length; - for(; j0) { + port=p; + } else { + port=ROBOT_PORT; + } host=h; // copy hostname @@ -74,6 +78,7 @@ sock->set(-1,-1); // open the socket + if (sock->connectClient(h,port) <= 0) { fprintf(stderr, "ERROR: Cannot open client socket %s:%i\n", h, port); return false; @@ -327,11 +332,36 @@ return (NULL); } +MsgRobot const *RobotClient::waitForNextMessage(double timeout) +{ + if (!isConnected()) + return NULL; -int RobotClient::isConnected() const { + struct pollfd pfd; + pfd.fd=sock->getFD(); + pfd.events=POLLIN; + pfd.revents=0; + + int rv=poll(&pfd,1,(int)ceil(timeout*1e3)); + if (rv<0) { + sock->disconnect(); + printf("BoeingRobotClient::Connection error\n"); + return NULL; + } else if (rv==0) { + // timeout + return NULL; + } else { + return getNextMessage(); + } +} + + +int RobotClient::isConnected() const +{ return sock->isConnected(); } -int RobotClient::getFD(){ +int RobotClient::getFD() const +{ return sock->getFD(); } Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.h 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.h 2007-10-01 15:57:04 UTC (rev 795) @@ -84,8 +84,12 @@ the id of the sending client */ MsgRobot const *getNextMessage(); + /** waits for the next message and then returns it. + The timeout is in seconds */ + MsgRobot const *waitForNextMessage(double timeout); + int isConnected() const; - int getFD(); + int getFD() const; bool sendPacket(MsgHeader *msg); Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-10-01 15:57:04 UTC (rev 795) @@ -55,6 +55,10 @@ socket_s->set(-1,-1); + if (port<0) { + port=ROBOT_PORT; + } + // open the socket if (socket_s->connectServer(port) <= 0) { fprintf(stderr, "ERROR: Cannot open debug server socket %i\n", port); Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.cc 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.cc 2007-10-01 15:57:04 UTC (rev 795) @@ -219,48 +219,45 @@ //=== Pasring for filenames =============================== -string removeExtension(char const *s) +string removeExtension(string const &s) { - string str=s; + size_t i=s.rfind("."); + string str; - int i=(int) str.rfind("."); - if (i>=0) - str.erase(i); + str.assign(s,0,i); return str; } -string removePath(char const *s) +string removePath(string const &s) { - string str=s; - - int i=(int) str.rfind("/"); - if (i>=0) - str.erase(0,i+1); + size_t i=s.rfind("/"); + string str; + if (i==string::npos) { + str=s; + } else { + str.assign(s,i+1,s.length()-i-1); + } return str; } -string getExtension(char const *s) +string getExtension(string const &s) { - string str=s,res; - - res.clear(); - int i=(int) str.rfind("."); - if (i<=0) - return res; - res.assign(str,i+1,str.length()-1); - return res; + string str; + size_t i=s.rfind("."); + if (i!=string::npos) { + str.assign(s,i+1,s.length()-i-1); + } + return str; } -string getPath(char const *s) +string getPath(string const &s) { - string str=s; - string res; - - res.clear(); - int i=(int) str.rfind("/"); - if (i>=0) - res.assign(str,0,i); - return res; + string str; + size_t i=s.rfind("/"); + if (i!=string::npos) { + str.assign(s,0,i); + } + return str; } string replaceChar(char const *s,char c,char replace) Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.h 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/string_helper.h 2007-10-01 15:57:04 UTC (rev 795) @@ -68,11 +68,11 @@ //=== Pasring for filenames =============================== -string removeExtension(char const *s); -string removePath(char const *s); +string removeExtension(string const &s); +string removePath(string const &s); -string getExtension(char const *s); -string getPath(char const *s); +string getExtension(string const &s); +string getPath(string const &s); string replaceChar(char const *s,char c,char replace); Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.cc 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.cc 2007-10-01 15:57:04 UTC (rev 795) @@ -352,6 +352,17 @@ return clients.size(); } +void fillTimeout(double t,struct timeval &tv) +{ + if (t>0) { + double ts = floor(t); + tv.tv_sec = (long) ts; + tv.tv_usec = (long) ((t-ts)*1E6); + } else { + tv.tv_sec=tv.tv_usec=0; + } +} + bool TCPSocket::readyForRecv(double timeout) { if (status <= 0) @@ -359,14 +370,9 @@ // timeout field struct timeval tv = {0, 0}; + fillTimeout(timeout,tv); - if (timeout>0) { - double ts = floor(timeout); - tv.tv_sec = (long) ts; - tv.tv_usec = (long) ((ts-timeout)*1E6); - } - if (status == Server) { if (clients.empty()) return (false); @@ -450,12 +456,14 @@ } -bool TCPSocket::readyForSend() +bool TCPSocket::readyForSend(double timeout) { if (status <= 0) return 0; struct timeval tv = {0, 0}; + fillTimeout(timeout,tv); + fd_set fdvar; int maxfd = 0; FD_ZERO(&fdvar); @@ -481,12 +489,14 @@ } } -bool TCPSocket::readyForAccept() +bool TCPSocket::readyForAccept(double timeout) { Assert(status == Server, "not a server"); if (status == Server) { struct timeval tv = {0, 0}; + fillTimeout(timeout,tv); + fd_set fdvar; FD_ZERO(&fdvar); Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.h 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/tcpsocket.h 2007-10-01 15:57:04 UTC (rev 795) @@ -140,8 +140,8 @@ // Returns if the socket can be written, read, or accepted without blocking. bool readyForRecv(double timeout=0.0); - bool readyForSend(); - bool readyForAccept(); + bool readyForSend(double timeout=0.0); + bool readyForAccept(double timeout=0.0); void print(sockaddr_in &a); private: Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/threadhelp.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/threadhelp.h 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/threadhelp.h 2007-10-01 15:57:04 UTC (rev 795) @@ -12,13 +12,51 @@ public: Thread() { thread_id=0; } + ~Thread() { cancel(); } /// create the thread. True on success int create(ThreadFn fn,void *params=NULL) { return (pthread_create(&thread_id,NULL,fn,params)==0); } + bool cancel() { + if (thread_id && pthread_cancel(thread_id)==0) { + thread_id=0; + return true; + } + return false; + } + + void *join() { + void *rval=NULL; + if (thread_id && pthread_join(thread_id,&rval)==0) { + thread_id=0; + return rval; + } + return NULL; + } + + // may not be posix compatible + void *tryJoin(bool &has_finished) { + void *rval=NULL; + has_finished=!(thread_id); + // if (thread_id && pthread_tryjoin_np(thread_id,&rval)==0) { + // thread_id=0; + // has_finished=true; + //} + return rval; + } + + // does not return!!! + static void exit(void *v=NULL) { + pthread_exit(v); + } + + static void checkCancel() { pthread_testcancel(); } + pthread_t getThreadID() const { return thread_id; } + + bool isStarted() const { return thread_id>0; } }; #endif Modified: trunk/TeamTalk/Libraries/boeingLib/utils/Makefile.sub =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/utils/Makefile.sub 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/utils/Makefile.sub 2007-10-01 15:57:04 UTC (rev 795) @@ -89,3 +89,38 @@ $(BIN)/$(TARGET): $(TEST_CONVERTER_OBJ) $(SRC_LIBS) $(LINK_ECHO) $(Q)$(CC) -o $@ $(TEST_CONVERTER_OBJ) $(SRC_LIBS) $(LIBS) + + +#==== test_thread ======================================================# + + +TARGET := test_thread +SRC := utils/$(TARGET).cc + +TEST_THREAD_OBJ := $(SRC:.cc=.o) + +ALL_SRC += $(SRC) +ALL_BIN_TARGETS += $(TARGET) + +$(TARGET): $(BIN)/$(TARGET) + +$(BIN)/$(TARGET): $(TEST_THREAD_OBJ) $(SRC_LIBS) + $(LINK_ECHO) + $(Q)$(CC) -o $@ $(TEST_THREAD_OBJ) $(SRC_LIBS) $(LIBS) + +#==== test_thread ======================================================# + + +TARGET := test_zlib +SRC := utils/$(TARGET).cc + +TEST_ZLIB_OBJ := $(SRC:.cc=.o) + +ALL_SRC += $(SRC) +ALL_BIN_TARGETS += $(TARGET) + +$(TARGET): $(BIN)/$(TARGET) + +$(BIN)/$(TARGET): $(TEST_ZLIB_OBJ) $(SRC_LIBS) + $(LINK_ECHO) + $(Q)$(CC) -o $@ $(TEST_ZLIB_OBJ) $(SRC_LIBS) $(LIBS) Modified: trunk/TeamTalk/Libraries/boeingLib/utils/test_robot_server.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/utils/test_robot_server.cc 2007-09-28 23:00:09 UTC (rev 794) +++ trunk/TeamTalk/Libraries/boeingLib/utils/test_robot_server.cc 2007-10-01 15:57:04 UTC (rev 795) @@ -10,6 +10,7 @@ #include "boeing_robot_server.h" #include "proghelp.h" +#include "command_line_parser.h" using namespace Boeing; @@ -18,29 +19,20 @@ //=== Code =============================================== -void PrintUsage(char const *pname) -{ - printf("USAGE: %s [options]\n",pname); - printf(" -h - this message\n"); -} - int main(int argc, char *argv[]) { // Connect the stop signals InitHandleStop(); - int c; - while ((c=getopt(argc,argv,"h"))>0) { - switch (c) { - case 'h': - default: - PrintUsage(argv[0]); - exit(1); - } - } + CommandLineParser parser; + parser.addUsage("n","Run with no delay in action"); + parser.addUsage("f","Always fail action"); + parser.addUsage("s","Always succeed action"); + parser.parse(argc,argv); + RobotServer bserver; // try to open the socket @@ -50,7 +42,13 @@ exit(1); } + bool always_fail=parser.hasOpt("f"); + bool always_succeed=parser.hasOpt("s"); + bool no_delay=parser.hasOpt("n"); + printf("=== Running server stub ============\n"); + printf("Running always_fail:%i always_succeed:%i no_delay:%i\n", + always_fail,always_succeed,no_delay); // create the test image static const size_t width=320; @@ -74,78 +72,86 @@ while ((msg=bserver.getNextMessage())!=NULL) { switch (msg->hdr.type) { case CMD_ACTION: - printf("(RE->ROBOT) action message\n"); - printf(" Action '%s'\n", msg->msg_action.action); + printf("(RE->ROBOT) action message\n"); + printf(" Action '%s'\n", msg->msg_action.action); - // sleep a random time - sleep((rand()%10)+1); - - // send the response - rv = ((rand()%10<1) ? FAILED : SUCCEEDED); - printf(" Done with value %i, taskid %i\n",rv,msg->msg_action.taskid); - bserver.sendActionAck(msg->msg_action.taskid,rv); - break; - case CMD_EVAL: - printf("(RE->ROBOT) eval message\n"); - printf(" Eval '%s'\n", msg->msg_eval.eval); - - // sleep a random time - sleep((rand()%10)+1); - - // send the response - rv = ((rand()%10<1) ? FAILED : SUCCEEDED); - printf(" Eval value %i\n",rv); - - bserver.sendEvalResult(msg->msg_eval.taskid,rv); - break; - case REQ_LOCATION: - printf("Sending fake location: 1,2,0.1,false\n"); - bserver.sendLocation(1.0f,2.0f,0.1f,false); - break; - case REQ_IMAGE: - printf("Sending fake image\n"); - - printf("Opening JPEG writer with %i %i\n",(int)width,(int)height); - jwriter.openMemGray(width,height); - jwriter.writeData(image); - bserver.sendJPEGImage((const unsigned char *)jwriter.getBuffer(), - jwriter.getWrittenLength(), - width,height,msg->msg_image.invoice); - break; - case CMD_HALT: - printf("(RE->ROBOT) halt message\n"); - rv=SUCCEEDED; - printf(" RobDone with value %i, taskid %i\n",rv, - msg->msg_action.taskid); - bserver.sendDone(msg->msg_action.taskid, rv); - break; - case CMD_GOTO: - printf("(RE->ROBOT) cmd_goto message, nothing implemented\n"); - break; - case CMD_HOME: - printf("(RE->ROBOT) home message, nothing implemented\n"); - break; - case CMD_FOLLOW: - printf("(RE->ROBOT) follow message, nothing implemented\n"); - break; - case CMD_COVER: - printf("(RE->ROBOT) cover message, nothing implemented\n"); - break; - case CMD_SETPOS: - printf("(RE->ROBOT) setpos message, nothing implemented\n"); - break; - case CMD_PAUSE: - printf("(RE->ROBOT) pause message, nothing implemented\n"); - // bserver.sendPlayHalt(); - break; - case CMD_RESUME: - printf("(RE->ROBOT) resume message, nothing implemented\n"); - break; - default: - printf("(RE->ROBOT) Unknown mesasge %i\n", msg->hdr.type); + // sleep a random time + if (!no_delay) { + sleep((rand()%10)+1); + } + + // send the response + if (always_succeed) { + rv=SUCCEEDED; + } else if (always_fail) { + rv=FAILED; + } else { + rv = ((rand()%10<1) ? FAILED : SUCCEEDED); + } + printf(" Done with value %i, taskid %i\n",rv,msg->msg_action.taskid); + bserver.sendActionAck(msg->msg_action.taskid,rv); + break; + case CMD_EVAL: + printf("(RE->ROBOT) eval message\n"); + printf(" Eval '%s'\n", msg->msg_eval.eval); + + // sleep a random time + //sleep((rand()%10)+1); + + // send the response + rv = ((rand()%10<1) ? FAILED : SUCCEEDED); + printf(" Eval value %i\n",rv); + + bserver.sendEvalResult(msg->msg_eval.taskid,rv); + break; + case REQ_LOCATION: + printf("Sending fake location: 1,2,0.1,false\n"); + bserver.sendLocation(1.0f,2.0f,0.1f,false); + break; + case REQ_IMAGE: + printf("Sending fake image\n"); + + printf("Opening JPEG writer with %i %i\n",(int)width,(int)height); + jwriter.openMemGray(width,height); + jwriter.writeData(image); + bserver.sendJPEGImage((const unsigned char *)jwriter.getBuffer(), + jwriter.getWrittenLength(), + width,height,msg->msg_image.invoice); + break; + case CMD_HALT: + printf("(RE->ROBOT) halt message\n"); + rv=SUCCEEDED; + printf(" RobDone with value %i, taskid %i\n",rv, + msg->msg_action.taskid); + bserver.sendDone(msg->msg_action.taskid, rv); + break; + case CMD_GOTO: + printf("(RE->ROBOT) cmd_goto message, nothing implemented\n"); + break; + case CMD_HOME: + printf("(RE->ROBOT) home message, nothing implemented\n"); + break; + case CMD_FOLLOW: + printf("(RE->ROBOT) follow message, nothing implemented\n"); + break; + case CMD_COVER: + printf("(RE->ROBOT) cover message, nothing implemented\n"); + break; + case CMD_SETPOS: + printf("(RE->ROBOT) setpos message, nothing implemented\n"); + break; + case CMD_PAUSE: + printf("(RE->ROBOT) pause message, nothing implemented\n"); + // bserver.sendPlayHalt(); + break; + case CMD_RESUME: + printf("(RE->ROBOT) resume message, nothing implemented\n"); + break; + default: + printf("(RE->ROBOT) Unknown mesasge %i\n", msg->hdr.type); } } - usleep(500*1000); + usleep(150*1000); } bserver.close(); From tk at edam.speech.cs.cmu.edu Mon Oct 1 13:20:15 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 1 Oct 2007 13:20:15 -0400 Subject: [TeamTalk 260]: [796] trunk/TeamTalk/TeamTalkBuild.bat: Tools solution may not exist. Message-ID: <200710011720.l91HKFh4017798@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071001/0e199a95/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/TeamTalkBuild.bat =================================================================== --- trunk/TeamTalk/TeamTalkBuild.bat 2007-10-01 15:57:04 UTC (rev 795) +++ trunk/TeamTalk/TeamTalkBuild.bat 2007-10-01 17:20:14 UTC (rev 796) @@ -11,7 +11,6 @@ title TeamTalk Code Build - Win32 IF NOT EXIST TeamTalkBuild.bat goto Error IF NOT EXIST Agents\Agents.sln goto Error -IF NOT EXIST Tools\Tools.sln goto Error IF NOT EXIST Tools\MakeLM\makelm.pl goto Error :Make directories for logs, temp files, and builds if they do not exist already From tk at edam.speech.cs.cmu.edu Tue Oct 2 00:26:54 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Tue, 2 Oct 2007 00:26:54 -0400 Subject: [TeamTalk 261]: [797] trunk/TeamTalk: 1) Changes in Pendecoder map display to properly render the current livemaps. Message-ID: <200710020426.l924QsZn020210@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071002/d94b86e9/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/MapCanvas.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/MapCanvas.java 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/MapCanvas.java 2007-10-02 04:26:54 UTC (rev 797) @@ -344,11 +344,11 @@ byte run_value = (byte) (encoded_map[i] & 0x000000FF); dirty |= run_value != MapBufferedImage.MAP_UNCHANGED; switch(row_order) { - case Y_MAJOR: + case X_MAJOR: Arrays.fill(decoded_map, j, run_terminus, run_value); j = run_terminus; break; - case X_MAJOR: + case Y_MAJOR: for (; j < run_terminus; j++) decoded_map[(j%y)*x+j/y] = run_value; break; default: @@ -472,8 +472,8 @@ */ public void setPreferredSize(Dimension d) { view_size = d; - map_to_screen.setToScale(view_size.width / native_width, view_size.height / native_height); - map_to_screen.translate(-x_origin, -y_origin); + map_to_screen.setToScale(view_size.width / native_width, -view_size.height / native_height); + map_to_screen.translate(-x_origin+native_width, -y_origin); try { screen_to_map = map_to_screen.createInverse(); } catch (NoninvertibleTransformException e) { Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-02 04:26:54 UTC (rev 797) @@ -332,13 +332,19 @@ return (int) udp_clients.size(); } -bool UDPSocket::waitForData() { +bool UDPSocket::waitForData(double timeout) { if (status <= 0) return 0; fd_set rdfs; FD_ZERO(&rdfs); FD_SET(fd, &rdfs); - return select((int)fd+1, &rdfs, NULL, NULL, NULL) > 0; + + if(timeout) { + timeval tm; + tm.tv_sec = (long)timeout; + tm.tv_usec = (long)((timeout - tm.tv_sec)*1e6); + return select((int)fd+1, &rdfs, NULL, NULL, &tm) > 0; + } else return select((int)fd+1, &rdfs, NULL, NULL, NULL) > 0; } bool UDPSocket::readyForRecv() Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-02 04:26:54 UTC (rev 797) @@ -147,7 +147,7 @@ // Returns if the socket can be written, read, or accepted without blocking. bool readyForRecv(); - bool waitForData(); //blocking version of readyForRecv() + bool waitForData(double timeout=0.); //blocking version of readyForRecv() bool readyForSend(); bool readyForAccept(); Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-10-02 04:26:54 UTC (rev 797) @@ -337,22 +337,8 @@ if (!isConnected()) return NULL; - struct pollfd pfd; - pfd.fd=sock->getFD(); - pfd.events=POLLIN; - pfd.revents=0; - - int rv=poll(&pfd,1,(int)ceil(timeout*1e3)); - if (rv<0) { - sock->disconnect(); - printf("BoeingRobotClient::Connection error\n"); - return NULL; - } else if (rv==0) { - // timeout - return NULL; - } else { - return getNextMessage(); - } + if(!sock->waitForData(timeout)) return NULL; + else return getNextMessage(); } Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc 2007-10-02 04:26:54 UTC (rev 797) @@ -400,6 +400,47 @@ return (false); } +bool UDPSocket::waitForData(double timeout) +{ + if (status <= 0) + return 0; + + if (status == Server && last_message_bytes > 0) + return true; + + pollfd pfd; + + pfd.fd = fd; + pfd.events = POLLIN; + + if (poll(&pfd, 1, timeout*1e3) <= 0) + return(false); + + // if (pfd.revents & (POLLERR | POLLNVAL)) { + if (pfd.revents & POLLERR) { + perror("UDPSocket:"); + fprintf(stderr, "error, shutting down socket..., fd %i perr %i, pnval %i\n", + fd,pfd.revents & POLLERR, pfd.revents & POLLNVAL); + disconnect(); + + return (false); + } + + // check for new data + if(pfd.revents & POLLIN) { + if (status == Server) { + udpServerRecv(); + return (last_message_bytes > 0); + } else { + // printf("can read from %d\n",i); + return(true); + } + } + + Assert(0, "How did we get here?"); + return (false); +} + bool UDPSocket::readyForSend() { if (status <= 0) Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.h 2007-10-01 17:20:14 UTC (rev 796) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.h 2007-10-02 04:26:54 UTC (rev 797) @@ -141,6 +141,7 @@ // Returns if the socket can be written, read, or accepted without blocking. bool readyForRecv(); + bool waitForData(double timeout); //blocking version of readyForRecv() bool readyForSend(); bool readyForAccept(); From tk at edam.speech.cs.cmu.edu Tue Oct 2 08:04:25 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Tue, 2 Oct 2007 08:04:25 -0400 Subject: [TeamTalk 262]: [798] trunk/TeamTalk/: Ignore alwaysontop dll Message-ID: <200710021204.l92C4PaI021585@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071002/5ec2f8bd/attachment.html -------------- next part -------------- Property changes on: trunk/TeamTalk ___________________________________________________________________ Name: svn:ignore - bin logs temp Ankh.Load Ankh.Unload *.ncb *.suo + bin logs temp Ankh.Load Ankh.Unload *.ncb *.suo WBDBV32I.DLL From tk at edam.speech.cs.cmu.edu Tue Oct 2 21:39:13 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Tue, 2 Oct 2007 21:39:13 -0400 Subject: [TeamTalk 263]: [799] trunk/TeamTalk/Agents: Include Pythia/ PythiaDynamicClient in Agents solution. Message-ID: <200710030139.l931dDuE023130@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071002/e01e0afb/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/Agents.sln =================================================================== --- trunk/TeamTalk/Agents/Agents.sln 2007-10-02 12:04:23 UTC (rev 798) +++ trunk/TeamTalk/Agents/Agents.sln 2007-10-03 01:39:11 UTC (rev 799) @@ -9,6 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkBackend", "TeamTalkBackend\TeamTalkBackend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" ProjectSection(ProjectDependencies) = postProject {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkDM", "TeamTalkDM\TeamTalkDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" @@ -20,16 +21,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" ProjectSection(ProjectDependencies) = postProject + {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" ProjectSection(ProjectDependencies) = postProject + {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Helios\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" @@ -48,6 +49,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\Libraries\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -110,6 +113,10 @@ {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32 {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32 {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj 2007-10-02 12:04:23 UTC (rev 798) +++ trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj 2007-10-03 01:39:11 UTC (rev 799) @@ -66,7 +66,7 @@ /> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071003/f316c284/attachment.html -------------- next part -------------- From matt at edam.speech.cs.cmu.edu Wed Oct 3 15:38:45 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Wed, 3 Oct 2007 15:38:45 -0400 Subject: [TeamTalk 265]: [801] branches/mrmarge/PocketTeamTalk/: Branched off for migration to PocketSphinx Message-ID: <200710031938.l93JcjSi029290@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071003/e15c7b58/attachment.html -------------- next part -------------- Copied: branches/mrmarge/PocketTeamTalk (from rev 800, trunk/TeamTalk) From matt at edam.speech.cs.cmu.edu Wed Oct 3 16:19:58 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Wed, 3 Oct 2007 16:19:58 -0400 Subject: [TeamTalk 266]: [802] branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/ startlist-desktop.config: set default AudioServer to non-debug version. Message-ID: <200710032019.l93KJwYB029338@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071003/85516251/attachment.html -------------- next part -------------- Modified: branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config =================================================================== --- branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-03 19:38:45 UTC (rev 801) +++ branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-03 20:19:58 UTC (rev 802) @@ -41,7 +41,7 @@ PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Phoenix -PROCESS: $BIN\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt +PROCESS: $BIN\Audio_Server.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Audio_Server From matt at edam.speech.cs.cmu.edu Wed Oct 3 16:52:07 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Wed, 3 Oct 2007 16:52:07 -0400 Subject: [TeamTalk 267]: [803] branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/ startlist-desktop.config: Audioset default AudioServer to debug version, non-debug version crashes after 45 mins. Message-ID: <200710032052.l93Kq7RQ029394@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071003/0554303f/attachment.html -------------- next part -------------- Modified: branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config =================================================================== --- branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-03 20:19:58 UTC (rev 802) +++ branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-03 20:52:07 UTC (rev 803) @@ -41,7 +41,7 @@ PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Phoenix -PROCESS: $BIN\Audio_Server.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt +PROCESS: $BIN\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Audio_Server From tk at edam.speech.cs.cmu.edu Wed Oct 3 23:42:33 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 3 Oct 2007 23:42:33 -0400 Subject: [TeamTalk 268]: [804] tags/BTH-0.2/TeamTalk/Agents: Applied revision 799 from trunk to BTH-0.2 Agents. Message-ID: <200710040342.l943gXuk029834@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071003/934e036a/attachment-0001.html -------------- next part -------------- Modified: tags/BTH-0.2/TeamTalk/Agents/Agents.sln =================================================================== --- tags/BTH-0.2/TeamTalk/Agents/Agents.sln 2007-10-03 20:52:07 UTC (rev 803) +++ tags/BTH-0.2/TeamTalk/Agents/Agents.sln 2007-10-04 03:42:33 UTC (rev 804) @@ -9,6 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkBackend", "TeamTalkBackend\TeamTalkBackend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" ProjectSection(ProjectDependencies) = postProject {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkDM", "TeamTalkDM\TeamTalkDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" @@ -22,16 +23,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" ProjectSection(ProjectDependencies) = postProject + {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" ProjectSection(ProjectDependencies) = postProject + {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Helios\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" @@ -48,6 +49,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "..\Libraries\sphinx2msdev\libsphinx2fe\libsphinx2fe.vcproj", "{D1928EF1-ABBB-4130-98E4-8BB293F982F3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -371,6 +374,28 @@ {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftDebug|Win32.Build.0 = Debug|Win32 {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftRelease|Win32.ActiveCfg = Release|Win32 {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftRelease|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.DebugOAA|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.FestivalRelease|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.halfreleaseaudio|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.halfreleaseaudio|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.SwiftRelease|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: tags/BTH-0.2/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj =================================================================== --- tags/BTH-0.2/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj 2007-10-03 20:52:07 UTC (rev 803) +++ tags/BTH-0.2/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj 2007-10-04 03:42:33 UTC (rev 804) @@ -66,7 +66,7 @@ /> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/f58367ae/attachment.html -------------- next part -------------- Property changes on: trunk/TeamTalk/Tools ___________________________________________________________________ Name: svn:externals - MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM/trunk + MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM/trunk VBScribe http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/VBScribe From tk at edam.speech.cs.cmu.edu Thu Oct 4 00:13:38 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 4 Oct 2007 00:13:38 -0400 Subject: [TeamTalk 270]: [806] branches/mrmarge/PocketTeamTalk/Tools/: Applied trunk revision 805 to PocketTeamTalk/Tools Message-ID: <200710040413.l944DcIJ029901@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/c704e393/attachment.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Tools ___________________________________________________________________ Name: svn:externals - MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM/trunk + MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM/trunk VBScribe http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/VBScribe From matt at edam.speech.cs.cmu.edu Thu Oct 4 12:23:53 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Thu, 4 Oct 2007 12:23:53 -0400 Subject: [TeamTalk 271]: [807] branches/mrmarge/PocketTeamTalk/Libraries: Added PocketSphinx, SphinxBase, and SphinxTrain tools to resources dir of PocketTeamTalk. Message-ID: <200710041623.l94GNr3v001723@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/9962dabe/attachment-0001.html -------------- next part -------------- Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/AUTHORS =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/AUTHORS (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/AUTHORS 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,13 @@ +Fil Alleva +Robert Brennan +Hsiao-wen Hon +Ravishankar Mosur +Eric Thayer +Kevin Lenzo +Alan W Black +Evandro Gouvea +David Huggins-Daines + +More! please help us get all the names. + + Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/COPYING =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/COPYING (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/COPYING 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,35 @@ +/* ==================================================================== + * Copyright (c) 1999-2001 Carnegie Mellon University. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * This work was supported in part by funding from the Defense Advanced + * Research Projects Agency and the National Science Foundation of the + * United States of America, and the CMU Sphinx Speech Consortium. + * + * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND + * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY + * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/ChangeLog =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/ChangeLog (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/ChangeLog 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,24 @@ +2007-08-23 David Huggins-Daines + + * all: PocketSphinx 0.4.1 (Revision 7200) + * win32: Fix Windows static-library builds + * python: Fix Python build + * various: Fix memory errors when calling fbs_init() multiple times + +2007-08-16 David Huggins-Daines + + * all: PocketSphinx 0.4 + * all: Numerous changes, see http://lima.lti.cs.cmu.edu/mediawiki/index.php?PocketSphinx + +2007-01-26 David Huggins-Daines + + * all: PocketSphinx 0.3 + * all: Compiles for bfin-uclinux, arm-linux, arm-wince-pe with GCC + * all: Compiles (untested) for WinCE using embedded VC++ 4.0 + * all: Somewhat faster than the last release + * all: Regression test suite + +2006-08-05 David Huggins-Daines + + * The first "real" PocketSphinx release. + Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/INSTALL =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/INSTALL (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/INSTALL 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,236 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.am =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.am (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.am 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,59 @@ +SUBDIRS = src \ + model \ + include \ + scripts \ + test + +EXTRA_DIST = autogen.sh \ + pocketsphinx.pc.in \ + pocketsphinx.dsw \ + pocketsphinx.vcw \ + win32/msdev/libpocketsphinx/libpocketsphinx.dsp \ + win32/msdev/pocketsphinx/pocketsphinx.dsp \ + win32/msdev/pocketsphinx_batch/pocketsphinx_batch.dsp \ + win32/msdev/pocketsphinx_continuous/pocketsphinx_continuous.dsp \ + win32/msdev/pocketsphinx_ptt/pocketsphinx_ptt.dsp \ + win32/msdev/libpocketsphinx/libpocketsphinx.vcp \ + win32/msdev/pocketsphinx/pocketsphinx.vcp \ + win32/msdev/pocketsphinx_batch/pocketsphinx_batch.vcp \ + python/setup.py \ + python/_pocketsphinxmodule.c \ + python/_pocketsphinx_test.py + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = pocketsphinx.pc +CLEANFILES = pocketsphinx.pc + +test: + $(LIBTOOL) --mode=execute src/programs/pocketsphinx_batch \ + -adcin TRUE -cepext .16k -samprate 16000 \ + -ctl $(top_srcdir)/model/lm/turtle/turtle.ctl \ + -cepdir $(top_srcdir)/model/lm/turtle \ + -lw 6.5 -fwdflatlw 8.5 -bestpathlw 9.5 \ + -uw 0.5 -fillpen 1e-10 -silpen 0.005 -wip 0.65 \ + -topn 1 -topsenfrm 3 -topsenthresh -70000 -beam 1e-50 \ + -pbeam 1e-50 -lpbeam 1e-40 -lponlybeam 1e-40 \ + -wbeam 1e-50 -fwdflat TRUE -fwdflatbeam 1e-70 \ + -fwdflatwbeam 1e-40 -bestpath TRUE \ + -lmdumpdir $(top_srcdir)/model/lm/turtle \ + -lm $(top_srcdir)/model/lm/turtle/turtle.lm \ + -dict $(top_srcdir)/model/lm/turtle/turtle.dic \ + -hmm $(top_srcdir)/model/hmm/wsj0 \ + -mmap TRUE + +test-debug: + $(LIBTOOL) --mode=execute gdb --args src/programs/pocketsphinx_batch \ + -adcin TRUE -cepext .16k -samprate 16000 \ + -ctl $(top_srcdir)/model/lm/turtle/turtle.ctl \ + -cepdir $(top_srcdir)/model/lm/turtle \ + -lw 6.5 -fwdflatlw 8.5 -bestpathlw 9.5 \ + -uw 0.5 -fillpen 1e-10 -silpen 0.005 -wip 0.65 \ + -topn 1 -topsenfrm 3 -topsenthresh -70000 -beam 1e-50 \ + -pbeam 1e-50 -lpbeam 1e-40 -lponlybeam 1e-40 \ + -wbeam 1e-50 -fwdflat TRUE -fwdflatbeam 1e-70 \ + -fwdflatwbeam 1e-40 -bestpath TRUE \ + -lmdumpdir $(top_srcdir)/model/lm/turtle \ + -lm $(top_srcdir)/model/lm/turtle/turtle.lm \ + -dict $(top_srcdir)/model/lm/turtle/turtle.dic \ + -hmm $(top_srcdir)/model/hmm/wsj0 \ + -mmap TRUE Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.in =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.in (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/Makefile.in 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,691 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + at SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/pocketsphinx.pc.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + config.guess config.sub depcomp install-sh ltmain.sh missing +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = pocketsphinx.pc +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CSH = @CSH@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +SUBDIRS = src \ + model \ + include \ + scripts \ + test + +EXTRA_DIST = autogen.sh \ + pocketsphinx.pc.in \ + pocketsphinx.dsw \ + pocketsphinx.vcw \ + win32/msdev/libpocketsphinx/libpocketsphinx.dsp \ + win32/msdev/pocketsphinx/pocketsphinx.dsp \ + win32/msdev/pocketsphinx_batch/pocketsphinx_batch.dsp \ + win32/msdev/pocketsphinx_continuous/pocketsphinx_continuous.dsp \ + win32/msdev/pocketsphinx_ptt/pocketsphinx_ptt.dsp \ + win32/msdev/libpocketsphinx/libpocketsphinx.vcp \ + win32/msdev/pocketsphinx/pocketsphinx.vcp \ + win32/msdev/pocketsphinx_batch/pocketsphinx_batch.vcp \ + python/setup.py \ + python/_pocketsphinxmodule.c \ + python/_pocketsphinx_test.py + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = pocketsphinx.pc +CLEANFILES = pocketsphinx.pc +all: all-recursive + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +pocketsphinx.pc: $(top_builddir)/config.status $(srcdir)/pocketsphinx.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) + $(mkdir_p) $(distdir)/. $(distdir)/python $(distdir)/scripts $(distdir)/test $(distdir)/win32/msdev/libpocketsphinx $(distdir)/win32/msdev/pocketsphinx $(distdir)/win32/msdev/pocketsphinx_batch $(distdir)/win32/msdev/pocketsphinx_continuous $(distdir)/win32/msdev/pocketsphinx_ptt + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-pkgconfigDATA + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am uninstall-pkgconfigDATA + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-pkgconfigDATA \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-pkgconfigDATA + + +test: + $(LIBTOOL) --mode=execute src/programs/pocketsphinx_batch \ + -adcin TRUE -cepext .16k -samprate 16000 \ + -ctl $(top_srcdir)/model/lm/turtle/turtle.ctl \ + -cepdir $(top_srcdir)/model/lm/turtle \ + -lw 6.5 -fwdflatlw 8.5 -bestpathlw 9.5 \ + -uw 0.5 -fillpen 1e-10 -silpen 0.005 -wip 0.65 \ + -topn 1 -topsenfrm 3 -topsenthresh -70000 -beam 1e-50 \ + -pbeam 1e-50 -lpbeam 1e-40 -lponlybeam 1e-40 \ + -wbeam 1e-50 -fwdflat TRUE -fwdflatbeam 1e-70 \ + -fwdflatwbeam 1e-40 -bestpath TRUE \ + -lmdumpdir $(top_srcdir)/model/lm/turtle \ + -lm $(top_srcdir)/model/lm/turtle/turtle.lm \ + -dict $(top_srcdir)/model/lm/turtle/turtle.dic \ + -hmm $(top_srcdir)/model/hmm/wsj0 \ + -mmap TRUE + +test-debug: + $(LIBTOOL) --mode=execute gdb --args src/programs/pocketsphinx_batch \ + -adcin TRUE -cepext .16k -samprate 16000 \ + -ctl $(top_srcdir)/model/lm/turtle/turtle.ctl \ + -cepdir $(top_srcdir)/model/lm/turtle \ + -lw 6.5 -fwdflatlw 8.5 -bestpathlw 9.5 \ + -uw 0.5 -fillpen 1e-10 -silpen 0.005 -wip 0.65 \ + -topn 1 -topsenfrm 3 -topsenthresh -70000 -beam 1e-50 \ + -pbeam 1e-50 -lpbeam 1e-40 -lponlybeam 1e-40 \ + -wbeam 1e-50 -fwdflat TRUE -fwdflatbeam 1e-70 \ + -fwdflatwbeam 1e-40 -bestpath TRUE \ + -lmdumpdir $(top_srcdir)/model/lm/turtle \ + -lm $(top_srcdir)/model/lm/turtle/turtle.lm \ + -dict $(top_srcdir)/model/lm/turtle/turtle.dic \ + -hmm $(top_srcdir)/model/hmm/wsj0 \ + -mmap TRUE +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/NEWS =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/NEWS (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/NEWS 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,9 @@ +2001-12-07 Dropped "naming" conditions from LICENSE. + + Use SphinxTrain to train acoustic models: + http://www.speech.cs.cmu.edu/SphinxTrain + +2000-01-27 CMU Sphinx is going Open Source! + + + Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/README =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/README (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/README 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,56 @@ +PocketSphinx 0.4.1 + +This is PocketSphinx, one of Carnegie Mellon University's open source +large vocabulary, speaker-independent continuous speech recognition +engine. Please see the LICENSE file for terms of use. + +THIS IS A RESEARCH SYSTEM. This is also an early release of a +research system. We know the APIs and function names are likely to +change, and that several tools need to be made available to make this +all complete. With your help and contributions, this can progress in +response to the needs and patches provided. + +To compile: + +First, you *must* have SphinxBase, which you can download from +http://cmusphinx.org/. You should download and unpack it to the same +parent directory as PocketSphinx, so that the configure script and +project files can find it. On Windows, you will need to rename +'sphinxbase-X.Y' (where X.Y is the SphinxBase version number) to +simply 'sphinxbase' for this to work. + +In a unix-like environment (such as linux, solaris etc): + + * build and optionally install SphinxBase. If you want to use + fixed-point arithmetic, you *must* configure SphinxBase with the + --enable-fixed option. + + * if you downloaded directly from the CVS repository, you need to do + this at least once to generate the "configure" file: + +% ./autogen.sh + + * if you downloaded the release version, or ran "autogen.sh" at least + once, then compile and install: + +% ./configure +% make clean all +% make test +% make install + +In MS Windows (TM), under MS Visual C++ 6.0 (or better): + + * compile all the projects in SphinxBase (from sphinxbase.dsw) + + * load pocketsphinx.dsw (located at the top level directory) + + * compile minimally the project 'pocketsphinx_continuous' + +MS Visual Studio will build the executables under .\bin\Release or +.\bin\Debug (depending on the version you choose on MS Visual Studio), +and the libraries under .\lib\Release or .\lib\Build. + +Test scripts are forthcoming for Windows. + +For up-to-date information, see http://www.pocketsphinx.org/ + Added: branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/aclocal.m4 =================================================================== --- branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/aclocal.m4 (rev 0) +++ branches/mrmarge/PocketTeamTalk/Libraries/pocketsphinx/aclocal.m4 2007-10-04 16:23:50 UTC (rev 807) @@ -0,0 +1,7263 @@ +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl + +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC + fi + ;; +esac + +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) + +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP + + +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX + + +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT + + +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +echo=${ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(ECHO) +])])# _LT_AC_PROG_ECHO_BACKSLASH + + +# _LT_AC_LOCK +# ----------- +AC_DEFUN([_LT_AC_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Thu Oct 4 15:46:53 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 4 Oct 2007 15:46:53 -0400 Subject: [TeamTalk 272]: [808] branches/mrmarge/PocketTeamTalk/Libraries: Deleting pocketsphinx and sphinxbase to make room for svn externals. Message-ID: <200710041946.l94JkrtS001975@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/9a8230fe/attachment.html -------------- next part -------------- From tk at edam.speech.cs.cmu.edu Thu Oct 4 16:06:31 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 4 Oct 2007 16:06:31 -0400 Subject: [TeamTalk 273]: [809] branches/mrmarge/PocketTeamTalk/Libraries/: Switched sphinx2 external to pocketsphinx external Message-ID: <200710042006.l94K6V9p002034@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/f413ab39/attachment.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Libraries ___________________________________________________________________ Name: svn:externals - Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Galaxy Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Phoenix RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 sphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/trunkSphinx2msdev + Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Galaxy Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Phoenix RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Rosetta pocketsphinx https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/pocketsphinx-0.4.1 sphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/trunkSphinx2msdev sphinxbase https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/sphinxbase-0.3 SphinxTrain https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/SphinxTrain From tk at edam.speech.cs.cmu.edu Thu Oct 4 17:05:13 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 4 Oct 2007 17:05:13 -0400 Subject: [TeamTalk 274]: [810] branches/mrmarge/PocketTeamTalk/Libraries/: Fixed sphinxbase external . Message-ID: <200710042105.l94L5D6h002127@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071004/cbcb1cc8/attachment.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Libraries ___________________________________________________________________ Name: svn:externals - Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Galaxy Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Phoenix RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Rosetta pocketsphinx https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/pocketsphinx-0.4.1 sphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/trunkSphinx2msdev sphinxbase https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/sphinxbase-0.3 SphinxTrain https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/SphinxTrain + Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Galaxy Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Phoenix RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Rosetta pocketsphinx https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/pocketsphinx-0.4.1 sphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/trunkSphinx2msdev sphinxbase https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/tags/sphinxbase-0.3/sphinxbase SphinxTrain https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/SphinxTrain From air at edam.speech.cs.cmu.edu Sun Oct 7 16:05:43 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Sun, 7 Oct 2007 16:05:43 -0400 Subject: [TeamTalk 275]: [811] branches/air/Resources: changed DecoderConfig/male-16khz. arg to point to class .ctl file Message-ID: <200710072005.l97K5htY023488@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071007/d01065a1/attachment.html -------------- next part -------------- Modified: branches/air/Resources/DecoderConfig/male-16khz.arg =================================================================== --- branches/air/Resources/DecoderConfig/male-16khz.arg 2007-10-04 21:05:13 UTC (rev 810) +++ branches/air/Resources/DecoderConfig/male-16khz.arg 2007-10-07 20:05:42 UTC (rev 811) @@ -23,7 +23,7 @@ -fwdflatbeam 1e-8 -fwdflatnwbeam 3e-4 -rescorelw 9.5 - -lmfn LanguageModel\TeamTalkLM.arpa + -lmctlfn LanguageModel\TeamTalk.ctl -dictfn Dictionary\TeamTalk.dict.reduced_phoneset -ndictfn Dictionary\noise.dict -phnfn HMM-16khz.ss/phone Added: branches/air/Resources/Grammar/DynamicRobotName.class =================================================================== --- branches/air/Resources/Grammar/DynamicRobotName.class (rev 0) +++ branches/air/Resources/Grammar/DynamicRobotName.class 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,4 @@ +(alphie) +(bashful) +(clyde) +(decker) Added: branches/air/Resources/Grammar/Number-20.class =================================================================== --- branches/air/Resources/Grammar/Number-20.class (rev 0) +++ branches/air/Resources/Grammar/Number-20.class 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,21 @@ + (zero) + (one) + (two) + (three) + (four) + (five) + (six) + (seven) + (eight) + (nine) + (ten) + (eleven) + (twelve) + (thirteen) + (fourteen) + (fifteen) + (sixteen) + (seventeen) + (eighteen) + (nineteen) + (twenty) Added: branches/air/Resources/Grammar/Number-80-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-80-by5.class (rev 0) +++ branches/air/Resources/Grammar/Number-80-by5.class 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,16 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) Added: branches/air/Resources/Grammar/Number-95-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-95-by5.class (rev 0) +++ branches/air/Resources/Grammar/Number-95-by5.class 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,19 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) #%%0.1%% there are more likely? + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) + (eighty five) + (ninety) #%%0.1%% + (ninety five) Modified: branches/air/Resources/Grammar/TeamTalkTask.forms =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.forms 2007-10-04 21:05:13 UTC (rev 810) +++ branches/air/Resources/Grammar/TeamTalkTask.forms 2007-10-07 20:05:42 UTC (rev 811) @@ -18,20 +18,12 @@ FUNCTION: Commands NETS: - [HumanReportCommand] - [HumanLocationQuery] - [HumanMoveCommand] -# [MoveVectorCardinal] - [MoveVectorRelative] - [MoveToGoal] - [HumanGoodbyeCommand] - [HumanTurnCommand] - [HumanHaltCommand] - [HumanFollowCommand] - [HumanPauseCommand] - [HumanContinueCommand] - [HumanExploreCommand] - [HumanSearchCommand] + [InvokePlay] + [ControlRobot] + [QueryRobot] + [MoveRobot] + [RespondYesNo] +# [HumanGoodbyeCommand] ; FUNCTION: Features @@ -39,43 +31,10 @@ [AbsoluteDistance] [TurnDirection] [MoveDirection] - [Units] ; -FUNCTION: YesNo - NETS: -# [Neither] - [Yes] - [No] -; -FUNCTION: Cancel - NETS: - [Cancel] -; -#FUNCTION: Queries -# NETS: -# [QueryProjector] -# [QueryWhiteboard] -# [QueryComputer] -# [QueryNetworking] -# [QueryLocation] -# [QueryRoomSize] -# [QueryRoomSizeSpec] -# [QueryOtherRooms] -# [QueryRoomDetails] -#; - -#FUNCTION: Responses -# NETS: -# [Indifferent] -# [Satisfied] -# [SomewhatSatisfied] -# [FirstOne] -# [SecondOne] -#; - # these auxiliaries are defined in order to capture some parses like # next, this that, which o/w would parse as date-time #FUNCTION: Auxiliaries Modified: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-04 21:05:13 UTC (rev 810) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-07 20:05:42 UTC (rev 811) @@ -10,23 +10,66 @@ [RobotName] (everyone) + (%[DynamicRobotName]%) # class stub ; [OBJ-Robot] ([RobotName]) ; + +######### Main Nets ############## + +[InvokePlay] + ([HumanExploreCommand]) + ([HumanSearchCommand]) + ([HumanFollowCommand]) +; + +[ControlRobot] + ([HumanReportCommand]) + ([HumanPauseCommand]) + ([HumanContinueCommand]) + ([HumanHaltCommand]) + ([Cancel]) +; + +[QueryRobot] + ([HumanLocationQuery]) +; + +[MoveRobot] + ([HumanMoveCommand]) + ([HumanTurnCommand]) + ([MoveVectorRelative]) +# ([MoveVectorCardinal]) + ([MoveToGoal]) +; + +[RespondYesNo] + ([Yes]) + ([No]) +; + +########################################### + + + [HumanExploreCommand] - (explore) + (explore *[MapLocation]) ; [HumanSearchCommand] - (search) + (search *[MapLocation]) ; +[MapLocation] + (this space) + (the area) +; + [HumanFollowCommand] (*[RobotName] FOLLOW [OBJ-Robot]) - FOLLOW (join) (follow) @@ -34,11 +77,11 @@ ; [HumanPauseCommand] - (*[RobotName] pause) + (*[RobotName] pause *task) ; [HumanContinueCommand] - (*[RobotName] continue) + (*[RobotName] continue *task) ; [HumanReportCommand] @@ -48,64 +91,57 @@ [HumanLocationQuery] (*[RobotName] where are you) + (*[RobotName] report location) ; [HumanHaltCommand] (*[RobotName] all stop) + (*[RobotName] stop immediately) ; +[Number-180-by5] +# equalize the relative proportion + ( %[Number-95-by5]% ) #%%0.54%% + ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + + [TurnDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) + (*PREP SIDE *[AngularQualifier]) + ([AngularQualifier] *PREP *SIDE) (around) +SIDE + (right) + (left) +PREP + (to the) ; [MoveDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) + (*PREP SIDE *[AngularQualifier]) (straight) (forward) (forwards) (back) (backward) (backwards) +SIDE + (left) + (right) +PREP + (to the) ; [AngularQualifier] ([Number-180-by5] degrees) ; -[Number-180-by5] - (five) - (ten) - (fifteen) - (twenty *five) - (thirty *five) - (forty *five) - (fifty *five) - (sixty *five) - (seventy *five) - (eighty *five) - (ninety *five) - (HUNDRED) - (HUNDRED *and five) - (HUNDRED *and ten) - (HUNDRED *and fifteen) - (HUNDRED *and twenty *five) - (HUNDRED *and thirty *five) - (HUNDRED *and fourty *five) - (HUNDRED *and fifty *five) - (HUNDRED *and sixty *five) - (HUNDRED *and seventy *five) - (HUNDRED *and eighty) -HUNDRED - (a hundred) - (one hundred) -; - [AbsoluteDistance] - ([Number-20] [Units]) + (%[Number-20]% [Units]) ; [RelativeDistance] @@ -122,15 +158,17 @@ ; [TeamTalkHalf] - (halfway) - (one half) - (a half) - (half) + (*MOD half) +MOD + (one) + (a) ; [TeamTalkThird] - (one third) - (a third) + (MOD third) +MOD + (one) + (a) ; [TeamTalkTwoThird] @@ -139,20 +177,18 @@ ; [TeamTalkOneQuarter] - (one quarters) (one quarter) - (one forth) - (a quarters) + (one fourth) (a quarter) - (a forth) + (a fourth) ; [TeamTalkThreeQuarter] (three quarter) (three quarters) - (three forth) - (three forths) + (three fourth) + (three fourths) ; [HumanMoveCommand] @@ -177,7 +213,6 @@ [MoveVectorRelative] (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) - MOVE (move) (go) @@ -185,15 +220,19 @@ (return) ; +[HumanTurnCommand] + (*[RobotName] TURN [TurnDirection]) +TURN + (turn) + (face) +; [MoveToGoal] (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) (*[RobotName] MOVE [Home]) - MOVE - (move) - (go) - (drive) - + (move *to) + (go *to) + (drive *to) PREP (toward) (towards) @@ -217,19 +256,26 @@ [Home] (home) + (base) ; [Xcoord] - (*negative [Number-20]) + (*NEG %[Number-20]%) +NEG + (negative) + (minus) ; [Ycoord] - (*negative [Number-20]) + (*NEG %[Number-20]%) +NEG + (negative) + (minus) ; [Units] - (meters) - (meter) + (metres) + (metre) # (feet) # (foot) # (yards) @@ -238,42 +284,13 @@ [HumanGoodbyeCommand] (goodbye) - (bye bye) + (bye) (mission complete) - (that's it) +# (that's it) ; -[HumanTurnCommand] - (TURN [TurnDirection]) -TURN - (turn) - (face) -; -[Number-20] - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) -; ################################################################### # YES/NO grammar @@ -281,20 +298,17 @@ [Yes] (YES *MOD) - (STRONG_MOD) (OKAY) - (WEAK_MOD) + (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain + (STRONG_MOD) #%%0.10%% YES (yes) (yeah) - (yep) - (yup) +# (yup) MOD (STRONG_MOD) (WEAK_MOD) STRONG_MOD - (you betcha) -#tk hack: interferes with "go forward" (*let's go for it) (absolutely) (definitely) (OKAY OKAY) @@ -303,20 +317,18 @@ (i think so) (i guess so) OKAY + (okay) (sure) (of course) - (ok) - (okay) (correct) - (fine) +# (fine) (perfect) (great) - (wonderful) +# (wonderful) (acceptable) (good *enough) - (right) - (alright) - (cool) +# (right) +# (alright) ; [No] @@ -327,9 +339,8 @@ (no way) (*no i DONT) (*no i DONT think so) - (never mind) (nevermind) - (*no not really) + (not really) (nowhere) (negative) DONT @@ -337,19 +348,18 @@ (do not) MOD (thanks) - (thank you) + (thank=you) # should be a lexeme (not really) - (i *really don't want to) (it's not) (i'm not) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) +#NO +# (no) +# (not) +#GOOD +# (right) +# (correct) +# (good) +# (okay) ; @@ -360,6 +370,7 @@ [Cancel] (CANCEL *COMMAND) CANCEL + (abort) (cancel) (quit) COMMAND Modified: branches/air/Resources/Grammar/cmp.pl =================================================================== --- branches/air/Resources/Grammar/cmp.pl 2007-10-04 21:05:13 UTC (rev 810) +++ branches/air/Resources/Grammar/cmp.pl 2007-10-07 20:05:42 UTC (rev 811) @@ -1,22 +1,37 @@ #!/usr/local/bin/perl use strict; +use Getopt::Long; +my $classflag = 0; +if (not GetOptions( "class" => \$classflag, )) { die "usage: cmp.pl [-class]\n"; } +print STDERR "cmp.pl: class is $classflag\n"; open(TTGRA, ">TeamTalk.gra"); open(NETS, ">nets"); open(TTTASKGRA, "TeamTalkTask.gra"); + +# check if a robot names file is available, copy into class file +if ( $classflag and -e 'TeamTalkRobots' ) { + system("copy","TeamTalkRobots","RobotName.class"); +} + +# substitute in the robot names while() { print TTGRA $_; next unless (/^\[([^\]]+)\]/); print NETS "$1\n"; - next unless $1 eq 'RobotName' && -e 'TeamTalkRobots'; - open(TTROBOTS, "TeamTalkRobots"); - for my $robot (grep /\S/, ) { + # backward compatible behavior + if ( not $classflag ) { + next unless $1 eq 'RobotName' && -e 'TeamTalkRobots'; + print STDERR "cmp.pl: directly inserting Robot Names\n"; + open(TTROBOTS, "TeamTalkRobots"); + for my $robot (grep /\S/, ) { chop $robot; $robot =~ s/\r$//; print TTGRA "\t($robot)\n"; + } + close TTROBOTS; } - close TTROBOTS; } open(FORMS, ">forms"); @@ -30,4 +45,7 @@ close COMPILE; close LOG; system("concept_leaf -grammar TeamTalk.net"); -1; + + +# 1; # now a program +exit 1; Added: branches/air/Resources/Grammar/compile_gra.pl =================================================================== --- branches/air/Resources/Grammar/compile_gra.pl (rev 0) +++ branches/air/Resources/Grammar/compile_gra.pl 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,55 @@ +#!/usr/local/bin/perl +# compile a grammar into forms and nets files +# produce a "final" version of the grammar (after resolution) + +use strict; +use Getopt::Long; + +# some defaults +my $domain = "TeamTalkTask"; +my $ingra = "$domain.gra"; +my $project = "TeamTalk"; +my $outgra = "$project.gra"; +my $absgra = "$project.grabs"; + +my $classflag = 0; +if (not GetOptions( "class" => \$classflag, + "domain:s" => \$domain, + "project:s" => \$project, + "ingra:s" => \$ingra, + "absgra:s" => \$absgra, + ) ) + { die "usage: compile_gra [-class] [-project -ingra <.gra> -absgra <.absgra>\n"; } +print STDERR "compile_gra: class->$classflag ingra->$ingra outgra->$outgra\n"; + +# check if a robot names file is available, copy into class file (note DOS) +# HARDWIRED!! +if ( $classflag and -e 'TeamTalkRobots' ) { system("copy","TeamTalkRobots","RobotName.class"); } + +# resolve classes to make "extended" and "abstracted" grammars +system("perl resolve.pl -i $ingra -e $outgra -a $absgra"); + +# fish out the net names +open(TTGRA, "$outgra") or die "compile_gra: can't open $outgra!\n";; +open(NETS, ">nets") or die "compile_gra: can't open nets!\n";; +while() { + next unless (/^\[([^\]]+)\]/); + print NETS "$1\n"; +} + +# copy over the forms file +open(TTFORMS, "$domain.forms") or die "compile_gra: no $ingra.forms file!\n"; +open(FORMS, ">forms"); +print FORMS ; +close TTFORMS; close FORMS; + +# compile Phoenix grammar +open(COMPILE, "compile -g . -f $project |"); +open(LOG, ">log"); print LOG ; close LOG; +close COMPILE; + +system("concept_leaf -grammar $project.net"); + + +exit 1; +# Added: branches/air/Resources/Grammar/resolve.pl =================================================================== --- branches/air/Resources/Grammar/resolve.pl (rev 0) +++ branches/air/Resources/Grammar/resolve.pl 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,79 @@ +#!E:/Perl/bin/perl -w +# resolve class references in a .gra file +# produce an expanded version for Phoenix, abstracted version for generate_* +# +# path to a class file is notated as "%[File]%" --> File.class +# a file of that name should exist, in the folder with the .gra file +# [20070923] (air) + +use Getopt::Long; + +my ($infile,$expfile); +my $usage = "usage: resolve -infile <.gra> -expgra <_exp.gra> -abstgra \n"; +if ( scalar @ARGV eq 0 or + not GetOptions ( "infile:s" => \$infile, + "expgra:s" => \$expfile, + "absgra:s" => \$absfile, + ) ) { die $usage; } +print STDERR "resolve: infile-> $infile; graex-> $expfile; grabs-> $absfile\n"; +open(IN,$infile) or die "resolve: can't open $infile!\n"; +open(OUT,">$expfile") or die "resolve: can't open expgra: $expfile!\n"; +open(ABS,">$absfile") or die "resolve: can't open absgra: $absfile!\n"; + +my $postscript = <) { + chomp; + if ( /(.+?)%\[(.+?)\]%(.*?)$/) { + $pre = $1; $file=$2; $post=$3; + print OUT "$pre\[$file\]$post\n"; + print ABS "$pre%\[$file\]%$post\n"; # pass the marker through + } else { print OUT "$_\n"; print ABS "$_\n"; next; } + if ( not defined $classnet{$file} ) { + print STDERR "resolve: defining $file\n"; + open(CLASS,"$file.class") or die "missing .class file: $file\n"; + my $classset = "\n[$file]\n"; + while () { + chomp; + if ( /#/ ) { ($text,$com) = split /\s*#\s*/,$_,2; $div="#"; } + else { $text = $_; $com = ""; $div = "";} + $text =~ s/^\s*(.+?)\s*$/$1/; + $classset .= "\t$text\t$div$com\n"; + } + $classset .= ";\n"; + $classnet{$file} = $classset; + close(CLASS); + } +} +close(IN); + +# add class nets at the end of the file +print OUT $postscript; +foreach $net (sort keys %classnet) { print OUT $classnet{$net}; } +close(OUT); + +close(ABS); + +# Added: branches/air/Resources/Grammar/tokenize.pl =================================================================== --- branches/air/Resources/Grammar/tokenize.pl (rev 0) +++ branches/air/Resources/Grammar/tokenize.pl 2007-10-07 20:05:42 UTC (rev 811) @@ -0,0 +1,155 @@ +#!E:/Perl/bin/perl.exe -w +# convert a .class file into: +# a) .probdef file b) .token file (for dict) c) .ctl file +# [20070923] (air) + +use Getopt::Long; +use File::Basename; + +my ($grafile,$project,$wordfile); +my $usage="usage: tokenize -grammar -project \n"; +if (scalar @ARGV eq 0 + or not GetOptions ( + "grammar=s" => \$grafile, + "project=s" => \$project, + ) ) { die $usage; } +$probdefile = "$project.probdef"; +$tokenfile = "$project.token"; +$wordfile = "$project.words"; +print STDERR "tokenize: grammar->$grafile; project->$project; wordfile->$wordfile\n"; +my $classcount = 0; + +my $epsilon = 0.0001; # slop factor for probability distribution (10^-4) +my $fault = 0; + +# scan .gra file; make list of classes that need to be processed +# also collect all terminals to make a wordlist (for lm compilation) +my %classes = (); my %wordlist = (); +open(GRA,$grafile) or die "tokenize: $grafile not found!\n$usage\n"; +while () { + chomp; + if ( /^\s*#/ or /^\s+$/ ) { next; } # skip comments, blank lines + if ( /\s+\(\s*(.+?)\)\s*/) { # look only at ()'s + @toks = split /\s+/, $1; + } else { next; } +#print STDERR "$_\n ->"; + foreach $tok (@toks) { + $tok =~ s/^\**(.+)/$1/; # strip off Kleene star +# print STDERR " '$tok'"; + if ( $tok =~ /^[A-Z]+/ ) { next; } # skip macros + if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, keep []'s + if ( not defined $classes{$1} ) { + print STDERR "tokenize: found $1\n"; + $classcount++; + } + $classes{$1} = sprintf "C%02d",$classcount; + $wordlist{$1} = "c"; # remember type +# print STDERR " $1($wordlist{$1})"; + } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # other net, ignore + else { + $w = $1; + $wordlist{$w} = "w"; +# print STDERR " {$w}($wordlist{$w})"; + } + } +# print STDERR "\n"; +} +close(GRA); + + +# do each class +open(PROB,">$probdefile") or die "tokenize: can't open $probdefile"; +foreach $classfil (sort keys %classes) { + $classid = $classes{$classfil}; + $classfil =~ s/\[(.+?)\]/$1/; # strip []'s + open(CLASS,"$classfil.class") or die "tokenize: class file $classfil not found"; + ($classname,$dirn,$suffix) = fileparse($classfil,qr/\.[^.]*/); + my %lexset = (); + while () { + chomp; + $line = $_; + if ( /#/ ) { # has a comment, necessarily a prob + ($text,$com) = split /\s*#\s*/,$line,2; + if ( $com =~ /%%(\d\.\d+)%%/ ) { $prob = $1; } + else { # bad + print STDERR "tokenize: possible malformed probability in $classfil \"$line\" --> ignored\n"; + $prob = undef; + $fault++; + } + } else { # unspecified: "implicit" + $text = $line; $prob = undef; + } + $text =~ s/^\s*\((.+?)\)\s*$/$1/; # trim spaces from ends, strip ()'s + $text =~ s/\s+/=/g; # tokenize the text by substituting spaces + $tokens{"$text:$classid"}++; + $lexset{"$text:$classid"} = $prob; + } + close(CLASS); + + # evaluate probabilities + $mass = 0.0; $empty = 0; + foreach $lex (keys %lexset) { + if ( defined $lexset{$lex}) { $mass += $lexset{$lex}; } + else { $empty++; } + } + if ($mass<0.0 or $mass>1.0) { + print STDERR "tokenize: $classfil -> explicit probs add up to $mass!\n"; + $fault++; + } + # fix up the probabilities so that everything adds up right + $adjust = 1.0; $dist = 0.0; + if ($empty eq 0 and $mass gt 0.0 and $mass lt (1.0-$epsilon)) { # all probs explicit + $adjust = 1.0 / $mass; # not enough mass: scale all probs upwards + print STDERR "tokenize: $classfil -> explicit probs scaled by $adjust\n"; + } elsif ($mass lt 1.0 and $empty gt 0) { + $dist = (1.0 - $mass)/$empty; # some probs not specified: split remaining mass + print STDERR "tokenize: $classfil -> token implicit probabilities set to $dist\n"; + } elsif ( $mass gt 1.0) { # something not right... + $adjust = 1.0 / ($mass+($epsilon*$empty)); # too much mass: scale all probs down + print STDERR "tokenize: $classfil -> explicit probs scaled by $adjust\n"; + $dist = $epsilon; # but set all other tokens to min prob + print STDERR "tokenize: $classfil -> $empty token probs set to $epsilon\n"; + } + + # readjust the class member probabilities + foreach $lex (keys %lexset) { + if ( defined $lexset{$lex} ) { $lexset{$lex} *= $adjust; } + else { $lexset{$lex} = $dist; } + } + + # add to the .probdef file + print PROB "LMCLASS [$classname]\n"; + foreach $lex (sort keys %lexset) { + printf PROB "%s\t%8.6f\n", uc($lex),$lexset{$lex}; + } + print PROB "END [$classname]\n\n"; +} +close(PROB); + +# create .words file (for lm compilation); includes class []'s --> UPPERCASE +open(WRD,">$wordfile") or die "tokenize: can't open $wordfile!\n"; +foreach $t (sort keys %wordlist) { + if ( $t =~ /\[.+?\]/ ) { print WRD "$t\n"; } else { print WRD "\U$t\n"; } +} +close(WRD); + +# create the .token file (for pronunciation dict); excludes []'s -> UPPERCASE +open(TOK,">$tokenfile") or die "tokenize: can't write to $tokenfile\n"; +foreach (keys %tokens) { $wordlist{$_}="t";} # add in the wordlist +foreach $tok (sort keys %wordlist) { + if ($tok =~ /\[.+?\]/ ) { next; } # but ignore nets []'s + print TOK "\U$tok\n"; # for compatibility with pronounce +} +close(TOK); + +# create a .ctl file +open(CTL,">$project.ctl") or die "tokenize: can't write to .ctl file!\n"; +print CTL "{ LanguageModel\\$project.probdef }\nLanguageModel\\$project.arpa general {\n"; +foreach $class (sort keys %classes) { + ($classname,$dirn,$suffix) = fileparse($class,qr/\.[^.]*/); + print CTL "$classname\n"; +} +print CTL "}\n"; +close(CTL); + +# From air at edam.speech.cs.cmu.edu Mon Oct 8 11:20:16 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 11:20:16 -0400 Subject: [TeamTalk 276]: [812] branches/air/Resources/Grammar/compile_gra.pl: minor fix Message-ID: <200710081520.l98FKGL2026178@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/2a91d816/attachment-0001.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/compile_gra.pl =================================================================== --- branches/air/Resources/Grammar/compile_gra.pl 2007-10-07 20:05:42 UTC (rev 811) +++ branches/air/Resources/Grammar/compile_gra.pl 2007-10-08 15:20:16 UTC (rev 812) @@ -24,7 +24,7 @@ # check if a robot names file is available, copy into class file (note DOS) # HARDWIRED!! -if ( $classflag and -e 'TeamTalkRobots' ) { system("copy","TeamTalkRobots","RobotName.class"); } +if ( $classflag and -e 'TeamTalkRobots' ) { system("copy","TeamTalkRobots","DynamicRobotName.class"); } # resolve classes to make "extended" and "abstracted" grammars system("perl resolve.pl -i $ingra -e $outgra -a $absgra"); From air at edam.speech.cs.cmu.edu Mon Oct 8 11:45:32 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 11:45:32 -0400 Subject: [TeamTalk 277]: [813] branches/air/Resources/Grammar: minor fixes Message-ID: <200710081545.l98FjWfT026233@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/b4885908/attachment.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/DynamicRobotName.class =================================================================== --- branches/air/Resources/Grammar/DynamicRobotName.class 2007-10-08 15:20:16 UTC (rev 812) +++ branches/air/Resources/Grammar/DynamicRobotName.class 2007-10-08 15:45:31 UTC (rev 813) @@ -1,4 +1,4 @@ -(alphie) -(bashful) -(clyde) -(decker) + (alphie) + (bashful) + (clyde) + (decker) Modified: branches/air/Resources/Grammar/compile_gra.pl =================================================================== --- branches/air/Resources/Grammar/compile_gra.pl 2007-10-08 15:20:16 UTC (rev 812) +++ branches/air/Resources/Grammar/compile_gra.pl 2007-10-08 15:45:31 UTC (rev 813) @@ -24,7 +24,11 @@ # check if a robot names file is available, copy into class file (note DOS) # HARDWIRED!! -if ( $classflag and -e 'TeamTalkRobots' ) { system("copy","TeamTalkRobots","DynamicRobotName.class"); } +if ( $classflag and -e 'TeamTalkRobots' ) { + open(IN,"TeamTalkRobots") or die "compile_gra: can't open TeamTalkRobots!\n"; + open(OUT,">DynamicRobotName.class") or die "compile_gra: can't open DynamicRobotName.class!\n"; + while () { chomp; print OUT "\t($_)\n"; } +} # resolve classes to make "extended" and "abstracted" grammars system("perl resolve.pl -i $ingra -e $outgra -a $absgra"); From air at edam.speech.cs.cmu.edu Mon Oct 8 12:05:41 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 12:05:41 -0400 Subject: [TeamTalk 278]: [814] branches/air/Resources/Grammar/TeamTalkTask.gra: minor change Message-ID: <200710081605.l98G5fQv026261@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/4e9e66a1/attachment.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 15:45:31 UTC (rev 813) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 16:05:40 UTC (rev 814) @@ -118,6 +118,7 @@ (left) PREP (to the) + (to your) ; [MoveDirection] From air at edam.speech.cs.cmu.edu Mon Oct 8 12:09:47 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 12:09:47 -0400 Subject: [TeamTalk 279]: [815] branches/air/Resources/Grammar/TeamTalkTask.gra: minor Message-ID: <200710081609.l98G9lge026275@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/22a49758/attachment.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 16:05:40 UTC (rev 814) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 16:09:47 UTC (rev 815) @@ -122,7 +122,7 @@ ; [MoveDirection] - (*PREP SIDE *[AngularQualifier]) + (*PREP SIDE) (straight) (forward) (forwards) @@ -134,6 +134,7 @@ (right) PREP (to the) + (to your) ; [AngularQualifier] @@ -226,6 +227,8 @@ TURN (turn) (face) + (move) + (go) ; [MoveToGoal] (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) From tk at edam.speech.cs.cmu.edu Mon Oct 8 13:06:21 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 13:06:21 -0400 Subject: [TeamTalk 280]: [816] trunk/TeamTalk/Resources: merge from branches/air/ Resources for class-based lm Message-ID: <200710081706.l98H6Lfg026346@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/03d8d376/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/Resources/DecoderConfig/male-16khz.arg =================================================================== --- trunk/TeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-08 16:09:47 UTC (rev 815) +++ trunk/TeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-08 17:06:21 UTC (rev 816) @@ -23,7 +23,7 @@ -fwdflatbeam 1e-8 -fwdflatnwbeam 3e-4 -rescorelw 9.5 - -lmfn LanguageModel\TeamTalkLM.arpa + -lmctlfn LanguageModel\TeamTalk.ctl -dictfn Dictionary\TeamTalk.dict.reduced_phoneset -ndictfn Dictionary\noise.dict -phnfn HMM-16khz.ss/phone Copied: trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class (from rev 815, branches/air/Resources/Grammar/DynamicRobotName.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,4 @@ + (alphie) + (bashful) + (clyde) + (decker) Copied: trunk/TeamTalk/Resources/Grammar/Number-20.class (from rev 815, branches/air/Resources/Grammar/Number-20.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-20.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/Number-20.class 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,21 @@ + (zero) + (one) + (two) + (three) + (four) + (five) + (six) + (seven) + (eight) + (nine) + (ten) + (eleven) + (twelve) + (thirteen) + (fourteen) + (fifteen) + (sixteen) + (seventeen) + (eighteen) + (nineteen) + (twenty) Copied: trunk/TeamTalk/Resources/Grammar/Number-80-by5.class (from rev 815, branches/air/Resources/Grammar/Number-80-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-80-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/Number-80-by5.class 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,16 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) Copied: trunk/TeamTalk/Resources/Grammar/Number-95-by5.class (from rev 815, branches/air/Resources/Grammar/Number-95-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-95-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/Number-95-by5.class 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,19 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) #%%0.1%% there are more likely? + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) + (eighty five) + (ninety) #%%0.1%% + (ninety five) Modified: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-08 16:09:47 UTC (rev 815) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-08 17:06:21 UTC (rev 816) @@ -18,20 +18,12 @@ FUNCTION: Commands NETS: - [HumanReportCommand] - [HumanLocationQuery] - [HumanMoveCommand] -# [MoveVectorCardinal] - [MoveVectorRelative] - [MoveToGoal] - [HumanGoodbyeCommand] - [HumanTurnCommand] - [HumanHaltCommand] - [HumanFollowCommand] - [HumanPauseCommand] - [HumanContinueCommand] - [HumanExploreCommand] - [HumanSearchCommand] + [InvokePlay] + [ControlRobot] + [QueryRobot] + [MoveRobot] + [RespondYesNo] +# [HumanGoodbyeCommand] ; FUNCTION: Features @@ -39,43 +31,10 @@ [AbsoluteDistance] [TurnDirection] [MoveDirection] - [Units] ; -FUNCTION: YesNo - NETS: -# [Neither] - [Yes] - [No] -; -FUNCTION: Cancel - NETS: - [Cancel] -; -#FUNCTION: Queries -# NETS: -# [QueryProjector] -# [QueryWhiteboard] -# [QueryComputer] -# [QueryNetworking] -# [QueryLocation] -# [QueryRoomSize] -# [QueryRoomSizeSpec] -# [QueryOtherRooms] -# [QueryRoomDetails] -#; - -#FUNCTION: Responses -# NETS: -# [Indifferent] -# [Satisfied] -# [SomewhatSatisfied] -# [FirstOne] -# [SecondOne] -#; - # these auxiliaries are defined in order to capture some parses like # next, this that, which o/w would parse as date-time #FUNCTION: Auxiliaries Modified: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 16:09:47 UTC (rev 815) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 17:06:21 UTC (rev 816) @@ -10,23 +10,66 @@ [RobotName] (everyone) + (%[DynamicRobotName]%) # class stub ; [OBJ-Robot] ([RobotName]) ; + +######### Main Nets ############## + +[InvokePlay] + ([HumanExploreCommand]) + ([HumanSearchCommand]) + ([HumanFollowCommand]) +; + +[ControlRobot] + ([HumanReportCommand]) + ([HumanPauseCommand]) + ([HumanContinueCommand]) + ([HumanHaltCommand]) + ([Cancel]) +; + +[QueryRobot] + ([HumanLocationQuery]) +; + +[MoveRobot] + ([HumanMoveCommand]) + ([HumanTurnCommand]) + ([MoveVectorRelative]) +# ([MoveVectorCardinal]) + ([MoveToGoal]) +; + +[RespondYesNo] + ([Yes]) + ([No]) +; + +########################################### + + + [HumanExploreCommand] - (explore) + (explore *[MapLocation]) ; [HumanSearchCommand] - (search) + (search *[MapLocation]) ; +[MapLocation] + (this space) + (the area) +; + [HumanFollowCommand] (*[RobotName] FOLLOW [OBJ-Robot]) - FOLLOW (join) (follow) @@ -34,11 +77,11 @@ ; [HumanPauseCommand] - (*[RobotName] pause) + (*[RobotName] pause *task) ; [HumanContinueCommand] - (*[RobotName] continue) + (*[RobotName] continue *task) ; [HumanReportCommand] @@ -48,64 +91,59 @@ [HumanLocationQuery] (*[RobotName] where are you) + (*[RobotName] report location) ; [HumanHaltCommand] (*[RobotName] all stop) + (*[RobotName] stop immediately) ; +[Number-180-by5] +# equalize the relative proportion + ( %[Number-95-by5]% ) #%%0.54%% + ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + + [TurnDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) + (*PREP SIDE *[AngularQualifier]) + ([AngularQualifier] *PREP *SIDE) (around) +SIDE + (right) + (left) +PREP + (to the) + (to your) ; [MoveDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) + (*PREP SIDE) (straight) (forward) (forwards) (back) (backward) (backwards) +SIDE + (left) + (right) +PREP + (to the) + (to your) ; [AngularQualifier] ([Number-180-by5] degrees) ; -[Number-180-by5] - (five) - (ten) - (fifteen) - (twenty *five) - (thirty *five) - (forty *five) - (fifty *five) - (sixty *five) - (seventy *five) - (eighty *five) - (ninety *five) - (HUNDRED) - (HUNDRED *and five) - (HUNDRED *and ten) - (HUNDRED *and fifteen) - (HUNDRED *and twenty *five) - (HUNDRED *and thirty *five) - (HUNDRED *and fourty *five) - (HUNDRED *and fifty *five) - (HUNDRED *and sixty *five) - (HUNDRED *and seventy *five) - (HUNDRED *and eighty) -HUNDRED - (a hundred) - (one hundred) -; - [AbsoluteDistance] - ([Number-20] [Units]) + (%[Number-20]% [Units]) ; [RelativeDistance] @@ -122,15 +160,17 @@ ; [TeamTalkHalf] - (halfway) - (one half) - (a half) - (half) + (*MOD half) +MOD + (one) + (a) ; [TeamTalkThird] - (one third) - (a third) + (MOD third) +MOD + (one) + (a) ; [TeamTalkTwoThird] @@ -139,20 +179,18 @@ ; [TeamTalkOneQuarter] - (one quarters) (one quarter) - (one forth) - (a quarters) + (one fourth) (a quarter) - (a forth) + (a fourth) ; [TeamTalkThreeQuarter] (three quarter) (three quarters) - (three forth) - (three forths) + (three fourth) + (three fourths) ; [HumanMoveCommand] @@ -177,7 +215,6 @@ [MoveVectorRelative] (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) - MOVE (move) (go) @@ -185,15 +222,21 @@ (return) ; +[HumanTurnCommand] + (*[RobotName] TURN [TurnDirection]) +TURN + (turn) + (face) + (move) + (go) +; [MoveToGoal] (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) (*[RobotName] MOVE [Home]) - MOVE - (move) - (go) - (drive) - + (move *to) + (go *to) + (drive *to) PREP (toward) (towards) @@ -217,19 +260,26 @@ [Home] (home) + (base) ; [Xcoord] - (*negative [Number-20]) + (*NEG %[Number-20]%) +NEG + (negative) + (minus) ; [Ycoord] - (*negative [Number-20]) + (*NEG %[Number-20]%) +NEG + (negative) + (minus) ; [Units] - (meters) - (meter) + (metres) + (metre) # (feet) # (foot) # (yards) @@ -238,42 +288,13 @@ [HumanGoodbyeCommand] (goodbye) - (bye bye) + (bye) (mission complete) - (that's it) +# (that's it) ; -[HumanTurnCommand] - (TURN [TurnDirection]) -TURN - (turn) - (face) -; -[Number-20] - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) -; ################################################################### # YES/NO grammar @@ -281,20 +302,17 @@ [Yes] (YES *MOD) - (STRONG_MOD) (OKAY) - (WEAK_MOD) + (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain + (STRONG_MOD) #%%0.10%% YES (yes) (yeah) - (yep) - (yup) +# (yup) MOD (STRONG_MOD) (WEAK_MOD) STRONG_MOD - (you betcha) -#tk hack: interferes with "go forward" (*let's go for it) (absolutely) (definitely) (OKAY OKAY) @@ -303,20 +321,18 @@ (i think so) (i guess so) OKAY + (okay) (sure) (of course) - (ok) - (okay) (correct) - (fine) +# (fine) (perfect) (great) - (wonderful) +# (wonderful) (acceptable) (good *enough) - (right) - (alright) - (cool) +# (right) +# (alright) ; [No] @@ -327,9 +343,8 @@ (no way) (*no i DONT) (*no i DONT think so) - (never mind) (nevermind) - (*no not really) + (not really) (nowhere) (negative) DONT @@ -337,19 +352,18 @@ (do not) MOD (thanks) - (thank you) + (thank=you) # should be a lexeme (not really) - (i *really don't want to) (it's not) (i'm not) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) +#NO +# (no) +# (not) +#GOOD +# (right) +# (correct) +# (good) +# (okay) ; @@ -360,6 +374,7 @@ [Cancel] (CANCEL *COMMAND) CANCEL + (abort) (cancel) (quit) COMMAND Modified: trunk/TeamTalk/Resources/Grammar/cmp.pl =================================================================== --- trunk/TeamTalk/Resources/Grammar/cmp.pl 2007-10-08 16:09:47 UTC (rev 815) +++ trunk/TeamTalk/Resources/Grammar/cmp.pl 2007-10-08 17:06:21 UTC (rev 816) @@ -1,22 +1,37 @@ #!/usr/local/bin/perl use strict; +use Getopt::Long; +my $classflag = 0; +if (not GetOptions( "class" => \$classflag, )) { die "usage: cmp.pl [-class]\n"; } +print STDERR "cmp.pl: class is $classflag\n"; open(TTGRA, ">TeamTalk.gra"); open(NETS, ">nets"); open(TTTASKGRA, "TeamTalkTask.gra"); + +# check if a robot names file is available, copy into class file +if ( $classflag and -e 'TeamTalkRobots' ) { + system("copy","TeamTalkRobots","RobotName.class"); +} + +# substitute in the robot names while() { print TTGRA $_; next unless (/^\[([^\]]+)\]/); print NETS "$1\n"; - next unless $1 eq 'RobotName' && -e 'TeamTalkRobots'; - open(TTROBOTS, "TeamTalkRobots"); - for my $robot (grep /\S/, ) { + # backward compatible behavior + if ( not $classflag ) { + next unless $1 eq 'RobotName' && -e 'TeamTalkRobots'; + print STDERR "cmp.pl: directly inserting Robot Names\n"; + open(TTROBOTS, "TeamTalkRobots"); + for my $robot (grep /\S/, ) { chop $robot; $robot =~ s/\r$//; print TTGRA "\t($robot)\n"; + } + close TTROBOTS; } - close TTROBOTS; } open(FORMS, ">forms"); @@ -30,4 +45,7 @@ close COMPILE; close LOG; system("concept_leaf -grammar TeamTalk.net"); -1; + + +# 1; # now a program +exit 1; Copied: trunk/TeamTalk/Resources/Grammar/compile_gra.pl (from rev 815, branches/air/Resources/Grammar/compile_gra.pl) =================================================================== --- trunk/TeamTalk/Resources/Grammar/compile_gra.pl (rev 0) +++ trunk/TeamTalk/Resources/Grammar/compile_gra.pl 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,59 @@ +#!/usr/local/bin/perl +# compile a grammar into forms and nets files +# produce a "final" version of the grammar (after resolution) + +use strict; +use Getopt::Long; + +# some defaults +my $domain = "TeamTalkTask"; +my $ingra = "$domain.gra"; +my $project = "TeamTalk"; +my $outgra = "$project.gra"; +my $absgra = "$project.grabs"; + +my $classflag = 0; +if (not GetOptions( "class" => \$classflag, + "domain:s" => \$domain, + "project:s" => \$project, + "ingra:s" => \$ingra, + "absgra:s" => \$absgra, + ) ) + { die "usage: compile_gra [-class] [-project -ingra <.gra> -absgra <.absgra>\n"; } +print STDERR "compile_gra: class->$classflag ingra->$ingra outgra->$outgra\n"; + +# check if a robot names file is available, copy into class file (note DOS) +# HARDWIRED!! +if ( $classflag and -e 'TeamTalkRobots' ) { + open(IN,"TeamTalkRobots") or die "compile_gra: can't open TeamTalkRobots!\n"; + open(OUT,">DynamicRobotName.class") or die "compile_gra: can't open DynamicRobotName.class!\n"; + while () { chomp; print OUT "\t($_)\n"; } +} + +# resolve classes to make "extended" and "abstracted" grammars +system("perl resolve.pl -i $ingra -e $outgra -a $absgra"); + +# fish out the net names +open(TTGRA, "$outgra") or die "compile_gra: can't open $outgra!\n";; +open(NETS, ">nets") or die "compile_gra: can't open nets!\n";; +while() { + next unless (/^\[([^\]]+)\]/); + print NETS "$1\n"; +} + +# copy over the forms file +open(TTFORMS, "$domain.forms") or die "compile_gra: no $ingra.forms file!\n"; +open(FORMS, ">forms"); +print FORMS ; +close TTFORMS; close FORMS; + +# compile Phoenix grammar +open(COMPILE, "compile -g . -f $project |"); +open(LOG, ">log"); print LOG ; close LOG; +close COMPILE; + +system("concept_leaf -grammar $project.net"); + + +exit 1; +# Copied: trunk/TeamTalk/Resources/Grammar/resolve.pl (from rev 815, branches/air/Resources/Grammar/resolve.pl) =================================================================== --- trunk/TeamTalk/Resources/Grammar/resolve.pl (rev 0) +++ trunk/TeamTalk/Resources/Grammar/resolve.pl 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,79 @@ +#!E:/Perl/bin/perl -w +# resolve class references in a .gra file +# produce an expanded version for Phoenix, abstracted version for generate_* +# +# path to a class file is notated as "%[File]%" --> File.class +# a file of that name should exist, in the folder with the .gra file +# [20070923] (air) + +use Getopt::Long; + +my ($infile,$expfile); +my $usage = "usage: resolve -infile <.gra> -expgra <_exp.gra> -abstgra \n"; +if ( scalar @ARGV eq 0 or + not GetOptions ( "infile:s" => \$infile, + "expgra:s" => \$expfile, + "absgra:s" => \$absfile, + ) ) { die $usage; } +print STDERR "resolve: infile-> $infile; graex-> $expfile; grabs-> $absfile\n"; +open(IN,$infile) or die "resolve: can't open $infile!\n"; +open(OUT,">$expfile") or die "resolve: can't open expgra: $expfile!\n"; +open(ABS,">$absfile") or die "resolve: can't open absgra: $absfile!\n"; + +my $postscript = <) { + chomp; + if ( /(.+?)%\[(.+?)\]%(.*?)$/) { + $pre = $1; $file=$2; $post=$3; + print OUT "$pre\[$file\]$post\n"; + print ABS "$pre%\[$file\]%$post\n"; # pass the marker through + } else { print OUT "$_\n"; print ABS "$_\n"; next; } + if ( not defined $classnet{$file} ) { + print STDERR "resolve: defining $file\n"; + open(CLASS,"$file.class") or die "missing .class file: $file\n"; + my $classset = "\n[$file]\n"; + while () { + chomp; + if ( /#/ ) { ($text,$com) = split /\s*#\s*/,$_,2; $div="#"; } + else { $text = $_; $com = ""; $div = "";} + $text =~ s/^\s*(.+?)\s*$/$1/; + $classset .= "\t$text\t$div$com\n"; + } + $classset .= ";\n"; + $classnet{$file} = $classset; + close(CLASS); + } +} +close(IN); + +# add class nets at the end of the file +print OUT $postscript; +foreach $net (sort keys %classnet) { print OUT $classnet{$net}; } +close(OUT); + +close(ABS); + +# Copied: trunk/TeamTalk/Resources/Grammar/tokenize.pl (from rev 815, branches/air/Resources/Grammar/tokenize.pl) =================================================================== --- trunk/TeamTalk/Resources/Grammar/tokenize.pl (rev 0) +++ trunk/TeamTalk/Resources/Grammar/tokenize.pl 2007-10-08 17:06:21 UTC (rev 816) @@ -0,0 +1,155 @@ +#!E:/Perl/bin/perl.exe -w +# convert a .class file into: +# a) .probdef file b) .token file (for dict) c) .ctl file +# [20070923] (air) + +use Getopt::Long; +use File::Basename; + +my ($grafile,$project,$wordfile); +my $usage="usage: tokenize -grammar -project \n"; +if (scalar @ARGV eq 0 + or not GetOptions ( + "grammar=s" => \$grafile, + "project=s" => \$project, + ) ) { die $usage; } +$probdefile = "$project.probdef"; +$tokenfile = "$project.token"; +$wordfile = "$project.words"; +print STDERR "tokenize: grammar->$grafile; project->$project; wordfile->$wordfile\n"; +my $classcount = 0; + +my $epsilon = 0.0001; # slop factor for probability distribution (10^-4) +my $fault = 0; + +# scan .gra file; make list of classes that need to be processed +# also collect all terminals to make a wordlist (for lm compilation) +my %classes = (); my %wordlist = (); +open(GRA,$grafile) or die "tokenize: $grafile not found!\n$usage\n"; +while () { + chomp; + if ( /^\s*#/ or /^\s+$/ ) { next; } # skip comments, blank lines + if ( /\s+\(\s*(.+?)\)\s*/) { # look only at ()'s + @toks = split /\s+/, $1; + } else { next; } +#print STDERR "$_\n ->"; + foreach $tok (@toks) { + $tok =~ s/^\**(.+)/$1/; # strip off Kleene star +# print STDERR " '$tok'"; + if ( $tok =~ /^[A-Z]+/ ) { next; } # skip macros + if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, keep []'s + if ( not defined $classes{$1} ) { + print STDERR "tokenize: found $1\n"; + $classcount++; + } + $classes{$1} = sprintf "C%02d",$classcount; + $wordlist{$1} = "c"; # remember type +# print STDERR " $1($wordlist{$1})"; + } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # other net, ignore + else { + $w = $1; + $wordlist{$w} = "w"; +# print STDERR " {$w}($wordlist{$w})"; + } + } +# print STDERR "\n"; +} +close(GRA); + + +# do each class +open(PROB,">$probdefile") or die "tokenize: can't open $probdefile"; +foreach $classfil (sort keys %classes) { + $classid = $classes{$classfil}; + $classfil =~ s/\[(.+?)\]/$1/; # strip []'s + open(CLASS,"$classfil.class") or die "tokenize: class file $classfil not found"; + ($classname,$dirn,$suffix) = fileparse($classfil,qr/\.[^.]*/); + my %lexset = (); + while () { + chomp; + $line = $_; + if ( /#/ ) { # has a comment, necessarily a prob + ($text,$com) = split /\s*#\s*/,$line,2; + if ( $com =~ /%%(\d\.\d+)%%/ ) { $prob = $1; } + else { # bad + print STDERR "tokenize: possible malformed probability in $classfil \"$line\" --> ignored\n"; + $prob = undef; + $fault++; + } + } else { # unspecified: "implicit" + $text = $line; $prob = undef; + } + $text =~ s/^\s*\((.+?)\)\s*$/$1/; # trim spaces from ends, strip ()'s + $text =~ s/\s+/=/g; # tokenize the text by substituting spaces + $tokens{"$text:$classid"}++; + $lexset{"$text:$classid"} = $prob; + } + close(CLASS); + + # evaluate probabilities + $mass = 0.0; $empty = 0; + foreach $lex (keys %lexset) { + if ( defined $lexset{$lex}) { $mass += $lexset{$lex}; } + else { $empty++; } + } + if ($mass<0.0 or $mass>1.0) { + print STDERR "tokenize: $classfil -> explicit probs add up to $mass!\n"; + $fault++; + } + # fix up the probabilities so that everything adds up right + $adjust = 1.0; $dist = 0.0; + if ($empty eq 0 and $mass gt 0.0 and $mass lt (1.0-$epsilon)) { # all probs explicit + $adjust = 1.0 / $mass; # not enough mass: scale all probs upwards + print STDERR "tokenize: $classfil -> explicit probs scaled by $adjust\n"; + } elsif ($mass lt 1.0 and $empty gt 0) { + $dist = (1.0 - $mass)/$empty; # some probs not specified: split remaining mass + print STDERR "tokenize: $classfil -> token implicit probabilities set to $dist\n"; + } elsif ( $mass gt 1.0) { # something not right... + $adjust = 1.0 / ($mass+($epsilon*$empty)); # too much mass: scale all probs down + print STDERR "tokenize: $classfil -> explicit probs scaled by $adjust\n"; + $dist = $epsilon; # but set all other tokens to min prob + print STDERR "tokenize: $classfil -> $empty token probs set to $epsilon\n"; + } + + # readjust the class member probabilities + foreach $lex (keys %lexset) { + if ( defined $lexset{$lex} ) { $lexset{$lex} *= $adjust; } + else { $lexset{$lex} = $dist; } + } + + # add to the .probdef file + print PROB "LMCLASS [$classname]\n"; + foreach $lex (sort keys %lexset) { + printf PROB "%s\t%8.6f\n", uc($lex),$lexset{$lex}; + } + print PROB "END [$classname]\n\n"; +} +close(PROB); + +# create .words file (for lm compilation); includes class []'s --> UPPERCASE +open(WRD,">$wordfile") or die "tokenize: can't open $wordfile!\n"; +foreach $t (sort keys %wordlist) { + if ( $t =~ /\[.+?\]/ ) { print WRD "$t\n"; } else { print WRD "\U$t\n"; } +} +close(WRD); + +# create the .token file (for pronunciation dict); excludes []'s -> UPPERCASE +open(TOK,">$tokenfile") or die "tokenize: can't write to $tokenfile\n"; +foreach (keys %tokens) { $wordlist{$_}="t";} # add in the wordlist +foreach $tok (sort keys %wordlist) { + if ($tok =~ /\[.+?\]/ ) { next; } # but ignore nets []'s + print TOK "\U$tok\n"; # for compatibility with pronounce +} +close(TOK); + +# create a .ctl file +open(CTL,">$project.ctl") or die "tokenize: can't write to .ctl file!\n"; +print CTL "{ LanguageModel\\$project.probdef }\nLanguageModel\\$project.arpa general {\n"; +foreach $class (sort keys %classes) { + ($classname,$dirn,$suffix) = fileparse($class,qr/\.[^.]*/); + print CTL "$classname\n"; +} +print CTL "}\n"; +close(CTL); + +# From air at edam.speech.cs.cmu.edu Mon Oct 8 14:57:18 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 14:57:18 -0400 Subject: [TeamTalk 281]: [817] branches/air/Resources/Grammar: fix ed bug in class handling Message-ID: <200710081857.l98IvICW026476@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/5bb20184/attachment.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 17:06:21 UTC (rev 816) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-08 18:57:17 UTC (rev 817) @@ -61,13 +61,9 @@ [HumanSearchCommand] (search *[MapLocation]) + (search [MoveDirection]) ; -[MapLocation] - (this space) - (the area) -; - [HumanFollowCommand] (*[RobotName] FOLLOW [OBJ-Robot]) FOLLOW @@ -77,7 +73,7 @@ ; [HumanPauseCommand] - (*[RobotName] pause *task) + (*[RobotName] pause *tas*herek) ; [HumanContinueCommand] @@ -100,14 +96,18 @@ ; [Number-180-by5] -# equalize the relative proportion - ( %[Number-95-by5]% ) #%%0.54%% + ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% HUNDRED ( a hundred ) ( one hundred ) ; +[Number-over180] + (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% + (two hundred *and %[Number-95-by5]%) #%%0.5%% + (three hundred *and %[Number-60-by5]%) #%%0.4%% +; [TurnDirection] (*PREP SIDE *[AngularQualifier]) @@ -138,7 +138,8 @@ ; [AngularQualifier] - ([Number-180-by5] degrees) + ([Number-180-by5] degrees) #%%0.667%% + ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's ; @@ -155,6 +156,18 @@ ([TeamTalkThreeQuarter] of the way) ; +[MapLocation] + (this space) + (the area) + (around *PLACE) + (PLACE) +PLACE + (here) + (there) + (your location) +; + + [TeamTalkAll] (all) ; @@ -286,10 +299,10 @@ # (yard) ; -[HumanGoodbyeCommand] - (goodbye) - (bye) - (mission complete) +#[HumanGoodbyeCommand] +# (goodbye) +# (bye) +# (mission complete) # (that's it) ; @@ -325,12 +338,12 @@ (sure) (of course) (correct) -# (fine) (perfect) (great) -# (wonderful) (acceptable) (good *enough) +# (fine) +# (wonderful) # (right) # (alright) ; @@ -345,8 +358,8 @@ (*no i DONT think so) (nevermind) (not really) - (nowhere) (negative) +# (nowhere) DONT (don't) (do not) Modified: branches/air/Resources/Grammar/tokenize.pl =================================================================== --- branches/air/Resources/Grammar/tokenize.pl 2007-10-08 17:06:21 UTC (rev 816) +++ branches/air/Resources/Grammar/tokenize.pl 2007-10-08 18:57:17 UTC (rev 817) @@ -22,8 +22,8 @@ my $epsilon = 0.0001; # slop factor for probability distribution (10^-4) my $fault = 0; -# scan .gra file; make list of classes that need to be processed -# also collect all terminals to make a wordlist (for lm compilation) +# scan .gra file; make a list of classes that need to be processed +# also collect all terminals to make a wordlist (used in lm compilation) my %classes = (); my %wordlist = (); open(GRA,$grafile) or die "tokenize: $grafile not found!\n$usage\n"; while () { @@ -32,27 +32,23 @@ if ( /\s+\(\s*(.+?)\)\s*/) { # look only at ()'s @toks = split /\s+/, $1; } else { next; } -#print STDERR "$_\n ->"; foreach $tok (@toks) { $tok =~ s/^\**(.+)/$1/; # strip off Kleene star -# print STDERR " '$tok'"; if ( $tok =~ /^[A-Z]+/ ) { next; } # skip macros - if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, keep []'s + if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, with their []'s + # insert new ones into class net list, also treat them as "words" for lm if ( not defined $classes{$1} ) { - print STDERR "tokenize: found $1\n"; $classcount++; + $classes{$1} = sprintf "C%02d",$classcount; + print STDERR "tokenize: found $1 [class: $classes{$1}]\n"; } - $classes{$1} = sprintf "C%02d",$classcount; $wordlist{$1} = "c"; # remember type -# print STDERR " $1($wordlist{$1})"; - } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # other net, ignore + } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # non-class net, ignore else { - $w = $1; + $w = $1; $wordlist{$w} = "w"; -# print STDERR " {$w}($wordlist{$w})"; } } -# print STDERR "\n"; } close(GRA); From tk at edam.speech.cs.cmu.edu Mon Oct 8 16:53:30 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 16:53:30 -0400 Subject: [TeamTalk 282]: [818] trunk/TeamTalk/Resources/Grammar: Migrated bugfix from branches/air/ Resources/Grammar 815-817 Message-ID: <200710082053.l98KrU1A026702@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/b9965e46/attachment.html -------------- next part -------------- Deleted: trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class 2007-10-08 18:57:17 UTC (rev 817) +++ trunk/TeamTalk/Resources/Grammar/DynamicRobotName.class 2007-10-08 20:53:30 UTC (rev 818) @@ -1,4 +0,0 @@ - (alphie) - (bashful) - (clyde) - (decker) Modified: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 18:57:17 UTC (rev 817) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 20:53:30 UTC (rev 818) @@ -61,13 +61,9 @@ [HumanSearchCommand] (search *[MapLocation]) + (search [MoveDirection]) ; -[MapLocation] - (this space) - (the area) -; - [HumanFollowCommand] (*[RobotName] FOLLOW [OBJ-Robot]) FOLLOW @@ -77,7 +73,7 @@ ; [HumanPauseCommand] - (*[RobotName] pause *task) + (*[RobotName] pause *tas*herek) ; [HumanContinueCommand] @@ -100,14 +96,18 @@ ; [Number-180-by5] -# equalize the relative proportion - ( %[Number-95-by5]% ) #%%0.54%% + ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% HUNDRED ( a hundred ) ( one hundred ) ; +[Number-over180] + (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% + (two hundred *and %[Number-95-by5]%) #%%0.5%% + (three hundred *and %[Number-60-by5]%) #%%0.4%% +; [TurnDirection] (*PREP SIDE *[AngularQualifier]) @@ -138,7 +138,8 @@ ; [AngularQualifier] - ([Number-180-by5] degrees) + ([Number-180-by5] degrees) #%%0.667%% + ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's ; @@ -155,6 +156,18 @@ ([TeamTalkThreeQuarter] of the way) ; +[MapLocation] + (this space) + (the area) + (around *PLACE) + (PLACE) +PLACE + (here) + (there) + (your location) +; + + [TeamTalkAll] (all) ; @@ -286,10 +299,10 @@ # (yard) ; -[HumanGoodbyeCommand] - (goodbye) - (bye) - (mission complete) +#[HumanGoodbyeCommand] +# (goodbye) +# (bye) +# (mission complete) # (that's it) ; @@ -325,12 +338,12 @@ (sure) (of course) (correct) -# (fine) (perfect) (great) -# (wonderful) (acceptable) (good *enough) +# (fine) +# (wonderful) # (right) # (alright) ; @@ -345,8 +358,8 @@ (*no i DONT think so) (nevermind) (not really) - (nowhere) (negative) +# (nowhere) DONT (don't) (do not) Modified: trunk/TeamTalk/Resources/Grammar/tokenize.pl =================================================================== --- trunk/TeamTalk/Resources/Grammar/tokenize.pl 2007-10-08 18:57:17 UTC (rev 817) +++ trunk/TeamTalk/Resources/Grammar/tokenize.pl 2007-10-08 20:53:30 UTC (rev 818) @@ -22,8 +22,8 @@ my $epsilon = 0.0001; # slop factor for probability distribution (10^-4) my $fault = 0; -# scan .gra file; make list of classes that need to be processed -# also collect all terminals to make a wordlist (for lm compilation) +# scan .gra file; make a list of classes that need to be processed +# also collect all terminals to make a wordlist (used in lm compilation) my %classes = (); my %wordlist = (); open(GRA,$grafile) or die "tokenize: $grafile not found!\n$usage\n"; while () { @@ -32,27 +32,23 @@ if ( /\s+\(\s*(.+?)\)\s*/) { # look only at ()'s @toks = split /\s+/, $1; } else { next; } -#print STDERR "$_\n ->"; foreach $tok (@toks) { $tok =~ s/^\**(.+)/$1/; # strip off Kleene star -# print STDERR " '$tok'"; if ( $tok =~ /^[A-Z]+/ ) { next; } # skip macros - if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, keep []'s + if ( $tok =~ /%(\[.+?\])%/) { # keep protected net names, with their []'s + # insert new ones into class net list, also treat them as "words" for lm if ( not defined $classes{$1} ) { - print STDERR "tokenize: found $1\n"; $classcount++; + $classes{$1} = sprintf "C%02d",$classcount; + print STDERR "tokenize: found $1 [class: $classes{$1}]\n"; } - $classes{$1} = sprintf "C%02d",$classcount; $wordlist{$1} = "c"; # remember type -# print STDERR " $1($wordlist{$1})"; - } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # other net, ignore + } elsif ( $tok =~ /^\[.+?\]/ ) { next; } # non-class net, ignore else { - $w = $1; + $w = $1; $wordlist{$w} = "w"; -# print STDERR " {$w}($wordlist{$w})"; } } -# print STDERR "\n"; } close(GRA); From tk at edam.speech.cs.cmu.edu Mon Oct 8 18:36:13 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 8 Oct 2007 18:36:13 -0400 Subject: [TeamTalk 283]: [819] trunk/TeamTalk/Resources: Bugfix: Added Number-60-by5 class. Message-ID: <200710082236.l98MaDi6026838@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071008/9940bb52/attachment.html -------------- next part -------------- Property changes on: trunk/TeamTalk/Resources/DecoderConfig/LanguageModel ___________________________________________________________________ Name: svn:ignore - TeamTalkLM.arpa + TeamTalk.arpa TeamTalk.ctl TeamTalk.probdef Property changes on: trunk/TeamTalk/Resources/Grammar ___________________________________________________________________ Name: svn:ignore - base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalkflat.gra TeamTalkTask.gra TeamTalkRobots + base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalk_flat.gra TeamTalk_abs.gra TeamTalkTask.gra TeamTalkRobots DynamicRobotName.class TeamTalk.corpus TeamTalk.ctl TeamTalk.probdef TeamTalk.token TeamTalk.words Added: trunk/TeamTalk/Resources/Grammar/Number-60-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-60-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/Number-60-by5.class 2007-10-08 22:36:11 UTC (rev 819) @@ -0,0 +1,12 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) Modified: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 20:53:30 UTC (rev 818) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-08 22:36:11 UTC (rev 819) @@ -104,7 +104,7 @@ ; [Number-over180] - (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% + (*one hundred *and %[Number-95-by5]%) #%%0.1%% (two hundred *and %[Number-95-by5]%) #%%0.5%% (three hundred *and %[Number-60-by5]%) #%%0.4%% ; From tk at edam.speech.cs.cmu.edu Tue Oct 9 01:18:48 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 01:18:48 -0400 Subject: [TeamTalk 284]: [820] trunk/TeamTalk/Agents: Added DateTime to support number sense. Message-ID: <200710090518.l995ImG7027618@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/499ed04b/attachment-0001.html -------------- next part -------------- Property changes on: trunk/TeamTalk/Agents ___________________________________________________________________ Name: svn:externals - Pythia http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Pythia Helios http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Audio_Server MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Sphinx_Engine NlgServer http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/NlgServer2 Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Phoenix2 + Pythia http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Pythia Helios http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Audio_Server MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Sphinx_Engine NlgServer http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/NlgServer2 Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Phoenix2 DateTime http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/DateTime4 Modified: trunk/TeamTalk/Agents/Agents.sln =================================================================== --- trunk/TeamTalk/Agents/Agents.sln 2007-10-08 22:36:11 UTC (rev 819) +++ trunk/TeamTalk/Agents/Agents.sln 2007-10-09 05:18:48 UTC (rev 820) @@ -51,6 +51,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime4", "DateTime\DateTime4.vcproj", "{45BAAD46-E855-4963-9CB6-324A3E276851}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -117,6 +119,10 @@ {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.Build.0 = Debug|Win32 {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.ActiveCfg = Release|Win32 {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.Build.0 = Release|Win32 + {45BAAD46-E855-4963-9CB6-324A3E276851}.Debug|Win32.ActiveCfg = Debug|Win32 + {45BAAD46-E855-4963-9CB6-324A3E276851}.Debug|Win32.Build.0 = Debug|Win32 + {45BAAD46-E855-4963-9CB6-324A3E276851}.Release|Win32.ActiveCfg = Release|Win32 + {45BAAD46-E855-4963-9CB6-324A3E276851}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From air at edam.speech.cs.cmu.edu Tue Oct 9 11:18:38 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 11:18:38 -0400 Subject: [TeamTalk 285]: [821] branches/air/Resources/Grammar/compile_gra.pl: Message-ID: <200710091518.l99FIciK029647@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/93f3149f/attachment.html -------------- next part -------------- Modified: branches/air/Resources/Grammar/compile_gra.pl =================================================================== --- branches/air/Resources/Grammar/compile_gra.pl 2007-10-09 05:18:48 UTC (rev 820) +++ branches/air/Resources/Grammar/compile_gra.pl 2007-10-09 15:18:38 UTC (rev 821) @@ -1,7 +1,12 @@ #!/usr/local/bin/perl # compile a grammar into forms and nets files # produce a "final" version of the grammar (after resolution) +# 'extended' grammar incorporates all class members and is used for parser +# 'abstracted' grammar leaves the classes as stubs and is used by the corpus generator +# based on cmp.pl +# [200710] (air) + use strict; use Getopt::Long; From air at edam.speech.cs.cmu.edu Tue Oct 9 11:49:07 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 11:49:07 -0400 Subject: [TeamTalk 286]: [822] branches/air/Resources/Grammar: update to clean copy Message-ID: <200710091549.l99Fn7S0029683@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/176bd5ff/attachment.html -------------- next part -------------- Added: branches/air/Resources/Grammar/Number-60-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-60-by5.class (rev 0) +++ branches/air/Resources/Grammar/Number-60-by5.class 2007-10-09 15:49:07 UTC (rev 822) @@ -0,0 +1,12 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) Added: branches/air/Resources/Grammar/Number-85-95-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-85-95-by5.class (rev 0) +++ branches/air/Resources/Grammar/Number-85-95-by5.class 2007-10-09 15:49:07 UTC (rev 822) @@ -0,0 +1,4 @@ + (eighty) + (eighty five) + (ninety) + (ninety five) Modified: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-09 15:18:38 UTC (rev 821) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-09 15:49:07 UTC (rev 822) @@ -73,7 +73,7 @@ ; [HumanPauseCommand] - (*[RobotName] pause *tas*herek) + (*[RobotName] pause *task *here) ; [HumanContinueCommand] @@ -104,7 +104,7 @@ ; [Number-over180] - (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% + (*one hundred *and %[Number-95-by5]%) #%%0.1%% (two hundred *and %[Number-95-by5]%) #%%0.5%% (three hundred *and %[Number-60-by5]%) #%%0.4%% ; From air at edam.speech.cs.cmu.edu Tue Oct 9 11:50:15 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 11:50:15 -0400 Subject: [TeamTalk 287]: [823] branches/air/Resources/Grammar/cmp.pl: Message-ID: <200710091550.l99FoFx4029696@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/d3d36511/attachment.html -------------- next part -------------- Deleted: branches/air/Resources/Grammar/cmp.pl =================================================================== --- branches/air/Resources/Grammar/cmp.pl 2007-10-09 15:49:07 UTC (rev 822) +++ branches/air/Resources/Grammar/cmp.pl 2007-10-09 15:50:14 UTC (rev 823) @@ -1,51 +0,0 @@ -#!/usr/local/bin/perl - -use strict; -use Getopt::Long; - -my $classflag = 0; -if (not GetOptions( "class" => \$classflag, )) { die "usage: cmp.pl [-class]\n"; } -print STDERR "cmp.pl: class is $classflag\n"; -open(TTGRA, ">TeamTalk.gra"); -open(NETS, ">nets"); -open(TTTASKGRA, "TeamTalkTask.gra"); - -# check if a robot names file is available, copy into class file -if ( $classflag and -e 'TeamTalkRobots' ) { - system("copy","TeamTalkRobots","RobotName.class"); -} - -# substitute in the robot names -while() { - print TTGRA $_; - next unless (/^\[([^\]]+)\]/); - print NETS "$1\n"; - # backward compatible behavior - if ( not $classflag ) { - next unless $1 eq 'RobotName' && -e 'TeamTalkRobots'; - print STDERR "cmp.pl: directly inserting Robot Names\n"; - open(TTROBOTS, "TeamTalkRobots"); - for my $robot (grep /\S/, ) { - chop $robot; - $robot =~ s/\r$//; - print TTGRA "\t($robot)\n"; - } - close TTROBOTS; - } -} - -open(FORMS, ">forms"); -open(TTFORMS, "TeamTalkTask.forms"); -print FORMS ; -close TTFORMS; close FORMS; - -open(COMPILE, "compile -g . -f TeamTalk|"); -open(LOG, ">log"); -print LOG ; -close COMPILE; close LOG; - -system("concept_leaf -grammar TeamTalk.net"); - - -# 1; # now a program -exit 1; From air at edam.speech.cs.cmu.edu Tue Oct 9 11:51:27 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 11:51:27 -0400 Subject: [TeamTalk 288]: [824] branches/air/Resources/Grammar: Message-ID: <200710091551.l99FpRaw029710@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/a7e205f6/attachment-0001.html -------------- next part -------------- Deleted: branches/air/Resources/Grammar/DynamicRobotName.class =================================================================== --- branches/air/Resources/Grammar/DynamicRobotName.class 2007-10-09 15:50:14 UTC (rev 823) +++ branches/air/Resources/Grammar/DynamicRobotName.class 2007-10-09 15:51:27 UTC (rev 824) @@ -1,4 +0,0 @@ - (alphie) - (bashful) - (clyde) - (decker) Deleted: branches/air/Resources/Grammar/Generic.forms =================================================================== --- branches/air/Resources/Grammar/Generic.forms 2007-10-09 15:50:14 UTC (rev 823) +++ branches/air/Resources/Grammar/Generic.forms 2007-10-09 15:51:27 UTC (rev 824) @@ -1,54 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is the forms file corresponding to the phoenix grammar for -# common task-independ constructs (Generic.gra) that we are likely -# to use in most of the future developed spoken dialog systems. -# -# HISTORY ------------------------------------------------------- -# -# [2002-12-03] (dbohus): set DateTime as non top-level slot, -# renamed date_time (so it no longer -# appears in the forms) -# [2002-11-26] (antoine): set TimeRange and Date as non-top level -# slots renamed time_range and date -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -FUNCTION: Social - NETS: - [_i_want] - [_greeting] - [_can_you] - [_lets] - [_courtesy] - [_emphatic] - [_tentative] -; - -FUNCTION: GenericDialogMechanisms - NETS: - [Help] - [Repeat] - [Suspend] - [Resume] - [StartOver] - [EstablishContext] - [GoodEnough] - [Quit] -; - -FUNCTION: YesNo - NETS: - [Neither] - [Yes] - [No] -; Deleted: branches/air/Resources/Grammar/Generic.gra =================================================================== --- branches/air/Resources/Grammar/Generic.gra 2007-10-09 15:50:14 UTC (rev 823) +++ branches/air/Resources/Grammar/Generic.gra 2007-10-09 15:51:27 UTC (rev 824) @@ -1,1715 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is a phoenix grammar for common task-independ constructs -# that we are likely to use in most of the future developed -# spoken dialog systems. Its starting point were the task -# independent constructs in the CMU Communicator grammar. -# -# -# HISTORY: ------------------------------------------------------- -# -# [2004-07-06] (dbohus): added a number of things to improve -# coverage (based on an analysis of -# parsing statistics for the roomline -# corpus on sprocket) -# [2002-04-04] (dbohus): added (i'll take) to [_i_want] -# [2002-12-20] (antoine): changed ([time_range] *[date] -# *[period_of_day]) into two -# separate rules to reduce ambiguity: -# ([time_range] [period_of_day]) -# is no longer possible, the period -# of day is always parsed inside the -# time_range. -# [2002-12-03] (dbohus): demoted [DateTime] to [date_time] which -# is no longer a top-level slot -# [2002-11-26] (antoine): added an optional [period_of_day] after -# ([time_range] *[date]) to account for -# e.g. "six thirty tomorrow morning" -# [2002-11-26] (antoine): set TimeRange, Date, Number as non-top -# (dbohus): level slots renamed time_range, date, -# number -# [2002-10-18] (dbohus): Added [DateTime], by taking it from -# Communicator (and cleaning it a bit) -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -################################################################### -# Social plus this that, etc -################################################################### - -[_greeting] - (hello) - (hi *there) - (good morning) - (good afternoon) - (good evening) -; - -[_can_you] - (could you *also *[_courtesy]) - (can you *also *[_courtesy]) - (will you *also *[_courtesy]) - (can we *also *[_courtesy]) - (would you *also *[_courtesy]) -; - -[_can_i] - (could i *also *[_courtesy]) - (can i *also *[_courtesy]) -; - -[_tell_me] - (*[_can_you] tell me *about) - (how about) -; - -[_courtesy] - (please) - (THANK *MUCH) - (*YOU welcome) - -THANK - (thanks) - (thank you) -MUCH - (*very much) - (a lot) -YOU - (you are) - (you're) -; - -[_it] - (it) - (this *one) - (that *one) -; - -[_lets] - (let's *say) - (let us *say) -; - -[_that_is] - (that's) - (that is) - (that'll) - (that'd) - (that was) - (it is) - (it's) -; - -[_this_that] - ([_this]) - ([_that]) -; - -[_that] - (that *one) - (it) -; - -[_this] - (this *one) - (the) - (it) -; - -[_emphatic] - (i *already SAID) - (*are you sure) - (actually) -SAID - (said) - (told you) -; - -[_tentative] - (i guess) - (i think) - (i believe) -; - -[_it_does] - (it does) - (it did) -; - -[_i_want] - (i *just *will *also want *TO_HAVE) - (i *just *will *also need *TO_HAVE) - (i *just *also wanna) - (i *just *also wanted *TO_HAVE) - (i'd like *TO_HAVE) - (i would like *TO_HAVE) - (i'd prefer *TO_HAVE) - (i would prefer *TO_HAVE) - (give me) - (CAN i *also get) - (CAN i *also have) - (CAN i *also take) - (i'll *also take) - (i'll *also have) - (i *just have to) - (i *just had to) - (i must) - (how about) - (what about) - (do you have) -CAN - (can) - (could) -TO_HAVE - (to *also *have) - (to *also *get) - (to *also *know) -; - - -################################################################### -# HELP GRAMMAR -################################################################### -[Help] - (*[_i_want] [general_help]) - (*[_tell_me] [what_can_i_say] *now) - (*[_i_want] [give_me_tips]) - ([system_capabilities]) -; - -[general_help] - (*[_i_want] *some help) - (*[_can_you] help me) - (customer service) - (interactive info) - (interactive information) - -[what_can_i_say] - (what CAN i DO_SAY) - (*what *are *THE options) - (*[_i_want] *some instructions) - (*[_i_want] an example) - (i don't know what to DO_SAY) - (i don't know what i CAN DO_SAY) -CAN - (can) - (should) - (could) - (do) -DO_SAY - (do) - (say) -THE - (the) - (my) -; - -[give_me_tips] - (*[_tell_me] how *[_can_i] *to use the system) - (*[_tell_me] how things work) - (*some *more TIPS) - (more help) -TIPS - (*INTERACTION hints) - (*INTERACTION tips) - (*INTERACTION commands) -INTERACTION - (system) - (interaction) - (communication) -; - -[system_capabilities] - (*[_tell_me] what *else can you do) - (*[_tell_me] what *else do you offer) - (*[_tell_me] who are you) - (*[_tell_me] what *else do you do) - (*[_tell_me] how *else can you help *me) -; - -################################################################### -# REPEAT GRAMMAR -################################################################### - -[Repeat] - (*sorry REPEAT *[_courtesy]) - (excuse me) - (*i *beg *your pardon) - (pardon me) - (*sorry what was that *again) - (*sorry what's that *again) - (*sorry WHATD you *just say) - ( what ) - (*sorry i didn't HEAR YOU) - -WHATD - (what did) - (what'd) - -REPEAT - (repeat the question *again) - (repeat *[_it]) - (say [_it] *again) - (say again) -HEAR - (hear) - (understand) - (catch) - -YOU - (you) - (that) - (it) - (what you said) -; - -################################################################### -# SUSPEND/RESUME GRAMMAR -################################################################### - -[Suspend] - (*[_lets] TAKE_A_BREAK *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] HOLD_ON *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] TAKE_A_BREAK *FOR_TIME *[_courtesy]) -HOLD_ON - (hold on *[_courtesy]) - (stand by *[_courtesy]) -TAKE_A_BREAK - (take a *SHORT break) - (have a *SHORT break) - (break *[_this] ACTIVITY) - (pause *[_this] ACTIVITY) - (hold on) - (suspend *[_this] *ACTIVITY) -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -SHORT - (short) - (quick) - (small) - (little) -FOR_TIME - (*for a while) - (*for now) - (*for a second) - (*for a minute) - (*for a couple of minutes) -; - -[Resume] - (*[_courtesy] resume *[_this] *ACTIVITY *[_courtesy]) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -; - -################################################################### -# START-OVER GRAMMAR -################################################################### - -[StartOver] - (restart *IT) - (reset *IT) - (start *IT *all OVER) - (start from the *very BEGINNING) - (go back to the BEGINNING) - (START from scratch) - (main menu) - -IT - ([_it]) - (*[_this] ACTIVITY) - (*[_this] system) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (session) - (conversation) - -OVER - (again) - (over) - -BEGINNING - (beginning) - (start) - -START - (start) - (restart) -; - - -################################################################### -# ESTABLISH CONTEXT GRAMMAR -################################################################### - -[EstablishContext] - (where are we) - (where am i) - (what's going on) - (what are we doing) - (what am i doing) - (what is happening) - (where were we) - (where was i) -; - -################################################################### -# GOOD ENOUGH GRAMMAR -################################################################### -[GoodEnough] - (*[_that_is] *good enough) -; - -################################################################### -# QUIT GRAMMAR -################################################################### - -[Quit] - (*good bye) - (goodbye) - (byebye) - (bye bye) - (hang up *now) - (see you later) - (that's all) - (have a good day) - (good night) - (goodnight) - (quit) - ( *[_i_want] abort *SESSION *[_courtesy] ) - ( *[_i_want] exit *SESSION *[_courtesy] ) - ( *[_i_want] quit *SESSION *[_courtesy] ) - -SESSION - (*[_this] dialog) - (*[_this] dialogue) - (*[_this] session) - (*[_this] conversation) - (*[_this] system) -; - - -################################################################### -# NEITHER grammar -################################################################### -[Neither] - (*[_i_want] NEITHER *one *OF_THOSE) - (NEITHER *one *OF_THOSE IS_GOOD) - (NO_WANT any *OF_THOSE) -NEITHER - (neither) - (none) -OF_THOSE - (of them) - (of these) - (of those) -IS_GOOD - (is good) - (is right) -NO_WANT - (i don't want) - (i don't like) -; - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (STRONG_MOD) - ( OKAY ) - ( WEAK_MOD ) -YES - (yes) - (yeah) - (yep) - (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (*[_that_is] *be OKAY) - ([_this_that] sounds OKAY) - ([_this_that] works) - (you betcha) - (*let's go for it) - (absolutely) - (definitely) - ( OKAY OKAY ) -WEAK_MOD - (why not) - (i think so) - (i guess so) - (*[_that_is] close enough) -OKAY - (sure) - (of course) - (ok) - (okay) - (correct) - (fine) - (perfect) - (great) - (wonderful) - (acceptable) - (good *enough) - (right) - (alright) - (cool) -; - -[No] - (no *MOD) - ([_emphatic] no) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (*no i DONT like [_this_that]) - (*no i DONT want [_this_that]) - (never mind) - (nevermind) - (*no not really) - (nowhere) - (negative) -DONT - (don't) - (do not) -MOD - (thanks) - (thank you) - (not really) - (i *really don't want to) - (i *really don't want [_this_that]) - (it's not) - (i'm not) - ([_that_is] not what i want) - (*[_that_is] NO *GOOD) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) -; - - -################################################################### -# NUMBERS GRAMMAR -################################################################### - -# (dbohus): This is the numbers grammar, extracted from the -# original Communicator grammar - -[number] - (one) - (THOU_HUND *AND_NUM) - (NUM) - -AND_NUM - (and AND_NUM_OPTS) - -AND_NUM_OPTS - (TEN *ONE'S) - (TEEN) - (ONE'S) - -THOU_HUND - (*THOU HUND) - (THOU) - -NUM - (*THOU *HUND *TEN ONE'S) - (*THOU *HUND TEEN) - (*THOU *HUND TEN) - (ONE ONE *ONE *ONE *ONE *ONE'S) - (ONE ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE'S) - (TEEN ONE *ONE'S) - (TEN_ONE ONE TEN_ONE ONE'S) - (TEN_ONE TEN *ONE'S) - (TEN_ONE TEEN) - -START_TEEN - (TEEN TEEN) - (TEEN TEN *ONE'S) - -TEN_ONE - (TEN) - (ONE) - -THOU - (*THOU_OPTS thousand) - -THOU_OPTS - (HUND) - (HUND_OPTS) - -HUND - (HUND_OPTS hundred) - -HUND_OPTS - (*TEN A_ONE) - (TEEN) - (TEN) - -A_ONE - (a) - (an) - (ONE) - - -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - -TEN - (twenty) - (thirty) - (forty) - (fifty) - (sixty) - (seventy) - (eighty) - (ninety) - -ONE'S - (ONE) - (POS) -ONE'S-1 - (ONE-1) - (POS) -POS - (zero's) - (oh's) - (one's) - (two's) - (three's) - (four's) - (five's) - (six's) - (seven's) - (eight's) - (nine's) - (fourth) - (sixth) - (seventh) - (eighth) - (ninth) - -ONE - (one) - (ONE-1) -ONE-1 - (zero) - (oh) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -[date_time] - (DATE *[time_range] *[time_range]) - ([time_range] *DATE *[time_range]) - ([time_range] [time_range] *DATE) - ([period_mod] DATE *[period_of_day]) - (*[period_mod] [today_relative]) - (*[time_range] *the NEXT [period_of_day]) - (*[time_range] *the [date_relative] [time_range]) - (that [day_of_week]) - (that [time_range]) - ([time_range] is fine) -DATE - ([date] *[period_of_day]) - ([day_name]) -NEXT - ([d_next]) - ([d_previous]) -; - -[date] - (*SELECTOR *ON *the MONTH_DAY *YEAR *[period_of_day]) - (*a DAY_WEEK *OF_MONTH) - (*sometime [today_relative]) - (*ON *the DATE_REL *OF_MONTH) - (*SOMETIME [date_relative]) - (*sometime [date_relative] DAY) - ([date_relative] [today_relative]) - (*[date_relative] [holiday]) -SELECTOR - (DAY_WEEK) - (sometime) -SOMETIME - (sometime) - ([anyday]) -DATE_REL - ([date_relative]) - ([day_ordinal] *of [date_relative]) - ([holiday]) - ([anyday]) - ([everyday]) - (last day *of *[month_after]) - ([day_of_month] DAY *of *[month_after]) - (the [day_ordinal]) - ([day_ordinal] AND [day_ordinal]) -AND - (and) - (or) -MONTH_DAY - (*[month_name] the [day_ordinal]) - ([month_name] *the [day_ordinal]) - ([day_ordinal] *day *of [month_name]) - ([month_name] [day_number]) - ([day_number] [month_name]) -DAY - (day) - ([day_of_week]) -DAY_WEEK - (*A *MOD_DAY *ON [day_of_week] *OF_WEEK *AT_TIME) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -ON - (date) - (during) - (for) - (on *that) - (of) -THE - (a) - (an) - (the) -OF_MONTH - (*IN_OF *A [month_name]) - (*IN_OF *A THIS_LAST month) - (of the month) -MOD_DAY - ([week_after]) - (EACH) -AT_TIME - (*at *the same time) -OF_WEEK - (*IN_OF *A *this week) - (*IN_OF *A [date_relative]) -EACH - (any) - (each) - (every) -A - (a) - (an) - (the) -IN_OF - (in) - (of) -THIS_LAST - (this) - (last) -DAY - (day) - (date) - ([day_name]) -; - -[day_of_month] - (first) - (second) - (third) - (fourth) - (fifth) -; - -[everyday] - (EACH DAY *OF_WEEK) - (daily) - (dailies) - (everyday) - ([each_day]) -EACH - (all) - (every) -DAY - (day) - (days) -OF_WEEK - (of *the week) -; - -[each_day] - (EACH *of *the DAY *OF_WEEK) -DAY - (day) - (days) - (date) - (dates) -EACH - (*FOR each) - (ORDERED *BY) -ORDERED - (order) - (ordered) - (sort) - (sorted) - (arrange) - (arranged) -BY - (by) - (according *to) -OF_WEEK - (of *the week) -FOR - (for) - (on) -; - -[anyday] - (*IN_ON *the *FIRST_LAST WEEK_MONTH *OF_MONTH) - (any DAY *OF_WEEK) -DAY - (date) - (dates) - (day) - (days) -OF_WEEK - (of *the week) -FIRST_LAST - (first) - (previous) - (next) - (last) - (following) - (coming) -WEEK_MONTH - (week) - (month) -IN_ON - (in) - (on) -OF_MONTH - (*IN_OF [month_name]) - (*IN_OF THIS_NEXT month) -IN_OF - (in) - (of) -THIS_NEXT - (this) - (last) - (next) -; - -[holiday] - ([holiday_name]) - ([holiday_nameday]) -; - -[holiday_name] - (HOL *DAY) -HOL - (christmas) - (easter) - (*the fourth of july) - (new year's *eve) - (new years *eve) - (new year *eve) - (thanksgiving) - (april fool's) - (halloween) -DAY - (day) - (days) -; - -[holiday_nameday] - (HOL_1 DAY) -HOL_1 - (independence) - (labor) - (memorial) - (st patrick's) - (valentine) - (st valentine's) - (groundhog) - (flag) - (united nations) - (veterans) - (martin luther king) - (presidents') - (armed forces) - (mothers') - (fathers') - (parent's) - (columbus) -DAY - (day) - (days) -; - -[date_relative] - (*ON *the NEXT) - (*THE day [day_after] *that) - (*THE day [day_prior] *that) - (ONE DAY [day_after] *that) - ([week_after]) - ([week_prior]) - ([week_this]) - ([month_after]) - ([year_after]) - ([date_offset]) -ON - (on) - (for) -THE - (a) - (the) -NEXT - ([d_this]) - ([d_same]) - ([d_next]) - ([d_previous]) -PREVIOUS - (previous) - (preceeding) - (prior) - (last) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -DAY - (day) - (days) -; - -[d_this] - (this) -; - -[d_same] - (*that same) -; - -[d_next] - (next) - (following) - (coming) -; - -[d_previous] - (previous) - (preceeding) - (prior) - (last) -; - -[date_offset] - ([day_offset]) - ([week_offset]) -; - -[day_offset] - ([number] DAY OFFSET) - (in [number] DAY) -DAY - (day) - (days) -OFFSET - ([days_after]) - ([days_prior]) -; - -[week_offset] - ([weeks_after]) -; - -[weeks_after] - (in [number] weeks) - ([number] weeks LATER) -LATER - (later) - (after *that) -; - -[days_after] - (later) - (after *that) - (from now) -; - -[days_prior] - (before) - (prior to) - (earlier) -; - -[month_after] - (NEXT month) -NEXT - (next) - (coming) - (following) -; - -[year_after] - (*of next year) -; - -[week_this] - (this week) -; - -[week_after] - (in ONE week) - (ONE week later) - (*the NEXT week) - (a week AFTER) - (after *about a week) - (the week after) - (ONE week from) -ONE - (one) - (a) -NEXT - (next) - (coming) - (following) -AFTER - (after) - (afterwards) -; - -[week_prior] - (THE week before *that) - (the LAST week) -THE - (a) - (the) -LAST - (last) - (previous) -; - -[day_after] - (after) - (afterwards) - (from) -; - -[day_prior] - (before) - (prior to) -; - -[time_range] - ([time_duration]) - ([time_spec]) - (ANYTIME [after] *I_SAY [start_time] *DAY_PERIOD) - (START *at *I_SAY [start_time] *AND *[after]) - (*at *I_SAY [start_time] AND [after]) - (*ANYTIME BEFORE DAY_TIME) - (*END *at *I_SAY [end_time] AND [before]) - (END *at *I_SAY [end_time]) - (*START *at [start_time] TO [end_time]) - (between [start_time] and [end_time]) -TO - (*going to) - (until) - (til) - (till) -ANYTIME - (anytime) - (any time) - (any times) - (sometime) - (some time) - (some times) - (anything) -DAY_TIME - (*[on_day] [end_time]) - ([end_time] *ON *THE [on_day] [period_of_day]) -DAY_PERIOD - (*ON *THE [on_day] [period_of_day]) -AND - (and *or) - (or) -ON - (of) - (on) -THE - (a) - (an) - (the) -END - (end) - (ends) - (ending) -START - (from *like) - (start) - (starts) - (starting) - (begin) - (begins) - (beginning) -BEFORE - ([before]) - (until) - (til) - (till) - (by) -I_SAY - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[on_day] - ([day_of_week] *DAY_MONTH_SPEC) - (DAY_MONTH_SPEC) -DAY_MONTH_SPEC - ([month_name] *the [day_ordinal] *YEAR) - (*the [day_ordinal] *of [month_name] *YEAR) - ([month_name] [day_number]) - ([day_number] [month_name]) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -; - -[year] - (*nineteen DECADE *ONE) - (two thousand *and *ONE) - (twenty oh ONE) -DECADE - (seventy) - (eighty) - (ninety) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - -[day_number] - (ONE) - (ten) - (TEEN) - (twenty) - (twenty ONE) - (thirty) - (thirty one) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -TEEN - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -; - -[day_ordinal] - (SMALL_ORD) - (tenth) - (TEEN_ORD) - (twentieth) - (twenty SMALL_ORD) - (thirtieth) - (thirty first) -SMALL_ORD - (first) - (second) - (third) - (fourth) - (fifth) - (sixth) - (seventh) - (eighth) - (ninth) -TEEN_ORD - (eleventh) - (twelfth) - (thirteenth) - (fourteenth) - (fifteenth) - (sixteenth) - (seventeenth) - (eighteenth) - (nineteenth) -; - -[month_name] - (*THE_MONTH NAME) -NAME - (january) - (february) - (march) - (april) - (may) - (june) - (july) - (august) - (september) - (october) - (november) - (december) -THE_MONTH - (*the month *of) -; - -[start_time] - ([time_spec]) -; - -[end_time] - ([time_spec]) -; - -[time_spec] - (*at [time]) - ([time_of_day]) - ([aprox_time]) - ([time_relative]) - ([time_duration]) -; - -[aprox_time] - (*at APPROX [time] *AS_POSS) - (APPROX [time_of_day]) -APPROX - (*JUST AROUND_ABOUT) - (*SOMETIME AROUND_ABOUT) - (one AROUND_ABOUT) - (*as CLOSE *to) - (*at approximately) - (in *the vicinity *of) -AROUND_ABOUT - (around) - (round) - (about) - (bout) -CLOSE - (close) - (closest) - (closer) - (near) - (nearer) - (nearest) -SOMETIME - (sometime) - (somewhere) -AS_POSS - (*as possible) -JUST - (just) - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[time] - ([hour] *MIN *[time_of_day]) - ([hour] o'clock *[time_of_day]) - (*TIME_PERIOD BEFORE TIME *o'clock *[time_of_day]) - ([noon]) - ([midnight]) - ([twenty_four]) -TIME_PERIOD - ([minute_rel] *MINUTE) - (*a [quarter]) - (*a [half]) -BEFORE - ([before]) - ([after]) -TIME - ([hour] *MIN) - ([noon]) - ([midnight]) -MIN - ([minute]) -MINUTE - (minute) - (minutes) -; - -[twenty_four] - (oh [hour] MIN *hours) - ([hour] MIN hours) -MIN - (hundred) - ([minute]) -; - -[noon] - (*twelve noon) - (noontime) - (noon time) -; - -[midnight] - (midnight) -; - -[after] - (*JUST AFTER) -JUST - (*at just) - (shortly) -AFTER - (after) - (later than) - (afterwards) - (NOT BEFORE *that) - (past) -BEFORE - (before) - (sooner *than) - (earlier *than) - (prior to) -NOT - (not) - (no) -; - -[before] - (*JUST before) - (sooner than) - (*JUST prior to) - (*JUST earlier than) - (not AFTER *that) - (NOT later than *that) -JUST - (*at just) - (shortly) -AFTER - (after) - (afterwards) - (past) -NOT - (not) - (no) -; - - -[quarter] - (quarter) -; - -[half] - (half) -; - -[minute_rel] - ([minute]) -; - -[minute] - (T_TEN *T_ONE) - (TEEN) - (ZERO T_ONE) -T_ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -T_TEN - (twenty) - (thirty) - (forty) - (fifty) -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -ZERO - (zero) - (oh) -; - -[time_of_day] - (*SOMETIME *[period_mod] *in *the *[period_mod] [period_of_day]) - -SOMETIME - (sometime) - (some time) - (anytime) - (any time) -; - -[hour] - (an) - (one) - (a couple of) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (noon) -; - -[day_of_week] - ([day_name]) - ([weekend]) - ([weekday]) -; - -[day_name] - (monday) - (tuesday) - (wednesday) - (thursday) - (friday) - (saturday) - (sunday) - (mondays) - (tuesdays) - (wednesdays) - (thursdays) - (fridays) - (saturdays) - (sundays) - (monday's) - (tuesday's) - (wednesday's) - (thursday's) - (friday's) - (saturday's) - (sunday's) -; - -[weekend] - (weekend) - (weekends) -; - -[weekday] - (MIDDLE *of *THE week) - (midweek) - (weekday) - (weekdays) - (MONDAY *AND TUESDAY *AND WEDNESDAY *AND THURSDAY *AND FRIDAY) - -THE - (a) - (the) - -MIDDLE - (mid) - (middle) - -MONDAY - (monday) - (mondays) - -TUESDAY - (tuesday) - (tuesdays) - -WEDNESDAY - (wednesday) - (wednesdays) - -THURSDAY - (thursday) - (thursdays) - -FRIDAY - (friday) - (fridays) - -AND - (and *or) - (or) -; - -[today_relative] - (today) - (today's) - (tonight) - (this [time_range]) - (tomorrow) - (tomorrow's) - (yesterday) - (yesterday's) -; - -[period_mod] - ([early]) - ([late]) - ([mid]) -; - -[period_of_day] - ([am]) - ([pm]) - ([morning]) - ([afternoon]) - ([evening]) - ([night]) - ([early_day]) - ([late_day]) - ([mid_day]) - ([anytime]) -; - -[am] - (a_m) - (a m) -; - -[pm] - (p_m) - (pm) - (p m) -; - -[morning] - (morning) - (mornings) -; - -[afternoon] - (afternoon) - (after noon) - (afternoons) -; - -[evening] - (evening) - (evenings) -; - -[night] - (night) - (nights) -; - -[early_day] - (early in the day) - (*in the early part of the day) - (*at *the beginning of the day) -; - -[late_day] - (late in the day) - (late *in day) - (*at *the end of the day) -; - -[mid_day] - (midday) - (mid day) - (*in *the middle *part of the day) -; - -[anytime] - (any TIME) - (any_time) - (anytime) - (all TIME) - (regardless of time) - -TIME - (time) - (times) -; - -[early] - (*MOD early) -MOD - (very) - (real) - (really) -; - -[late] - (*MOD late) -MOD - (very) - (real) - (really) -; - -[mid] - (mid) - (*in *the middle of the) -; - -[time_relative] - ([now]) - ([time_relative_before]) - ([time_relative_after]) -; - -[now] - (*right now) - (as soon as possible) - (immediately) - (right away) -; - -[time_relative_before] - ([duration] ago) -; - -[time_relative_after] - (in [duration]) -; - -[duration] - ([hour] hour *AND_MINUTES) - ([hour] hours *AND_MINUTES) - ([minute] minutes) -AND_MINUTES - (*and [minute] *MINUTE) - (*and *a [d_quarter]) - (*and *a [d_half]) -MINUTE - (minute) - (minutes) -; - -[d_half] - (half) -; - -[d_quarter] - (quarter) -; - -[time_duration] - (*for *A_PERIOD_OF [duration]) - (*for [whole_day]) - -A_PERIOD_OF - (a period of) - (*just *around) - (about) - (approximately) -; - -[whole_day] - (*the whole day) - (all day *long) -; \ No newline at end of file From air at edam.speech.cs.cmu.edu Tue Oct 9 15:11:20 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 15:11:20 -0400 Subject: [TeamTalk 289]: [825] branches/air/Resources/Grammar: reorganized Grammar folder Message-ID: <200710091911.l99JBKF1030173@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/632cb724/attachment.html -------------- next part -------------- Added: branches/air/Resources/Grammar/GRAMMAR/Number-20.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-20.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,21 @@ + (zero) + (one) + (two) + (three) + (four) + (five) + (six) + (seven) + (eight) + (nine) + (ten) + (eleven) + (twelve) + (thirteen) + (fourteen) + (fifteen) + (sixteen) + (seventeen) + (eighteen) + (nineteen) + (twenty) Added: branches/air/Resources/Grammar/GRAMMAR/Number-60-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-60-by5.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,12 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) Added: branches/air/Resources/Grammar/GRAMMAR/Number-80-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-80-by5.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,16 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) Added: branches/air/Resources/Grammar/GRAMMAR/Number-85-95-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-85-95-by5.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,4 @@ + (eighty) + (eighty five) + (ninety) + (ninety five) Added: branches/air/Resources/Grammar/GRAMMAR/Number-95-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-95-by5.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,19 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) #%%0.1%% there are more likely? + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) + (eighty five) + (ninety) #%%0.1%% + (ninety five) Added: branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.forms =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.forms (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,43 @@ +################################################################### +# +# TeamTalk Grammar +# +# Written by: June Sison +# +# This is the forms file corresponding to the phoenix grammar for +# the TeamTalk system +# +# +# HISTORY ------------------------------------------------------- +# +# [2005-09-21] (dbohus): added cancel +# [2005-09-21] (tk): added yes/no +# [2003-03-08] (sison): started working on this +# +################################################################### + +FUNCTION: Commands + NETS: + [InvokePlay] + [ControlRobot] + [QueryRobot] + [MoveRobot] + [RespondYesNo] +# [HumanGoodbyeCommand] +; + +FUNCTION: Features + NETS: + [AbsoluteDistance] + [TurnDirection] + [MoveDirection] +; + + + +# these auxiliaries are defined in order to capture some parses like +# next, this that, which o/w would parse as date-time +#FUNCTION: Auxiliaries +# NETS: +# [__datetime_junk] +#; \ No newline at end of file Added: branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.gra (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-09 19:11:20 UTC (rev 825) @@ -0,0 +1,396 @@ +################################################################### +# +# TEAMTALK T A S K G R A M M A R +# +# HISTORY: ------------------------------------------------------- +# +# [2003-03-08] (sison): started working on this +# +################################################################### + +[RobotName] + (everyone) + (%[DynamicRobotName]%) # class stub +; + +[OBJ-Robot] + ([RobotName]) +; + + +######### Main Nets ############## + +[InvokePlay] + ([HumanExploreCommand]) + ([HumanSearchCommand]) + ([HumanFollowCommand]) +; + +[ControlRobot] + ([HumanReportCommand]) + ([HumanPauseCommand]) + ([HumanContinueCommand]) + ([HumanHaltCommand]) + ([Cancel]) +; + +[QueryRobot] + ([HumanLocationQuery]) +; + +[MoveRobot] + ([HumanMoveCommand]) + ([HumanTurnCommand]) + ([MoveVectorRelative]) +# ([MoveVectorCardinal]) + ([MoveToGoal]) +; + +[RespondYesNo] + ([Yes]) + ([No]) +; + +########################################### + + + +[HumanExploreCommand] + (explore *[MapLocation]) +; + +[HumanSearchCommand] + (search *[MapLocation]) + (search [MoveDirection]) +; + +[HumanFollowCommand] + (*[RobotName] FOLLOW [OBJ-Robot]) +FOLLOW + (join) + (follow) + (find) +; + +[HumanPauseCommand] + (*[RobotName] pause *task *here) +; + +[HumanContinueCommand] + (*[RobotName] continue *task) +; + +[HumanReportCommand] + (*[RobotName] report) + ([RobotName]) +; + +[HumanLocationQuery] + (*[RobotName] where are you) + (*[RobotName] report location) +; + +[HumanHaltCommand] + (*[RobotName] all stop) + (*[RobotName] stop immediately) +; + +[Number-180-by5] + ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion + ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + +[Number-over180] + (*one hundred *and %[Number-95-by5]%) #%%0.1%% + (two hundred *and %[Number-95-by5]%) #%%0.5%% + (three hundred *and %[Number-60-by5]%) #%%0.4%% +; + +[TurnDirection] + (*PREP SIDE *[AngularQualifier]) + ([AngularQualifier] *PREP *SIDE) + (around) +SIDE + (right) + (left) +PREP + (to the) + (to your) +; + +[MoveDirection] + (*PREP SIDE) + (straight) + (forward) + (forwards) + (back) + (backward) + (backwards) +SIDE + (left) + (right) +PREP + (to the) + (to your) +; + +[AngularQualifier] + ([Number-180-by5] degrees) #%%0.667%% + ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's +; + + +[AbsoluteDistance] + (%[Number-20]% [Units]) +; + +[RelativeDistance] + ([TeamTalkAll] *of the way) + ([TeamTalkHalf] *of *the way) + ([TeamTalkThird] of the way) + ([TeamTalkTwoThird] of the way) + ([TeamTalkOneQuarter] of the way) + ([TeamTalkThreeQuarter] of the way) +; + +[MapLocation] + (this space) + (the area) + (around *PLACE) + (PLACE) +PLACE + (here) + (there) + (your location) +; + + +[TeamTalkAll] + (all) +; + +[TeamTalkHalf] + (*MOD half) +MOD + (one) + (a) +; + +[TeamTalkThird] + (MOD third) +MOD + (one) + (a) +; + +[TeamTalkTwoThird] + (two third) + (two thirds) +; + +[TeamTalkOneQuarter] + (one quarter) + (one fourth) + (a quarter) + (a fourth) +; + + +[TeamTalkThreeQuarter] + (three quarter) + (three quarters) + (three fourth) + (three fourths) +; + +[HumanMoveCommand] +# ([MoveVectorCardinal]) + ([MoveVectorRelative]) + ([MoveToGoal]) +; + +[Join] + (*[RobotName] join [RobotName]) +; + +#[MoveVectorCardinal] +# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) +# (*[RobotName] MOVE [CardinalDirection]) +# +#MOVE +# (move) +# (go) +#; + +[MoveVectorRelative] + (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) + (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) +MOVE + (move) + (go) + (drive) + (return) +; + +[HumanTurnCommand] + (*[RobotName] TURN [TurnDirection]) +TURN + (turn) + (face) + (move) + (go) +; +[MoveToGoal] + (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) + (*[RobotName] MOVE [Home]) +MOVE + (move *to) + (go *to) + (drive *to) +PREP + (toward) + (towards) + (to) + (down *to) + (down towards) + (up *to) + (up towards) +; + +[Side] + (the=north=end=of) + (the=east=end=of) + (the=south=end=of) + (the=west=end=of) + +[Goal] + ([Home]) + ([Xcoord] [Ycoord]) +; + +[Home] + (home) + (base) +; + +[Xcoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Ycoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Units] + (metres) + (metre) +# (feet) +# (foot) +# (yards) +# (yard) +; + +#[HumanGoodbyeCommand] +# (goodbye) +# (bye) +# (mission complete) +# (that's it) +; + + + + +################################################################### +# YES/NO grammar +################################################################### + +[Yes] + (YES *MOD) + (OKAY) + (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain + (STRONG_MOD) #%%0.10%% +YES + (yes) + (yeah) +# (yup) +MOD + (STRONG_MOD) + (WEAK_MOD) +STRONG_MOD + (absolutely) + (definitely) + (OKAY OKAY) +WEAK_MOD + (why not) + (i think so) + (i guess so) +OKAY + (okay) + (sure) + (of course) + (correct) + (perfect) + (great) + (acceptable) + (good *enough) +# (fine) +# (wonderful) +# (right) +# (alright) +; + +[No] + (no *MOD) + (*no absolutely not) + (nope) + (nah) + (no way) + (*no i DONT) + (*no i DONT think so) + (nevermind) + (not really) + (negative) +# (nowhere) +DONT + (don't) + (do not) +MOD + (thanks) + (thank=you) # should be a lexeme + (not really) + (it's not) + (i'm not) +#NO +# (no) +# (not) +#GOOD +# (right) +# (correct) +# (good) +# (okay) +; + + +################################################################### +# CANCEL grammar +################################################################### + +[Cancel] + (CANCEL *COMMAND) +CANCEL + (abort) + (cancel) + (quit) +COMMAND + (*that command) + (that) +; \ No newline at end of file Added: branches/air/Resources/Grammar/bin/compile.exe =================================================================== (Binary files differ) Property changes on: branches/air/Resources/Grammar/bin/compile.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/air/Resources/Grammar/bin/concept_leaf.exe =================================================================== (Binary files differ) Property changes on: branches/air/Resources/Grammar/bin/concept_leaf.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/air/Resources/Grammar/bin/parse.exe =================================================================== (Binary files differ) Property changes on: branches/air/Resources/Grammar/bin/parse.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/air/Resources/Grammar/bin/pqual.exe =================================================================== (Binary files differ) Property changes on: branches/air/Resources/Grammar/bin/pqual.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/air/Resources/Grammar/bin/train.exe =================================================================== (Binary files differ) Property changes on: branches/air/Resources/Grammar/bin/train.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/air/Resources/Grammar/compile_gra.pl =================================================================== --- branches/air/Resources/Grammar/compile_gra.pl 2007-10-09 15:51:27 UTC (rev 824) +++ branches/air/Resources/Grammar/compile_gra.pl 2007-10-09 19:11:20 UTC (rev 825) @@ -31,7 +31,8 @@ # HARDWIRED!! if ( $classflag and -e 'TeamTalkRobots' ) { open(IN,"TeamTalkRobots") or die "compile_gra: can't open TeamTalkRobots!\n"; - open(OUT,">DynamicRobotName.class") or die "compile_gra: can't open DynamicRobotName.class!\n"; + open(OUT,">GRAMMAR/DynamicRobotName.class") + or die "compile_gra: can't open DynamicRobotName.class!\n"; while () { chomp; print OUT "\t($_)\n"; } } @@ -47,17 +48,17 @@ } # copy over the forms file -open(TTFORMS, "$domain.forms") or die "compile_gra: no $ingra.forms file!\n"; +open(TTFORMS, "GRAMMAR/$domain.forms") or die "compile_gra: no $ingra.forms file!\n"; open(FORMS, ">forms"); print FORMS ; close TTFORMS; close FORMS; # compile Phoenix grammar -open(COMPILE, "compile -g . -f $project |"); +open(COMPILE, "bin/compile -g . -f $project |"); open(LOG, ">log"); print LOG ; close LOG; close COMPILE; -system("concept_leaf -grammar $project.net"); +system("bin/concept_leaf -grammar $project.net"); exit 1; Modified: branches/air/Resources/Grammar/resolve.pl =================================================================== --- branches/air/Resources/Grammar/resolve.pl 2007-10-09 15:51:27 UTC (rev 824) +++ branches/air/Resources/Grammar/resolve.pl 2007-10-09 19:11:20 UTC (rev 825) @@ -16,29 +16,25 @@ "absgra:s" => \$absfile, ) ) { die $usage; } print STDERR "resolve: infile-> $infile; graex-> $expfile; grabs-> $absfile\n"; -open(IN,$infile) or die "resolve: can't open $infile!\n"; +open(IN,"GRAMMAR/$infile") or die "resolve: can't open $infile!\n"; open(OUT,">$expfile") or die "resolve: can't open expgra: $expfile!\n"; open(ABS,">$absfile") or die "resolve: can't open absgra: $absfile!\n"; my $postscript = <) { chomp; Modified: branches/air/Resources/Grammar/tokenize.pl =================================================================== --- branches/air/Resources/Grammar/tokenize.pl 2007-10-09 15:51:27 UTC (rev 824) +++ branches/air/Resources/Grammar/tokenize.pl 2007-10-09 19:11:20 UTC (rev 825) @@ -1,8 +1,13 @@ #!E:/Perl/bin/perl.exe -w -# convert a .class file into: -# a) .probdef file b) .token file (for dict) c) .ctl file -# [20070923] (air) +# +# convert absolute task grammar and its .class files into: +# a) .ctl file +# b) .probdef file +# c) .token file (for pronounce dict) +# d) .words (for lm wordlist) +# [20070923] (air) Created. + use Getopt::Long; use File::Basename; @@ -25,7 +30,7 @@ # scan .gra file; make a list of classes that need to be processed # also collect all terminals to make a wordlist (used in lm compilation) my %classes = (); my %wordlist = (); -open(GRA,$grafile) or die "tokenize: $grafile not found!\n$usage\n"; +open(GRA,"$grafile") or die "tokenize: $grafile not found!\n$usage\n"; while () { chomp; if ( /^\s*#/ or /^\s+$/ ) { next; } # skip comments, blank lines @@ -58,7 +63,7 @@ foreach $classfil (sort keys %classes) { $classid = $classes{$classfil}; $classfil =~ s/\[(.+?)\]/$1/; # strip []'s - open(CLASS,"$classfil.class") or die "tokenize: class file $classfil not found"; + open(CLASS,"GRAMMAR/$classfil.class") or die "tokenize: class file $classfil not found"; ($classname,$dirn,$suffix) = fileparse($classfil,qr/\.[^.]*/); my %lexset = (); while () { From air at edam.speech.cs.cmu.edu Tue Oct 9 15:13:21 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 15:13:21 -0400 Subject: [TeamTalk 290]: [826] branches/air/Resources/Grammar: cleanup Message-ID: <200710091913.l99JDLYU030183@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/97710990/attachment-0001.html -------------- next part -------------- Added: branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class (rev 0) +++ branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class 2007-10-09 19:13:21 UTC (rev 826) @@ -0,0 +1,4 @@ + (alphie) + (bashful) + (clyde) + (decker) Deleted: branches/air/Resources/Grammar/Number-20.class =================================================================== --- branches/air/Resources/Grammar/Number-20.class 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/Number-20.class 2007-10-09 19:13:21 UTC (rev 826) @@ -1,21 +0,0 @@ - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) Deleted: branches/air/Resources/Grammar/Number-60-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-60-by5.class 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/Number-60-by5.class 2007-10-09 19:13:21 UTC (rev 826) @@ -1,12 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) Deleted: branches/air/Resources/Grammar/Number-80-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-80-by5.class 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/Number-80-by5.class 2007-10-09 19:13:21 UTC (rev 826) @@ -1,16 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) Deleted: branches/air/Resources/Grammar/Number-85-95-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-85-95-by5.class 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/Number-85-95-by5.class 2007-10-09 19:13:21 UTC (rev 826) @@ -1,4 +0,0 @@ - (eighty) - (eighty five) - (ninety) - (ninety five) Deleted: branches/air/Resources/Grammar/Number-95-by5.class =================================================================== --- branches/air/Resources/Grammar/Number-95-by5.class 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/Number-95-by5.class 2007-10-09 19:13:21 UTC (rev 826) @@ -1,19 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) #%%0.1%% there are more likely? - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) - (eighty five) - (ninety) #%%0.1%% - (ninety five) Deleted: branches/air/Resources/Grammar/TeamTalkTask.forms =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.forms 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/TeamTalkTask.forms 2007-10-09 19:13:21 UTC (rev 826) @@ -1,43 +0,0 @@ -################################################################### -# -# TeamTalk Grammar -# -# Written by: June Sison -# -# This is the forms file corresponding to the phoenix grammar for -# the TeamTalk system -# -# -# HISTORY ------------------------------------------------------- -# -# [2005-09-21] (dbohus): added cancel -# [2005-09-21] (tk): added yes/no -# [2003-03-08] (sison): started working on this -# -################################################################### - -FUNCTION: Commands - NETS: - [InvokePlay] - [ControlRobot] - [QueryRobot] - [MoveRobot] - [RespondYesNo] -# [HumanGoodbyeCommand] -; - -FUNCTION: Features - NETS: - [AbsoluteDistance] - [TurnDirection] - [MoveDirection] -; - - - -# these auxiliaries are defined in order to capture some parses like -# next, this that, which o/w would parse as date-time -#FUNCTION: Auxiliaries -# NETS: -# [__datetime_junk] -#; \ No newline at end of file Deleted: branches/air/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-09 19:11:20 UTC (rev 825) +++ branches/air/Resources/Grammar/TeamTalkTask.gra 2007-10-09 19:13:21 UTC (rev 826) @@ -1,396 +0,0 @@ -################################################################### -# -# TEAMTALK T A S K G R A M M A R -# -# HISTORY: ------------------------------------------------------- -# -# [2003-03-08] (sison): started working on this -# -################################################################### - -[RobotName] - (everyone) - (%[DynamicRobotName]%) # class stub -; - -[OBJ-Robot] - ([RobotName]) -; - - -######### Main Nets ############## - -[InvokePlay] - ([HumanExploreCommand]) - ([HumanSearchCommand]) - ([HumanFollowCommand]) -; - -[ControlRobot] - ([HumanReportCommand]) - ([HumanPauseCommand]) - ([HumanContinueCommand]) - ([HumanHaltCommand]) - ([Cancel]) -; - -[QueryRobot] - ([HumanLocationQuery]) -; - -[MoveRobot] - ([HumanMoveCommand]) - ([HumanTurnCommand]) - ([MoveVectorRelative]) -# ([MoveVectorCardinal]) - ([MoveToGoal]) -; - -[RespondYesNo] - ([Yes]) - ([No]) -; - -########################################### - - - -[HumanExploreCommand] - (explore *[MapLocation]) -; - -[HumanSearchCommand] - (search *[MapLocation]) - (search [MoveDirection]) -; - -[HumanFollowCommand] - (*[RobotName] FOLLOW [OBJ-Robot]) -FOLLOW - (join) - (follow) - (find) -; - -[HumanPauseCommand] - (*[RobotName] pause *task *here) -; - -[HumanContinueCommand] - (*[RobotName] continue *task) -; - -[HumanReportCommand] - (*[RobotName] report) - ([RobotName]) -; - -[HumanLocationQuery] - (*[RobotName] where are you) - (*[RobotName] report location) -; - -[HumanHaltCommand] - (*[RobotName] all stop) - (*[RobotName] stop immediately) -; - -[Number-180-by5] - ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion - ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% -HUNDRED - ( a hundred ) - ( one hundred ) -; - -[Number-over180] - (*one hundred *and %[Number-95-by5]%) #%%0.1%% - (two hundred *and %[Number-95-by5]%) #%%0.5%% - (three hundred *and %[Number-60-by5]%) #%%0.4%% -; - -[TurnDirection] - (*PREP SIDE *[AngularQualifier]) - ([AngularQualifier] *PREP *SIDE) - (around) -SIDE - (right) - (left) -PREP - (to the) - (to your) -; - -[MoveDirection] - (*PREP SIDE) - (straight) - (forward) - (forwards) - (back) - (backward) - (backwards) -SIDE - (left) - (right) -PREP - (to the) - (to your) -; - -[AngularQualifier] - ([Number-180-by5] degrees) #%%0.667%% - ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's -; - - -[AbsoluteDistance] - (%[Number-20]% [Units]) -; - -[RelativeDistance] - ([TeamTalkAll] *of the way) - ([TeamTalkHalf] *of *the way) - ([TeamTalkThird] of the way) - ([TeamTalkTwoThird] of the way) - ([TeamTalkOneQuarter] of the way) - ([TeamTalkThreeQuarter] of the way) -; - -[MapLocation] - (this space) - (the area) - (around *PLACE) - (PLACE) -PLACE - (here) - (there) - (your location) -; - - -[TeamTalkAll] - (all) -; - -[TeamTalkHalf] - (*MOD half) -MOD - (one) - (a) -; - -[TeamTalkThird] - (MOD third) -MOD - (one) - (a) -; - -[TeamTalkTwoThird] - (two third) - (two thirds) -; - -[TeamTalkOneQuarter] - (one quarter) - (one fourth) - (a quarter) - (a fourth) -; - - -[TeamTalkThreeQuarter] - (three quarter) - (three quarters) - (three fourth) - (three fourths) -; - -[HumanMoveCommand] -# ([MoveVectorCardinal]) - ([MoveVectorRelative]) - ([MoveToGoal]) -; - -[Join] - (*[RobotName] join [RobotName]) -; - -#[MoveVectorCardinal] -# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) -# (*[RobotName] MOVE [CardinalDirection]) -# -#MOVE -# (move) -# (go) -#; - -[MoveVectorRelative] - (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) - (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) -MOVE - (move) - (go) - (drive) - (return) -; - -[HumanTurnCommand] - (*[RobotName] TURN [TurnDirection]) -TURN - (turn) - (face) - (move) - (go) -; -[MoveToGoal] - (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) - (*[RobotName] MOVE [Home]) -MOVE - (move *to) - (go *to) - (drive *to) -PREP - (toward) - (towards) - (to) - (down *to) - (down towards) - (up *to) - (up towards) -; - -[Side] - (the=north=end=of) - (the=east=end=of) - (the=south=end=of) - (the=west=end=of) - -[Goal] - ([Home]) - ([Xcoord] [Ycoord]) -; - -[Home] - (home) - (base) -; - -[Xcoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Ycoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Units] - (metres) - (metre) -# (feet) -# (foot) -# (yards) -# (yard) -; - -#[HumanGoodbyeCommand] -# (goodbye) -# (bye) -# (mission complete) -# (that's it) -; - - - - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (OKAY) - (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain - (STRONG_MOD) #%%0.10%% -YES - (yes) - (yeah) -# (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (absolutely) - (definitely) - (OKAY OKAY) -WEAK_MOD - (why not) - (i think so) - (i guess so) -OKAY - (okay) - (sure) - (of course) - (correct) - (perfect) - (great) - (acceptable) - (good *enough) -# (fine) -# (wonderful) -# (right) -# (alright) -; - -[No] - (no *MOD) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (nevermind) - (not really) - (negative) -# (nowhere) -DONT - (don't) - (do not) -MOD - (thanks) - (thank=you) # should be a lexeme - (not really) - (it's not) - (i'm not) -#NO -# (no) -# (not) -#GOOD -# (right) -# (correct) -# (good) -# (okay) -; - - -################################################################### -# CANCEL grammar -################################################################### - -[Cancel] - (CANCEL *COMMAND) -CANCEL - (abort) - (cancel) - (quit) -COMMAND - (*that command) - (that) -; \ No newline at end of file Deleted: branches/air/Resources/Grammar/compile.exe =================================================================== (Binary files differ) Deleted: branches/air/Resources/Grammar/concept_leaf.exe =================================================================== (Binary files differ) Deleted: branches/air/Resources/Grammar/parse.exe =================================================================== (Binary files differ) Deleted: branches/air/Resources/Grammar/pqual.exe =================================================================== (Binary files differ) Deleted: branches/air/Resources/Grammar/train.exe =================================================================== (Binary files differ) From air at edam.speech.cs.cmu.edu Tue Oct 9 15:13:46 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 15:13:46 -0400 Subject: [TeamTalk 291]: [827] branches/air/Resources/DecoderConfig/LanguageModel: Message-ID: <200710091913.l99JDkM2030194@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/e5c3874d/attachment-0001.html -------------- next part -------------- Added: branches/air/Resources/DecoderConfig/LanguageModel/TeamTalk.arpa =================================================================== --- branches/air/Resources/DecoderConfig/LanguageModel/TeamTalk.arpa (rev 0) +++ branches/air/Resources/DecoderConfig/LanguageModel/TeamTalk.arpa 2007-10-09 19:13:46 UTC (rev 827) @@ -0,0 +1,2469 @@ +############################################################################# +## Copyright (c) 1996, Carnegie Mellon University, Cambridge University, +## Ronald Rosenfeld and Philip Clarkson +############################################################################# +============================================================================= +=============== This file was produced by the CMU-Cambridge =============== +=============== Statistical Language Modeling Toolkit =============== +============================================================================= +This is a 3-gram language model, based on a vocabulary of 112 words, + which begins "[DynamicRobotName]", "[Number-20]", "[Number-60-by5]"... +This is a CLOSED-vocabulary model + (OOVs eliminated from training data and are forbidden in test data) +Good-Turing discounting was applied. +1-gram frequency of frequency : +2-gram frequency of frequency : +3-gram frequency of frequency : +1-gram discounting ratios : +2-gram discounting ratios : +3-gram discounting ratios : +This file is in the ARPA-standard format introduced by Doug Paul. + +p(wd3|wd1,wd2)= if(trigram exists) p_3(wd1,wd2,wd3) + else if(bigram w1,w2 exists) bo_wt_2(w1,w2)*p(wd3|wd2) + else p(wd3|w2) + +p(wd2|wd1)= if(bigram exists) p_2(wd1,wd2) + else bo_wt_1(wd1)*p_1(wd2) + +All probs and back-off weights (bo_wt) are given in log10 form. + +Data formats: + +Beginning of data mark: \data\ +ngram 1=nr # number of 1-grams +ngram 2=nr # number of 2-grams +ngram 3=nr # number of 3-grams + +\1-grams: +p_1 wd_1 bo_wt_1 +\2-grams: +p_2 wd_1 wd_2 bo_wt_2 +\3-grams: +p_3 wd_1 wd_2 wd_3 + +end of data mark: \end\ + +\data\ +ngram 1=112 +ngram 2=592 +ngram 3=1707 + +\1-grams: +-1.5864 [DynamicRobotName] -3.2677 +-1.2111 [Number-20] -3.6174 +-2.3410 [Number-60-by5] -2.6888 +-1.9720 [Number-80-by5] -3.0569 +-1.7110 [Number-95-by5] -3.3175 +-2.2213 A -2.8150 +-2.7446 ABORT -2.1677 +-2.5223 ABSOLUTELY -2.3836 +-3.3111 ACCEPTABLE -1.6570 +-2.4436 ALL -2.5917 +-1.9483 AND -3.0812 +-1.8619 ARE -3.1761 +-2.8286 AREA -2.0826 +-2.0572 AROUND -2.8384 +-2.1486 BACK -2.7207 +-2.1426 BACKWARD -2.7267 +-2.1437 BACKWARDS -2.7256 +-2.5370 BASE -2.3717 +-2.7131 CANCEL -2.1987 +-2.7360 COMMAND -2.1742 +-2.2853 CONTINUE -2.6196 +-3.0941 CORRECT -1.8488 +-3.1244 COURSE -1.8257 +-2.9607 DEFINITELY -1.9524 +-1.4599 DEGREES -3.3915 +-2.7446 DO -2.3003 +-2.6971 DON'T -2.2131 +-2.5649 DOWN -2.4417 +-2.2353 DRIVE -2.7074 +-3.0797 ENOUGH -1.8619 +-1.5929 EVERYONE -3.2612 +-2.0603 EXPLORE -2.8177 +-2.7693 FACE -2.2223 +-2.5289 FIND -2.4956 +-2.4982 FOLLOW -2.5261 +-2.1831 FORWARD -2.6863 +-2.1702 FORWARDS -2.6992 +-3.5963 FOURTH -1.4757 +-4.0435 FOURTHS -1.0777 +-2.1070 GO -2.8036 +-2.8340 GOOD -2.0905 +-3.1458 GREAT -1.7976 +-2.9753 GUESS -2.0740 +-2.7670 HALF -2.2732 +-2.4403 HERE -2.4678 +-2.5276 HOME -2.3810 +-1.6494 HUNDRED -3.3746 +-2.2393 I -2.8043 +-3.6633 I'M -1.4121 +-2.6268 IMMEDIATELY -2.2824 +-3.5120 IT'S -1.5534 +-2.5664 JOIN -2.4585 +-1.6134 LEFT -3.2105 +-1.8394 LOCATION -3.0671 +-1.5850 METRE -3.2382 +-1.5643 METRES -3.2588 +-2.7192 MINUS -2.3008 +-2.1431 MOVE -2.7686 +-3.0478 NAH -1.8668 +-2.5276 NEGATIVE -2.3440 +-3.0182 NEVERMIND -1.8959 +-2.2441 NO -2.6558 +-2.9607 NOPE -1.9524 +-2.1813 NOT -2.7247 +-2.4718 OF -2.5651 +-3.2174 OKAY -1.7386 +-2.1655 ONE -2.8703 +-2.2610 PAUSE -2.6423 +-3.2511 PERFECT -1.6989 +-3.5250 QUARTER -1.5426 +-4.0435 QUARTERS -1.0777 +-2.7602 QUIT -2.1525 +-2.8821 REALLY -2.0298 +-1.7702 REPORT -3.1277 +-2.5649 RETURN -2.4025 +-1.6087 RIGHT -3.2151 +-2.0182 SEARCH -2.7716 +-2.4371 SO -2.4710 +-2.8054 SPACE -2.1055 +-2.2884 STOP -2.6185 +-2.1492 STRAIGHT -2.7202 +-3.1627 SURE -1.7871 +-2.2525 TASK -2.6534 +-3.8130 THANK=YOU -1.1412 +-3.5664 THANKS -1.3676 +-2.7131 THAT -2.1978 +-1.7028 THE -3.1700 +-3.0223 THE=EAST=END=OF -2.0128 +-3.0941 THE=NORTH=END=OF -1.9452 +-3.0223 THE=SOUTH=END=OF -2.0128 +-2.9329 THE=WEST=END=OF -2.0978 +-2.9164 THERE -1.9960 +-2.5856 THINK -2.4593 +-3.2876 THIRD -1.7694 +-3.6633 THIRDS -1.4135 +-2.8054 THIS -2.2424 +-2.3031 THREE -2.7349 +-1.4216 TO -3.5337 +-3.1141 TOWARD -1.9433 +-2.5751 TOWARDS -2.4485 +-2.7763 TURN -2.2157 +-2.2002 TWO -2.8355 +-2.5578 UP -2.4486 +-2.3103 WAY -2.5724 +-1.8619 WHERE -3.1761 +-2.9753 WHY -2.0727 +-2.4339 YEAH -2.4742 +-2.4171 YES -2.4911 +-1.8619 YOU -3.0446 +-1.7933 YOUR -3.0743 +-99.0000 -4.2011 +-0.5664 -4.4771 + +\2-grams: +-1.5676 [DynamicRobotName] ALL -1.2564 +-1.3044 [DynamicRobotName] CONTINUE 0.6051 +-1.2475 [DynamicRobotName] DRIVE -0.5928 +-1.7607 [DynamicRobotName] FACE 0.1228 +-1.5459 [DynamicRobotName] FIND 0.6047 +-1.4866 [DynamicRobotName] FOLLOW 0.5759 +-1.1375 [DynamicRobotName] GO 0.0251 +-1.6535 [DynamicRobotName] JOIN 0.6753 +-1.1972 [DynamicRobotName] MOVE 0.6519 +-1.2610 [DynamicRobotName] PAUSE 0.5867 +-0.7867 [DynamicRobotName] REPORT 0.6009 +-1.5846 [DynamicRobotName] RETURN -0.1591 +-1.6208 [DynamicRobotName] STOP -1.5728 +-1.7038 [DynamicRobotName] TURN 0.5364 +-0.9046 [DynamicRobotName] WHERE 0.6270 +-0.6638 [DynamicRobotName] 1.6813 +-1.4673 [Number-20] [Number-20] -2.3354 +-0.3742 [Number-20] METRE 0.0015 +-0.3535 [Number-20] METRES 0.0014 +-1.8116 [Number-20] MINUS 0.3072 +-1.7500 [Number-20] NEGATIVE -1.6160 +-1.1739 [Number-20] 1.8182 +-0.0009 [Number-60-by5] DEGREES 0.8808 +-0.0004 [Number-80-by5] DEGREES 0.5122 +-0.0002 [Number-95-by5] DEGREES 0.2515 +-2.0479 A FOURTH 0.6990 +-1.1729 A HALF 0.6323 +-0.0567 A HUNDRED -2.1785 +-1.9230 A QUARTER 0.6410 +-1.4837 A THIRD 0.4284 +-0.8023 ABORT COMMAND 0.8066 +-0.4946 ABORT THAT 0.5235 +-0.2863 ABORT 2.4559 +-0.2028 ABSOLUTELY NOT -1.8486 +-0.4316 ABSOLUTELY 2.3837 +-1.4983 ACCEPTABLE ACCEPTABLE 0.1761 +-1.1973 ACCEPTABLE CORRECT -0.0422 +-1.3222 ACCEPTABLE GOOD -0.2933 +-1.4983 ACCEPTABLE GREAT 0.3375 +-1.3222 ACCEPTABLE OF -0.3676 +-1.1973 ACCEPTABLE PERFECT 0.0327 +-1.4983 ACCEPTABLE SURE 0.2482 +-0.1761 ACCEPTABLE 2.8539 +-1.0479 ALL OF -1.1005 +-0.1143 ALL STOP -2.1525 +-0.8560 ALL THE -1.6709 +-0.6866 AND [Number-60-by5] 0.2942 +-0.3324 AND [Number-80-by5] 0.3081 +-0.4838 AND [Number-95-by5] 0.7201 +-0.0003 ARE YOU 0.0003 +-0.0026 AREA 2.2597 +-1.3551 AROUND HERE 0.9718 +-1.1962 AROUND THERE 0.3411 +-1.2177 AROUND YOUR -1.7388 +-0.0806 AROUND 1.5692 +-1.3402 BACK [Number-20] -0.6849 +-0.0209 BACK 1.6015 +-1.3840 BACKWARD [Number-20] -0.6471 +-0.0189 BACKWARD 1.5935 +-1.2994 BACKWARDS [Number-20] -0.7307 +-0.0229 BACKWARDS 1.5986 +-0.0013 BASE 1.9693 +-0.8070 CANCEL COMMAND 0.7803 +-0.3940 CANCEL THAT 0.3920 +-0.3607 CANCEL 2.4994 +-0.0021 COMMAND 2.1675 +-0.2733 CONTINUE TASK -1.8787 +-0.3323 CONTINUE 2.0490 +-1.5141 CORRECT ACCEPTABLE 0.0000 +-1.3892 CORRECT CORRECT -0.0422 +-1.2131 CORRECT GOOD 0.1761 +-1.3892 CORRECT GREAT 0.0364 +-1.5141 CORRECT OF -0.3676 +-1.6902 CORRECT OKAY 0.2788 +-1.3892 CORRECT SURE -0.0529 +-0.1400 CORRECT 2.6259 +-1.6675 COURSE ACCEPTABLE 0.1761 +-1.6675 COURSE CORRECT 0.2588 +-1.3664 COURSE GOOD 0.3522 +-1.6675 COURSE GREAT 0.3375 +-1.4914 COURSE OF -0.3676 +-1.2695 COURSE OKAY -0.1192 +-1.4914 COURSE PERFECT 0.1576 +-1.3664 COURSE SURE -0.0529 +-0.1424 COURSE 2.6511 +-0.0035 DEFINITELY 2.3908 +-1.0314 DEGREES LEFT -1.9420 +-1.0941 DEGREES RIGHT -1.8983 +-0.4844 DEGREES TO -2.4223 +-0.3024 DEGREES 1.1954 +-0.0022 DO NOT -1.6038 +-0.3931 DON'T THINK 0.5019 +-0.2283 DON'T 2.3533 +-1.3816 DOWN [Number-20] -1.0837 +-1.1945 DOWN BASE 1.2082 +-1.3816 DOWN HOME 1.4046 +-1.5925 DOWN MINUS 1.4253 +-1.5413 DOWN NEGATIVE -0.4875 +-1.4955 DOWN THE=EAST=END=OF 1.0453 +-1.5413 DOWN THE=NORTH=END=OF 0.0692 +-1.2168 DOWN THE=SOUTH=END=OF 0.7666 +-1.2403 DOWN THE=WEST=END=OF -0.4674 +-0.5133 DOWN TO -1.9359 +-0.5088 DOWN TOWARDS 0.4961 +-0.6743 DRIVE [Number-20] -1.2778 +-1.7095 DRIVE A -1.0624 +-1.6773 DRIVE ALL -1.0333 +-1.6474 DRIVE BACK 1.7204 +-1.5447 DRIVE BACKWARD 1.6238 +-1.6194 DRIVE BACKWARDS 1.6973 +-1.4433 DRIVE BASE 1.1290 +-1.5447 DRIVE DOWN -0.5685 +-1.6773 DRIVE FORWARD 1.7160 +-1.5224 DRIVE FORWARDS 1.5740 +-1.6194 DRIVE HALF 1.0814 +-1.6474 DRIVE HOME 1.3424 +-1.9204 DRIVE LEFT -0.2757 +-1.5447 DRIVE ONE -1.2182 +-1.7821 DRIVE RIGHT -0.4281 +-1.4617 DRIVE STRAIGHT 1.5342 +-2.0453 DRIVE THREE -0.7557 +-0.4870 DRIVE TO -1.9482 +-1.8692 DRIVE TOWARD -0.2070 +-1.7443 DRIVE TOWARDS -0.6216 +-1.9204 DRIVE TWO -0.8736 +-1.4085 DRIVE UP -0.2136 +-1.5272 ENOUGH ACCEPTABLE 0.0000 +-1.3054 ENOUGH CORRECT -0.1391 +-1.5272 ENOUGH GOOD 0.4771 +-1.3054 ENOUGH GREAT -0.0605 +-1.5272 ENOUGH OF -0.3676 +-1.7033 ENOUGH PERFECT 0.3337 +-1.7033 ENOUGH SURE 0.2482 +-0.1178 ENOUGH 2.5906 +-1.5555 EVERYONE ALL -1.2619 +-1.3668 EVERYONE CONTINUE 0.6741 +-1.2545 EVERYONE DRIVE -0.2203 +-1.8000 EVERYONE FACE 0.1685 +-1.5394 EVERYONE FIND 0.6047 +-1.5237 EVERYONE FOLLOW 0.6196 +-1.1049 EVERYONE GO -0.0010 +-1.4894 EVERYONE JOIN 0.5177 +-1.1837 EVERYONE MOVE 0.6448 +-1.2918 EVERYONE PAUSE 0.6240 +-0.7612 EVERYONE REPORT 0.5820 +-1.5667 EVERYONE RETURN 0.6077 +-1.6143 EVERYONE STOP -1.5728 +-1.8197 EVERYONE TURN -0.4552 +-0.8610 EVERYONE WHERE 0.5900 +-0.7136 EVERYONE 1.7376 +-0.7267 EXPLORE AROUND 0.7285 +-1.4816 EXPLORE HERE 1.1002 +-0.9868 EXPLORE THE -1.9661 +-1.3635 EXPLORE THERE 0.5103 +-0.9868 EXPLORE THIS 0.2430 +-1.4305 EXPLORE YOUR -1.5242 +-0.3083 EXPLORE 1.7986 +-0.7803 FACE [Number-95-by5] 1.8143 +-1.1228 FACE A -0.2638 +-1.0436 FACE AROUND -0.4842 +-1.9978 FACE HUNDRED 0.0016 +-1.1228 FACE LEFT -0.1355 +-1.1849 FACE ONE -0.2326 +-0.9766 FACE RIGHT 0.4064 +-1.0684 FACE THREE -0.1929 +-0.5999 FACE TO -1.0216 +-1.1527 FACE TWO 0.0275 +-0.2958 FIND [DynamicRobotName] -2.1166 +-0.3090 FIND EVERYONE -2.1162 +-0.2634 FOLLOW [DynamicRobotName] -2.1794 +-0.3449 FOLLOW EVERYONE -2.1108 +-1.3570 FORWARD [Number-20] -0.6337 +-0.0201 FORWARD 1.6352 +-1.2840 FORWARDS [Number-20] -0.7197 +-0.0238 FORWARDS 1.6259 +-0.0147 FOURTH OF -1.0066 +-0.0378 FOURTHS OF -0.5856 +-0.8064 GO [Number-20] -1.2716 +-1.5022 GO [Number-95-by5] 1.8857 +-1.5877 GO A 0.5101 +-1.6070 GO ALL -1.2296 +-1.7733 GO AROUND -0.4050 +-1.5877 GO BACK 1.5348 +-1.6484 GO BACKWARD 1.6015 +-1.5344 GO BACKWARDS 1.4865 +-1.8033 GO BASE 1.3631 +-1.5514 GO DOWN -0.8318 +-1.6272 GO FORWARD 1.5399 +-1.5344 GO FORWARDS 1.4601 +-1.7453 GO HALF 1.0814 +-1.6941 GO HOME 1.2632 +-2.4723 GO HUNDRED -0.0116 +-1.4309 GO LEFT 0.3110 +-1.4580 GO ONE 0.3900 +-1.4053 GO RIGHT 0.6616 +-1.6706 GO STRAIGHT 1.6172 +-1.6070 GO THREE 0.4027 +-0.5549 GO TO -0.6027 +-1.8702 GO TOWARD -0.4994 +-1.8702 GO TOWARDS -0.4714 +-1.6070 GO TWO 1.5033 +-1.3931 GO UP -0.1678 +-1.9320 GOOD ACCEPTABLE 0.1761 +-1.7559 GOOD CORRECT 0.0827 +-0.2645 GOOD ENOUGH 0.0358 +-1.5340 GOOD GOOD 0.2553 +-1.6309 GOOD GREAT 0.0364 +-1.9320 GOOD OF -0.1916 +-1.9320 GOOD OKAY 0.2788 +-0.4621 GOOD 2.7063 +-1.6385 GREAT ACCEPTABLE 0.1761 +-1.2405 GREAT CORRECT -0.1391 +-1.2405 GREAT GOOD 0.2553 +-1.6385 GREAT OF -0.1916 +-1.4624 GREAT OKAY 0.1027 +-1.6385 GREAT SURE 0.2482 +-0.1134 GREAT 2.6511 +-0.0037 GUESS SO 0.5366 +-0.3124 HALF OF -1.3262 +-0.5147 HALF THE -1.6936 +-0.6945 HALF WAY -0.8609 +-0.0011 HERE 1.8729 +-0.0013 HOME 1.9599 +-0.9988 HUNDRED [Number-60-by5] 0.3080 +-0.6168 HUNDRED [Number-80-by5] 0.2941 +-0.8073 HUNDRED [Number-95-by5] 0.7451 +-0.2995 HUNDRED AND 0.0010 +-0.5065 I DO 0.0022 +-0.4592 I DON'T 0.0039 +-0.7357 I GUESS 0.0037 +-0.8075 I THINK 0.4609 +-0.0170 I'M NOT -0.9244 +-0.0017 IMMEDIATELY 2.0588 +-0.0122 IT'S NOT -1.0705 +-0.2800 JOIN [DynamicRobotName] -2.0952 +-0.3261 JOIN EVERYONE -2.0620 +-2.0336 LEFT [Number-20] -0.5265 +-1.0774 LEFT [Number-95-by5] 0.9787 +-1.4359 LEFT A -1.0834 +-2.2854 LEFT HUNDRED -0.6806 +-1.3708 LEFT ONE -1.1793 +-1.4725 LEFT THREE -0.9215 +-1.4725 LEFT TWO -0.7854 +-0.1221 LEFT 1.1677 +-0.0003 LOCATION 1.2727 +-2.0984 METRE BACK -0.0334 +-2.1591 METRE BACKWARD 0.0700 +-2.1379 METRE BACKWARDS -0.0335 +-2.0452 METRE FORWARD -0.0714 +-2.1591 METRE FORWARDS -0.0280 +-2.4188 METRE LEFT -0.4307 +-2.6820 METRE RIGHT -0.1865 +-2.2560 METRE STRAIGHT 0.0291 +-2.0984 METRE TO -0.6844 +-0.0259 METRE 1.0429 +-2.1005 METRES BACK -0.0519 +-2.2503 METRES BACKWARD 0.1406 +-2.2255 METRES BACKWARDS 0.0334 +-2.2255 METRES FORWARD 0.0883 +-2.4807 METRES FORWARDS 0.2730 +-2.3046 METRES LEFT -0.5654 +-2.6356 METRES RIGHT -0.2534 +-2.2020 METRES STRAIGHT -0.0455 +-2.1383 METRES TO -0.6651 +-0.0222 METRES 1.0186 +-0.0020 MINUS [Number-20] -2.2637 +-0.7713 MOVE [Number-20] -1.2716 +-1.5921 MOVE [Number-95-by5] 2.0106 +-1.4830 MOVE A 1.3947 +-1.9601 MOVE ALL -0.8891 +-1.4994 MOVE AROUND -0.6439 +-1.6839 MOVE BACK 1.6661 +-1.6356 MOVE BACKWARD 1.6238 +-1.7383 MOVE BACKWARDS 1.7254 +-1.7102 MOVE BASE 1.3051 +-1.4372 MOVE DOWN -0.6805 +-1.5164 MOVE FORWARD 1.4642 +-1.7383 MOVE FORWARDS 1.6990 +-1.8004 MOVE HALF 1.1716 +-1.7682 MOVE HOME 1.3724 +-2.4372 MOVE HUNDRED -0.0116 +-1.4672 MOVE LEFT -0.0409 +-1.3580 MOVE ONE 1.3251 +-1.4672 MOVE RIGHT 0.7586 +-1.6839 MOVE STRAIGHT 1.6655 +-1.6839 MOVE THREE 1.5146 +-0.5129 MOVE TO -0.6096 +-1.9143 MOVE TOWARD -0.3445 +-1.9601 MOVE TOWARDS -0.5717 +-1.8004 MOVE TWO 1.7318 +-1.5921 MOVE UP -0.7740 +-0.0043 NAH 2.4771 +-0.1814 NEGATIVE [Number-20] -2.2758 +-0.4706 NEGATIVE 2.4279 +-0.0040 NEVERMIND 2.4478 +-0.7768 NO ABSOLUTELY -1.6012 +-0.4987 NO I -1.8404 +-1.4082 NO I'M 0.0170 +-1.2621 NO IT'S 0.0122 +-1.3438 NO NOT -1.3658 +-1.5509 NO THANK=YOU 0.0235 +-1.3148 NO THANKS 0.0138 +-0.8019 NO WAY -1.9158 +-0.8519 NO 2.5229 +-0.0035 NOPE 2.3908 +-0.7002 NOT REALLY 0.0030 +-0.8689 NOT THINK 0.4653 +-0.1779 NOT 1.7905 +-0.6521 OF COURSE 0.0442 +-0.1872 OF THE -2.3119 +-0.9042 OF WAY -1.0825 +-1.5798 OKAY ACCEPTABLE 0.1761 +-1.4037 OKAY GOOD 0.4771 +-1.4037 OKAY GREAT 0.1614 +-1.4037 OKAY OF -0.3676 +-1.5798 OKAY OKAY 0.2788 +-1.2788 OKAY PERFECT 0.0327 +-1.5798 OKAY SURE 0.2482 +-0.1326 OKAY 2.7289 +-1.6773 ONE FOURTH 0.2730 +-1.1255 ONE HALF 0.5297 +-0.0612 ONE HUNDRED -1.8232 +-1.9271 ONE QUARTER 0.5898 +-1.6509 ONE THIRD 0.5404 +-0.5894 PAUSE HERE 0.4094 +-0.2898 PAUSE TASK 0.2975 +-0.6423 PAUSE 2.3341 +-1.3617 PERFECT ACCEPTABLE 0.0000 +-1.5378 PERFECT CORRECT 0.2588 +-1.2368 PERFECT GOOD 0.3522 +-1.5378 PERFECT GREAT 0.3375 +-1.2368 PERFECT OKAY -0.0223 +-0.1146 PERFECT 2.7529 +-0.0126 QUARTER OF -1.0757 +-0.0378 QUARTERS OF -0.5856 +-0.8299 QUIT COMMAND 0.8494 +-0.4861 QUIT THAT 0.5303 +-0.2837 QUIT 2.4685 +-0.0030 REALLY 2.3128 +-0.1051 REPORT LOCATION 0.0359 +-0.6686 REPORT 1.8718 +-0.3066 RETURN [Number-20] -1.3161 +-1.2637 RETURN BACK 1.6661 +-1.1931 RETURN BACKWARD 1.6015 +-0.9756 RETURN BACKWARDS 1.3829 +-1.2637 RETURN FORWARD 1.6317 +-1.1324 RETURN FORWARDS 1.5133 +-1.4942 RETURN LEFT -0.3726 +-1.7952 RETURN RIGHT -0.0856 +-1.2900 RETURN STRAIGHT 1.6919 +-1.2900 RETURN TO -0.5268 +-1.9047 RIGHT [Number-20] -0.6601 +-1.0651 RIGHT [Number-95-by5] 0.9618 +-1.4068 RIGHT A -1.1171 +-2.2320 RIGHT HUNDRED -0.7386 +-1.4191 RIGHT ONE -1.1356 +-1.5171 RIGHT THREE -0.8816 +-1.3606 RIGHT TWO -0.9019 +-0.1285 RIGHT 1.1694 +-0.8799 SEARCH AROUND 0.8363 +-1.4524 SEARCH BACK -0.2515 +-1.3695 SEARCH BACKWARD -0.2917 +-1.4524 SEARCH BACKWARDS -0.2911 +-1.3695 SEARCH FORWARD -0.3191 +-1.4194 SEARCH FORWARDS -0.3398 +-1.6898 SEARCH HERE 1.2629 +-1.6705 SEARCH LEFT -0.7511 +-1.5409 SEARCH RIGHT -0.8997 +-1.4194 SEARCH STRAIGHT -0.3796 +-1.2127 SEARCH THE -1.7856 +-1.5137 SEARCH THERE 0.6150 +-1.1572 SEARCH THIS 0.3680 +-1.4881 SEARCH TO -0.8667 +-1.5007 SEARCH YOUR -1.4994 +-0.4699 SEARCH 1.9148 +-0.0011 SO 1.8697 +-0.0025 SPACE 2.2366 +-0.3391 STOP IMMEDIATELY 0.0017 +-0.2674 STOP 1.9872 +-1.2428 STRAIGHT [Number-20] -0.7818 +-0.0262 STRAIGHT 1.6073 +-1.6284 SURE ACCEPTABLE 0.1761 +-1.6284 SURE CORRECT 0.2588 +-1.4523 SURE GOOD -0.1362 +-1.3274 SURE OF -0.4926 +-1.0843 SURE OKAY -0.2653 +-1.6284 SURE PERFECT 0.3337 +-1.4523 SURE SURE 0.0721 +-0.1441 SURE 2.6918 +-0.6112 TASK HERE 0.4235 +-0.1228 TASK 1.8069 +-0.0235 THANK=YOU 3.2219 +-0.0138 THANKS 2.9858 +-0.2872 THAT COMMAND 0.2625 +-0.3194 THAT 2.4601 +-1.1243 THE AREA 0.0026 +-0.5289 THE LEFT 0.6186 +-0.5017 THE RIGHT 0.5961 +-0.7879 THE WAY -1.8237 +-0.8220 THE 1.9573 +-0.5829 THE=EAST=END=OF [Number-20] -1.4321 +-0.6651 THE=EAST=END=OF BASE 1.1290 +-0.5540 THE=EAST=END=OF HOME 1.0272 +-0.8412 THE=EAST=END=OF MINUS 1.1243 +-1.0453 THE=EAST=END=OF NEGATIVE -0.5333 +-0.5464 THE=NORTH=END=OF [Number-20] -1.4011 +-0.5306 THE=NORTH=END=OF BASE 1.0620 +-0.6353 THE=NORTH=END=OF HOME 1.1761 +-1.0235 THE=NORTH=END=OF MINUS 1.3741 +-1.0746 THE=NORTH=END=OF NEGATIVE -0.4363 +-0.5268 THE=SOUTH=END=OF [Number-20] -1.4883 +-0.6651 THE=SOUTH=END=OF BASE 1.1290 +-0.5982 THE=SOUTH=END=OF HOME 1.0714 +-1.0911 THE=SOUTH=END=OF MINUS 1.3741 +-0.8412 THE=SOUTH=END=OF NEGATIVE -0.7374 +-0.6252 THE=WEST=END=OF [Number-20] -1.4749 +-0.6832 THE=WEST=END=OF BASE 1.0620 +-0.6118 THE=WEST=END=OF HOME 1.0000 +-0.8081 THE=WEST=END=OF MINUS 1.0062 +-0.8293 THE=WEST=END=OF NEGATIVE -0.8343 +-0.0032 THERE 2.3468 +-0.0015 THINK SO 0.1491 +-0.0074 THIRD OF -1.3077 +-0.0170 THIRDS OF -0.9422 +-0.0025 THIS SPACE 0.0025 +-1.7908 THREE FOURTH 0.5229 +-1.7037 THREE FOURTHS 0.0378 +-0.0418 THREE HUNDRED -2.3031 +-1.4663 THREE QUARTER 0.2653 +-1.7037 THREE QUARTERS 0.0378 +-1.9167 TO [Number-20] -1.6773 +-2.0445 TO A -1.5238 +-1.9341 TO ALL -1.5773 +-1.6700 TO BASE 0.5550 +-1.7918 TO DOWN 0.6630 +-1.9430 TO HALF 0.6043 +-1.6243 TO HOME 0.5185 +-2.2626 TO MINUS 0.9667 +-2.4202 TO NEGATIVE -0.7374 +-1.9615 TO ONE -1.6022 +-0.4013 TO THE -2.6005 +-2.0332 TO THE=EAST=END=OF 0.4543 +-2.1329 TO THE=NORTH=END=OF 0.4864 +-2.1771 TO THE=SOUTH=END=OF 0.5982 +-1.9430 TO THE=WEST=END=OF 0.4491 +-2.2093 TO THREE -1.3740 +-2.1619 TO TO -1.4161 +-2.3233 TO TOWARD -0.4694 +-2.2263 TO TOWARDS -0.1455 +-2.2263 TO TWO -1.3685 +-1.7000 TO UP 0.5781 +-0.4057 TO YOUR -2.0744 +-0.8316 TOWARD [Number-20] -1.1159 +-0.9363 TOWARD BASE 1.4678 +-0.8316 TOWARD HOME 1.3724 +-1.5006 TOWARD MINUS 1.8513 +-1.1996 TOWARD NEGATIVE -0.3114 +-0.8016 TOWARD THE=EAST=END=OF -0.1722 +-0.9777 TOWARD THE=NORTH=END=OF 0.9777 +-0.9363 TOWARD THE=SOUTH=END=OF -0.2265 +-0.9777 TOWARD THE=WEST=END=OF -0.2121 +-0.8297 TOWARDS [Number-20] -1.6230 +-0.9031 TOWARDS BASE 0.9294 +-0.8808 TOWARDS HOME 0.9165 +-1.1818 TOWARDS MINUS 1.0273 +-1.2788 TOWARDS NEGATIVE -0.7374 +-0.9644 TOWARDS THE=EAST=END=OF 0.5268 +-1.0058 TOWARDS THE=NORTH=END=OF 0.5006 +-0.8918 TOWARDS THE=SOUTH=END=OF 0.4543 +-0.8596 TOWARDS THE=WEST=END=OF 0.5071 +-0.7482 TURN [Number-95-by5] 1.7888 +-1.3892 TURN A 0.0092 +-0.9120 TURN AROUND -0.6091 +-1.6902 TURN HUNDRED -0.1365 +-1.0135 TURN LEFT 0.0098 +-1.1783 TURN ONE -0.2326 +-1.0135 TURN RIGHT 0.4498 +-1.3892 TURN THREE 0.1344 +-0.6390 TURN TO -0.9759 +-0.9912 TURN TWO -0.1274 +-0.0301 TWO HUNDRED -2.3500 +-1.5235 TWO THIRD 0.4486 +-1.4478 TWO THIRDS 0.0170 +-1.2983 UP [Number-20] -1.1739 +-1.2983 UP BASE 1.3051 +-1.4232 UP HOME 1.4393 +-1.6573 UP MINUS 1.4833 +-1.8035 UP NEGATIVE -0.2322 +-1.3885 UP THE=EAST=END=OF -0.1100 +-1.3563 UP THE=NORTH=END=OF -0.1684 +-1.3885 UP THE=SOUTH=END=OF -0.0686 +-1.2983 UP THE=WEST=END=OF 0.9262 +-0.4571 UP TO -1.9990 +-0.5293 UP TOWARDS 0.5097 +-0.5239 WAY DOWN 0.2807 +-1.0667 WAY TO -1.6258 +-1.1477 WAY TOWARD -0.2154 +-1.0228 WAY TOWARDS 0.7669 +-0.5804 WAY UP 0.3441 +-0.7345 WAY 2.4728 +-0.0003 WHERE ARE 0.0003 +-0.0037 WHY NOT -1.5983 +-1.0669 YEAH ABSOLUTELY -1.3555 +-1.6690 YEAH CORRECT -0.8551 +-1.0435 YEAH DEFINITELY 0.5101 +-1.9243 YEAH GOOD -0.3048 +-2.1461 YEAH GREAT -0.4407 +-0.7720 YEAH I -1.6711 +-1.7782 YEAH OF -0.7356 +-1.9243 YEAH OKAY -0.6507 +-2.0212 YEAH PERFECT -0.5266 +-1.9243 YEAH SURE -0.6269 +-1.1919 YEAH WHY 0.6442 +-0.3031 YEAH 2.1570 +-1.0172 YES ABSOLUTELY -1.4225 +-1.7954 YES ACCEPTABLE -0.7700 +-1.8623 YES CORRECT -0.6846 +-1.0723 YES DEFINITELY 0.5217 +-1.6405 YES GOOD -0.6183 +-1.7954 YES GREAT -0.7507 +-0.8923 YES I -1.5680 +-2.3395 YES OF -0.1916 +-2.3395 YES OKAY -0.2835 +-2.0384 YES PERFECT -0.5485 +-1.9415 YES SURE -0.6329 +-1.0494 YES WHY 0.4845 +-0.3000 YES 2.1367 +-0.0003 YOU 1.2953 +-0.4163 YOUR LEFT 0.5965 +-1.1476 YOUR LOCATION 1.1009 +-0.4063 YOUR RIGHT 0.5911 +-0.8168 YOUR 2.0426 +-1.1069 [DynamicRobotName] 0.0886 +-0.7752 [Number-20] -2.8314 +-1.5837 [Number-95-by5] 0.4385 +-1.9427 A -1.6230 +-2.1770 ABORT 0.0065 +-2.2990 ABSOLUTELY 0.3461 +-2.9098 ACCEPTABLE -0.6140 +-2.2905 ALL -1.5518 +-1.7229 AROUND -1.9840 +-1.6745 BACK -1.4751 +-1.6698 BACKWARD -1.4371 +-1.6752 BACKWARDS -1.5141 +-2.1456 CANCEL 0.0060 +-1.9852 CONTINUE 0.2677 +-2.7146 CORRECT -0.8861 +-2.7878 DEFINITELY 0.3997 +-1.9661 DRIVE 0.3116 +-1.1049 EVERYONE 0.0801 +-1.4944 EXPLORE 0.0031 +-2.4957 FACE 0.3166 +-2.2579 FIND 0.2984 +-2.2350 FOLLOW 0.3060 +-1.7252 FORWARD -1.4092 +-1.6991 FORWARDS -1.5059 +-1.8405 GO 0.3119 +-2.3881 GOOD -0.5559 +-2.7221 GREAT -0.6615 +-2.8869 HUNDRED -1.1255 +-1.9852 I 0.3148 +-2.3107 JOIN 0.3141 +-1.5475 LEFT -0.9139 +-1.8455 MOVE -0.3202 +-2.4780 NAH 0.0043 +-2.4288 NEGATIVE -1.8698 +-2.4486 NEVERMIND 0.0040 +-1.6780 NO 0.0062 +-2.3916 NOPE 0.0035 +-2.4061 NOT -1.9753 +-2.6856 OF -1.6829 +-2.8248 OKAY -0.5506 +-1.8903 ONE -1.7063 +-1.9923 PAUSE 0.2996 +-2.8059 PERFECT -0.5322 +-2.1924 QUIT 0.0067 +-1.5161 REPORT 0.3120 +-2.2961 RETURN 0.3123 +-1.5385 RIGHT -1.0474 +-1.4523 SEARCH 0.0065 +-2.3776 STOP -1.8343 +-1.6711 STRAIGHT -1.5736 +-2.7221 SURE -0.5254 +-2.0171 THREE -1.4234 +-1.2342 TO -2.5664 +-2.5335 TURN 0.3478 +-1.8825 TWO -1.4219 +-1.5904 WHERE 0.2945 +-2.7456 WHY 0.3432 +-1.8673 YEAH 0.0126 +-1.8506 YES 0.0131 +-0.0000 0.0009 + +\3-grams: +-0.0056 [DynamicRobotName] ALL STOP +-0.2577 [DynamicRobotName] CONTINUE TASK +-0.3560 [DynamicRobotName] CONTINUE +-0.7351 [DynamicRobotName] DRIVE [Number-20] +-1.6101 [DynamicRobotName] DRIVE A +-1.5132 [DynamicRobotName] DRIVE ALL +-1.3671 [DynamicRobotName] DRIVE BACKWARD +-2.2122 [DynamicRobotName] DRIVE BACKWARDS +-1.5132 [DynamicRobotName] DRIVE BASE +-1.7351 [DynamicRobotName] DRIVE DOWN +-1.6101 [DynamicRobotName] DRIVE FORWARD +-1.7351 [DynamicRobotName] DRIVE FORWARDS +-1.9112 [DynamicRobotName] DRIVE HALF +-1.7351 [DynamicRobotName] DRIVE HOME +-1.5132 [DynamicRobotName] DRIVE LEFT +-1.3671 [DynamicRobotName] DRIVE ONE +-1.7351 [DynamicRobotName] DRIVE RIGHT +-1.6101 [DynamicRobotName] DRIVE STRAIGHT +-2.2122 [DynamicRobotName] DRIVE THREE +-0.4488 [DynamicRobotName] DRIVE TO +-1.9112 [DynamicRobotName] DRIVE TOWARD +-1.5132 [DynamicRobotName] DRIVE TOWARDS +-2.2122 [DynamicRobotName] DRIVE TWO +-1.2579 [DynamicRobotName] DRIVE UP +-1.2218 [DynamicRobotName] FACE [Number-95-by5] +-1.0000 [DynamicRobotName] FACE A +-0.9208 [DynamicRobotName] FACE AROUND +-1.0000 [DynamicRobotName] FACE LEFT +-1.3979 [DynamicRobotName] FACE ONE +-1.0000 [DynamicRobotName] FACE RIGHT +-1.3979 [DynamicRobotName] FACE THREE +-0.4949 [DynamicRobotName] FACE TO +-1.0000 [DynamicRobotName] FACE TWO +-0.3010 [DynamicRobotName] FIND [DynamicRobotName] +-0.3118 [DynamicRobotName] FIND EVERYONE +-0.2571 [DynamicRobotName] FOLLOW [DynamicRobotName] +-0.3603 [DynamicRobotName] FOLLOW EVERYONE +-0.8909 [DynamicRobotName] GO [Number-20] +-1.4191 [DynamicRobotName] GO [Number-95-by5] +-1.7202 [DynamicRobotName] GO A +-1.7202 [DynamicRobotName] GO ALL +-1.7202 [DynamicRobotName] GO AROUND +-1.5441 [DynamicRobotName] GO BACK +-1.3680 [DynamicRobotName] GO BACKWARD +-1.5441 [DynamicRobotName] GO BACKWARDS +-2.3222 [DynamicRobotName] GO BASE +-1.4191 [DynamicRobotName] GO DOWN +-1.5441 [DynamicRobotName] GO FORWARD +-1.6232 [DynamicRobotName] GO FORWARDS +-1.5441 [DynamicRobotName] GO HALF +-1.8451 [DynamicRobotName] GO HOME +-1.3680 [DynamicRobotName] GO LEFT +-1.4771 [DynamicRobotName] GO ONE +-1.5441 [DynamicRobotName] GO RIGHT +-1.6232 [DynamicRobotName] GO STRAIGHT +-1.8451 [DynamicRobotName] GO THREE +-0.5369 [DynamicRobotName] GO TO +-2.0212 [DynamicRobotName] GO TOWARD +-1.7202 [DynamicRobotName] GO TOWARDS +-1.4771 [DynamicRobotName] GO TWO +-1.4191 [DynamicRobotName] GO UP +-0.2041 [DynamicRobotName] JOIN [DynamicRobotName] +-0.4445 [DynamicRobotName] JOIN EVERYONE +-0.7711 [DynamicRobotName] MOVE [Number-20] +-1.5635 [DynamicRobotName] MOVE [Number-95-by5] +-1.5635 [DynamicRobotName] MOVE A +-2.2625 [DynamicRobotName] MOVE ALL +-1.7853 [DynamicRobotName] MOVE AROUND +-1.5635 [DynamicRobotName] MOVE BACK +-1.9614 [DynamicRobotName] MOVE BACKWARD +-1.5635 [DynamicRobotName] MOVE BACKWARDS +-1.9614 [DynamicRobotName] MOVE BASE +-1.9614 [DynamicRobotName] MOVE DOWN +-1.5635 [DynamicRobotName] MOVE FORWARD +-1.7853 [DynamicRobotName] MOVE FORWARDS +-1.7853 [DynamicRobotName] MOVE HALF +-1.7853 [DynamicRobotName] MOVE HOME +-2.2625 [DynamicRobotName] MOVE HUNDRED +-1.3082 [DynamicRobotName] MOVE LEFT +-1.3594 [DynamicRobotName] MOVE ONE +-1.6604 [DynamicRobotName] MOVE RIGHT +-1.5635 [DynamicRobotName] MOVE STRAIGHT +-1.5635 [DynamicRobotName] MOVE THREE +-0.4563 [DynamicRobotName] MOVE TO +-1.9614 [DynamicRobotName] MOVE TOWARD +-2.2625 [DynamicRobotName] MOVE TOWARDS +-1.6604 [DynamicRobotName] MOVE TWO +-1.6604 [DynamicRobotName] MOVE UP +-0.5754 [DynamicRobotName] PAUSE HERE +-0.3122 [DynamicRobotName] PAUSE TASK +-0.6189 [DynamicRobotName] PAUSE +-0.1001 [DynamicRobotName] REPORT LOCATION +-0.6907 [DynamicRobotName] REPORT +-0.2730 [DynamicRobotName] RETURN [Number-20] +-1.2730 [DynamicRobotName] RETURN BACK +-1.0300 [DynamicRobotName] RETURN BACKWARD +-1.0300 [DynamicRobotName] RETURN BACKWARDS +-1.8751 [DynamicRobotName] RETURN FORWARD +-1.0969 [DynamicRobotName] RETURN FORWARDS +-1.5740 [DynamicRobotName] RETURN LEFT +-1.5740 [DynamicRobotName] RETURN STRAIGHT +-1.1761 [DynamicRobotName] RETURN TO +-0.0063 [DynamicRobotName] STOP IMMEDIATELY +-0.6767 [DynamicRobotName] TURN [Number-95-by5] +-1.7559 [DynamicRobotName] TURN A +-0.8528 [DynamicRobotName] TURN AROUND +-1.7559 [DynamicRobotName] TURN HUNDRED +-1.0569 [DynamicRobotName] TURN LEFT +-1.0569 [DynamicRobotName] TURN ONE +-0.9777 [DynamicRobotName] TURN RIGHT +-1.7559 [DynamicRobotName] TURN THREE +-0.6419 [DynamicRobotName] TURN TO +-1.1538 [DynamicRobotName] TURN TWO +-0.0012 [DynamicRobotName] WHERE ARE +-0.0007 [DynamicRobotName] +-0.0019 [Number-20] [Number-20] +-2.1162 [Number-20] METRE BACK +-2.1799 [Number-20] METRE BACKWARD +-2.1576 [Number-20] METRE BACKWARDS +-2.0607 [Number-20] METRE FORWARD +-2.1799 [Number-20] METRE FORWARDS +-2.4586 [Number-20] METRE LEFT +-2.7597 [Number-20] METRE RIGHT +-2.2825 [Number-20] METRE STRAIGHT +-2.1162 [Number-20] METRE TO +-0.0245 [Number-20] METRE +-2.1176 [Number-20] METRES BACK +-2.2752 [Number-20] METRES BACKWARD +-2.2488 [Number-20] METRES BACKWARDS +-2.2488 [Number-20] METRES FORWARD +-2.5250 [Number-20] METRES FORWARDS +-2.3332 [Number-20] METRES LEFT +-2.7011 [Number-20] METRES RIGHT +-2.2240 [Number-20] METRES STRAIGHT +-2.1571 [Number-20] METRES TO +-0.0210 [Number-20] METRES +-0.0042 [Number-20] MINUS [Number-20] +-0.0036 [Number-20] NEGATIVE [Number-20] +-0.0010 [Number-20] +-1.1718 [Number-60-by5] DEGREES LEFT +-1.0405 [Number-60-by5] DEGREES RIGHT +-0.4754 [Number-60-by5] DEGREES TO +-0.2968 [Number-60-by5] DEGREES +-1.0466 [Number-80-by5] DEGREES LEFT +-1.0590 [Number-80-by5] DEGREES RIGHT +-0.4742 [Number-80-by5] DEGREES TO +-0.3130 [Number-80-by5] DEGREES +-0.9982 [Number-95-by5] DEGREES LEFT +-1.1312 [Number-95-by5] DEGREES RIGHT +-0.4925 [Number-95-by5] DEGREES TO +-0.2980 [Number-95-by5] DEGREES +-0.0792 A FOURTH OF +-0.2730 A HALF OF +-0.6532 A HALF THE +-0.6532 A HALF WAY +-0.2851 A HUNDRED [Number-80-by5] +-0.3191 A HUNDRED AND +-0.0580 A QUARTER OF +-0.0202 A THIRD OF +-0.0138 ABORT COMMAND +-0.2814 ABORT THAT COMMAND +-0.3358 ABORT THAT +-0.0042 ABORT +-0.0021 ABSOLUTELY NOT +-0.0035 ABSOLUTELY +-0.3010 ACCEPTABLE ACCEPTABLE +-0.1249 ACCEPTABLE CORRECT +-0.1761 ACCEPTABLE GOOD +-0.3010 ACCEPTABLE GREAT +-0.1761 ACCEPTABLE OF COURSE +-0.1249 ACCEPTABLE PERFECT +-0.3010 ACCEPTABLE SURE +-0.0105 ACCEPTABLE +-0.0122 ALL OF THE +-0.0014 ALL STOP +-0.0078 ALL THE WAY +-0.0017 AND [Number-60-by5] DEGREES +-0.0007 AND [Number-80-by5] DEGREES +-0.0011 AND [Number-95-by5] DEGREES +-0.0003 ARE YOU +-0.0026 AREA +-0.0102 AROUND HERE +-0.0071 AROUND THERE +-0.0074 AROUND YOUR LOCATION +-0.0005 AROUND +-0.4771 BACK [Number-20] METRE +-0.1946 BACK [Number-20] METRES +-0.0006 BACK +-0.4046 BACKWARD [Number-20] METRE +-0.2398 BACKWARD [Number-20] METRES +-0.0006 BACKWARD +-0.3468 BACKWARDS [Number-20] METRE +-0.2798 BACKWARDS [Number-20] METRES +-0.0006 BACKWARDS +-0.0014 BASE +-0.0130 CANCEL COMMAND +-0.2817 CANCEL THAT COMMAND +-0.3317 CANCEL THAT +-0.0046 CANCEL +-0.0021 COMMAND +-0.0014 CONTINUE TASK +-0.0016 CONTINUE +-0.1761 CORRECT ACCEPTABLE +-0.1249 CORRECT CORRECT +-0.3010 CORRECT GOOD ENOUGH +-0.4771 CORRECT GOOD +-0.1249 CORRECT GREAT +-0.1761 CORRECT OF COURSE +-0.3010 CORRECT OKAY +-0.1249 CORRECT SURE +-0.0062 CORRECT +-0.3010 COURSE ACCEPTABLE +-0.3010 COURSE CORRECT +-0.3010 COURSE GOOD ENOUGH +-0.6021 COURSE GOOD +-0.3010 COURSE GREAT +-0.1761 COURSE OF COURSE +-0.0969 COURSE OKAY +-0.1761 COURSE PERFECT +-0.1249 COURSE SURE +-0.0065 COURSE +-0.0036 DEFINITELY +-0.0012 DEGREES LEFT +-0.0014 DEGREES RIGHT +-0.2848 DEGREES TO THE +-0.3186 DEGREES TO YOUR +-0.0002 DEGREES +-0.3098 DO NOT THINK +-0.2967 DO NOT +-0.0048 DON'T THINK SO +-0.0033 DON'T +-0.3358 DOWN [Number-20] [Number-20] +-0.5119 DOWN [Number-20] MINUS +-0.8129 DOWN [Number-20] NEGATIVE +-0.0223 DOWN BASE +-0.0348 DOWN HOME +-0.0580 DOWN MINUS [Number-20] +-0.0512 DOWN NEGATIVE [Number-20] +-0.6990 DOWN THE=EAST=END=OF [Number-20] +-0.6990 DOWN THE=EAST=END=OF BASE +-0.6990 DOWN THE=EAST=END=OF HOME +-1.0000 DOWN THE=EAST=END=OF MINUS +-0.6990 DOWN THE=EAST=END=OF NEGATIVE +-0.9542 DOWN THE=NORTH=END=OF [Number-20] +-0.4771 DOWN THE=NORTH=END=OF BASE +-0.4771 DOWN THE=NORTH=END=OF HOME +-0.9542 DOWN THE=NORTH=END=OF MINUS +-0.6767 DOWN THE=SOUTH=END=OF [Number-20] +-0.8016 DOWN THE=SOUTH=END=OF BASE +-0.3757 DOWN THE=SOUTH=END=OF HOME +-1.2788 DOWN THE=SOUTH=END=OF MINUS +-0.9777 DOWN THE=SOUTH=END=OF NEGATIVE +-0.6532 DOWN THE=WEST=END=OF [Number-20] +-0.9542 DOWN THE=WEST=END=OF BASE +-0.3522 DOWN THE=WEST=END=OF HOME +-0.7782 DOWN THE=WEST=END=OF NEGATIVE +-0.8683 DOWN TO [Number-20] +-0.8361 DOWN TO BASE +-0.8062 DOWN TO HOME +-1.0792 DOWN TO MINUS +-1.2833 DOWN TO NEGATIVE +-0.9409 DOWN TO THE=EAST=END=OF +-1.6812 DOWN TO THE=NORTH=END=OF +-1.0280 DOWN TO THE=SOUTH=END=OF +-0.7270 DOWN TO THE=WEST=END=OF +-0.8107 DOWN TOWARDS [Number-20] +-1.0325 DOWN TOWARDS BASE +-0.8406 DOWN TOWARDS HOME +-1.2086 DOWN TOWARDS MINUS +-1.3847 DOWN TOWARDS NEGATIVE +-1.0837 DOWN TOWARDS THE=EAST=END=OF +-1.2086 DOWN TOWARDS THE=NORTH=END=OF +-0.7315 DOWN TOWARDS THE=SOUTH=END=OF +-0.7827 DOWN TOWARDS THE=WEST=END=OF +-0.2627 DRIVE [Number-20] METRE +-0.3499 DRIVE [Number-20] METRES +-0.2688 DRIVE A HALF +-1.1139 DRIVE A QUARTER +-0.5119 DRIVE A THIRD +-0.3010 DRIVE ALL OF +-0.3680 DRIVE ALL THE +-0.3310 DRIVE BACK [Number-20] +-0.3310 DRIVE BACK +-0.3245 DRIVE BACKWARD [Number-20] +-0.3245 DRIVE BACKWARD +-0.4260 DRIVE BACKWARDS [Number-20] +-0.2499 DRIVE BACKWARDS +-0.0185 DRIVE BASE +-0.8016 DRIVE DOWN [Number-20] +-1.2788 DRIVE DOWN NEGATIVE +-1.2788 DRIVE DOWN THE=SOUTH=END=OF +-0.9777 DRIVE DOWN THE=WEST=END=OF +-0.5006 DRIVE DOWN TO +-0.5798 DRIVE DOWN TOWARDS +-0.3010 DRIVE FORWARD [Number-20] +-0.3680 DRIVE FORWARD +-0.3979 DRIVE FORWARDS [Number-20] +-0.2596 DRIVE FORWARDS +-0.5051 DRIVE HALF OF +-0.4260 DRIVE HALF THE +-0.6021 DRIVE HALF WAY +-0.0300 DRIVE HOME +-0.4260 DRIVE LEFT [Number-20] +-0.3010 DRIVE LEFT +-0.9777 DRIVE ONE FOURTH +-0.2374 DRIVE ONE HALF +-1.2788 DRIVE ONE QUARTER +-0.6767 DRIVE ONE THIRD +-0.4393 DRIVE RIGHT [Number-20] +-0.2632 DRIVE RIGHT +-0.2156 DRIVE STRAIGHT [Number-20] +-0.4586 DRIVE STRAIGHT +-0.7782 DRIVE THREE FOURTH +-0.1761 DRIVE THREE QUARTER +-2.0354 DRIVE TO [Number-20] +-1.1604 DRIVE TO A +-0.9747 DRIVE TO ALL +-1.2573 DRIVE TO BASE +-0.9215 DRIVE TO DOWN +-1.0812 DRIVE TO HALF +-1.0577 DRIVE TO HOME +-1.1060 DRIVE TO ONE +-1.2951 DRIVE TO THE +-2.3365 DRIVE TO THE=EAST=END=OF +-2.0354 DRIVE TO THE=NORTH=END=OF +-2.3365 DRIVE TO THE=WEST=END=OF +-1.1604 DRIVE TO THREE +-1.5583 DRIVE TO TO +-1.7344 DRIVE TO TOWARD +-1.3365 DRIVE TO TOWARDS +-1.4334 DRIVE TO TWO +-0.9215 DRIVE TO UP +-0.6532 DRIVE TOWARD [Number-20] +-0.9542 DRIVE TOWARD BASE +-0.9542 DRIVE TOWARD HOME +-0.9542 DRIVE TOWARD MINUS +-0.9542 DRIVE TOWARD THE=EAST=END=OF +-0.9542 DRIVE TOWARD THE=NORTH=END=OF +-0.9542 DRIVE TOWARD THE=SOUTH=END=OF +-1.0792 DRIVE TOWARDS [Number-20] +-0.4771 DRIVE TOWARDS BASE +-0.7782 DRIVE TOWARDS HOME +-1.0792 DRIVE TOWARDS THE=EAST=END=OF +-0.6021 DRIVE TOWARDS THE=WEST=END=OF +-0.6021 DRIVE TWO THIRD +-0.2041 DRIVE TWO THIRDS +-1.4150 DRIVE UP [Number-20] +-1.4150 DRIVE UP BASE +-1.4150 DRIVE UP HOME +-1.4150 DRIVE UP MINUS +-1.4150 DRIVE UP THE=EAST=END=OF +-1.1139 DRIVE UP THE=SOUTH=END=OF +-1.1139 DRIVE UP THE=WEST=END=OF +-0.4150 DRIVE UP TO +-0.6368 DRIVE UP TOWARDS +-0.1761 ENOUGH ACCEPTABLE +-0.0969 ENOUGH CORRECT +-0.4771 ENOUGH GOOD ENOUGH +-0.4771 ENOUGH GOOD +-0.0969 ENOUGH GREAT +-0.1761 ENOUGH OF COURSE +-0.3010 ENOUGH PERFECT +-0.3010 ENOUGH SURE +-0.0057 ENOUGH +-0.0055 EVERYONE ALL STOP +-0.2734 EVERYONE CONTINUE TASK +-0.3382 EVERYONE CONTINUE +-0.6801 EVERYONE DRIVE [Number-20] +-2.1987 EVERYONE DRIVE A +-1.5966 EVERYONE DRIVE ALL +-1.5966 EVERYONE DRIVE BACK +-1.4205 EVERYONE DRIVE BACKWARD +-1.4205 EVERYONE DRIVE BACKWARDS +-1.5966 EVERYONE DRIVE BASE +-1.4205 EVERYONE DRIVE DOWN +-1.8976 EVERYONE DRIVE FORWARD +-1.3536 EVERYONE DRIVE FORWARDS +-1.8976 EVERYONE DRIVE HALF +-1.5966 EVERYONE DRIVE HOME +-2.1987 EVERYONE DRIVE LEFT +-1.5966 EVERYONE DRIVE ONE +-1.4997 EVERYONE DRIVE RIGHT +-1.5966 EVERYONE DRIVE STRAIGHT +-0.5085 EVERYONE DRIVE TO +-1.7215 EVERYONE DRIVE TOWARD +-1.7215 EVERYONE DRIVE TOWARDS +-1.7215 EVERYONE DRIVE TWO +-1.4205 EVERYONE DRIVE UP +-0.6990 EVERYONE FACE [Number-95-by5] +-0.9542 EVERYONE FACE A +-1.3522 EVERYONE FACE AROUND +-1.1761 EVERYONE FACE LEFT +-1.1761 EVERYONE FACE ONE +-1.1761 EVERYONE FACE RIGHT +-1.0512 EVERYONE FACE THREE +-0.6532 EVERYONE FACE TO +-0.9542 EVERYONE FACE TWO +-0.3456 EVERYONE FIND [DynamicRobotName] +-0.2704 EVERYONE FIND EVERYONE +-0.2482 EVERYONE FOLLOW [DynamicRobotName] +-0.3731 EVERYONE FOLLOW EVERYONE +-0.9011 EVERYONE GO [Number-20] +-1.3941 EVERYONE GO [Number-95-by5] +-1.4452 EVERYONE GO A +-1.3483 EVERYONE GO ALL +-2.0473 EVERYONE GO AROUND +-1.6493 EVERYONE GO BACK +-2.0473 EVERYONE GO BACKWARD +-1.8712 EVERYONE GO BACKWARDS +-1.6493 EVERYONE GO BASE +-1.6493 EVERYONE GO DOWN +-1.5702 EVERYONE GO FORWARD +-1.3069 EVERYONE GO FORWARDS +-1.7462 EVERYONE GO HALF +-1.7462 EVERYONE GO HOME +-1.5032 EVERYONE GO LEFT +-1.4452 EVERYONE GO ONE +-1.3483 EVERYONE GO RIGHT +-1.8712 EVERYONE GO STRAIGHT +-1.7462 EVERYONE GO THREE +-0.4910 EVERYONE GO TO +-2.0473 EVERYONE GO TOWARD +-2.0473 EVERYONE GO TOWARDS +-2.3483 EVERYONE GO TWO +-1.3069 EVERYONE GO UP +-0.2825 EVERYONE JOIN [DynamicRobotName] +-0.3303 EVERYONE JOIN EVERYONE +-0.8545 EVERYONE MOVE [Number-20] +-1.7924 EVERYONE MOVE [Number-95-by5] +-1.6675 EVERYONE MOVE A +-1.9685 EVERYONE MOVE ALL +-1.4244 EVERYONE MOVE AROUND +-2.2695 EVERYONE MOVE BACK +-1.6675 EVERYONE MOVE BACKWARD +-2.2695 EVERYONE MOVE BACKWARDS +-1.6675 EVERYONE MOVE BASE +-1.3153 EVERYONE MOVE DOWN +-2.2695 EVERYONE MOVE FORWARD +-1.4244 EVERYONE MOVE FORWARDS +-1.6675 EVERYONE MOVE HALF +-2.2695 EVERYONE MOVE HOME +-2.2695 EVERYONE MOVE HUNDRED +-1.4914 EVERYONE MOVE LEFT +-1.3664 EVERYONE MOVE ONE +-1.4244 EVERYONE MOVE RIGHT +-1.6675 EVERYONE MOVE STRAIGHT +-1.5705 EVERYONE MOVE THREE +-0.4702 EVERYONE MOVE TO +-1.7924 EVERYONE MOVE TOWARD +-1.7924 EVERYONE MOVE TOWARDS +-1.6675 EVERYONE MOVE TWO +-1.4244 EVERYONE MOVE UP +-0.6562 EVERYONE PAUSE HERE +-0.2749 EVERYONE PAUSE TASK +-0.6173 EVERYONE PAUSE +-0.1031 EVERYONE REPORT LOCATION +-0.6791 EVERYONE REPORT +-0.3183 EVERYONE RETURN [Number-20] +-1.1875 EVERYONE RETURN BACK +-1.5855 EVERYONE RETURN BACKWARD +-1.1083 EVERYONE RETURN BACKWARDS +-1.1875 EVERYONE RETURN FORWARD +-1.1875 EVERYONE RETURN FORWARDS +-1.4094 EVERYONE RETURN LEFT +-1.4094 EVERYONE RETURN RIGHT +-1.1875 EVERYONE RETURN STRAIGHT +-1.1875 EVERYONE RETURN TO +-0.0063 EVERYONE STOP IMMEDIATELY +-0.5543 EVERYONE TURN [Number-95-by5] +-1.6335 EVERYONE TURN A +-0.9345 EVERYONE TURN AROUND +-1.3324 EVERYONE TURN LEFT +-1.0314 EVERYONE TURN ONE +-0.9345 EVERYONE TURN RIGHT +-0.6335 EVERYONE TURN TO +-1.1563 EVERYONE TURN TWO +-0.0011 EVERYONE WHERE ARE +-0.0008 EVERYONE +-0.7977 EXPLORE AROUND HERE +-0.7977 EXPLORE AROUND THERE +-0.7830 EXPLORE AROUND YOUR +-0.2916 EXPLORE AROUND +-0.0138 EXPLORE HERE +-0.0044 EXPLORE THE AREA +-0.0105 EXPLORE THERE +-0.0044 EXPLORE THIS SPACE +-0.0122 EXPLORE YOUR LOCATION +-0.0009 EXPLORE +-0.0134 FACE [Number-95-by5] DEGREES +-0.0300 FACE A HUNDRED +-0.0248 FACE AROUND +-0.3010 FACE HUNDRED AND +-0.6990 FACE LEFT [Number-95-by5] +-1.1761 FACE LEFT A +-1.1761 FACE LEFT TWO +-0.2218 FACE LEFT +-0.0348 FACE ONE HUNDRED +-0.7202 FACE RIGHT [Number-95-by5] +-1.3222 FACE RIGHT A +-1.3222 FACE RIGHT ONE +-1.0212 FACE RIGHT THREE +-1.3222 FACE RIGHT TWO +-0.2808 FACE RIGHT +-0.0263 FACE THREE HUNDRED +-0.2518 FACE TO THE +-0.3768 FACE TO YOUR +-0.0322 FACE TWO HUNDRED +-0.0026 FIND [DynamicRobotName] +-0.0027 FIND EVERYONE +-0.0023 FOLLOW [DynamicRobotName] +-0.0027 FOLLOW EVERYONE +-0.2499 FORWARD [Number-20] METRE +-0.3912 FORWARD [Number-20] METRES +-0.0006 FORWARD +-0.3606 FORWARDS [Number-20] METRE +-0.2688 FORWARDS [Number-20] METRES +-0.0006 FORWARDS +-0.0152 FOURTH OF THE +-0.0414 FOURTHS OF THE +-0.3796 GO [Number-20] METRE +-0.2399 GO [Number-20] METRES +-0.0158 GO [Number-95-by5] DEGREES +-1.3617 GO A FOURTH +-0.3617 GO A HALF +-0.4075 GO A HUNDRED +-1.0607 GO A THIRD +-0.4393 GO ALL OF +-0.2285 GO ALL THE +-0.0300 GO AROUND +-0.3617 GO BACK [Number-20] +-0.2825 GO BACK +-0.5229 GO BACKWARD [Number-20] +-0.1871 GO BACKWARD +-0.4150 GO BACKWARDS [Number-20] +-0.2389 GO BACKWARDS +-0.0322 GO BASE +-1.3979 GO DOWN [Number-20] +-1.3979 GO DOWN HOME +-0.9208 GO DOWN NEGATIVE +-0.4437 GO DOWN TO +-0.3979 GO DOWN TOWARDS +-0.3222 GO FORWARD [Number-20] +-0.3222 GO FORWARD +-0.2688 GO FORWARDS [Number-20] +-0.3736 GO FORWARDS +-0.3590 GO HALF OF +-0.5051 GO HALF THE +-0.7270 GO HALF WAY +-0.0248 GO HOME +-0.4771 GO HUNDRED [Number-95-by5] +-0.4771 GO HUNDRED AND +-0.9165 GO LEFT [Number-95-by5] +-1.5185 GO LEFT A +-1.2175 GO LEFT ONE +-1.2175 GO LEFT THREE +-0.9165 GO LEFT TWO +-0.2398 GO LEFT +-1.4914 GO ONE FOURTH +-0.4500 GO ONE HALF +-0.3153 GO ONE HUNDRED +-1.0142 GO ONE THIRD +-1.0669 GO RIGHT [Number-20] +-1.2430 GO RIGHT [Number-95-by5] +-1.5441 GO RIGHT A +-1.5441 GO RIGHT ONE +-1.2430 GO RIGHT THREE +-1.0669 GO RIGHT TWO +-0.2016 GO RIGHT +-0.1326 GO STRAIGHT [Number-20] +-0.6767 GO STRAIGHT +-0.8653 GO THREE FOURTHS +-0.2632 GO THREE HUNDRED +-0.7404 GO THREE QUARTER +-1.0414 GO THREE QUARTERS +-2.0934 GO TO [Number-20] +-1.2805 GO TO A +-1.3945 GO TO ALL +-1.0934 GO TO BASE +-0.9473 GO TO DOWN +-1.2483 GO TO HALF +-1.0934 GO TO HOME +-2.3945 GO TO MINUS +-2.3945 GO TO NEGATIVE +-1.2805 GO TO ONE +-0.9031 GO TO THE +-2.3945 GO TO THE=NORTH=END=OF +-2.0934 GO TO THE=WEST=END=OF +-1.7924 GO TO THREE +-1.3945 GO TO TO +-1.5494 GO TO TOWARD +-1.5494 GO TO TOWARDS +-1.4914 GO TO TWO +-0.9473 GO TO UP +-0.9631 GO TO YOUR +-1.0792 GO TOWARD [Number-20] +-0.4771 GO TOWARD HOME +-1.0792 GO TOWARD NEGATIVE +-0.7782 GO TOWARD THE=EAST=END=OF +-1.0792 GO TOWARD THE=SOUTH=END=OF +-0.7782 GO TOWARD THE=WEST=END=OF +-0.7782 GO TOWARDS [Number-20] +-1.0792 GO TOWARDS HOME +-0.6021 GO TOWARDS THE=EAST=END=OF +-1.0792 GO TOWARDS THE=NORTH=END=OF +-0.6021 GO TOWARDS THE=SOUTH=END=OF +-1.0792 GO TOWARDS THE=WEST=END=OF +-0.3010 GO TWO HUNDRED +-0.4973 GO TWO THIRD +-0.8653 GO TWO THIRDS +-1.5563 GO UP [Number-20] +-1.5563 GO UP BASE +-1.5563 GO UP HOME +-1.0792 GO UP THE=EAST=END=OF +-0.9542 GO UP THE=NORTH=END=OF +-1.5563 GO UP THE=SOUTH=END=OF +-0.9542 GO UP THE=WEST=END=OF +-0.5563 GO UP TO +-0.5563 GO UP TOWARDS +-0.3010 GOOD ACCEPTABLE +-0.1761 GOOD CORRECT +-1.6675 GOOD ENOUGH ACCEPTABLE +-1.3664 GOOD ENOUGH CORRECT +-1.6675 GOOD ENOUGH GOOD +-1.3664 GOOD ENOUGH GREAT +-1.6675 GOOD ENOUGH OF +-1.9685 GOOD ENOUGH PERFECT +-1.9685 GOOD ENOUGH SURE +-0.0877 GOOD ENOUGH +-0.2218 GOOD GOOD ENOUGH +-0.6990 GOOD GOOD +-0.1249 GOOD GREAT +-0.3010 GOOD OF COURSE +-0.3010 GOOD OKAY +-0.0074 GOOD +-0.3010 GREAT ACCEPTABLE +-0.0969 GREAT CORRECT +-0.2218 GREAT GOOD ENOUGH +-0.6990 GREAT GOOD +-0.3010 GREAT OF COURSE +-0.1761 GREAT OKAY +-0.3010 GREAT SURE +-0.0065 GREAT +-0.0037 GUESS SO +-0.3010 HALF OF THE +-0.3104 HALF OF WAY +-0.0074 HALF THE WAY +-0.3606 HALF WAY DOWN +-0.8129 HALF WAY TO +-1.1139 HALF WAY TOWARD +-0.8921 HALF WAY TOWARDS +-0.7460 HALF WAY UP +-0.0011 HERE +-0.0013 HOME +-0.0017 HUNDRED [Number-60-by5] DEGREES +-0.0007 HUNDRED [Number-80-by5] DEGREES +-0.0011 HUNDRED [Number-95-by5] DEGREES +-0.6873 HUNDRED AND [Number-60-by5] +-0.3321 HUNDRED AND [Number-80-by5] +-0.4838 HUNDRED AND [Number-95-by5] +-0.0022 I DO NOT +-0.3941 I DON'T THINK +-0.2277 I DON'T +-0.0037 I GUESS SO +-0.0044 I THINK SO +-0.0177 I'M NOT +-0.0017 IMMEDIATELY +-0.0126 IT'S NOT +-0.0027 JOIN [DynamicRobotName] +-0.0030 JOIN EVERYONE +-0.2840 LEFT [Number-20] METRE +-0.3565 LEFT [Number-20] METRES +-0.0019 LEFT [Number-95-by5] DEGREES +-0.0044 LEFT A HUNDRED +-0.2430 LEFT HUNDRED [Number-95-by5] +-0.4472 LEFT HUNDRED AND +-0.0038 LEFT ONE HUNDRED +-0.0048 LEFT THREE HUNDRED +-0.0048 LEFT TWO HUNDRED +-0.0002 LEFT +-0.0003 LOCATION +-0.0193 METRE BACK +-0.0223 METRE BACKWARD +-0.0212 METRE BACKWARDS +-0.0170 METRE FORWARD +-0.0223 METRE FORWARDS +-0.0414 METRE LEFT +-0.0792 METRE RIGHT +-0.0280 METRE STRAIGHT +-0.3617 METRE TO THE +-0.2825 METRE TO YOUR +-0.0002 METRE +-0.0185 METRES BACK +-0.0263 METRES BACKWARD +-0.0248 METRES BACKWARDS +-0.0248 METRES FORWARD +-0.0458 METRES FORWARDS +-0.0300 METRES LEFT +-0.0669 METRES RIGHT +-0.0235 METRES STRAIGHT +-0.3882 METRES TO THE +-0.2632 METRES TO YOUR +-0.0002 METRES +-0.5860 MINUS [Number-20] [Number-20] +-0.9461 MINUS [Number-20] MINUS +-0.8792 MINUS [Number-20] NEGATIVE +-0.3093 MINUS [Number-20] +-0.2292 MOVE [Number-20] METRE +-0.3948 MOVE [Number-20] METRES +-0.0212 MOVE [Number-95-by5] DEGREES +-1.1303 MOVE A FOURTH +-0.6532 MOVE A HALF +-0.3900 MOVE A HUNDRED +-1.4314 MOVE A QUARTER +-0.6532 MOVE A THIRD +-0.0512 MOVE ALL THE +-0.0170 MOVE AROUND +-0.2304 MOVE BACK [Number-20] +-0.4523 MOVE BACK +-0.5006 MOVE BACKWARD [Number-20] +-0.1996 MOVE BACKWARD +-0.4771 MOVE BACKWARDS [Number-20] +-0.2218 MOVE BACKWARDS +-0.0280 MOVE BASE +-0.7782 MOVE DOWN BASE +-1.4771 MOVE DOWN HOME +-1.1761 MOVE DOWN THE=SOUTH=END=OF +-1.1761 MOVE DOWN THE=WEST=END=OF +-0.3979 MOVE DOWN TO +-0.6320 MOVE DOWN TOWARDS +-0.4949 MOVE FORWARD [Number-20] +-0.1938 MOVE FORWARD +-0.3979 MOVE FORWARDS [Number-20] +-0.2730 MOVE FORWARDS +-0.3358 MOVE HALF OF +-0.4150 MOVE HALF THE +-1.1139 MOVE HALF WAY +-0.0322 MOVE HOME +-0.4771 MOVE HUNDRED [Number-95-by5] +-0.4771 MOVE HUNDRED AND +-1.1461 MOVE LEFT [Number-20] +-0.9700 MOVE LEFT [Number-95-by5] +-0.9700 MOVE LEFT A +-1.4472 MOVE LEFT ONE +-1.4472 MOVE LEFT TWO +-0.2167 MOVE LEFT +-0.9542 MOVE ONE FOURTH +-0.6532 MOVE ONE HALF +-0.3010 MOVE ONE HUNDRED +-1.0792 MOVE ONE QUARTER +-1.2553 MOVE ONE THIRD +-0.8451 MOVE RIGHT [Number-20] +-1.1461 MOVE RIGHT [Number-95-by5] +-1.4472 MOVE RIGHT A +-1.1461 MOVE RIGHT ONE +-1.1461 MOVE RIGHT THREE +-1.1461 MOVE RIGHT TWO +-0.3010 MOVE RIGHT +-0.3274 MOVE STRAIGHT [Number-20] +-0.3274 MOVE STRAIGHT +-1.2304 MOVE THREE FOURTH +-1.2304 MOVE THREE FOURTHS +-0.2762 MOVE THREE HUNDRED +-0.7533 MOVE THREE QUARTER +-0.9294 MOVE THREE QUARTERS +-2.1004 MOVE TO [Number-20] +-1.4472 MOVE TO A +-1.2253 MOVE TO ALL +-1.1226 MOVE TO BASE +-1.2875 MOVE TO DOWN +-1.2253 MOVE TO HALF +-1.0035 MOVE TO HOME +-1.2253 MOVE TO ONE +-1.0212 MOVE TO THE +-1.9243 MOVE TO THE=EAST=END=OF +-2.1004 MOVE TO THE=NORTH=END=OF +-1.9243 MOVE TO THE=WEST=END=OF +-1.6232 MOVE TO THREE +-1.3222 MOVE TO TO +-1.4983 MOVE TO TOWARD +-1.5563 MOVE TO TOWARDS +-1.4983 MOVE TO TWO +-0.9390 MOVE TO UP +-0.8451 MOVE TO YOUR +-0.6990 MOVE TOWARD BASE +-1.0000 MOVE TOWARD HOME +-1.0000 MOVE TOWARD MINUS +-0.6990 MOVE TOWARD THE=EAST=END=OF +-1.0000 MOVE TOWARD THE=NORTH=END=OF +-1.0000 MOVE TOWARD THE=SOUTH=END=OF +-1.0000 MOVE TOWARD THE=WEST=END=OF +-0.9542 MOVE TOWARDS [Number-20] +-0.9542 MOVE TOWARDS BASE +-0.6532 MOVE TOWARDS MINUS +-0.6532 MOVE TOWARDS THE=EAST=END=OF +-0.6532 MOVE TOWARDS THE=WEST=END=OF +-0.1597 MOVE TWO HUNDRED +-1.1139 MOVE TWO THIRD +-0.8129 MOVE TWO THIRDS +-1.3222 MOVE UP BASE +-1.3222 MOVE UP MINUS +-0.2808 MOVE UP TO +-0.4771 MOVE UP TOWARDS +-0.0044 NAH +-0.6061 NEGATIVE [Number-20] [Number-20] +-0.9767 NEGATIVE [Number-20] MINUS +-1.0374 NEGATIVE [Number-20] NEGATIVE +-0.2593 NEGATIVE [Number-20] +-0.0039 NEGATIVE +-0.0041 NEVERMIND +-0.0041 NO ABSOLUTELY NOT +-0.3390 NO I DO +-0.2701 NO I DON'T +-0.0177 NO I'M NOT +-0.0126 NO IT'S NOT +-0.0152 NO NOT REALLY +-0.0248 NO THANK=YOU +-0.0142 NO THANKS +-0.0043 NO WAY +-0.0049 NO +-0.0036 NOPE +-0.0030 NOT REALLY +-0.0044 NOT THINK SO +-0.0009 NOT +-1.9243 OF COURSE ACCEPTABLE +-1.9243 OF COURSE CORRECT +-1.4472 OF COURSE GOOD +-1.9243 OF COURSE GREAT +-1.6232 OF COURSE OF +-1.3222 OF COURSE OKAY +-1.6232 OF COURSE PERFECT +-1.4472 OF COURSE SURE +-0.1047 OF COURSE +-0.0018 OF THE WAY +-0.3297 OF WAY DOWN +-0.8939 OF WAY TO +-1.0700 OF WAY TOWARDS +-0.5260 OF WAY UP +-0.3010 OKAY ACCEPTABLE +-0.4771 OKAY GOOD ENOUGH +-0.4771 OKAY GOOD +-0.1761 OKAY GREAT +-0.1761 OKAY OF COURSE +-0.3010 OKAY OKAY +-0.1249 OKAY PERFECT +-0.3010 OKAY SURE +-0.0078 OKAY +-0.0280 ONE FOURTH OF +-0.2374 ONE HALF OF +-0.6419 ONE HALF THE +-0.7559 ONE HALF WAY +-0.3519 ONE HUNDRED [Number-80-by5] +-1.3578 ONE HUNDRED [Number-95-by5] +-0.2926 ONE HUNDRED AND +-0.0512 ONE QUARTER OF +-0.0263 ONE THIRD OF +-0.0028 PAUSE HERE +-0.3166 PAUSE TASK HERE +-0.2887 PAUSE TASK +-0.0031 PAUSE +-0.1761 PERFECT ACCEPTABLE +-0.3010 PERFECT CORRECT +-0.3010 PERFECT GOOD ENOUGH +-0.6021 PERFECT GOOD +-0.3010 PERFECT GREAT +-0.1249 PERFECT OKAY +-0.0083 PERFECT +-0.0130 QUARTER OF THE +-0.0414 QUARTERS OF THE +-0.0152 QUIT COMMAND +-0.3148 QUIT THAT COMMAND +-0.3010 QUIT THAT +-0.0043 QUIT +-0.0030 REALLY +-0.0003 REPORT LOCATION +-0.0011 REPORT +-0.2632 RETURN [Number-20] METRE +-0.3487 RETURN [Number-20] METRES +-0.3274 RETURN BACK [Number-20] +-0.3274 RETURN BACK +-0.2596 RETURN BACKWARD [Number-20] +-0.3979 RETURN BACKWARD +-0.2632 RETURN BACKWARDS [Number-20] +-0.3724 RETURN BACKWARDS +-0.4523 RETURN FORWARD [Number-20] +-0.2304 RETURN FORWARD +-0.3617 RETURN FORWARDS [Number-20] +-0.2825 RETURN FORWARDS +-0.3979 RETURN LEFT [Number-20] +-0.3010 RETURN LEFT +-0.3979 RETURN RIGHT [Number-20] +-0.3979 RETURN RIGHT +-0.3010 RETURN STRAIGHT [Number-20] +-0.3590 RETURN STRAIGHT +-0.3010 RETURN TO THE +-0.3590 RETURN TO YOUR +-0.3854 RIGHT [Number-20] METRE +-0.2527 RIGHT [Number-20] METRES +-0.0019 RIGHT [Number-95-by5] DEGREES +-0.0041 RIGHT A HUNDRED +-0.4260 RIGHT HUNDRED [Number-95-by5] +-0.2499 RIGHT HUNDRED AND +-0.0042 RIGHT ONE HUNDRED +-0.0053 RIGHT THREE HUNDRED +-0.0037 RIGHT TWO HUNDRED +-0.0002 RIGHT +-1.0383 SEARCH AROUND HERE +-0.6471 SEARCH AROUND THERE +-0.7051 SEARCH AROUND YOUR +-0.3198 SEARCH AROUND +-0.0116 SEARCH BACK +-0.0095 SEARCH BACKWARD +-0.0116 SEARCH BACKWARDS +-0.0095 SEARCH FORWARD +-0.0107 SEARCH FORWARDS +-0.0202 SEARCH HERE +-0.0193 SEARCH LEFT +-0.0142 SEARCH RIGHT +-0.0107 SEARCH STRAIGHT +-0.0066 SEARCH THE AREA +-0.0134 SEARCH THERE +-0.0058 SEARCH THIS SPACE +-0.2218 SEARCH TO THE +-0.4301 SEARCH TO YOUR +-0.0130 SEARCH YOUR LOCATION +-0.0012 SEARCH +-0.0011 SO +-0.0025 SPACE +-0.0017 STOP IMMEDIATELY +-0.0014 STOP +-0.4771 STRAIGHT [Number-20] METRE +-0.1908 STRAIGHT [Number-20] METRES +-0.0006 STRAIGHT +-0.3010 SURE ACCEPTABLE +-0.3010 SURE CORRECT +-0.1761 SURE GOOD ENOUGH +-0.1249 SURE OF COURSE +-0.0669 SURE OKAY +-0.3010 SURE PERFECT +-0.1761 SURE SURE +-0.0072 SURE +-0.0029 TASK HERE +-0.0009 TASK +-0.0248 THANK=YOU +-0.0142 THANKS +-0.0039 THAT COMMAND +-0.0042 THAT +-0.0026 THE AREA +-1.9098 THE LEFT [Number-20] +-1.1053 THE LEFT [Number-95-by5] +-1.2944 THE LEFT A +-2.5119 THE LEFT HUNDRED +-1.4907 THE LEFT ONE +-1.5119 THE LEFT THREE +-1.5576 THE LEFT TWO +-0.1174 THE LEFT +-1.7609 THE RIGHT [Number-20] +-1.0997 THE RIGHT [Number-95-by5] +-1.3630 THE RIGHT A +-2.5391 THE RIGHT HUNDRED +-1.3630 THE RIGHT ONE +-1.4422 THE RIGHT THREE +-1.5179 THE RIGHT TWO +-0.1275 THE RIGHT +-0.4605 THE WAY DOWN +-1.0224 THE WAY TO +-1.0098 THE WAY TOWARD +-0.9306 THE WAY TOWARDS +-0.4675 THE WAY UP +-0.0013 THE +-0.2583 THE=EAST=END=OF [Number-20] [Number-20] +-0.8603 THE=EAST=END=OF [Number-20] MINUS +-0.5593 THE=EAST=END=OF [Number-20] NEGATIVE +-0.0185 THE=EAST=END=OF BASE +-0.0142 THE=EAST=END=OF HOME +-0.0280 THE=EAST=END=OF MINUS [Number-20] +-0.0458 THE=EAST=END=OF NEGATIVE [Number-20] +-0.3900 THE=NORTH=END=OF [Number-20] [Number-20] +-0.5863 THE=NORTH=END=OF [Number-20] MINUS +-0.5283 THE=NORTH=END=OF [Number-20] NEGATIVE +-0.0158 THE=NORTH=END=OF BASE +-0.0202 THE=NORTH=END=OF HOME +-0.0512 THE=NORTH=END=OF MINUS [Number-20] +-0.0580 THE=NORTH=END=OF NEGATIVE [Number-20] +-0.2881 THE=SOUTH=END=OF [Number-20] [Number-20] +-0.6154 THE=SOUTH=END=OF [Number-20] MINUS +-0.6734 THE=SOUTH=END=OF [Number-20] NEGATIVE +-0.0185 THE=SOUTH=END=OF BASE +-0.0158 THE=SOUTH=END=OF HOME +-0.0512 THE=SOUTH=END=OF MINUS [Number-20] +-0.0280 THE=SOUTH=END=OF NEGATIVE [Number-20] +-0.3010 THE=WEST=END=OF [Number-20] [Number-20] +-0.5051 THE=WEST=END=OF [Number-20] MINUS +-0.8062 THE=WEST=END=OF [Number-20] NEGATIVE +-0.0158 THE=WEST=END=OF BASE +-0.0134 THE=WEST=END=OF HOME +-0.0212 THE=WEST=END=OF MINUS [Number-20] +-0.0223 THE=WEST=END=OF NEGATIVE [Number-20] +-0.0032 THERE +-0.0015 THINK SO +-0.0076 THIRD OF THE +-0.0177 THIRDS OF THE +-0.0025 THIS SPACE +-0.0512 THREE FOURTH OF +-0.0414 THREE FOURTHS OF +-0.3088 THREE HUNDRED [Number-60-by5] +-0.2951 THREE HUNDRED AND +-0.0235 THREE QUARTER OF +-0.0414 THREE QUARTERS OF +-0.2762 TO [Number-20] [Number-20] +-0.8045 TO [Number-20] MINUS +-0.5315 TO [Number-20] NEGATIVE +-1.2788 TO A FOURTH +-0.2576 TO A HALF +-0.8808 TO A QUARTER +-0.6255 TO A THIRD +-0.3892 TO ALL OF +-0.2430 TO ALL THE +-0.0049 TO BASE +-1.5315 TO DOWN [Number-20] +-1.3554 TO DOWN BASE +-1.3554 TO DOWN HOME +-1.8325 TO DOWN MINUS +-1.8325 TO DOWN NEGATIVE +-1.2304 TO DOWN THE=EAST=END=OF +-1.8325 TO DOWN THE=NORTH=END=OF +-1.2304 TO DOWN THE=SOUTH=END=OF +-1.5315 TO DOWN THE=WEST=END=OF +-0.4708 TO DOWN TO +-0.4708 TO DOWN TOWARDS +-0.4260 TO HALF OF +-0.4025 TO HALF THE +-0.6812 TO HALF WAY +-0.0044 TO HOME +-0.0193 TO MINUS [Number-20] +-0.0280 TO NEGATIVE [Number-20] +-0.7597 TO ONE FOURTH +-0.2478 TO ONE HALF +-1.0607 TO ONE QUARTER +-0.8177 TO ONE THIRD +-0.4107 TO THE LEFT +-0.3835 TO THE RIGHT +-0.7045 TO THE +-0.5497 TO THE=EAST=END=OF [Number-20] +-0.6880 TO THE=EAST=END=OF BASE +-0.5497 TO THE=EAST=END=OF HOME +-0.9890 TO THE=EAST=END=OF MINUS +-0.9890 TO THE=EAST=END=OF NEGATIVE +-0.3774 TO THE=NORTH=END=OF [Number-20] +-0.5883 TO THE=NORTH=END=OF BASE +-0.7132 TO THE=NORTH=END=OF HOME +-1.4914 TO THE=NORTH=END=OF MINUS +-1.1903 TO THE=NORTH=END=OF NEGATIVE +-0.6021 TO THE=SOUTH=END=OF [Number-20] +-0.6690 TO THE=SOUTH=END=OF BASE +-0.7482 TO THE=SOUTH=END=OF HOME +-1.1461 TO THE=SOUTH=END=OF MINUS +-0.6021 TO THE=SOUTH=END=OF NEGATIVE +-0.5673 TO THE=WEST=END=OF [Number-20] +-0.7270 TO THE=WEST=END=OF BASE +-0.6812 TO THE=WEST=END=OF HOME +-0.7782 TO THE=WEST=END=OF MINUS +-0.8361 TO THE=WEST=END=OF NEGATIVE +-0.6368 TO THREE FOURTH +-0.6368 TO THREE FOURTHS +-0.5699 TO THREE QUARTER +-0.6368 TO THREE QUARTERS +-0.9853 TO TO [Number-20] +-0.8603 TO TO BASE +-1.1614 TO TO HOME +-1.1614 TO TO MINUS +-1.4624 TO TO NEGATIVE +-0.9853 TO TO THE=EAST=END=OF +-0.6173 TO TO THE=NORTH=END=OF +-0.9853 TO TO THE=SOUTH=END=OF +-0.9853 TO TO THE=WEST=END=OF +-0.5229 TO TOWARD [Number-20] +-1.0000 TO TOWARD BASE +-0.8239 TO TOWARD HOME +-1.3010 TO TOWARD NEGATIVE +-1.3010 TO TOWARD THE=EAST=END=OF +-0.8239 TO TOWARD THE=SOUTH=END=OF +-0.8239 TO TOWARD THE=WEST=END=OF +-0.6198 TO TOWARDS [Number-20] +-0.7959 TO TOWARDS BASE +-1.3979 TO TOWARDS HOME +-0.9208 TO TOWARDS MINUS +-1.0969 TO TOWARDS THE=EAST=END=OF +-0.9208 TO TOWARDS THE=NORTH=END=OF +-0.9208 TO TOWARDS THE=SOUTH=END=OF +-1.0969 TO TOWARDS THE=WEST=END=OF +-0.3979 TO TWO THIRD +-0.2518 TO TWO THIRDS +-1.1461 TO UP [Number-20] +-1.1461 TO UP BASE +-1.4472 TO UP HOME +-1.6232 TO UP MINUS +-1.6232 TO UP NEGATIVE +-1.3222 TO UP THE=EAST=END=OF +-1.4472 TO UP THE=NORTH=END=OF +-1.4472 TO UP THE=SOUTH=END=OF +-1.4472 TO UP THE=WEST=END=OF +-0.3928 TO UP TO +-0.6938 TO UP TOWARDS +-0.3841 TO YOUR LEFT +-0.3741 TO YOUR RIGHT +-0.7856 TO YOUR +-0.8451 TOWARD [Number-20] [Number-20] +-0.8451 TOWARD [Number-20] MINUS +-0.1919 TOWARD [Number-20] NEGATIVE +-0.0414 TOWARD BASE +-0.0322 TOWARD HOME +-0.1761 TOWARD MINUS [Number-20] +-0.0792 TOWARD NEGATIVE [Number-20] +-0.6990 TOWARD THE=EAST=END=OF [Number-20] +-0.5740 TOWARD THE=EAST=END=OF BASE +-0.5740 TOWARD THE=EAST=END=OF HOME +-0.6990 TOWARD THE=EAST=END=OF MINUS +-0.6990 TOWARD THE=NORTH=END=OF [Number-20] +-1.0000 TOWARD THE=NORTH=END=OF BASE +-0.6990 TOWARD THE=NORTH=END=OF HOME +-0.6990 TOWARD THE=NORTH=END=OF MINUS +-0.6990 TOWARD THE=NORTH=END=OF NEGATIVE +-0.3424 TOWARD THE=SOUTH=END=OF [Number-20] +-0.7404 TOWARD THE=SOUTH=END=OF BASE +-1.0414 TOWARD THE=SOUTH=END=OF HOME +-0.7404 TOWARD THE=SOUTH=END=OF MINUS +-0.3979 TOWARD THE=WEST=END=OF [Number-20] +-1.0000 TOWARD THE=WEST=END=OF BASE +-0.6990 TOWARD THE=WEST=END=OF HOME +-0.6990 TOWARD THE=WEST=END=OF NEGATIVE +-0.3522 TOWARDS [Number-20] [Number-20] +-0.6990 TOWARDS [Number-20] MINUS +-0.4771 TOWARDS [Number-20] NEGATIVE +-0.0116 TOWARDS BASE +-0.0110 TOWARDS HOME +-0.0223 TOWARDS MINUS [Number-20] +-0.0280 TOWARDS NEGATIVE [Number-20] +-0.5643 TOWARDS THE=EAST=END=OF [Number-20] +-0.6734 TOWARDS THE=EAST=END=OF BASE +-0.6154 TOWARDS THE=EAST=END=OF HOME +-0.8195 TOWARDS THE=EAST=END=OF MINUS +-1.0414 TOWARDS THE=EAST=END=OF NEGATIVE +-0.6320 TOWARDS THE=NORTH=END=OF [Number-20] +-0.5229 TOWARDS THE=NORTH=END=OF BASE +-0.6320 TOWARDS THE=NORTH=END=OF HOME +-0.8751 TOWARDS THE=NORTH=END=OF MINUS +-1.1761 TOWARDS THE=NORTH=END=OF NEGATIVE +-0.5497 TOWARDS THE=SOUTH=END=OF [Number-20] +-0.6880 TOWARDS THE=SOUTH=END=OF BASE +-0.5497 TOWARDS THE=SOUTH=END=OF HOME +-1.1139 TOWARDS THE=SOUTH=END=OF MINUS +-0.8921 TOWARDS THE=SOUTH=END=OF NEGATIVE +-0.6690 TOWARDS THE=WEST=END=OF [Number-20] +-0.6690 TOWARDS THE=WEST=END=OF BASE +-0.6232 TOWARDS THE=WEST=END=OF HOME +-0.7782 TOWARDS THE=WEST=END=OF MINUS +-0.8451 TOWARDS THE=WEST=END=OF NEGATIVE +-0.0126 TURN [Number-95-by5] DEGREES +-0.0580 TURN A HUNDRED +-0.0185 TURN AROUND +-0.3010 TURN HUNDRED [Number-95-by5] +-0.6021 TURN HUNDRED AND +-0.9777 TURN LEFT [Number-95-by5] +-0.9777 TURN LEFT ONE +-0.8016 TURN LEFT THREE +-1.2788 TURN LEFT TWO +-0.2788 TURN LEFT +-0.0348 TURN ONE HUNDRED +-0.6767 TURN RIGHT [Number-95-by5] +-1.2788 TURN RIGHT A +-1.2788 TURN RIGHT ONE +-0.8016 TURN RIGHT THREE +-1.2788 TURN RIGHT TWO +-0.3757 TURN RIGHT +-0.0580 TURN THREE HUNDRED +-0.3979 TURN TO THE +-0.2382 TURN TO YOUR +-0.0223 TURN TWO HUNDRED +-0.3145 TWO HUNDRED [Number-95-by5] +-0.2892 TWO HUNDRED AND +-0.0212 TWO THIRD OF +-0.0177 TWO THIRDS OF +-0.3590 UP [Number-20] [Number-20] +-0.5051 UP [Number-20] MINUS +-0.7270 UP [Number-20] NEGATIVE +-0.0280 UP BASE +-0.0378 UP HOME +-0.0669 UP MINUS [Number-20] +-0.0969 UP NEGATIVE [Number-20] +-0.6368 UP THE=EAST=END=OF [Number-20] +-0.8129 UP THE=EAST=END=OF BASE +-0.4150 UP THE=EAST=END=OF HOME +-0.8129 UP THE=EAST=END=OF MINUS +-0.6690 UP THE=NORTH=END=OF [Number-20] +-0.3680 UP THE=NORTH=END=OF BASE +-0.6690 UP THE=NORTH=END=OF HOME +-1.1461 UP THE=NORTH=END=OF NEGATIVE +-0.4150 UP THE=SOUTH=END=OF [Number-20] +-0.5119 UP THE=SOUTH=END=OF BASE +-0.8129 UP THE=SOUTH=END=OF HOME +-1.1139 UP THE=SOUTH=END=OF NEGATIVE +-1.2041 UP THE=WEST=END=OF [Number-20] +-0.4260 UP THE=WEST=END=OF BASE +-0.9031 UP THE=WEST=END=OF HOME +-0.5051 UP THE=WEST=END=OF MINUS +-1.2041 UP THE=WEST=END=OF NEGATIVE +-0.7029 UP TO [Number-20] +-0.8412 UP TO BASE +-0.8992 UP TO HOME +-1.0911 UP TO MINUS +-1.2672 UP TO NEGATIVE +-1.0453 UP TO THE=EAST=END=OF +-1.0453 UP TO THE=NORTH=END=OF +-1.0911 UP TO THE=SOUTH=END=OF +-0.8992 UP TO THE=WEST=END=OF +-0.8939 UP TOWARDS [Number-20] +-0.8592 UP TOWARDS BASE +-0.7690 UP TOWARDS HOME +-1.4960 UP TOWARDS MINUS +-1.0700 UP TOWARDS NEGATIVE +-1.0189 UP TOWARDS THE=EAST=END=OF +-0.8939 UP TOWARDS THE=NORTH=END=OF +-1.0700 UP TOWARDS THE=SOUTH=END=OF +-0.8939 UP TOWARDS THE=WEST=END=OF +-1.4367 WAY DOWN [Number-20] +-1.1735 WAY DOWN BASE +-1.3697 WAY DOWN HOME +-1.4367 WAY DOWN MINUS +-1.7377 WAY DOWN NEGATIVE +-1.5159 WAY DOWN THE=EAST=END=OF +-1.3697 WAY DOWN THE=NORTH=END=OF +-1.1735 WAY DOWN THE=SOUTH=END=OF +-1.1735 WAY DOWN THE=WEST=END=OF +-0.5616 WAY DOWN TO +-0.5073 WAY DOWN TOWARDS +-0.8939 WAY TO [Number-20] +-1.0700 WAY TO BASE +-1.0700 WAY TO HOME +-1.3711 WAY TO MINUS +-1.3711 WAY TO NEGATIVE +-0.6721 WAY TO THE=EAST=END=OF +-0.8939 WAY TO THE=NORTH=END=OF +-0.8939 WAY TO THE=SOUTH=END=OF +-0.8939 WAY TO THE=WEST=END=OF +-0.9890 WAY TOWARD [Number-20] +-0.8921 WAY TOWARD BASE +-0.9890 WAY TOWARD HOME +-1.1139 WAY TOWARD NEGATIVE +-0.6880 WAY TOWARD THE=EAST=END=OF +-0.7460 WAY TOWARD THE=NORTH=END=OF +-0.9890 WAY TOWARD THE=SOUTH=END=OF +-1.1139 WAY TOWARD THE=WEST=END=OF +-0.8709 WAY TOWARDS [Number-20] +-0.9379 WAY TOWARDS BASE +-1.0170 WAY TOWARDS HOME +-1.0170 WAY TOWARDS MINUS +-1.2389 WAY TOWARDS NEGATIVE +-0.8709 WAY TOWARDS THE=EAST=END=OF +-0.8709 WAY TOWARDS THE=NORTH=END=OF +-0.9379 WAY TOWARDS THE=SOUTH=END=OF +-1.0170 WAY TOWARDS THE=WEST=END=OF +-1.3133 WAY UP [Number-20] +-1.3802 WAY UP BASE +-1.3802 WAY UP HOME +-1.8573 WAY UP MINUS +-1.8573 WAY UP NEGATIVE +-1.5563 WAY UP THE=EAST=END=OF +-1.3802 WAY UP THE=NORTH=END=OF +-1.3802 WAY UP THE=SOUTH=END=OF +-1.3802 WAY UP THE=WEST=END=OF +-0.5051 WAY UP TO +-0.4341 WAY UP TOWARDS +-0.0043 WAY @@ Diff output truncated at 60000 characters. @@ From air at edam.speech.cs.cmu.edu Tue Oct 9 16:20:04 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Tue, 9 Oct 2007 16:20:04 -0400 Subject: [TeamTalk 292]: [828] branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class: Message-ID: <200710092020.l99KK499030314@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071009/db3cf1af/attachment.html -------------- next part -------------- Deleted: branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class 2007-10-09 19:13:46 UTC (rev 827) +++ branches/air/Resources/Grammar/GRAMMAR/DynamicRobotName.class 2007-10-09 20:20:03 UTC (rev 828) @@ -1,4 +0,0 @@ - (alphie) - (bashful) - (clyde) - (decker) From air at edam.speech.cs.cmu.edu Wed Oct 10 11:55:48 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Wed, 10 Oct 2007 11:55:48 -0400 Subject: [TeamTalk 293]: [829] branches/air/Tools/: Created folder remotely Message-ID: <200710101555.l9AFtmwK000598@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071010/c8ecbe1a/attachment.html -------------- next part -------------- From air at edam.speech.cs.cmu.edu Wed Oct 10 11:55:59 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Wed, 10 Oct 2007 11:55:59 -0400 Subject: [TeamTalk 294]: [830] branches/air/Tools/MakeGra/: Created folder remotely Message-ID: <200710101555.l9AFtxJW000608@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071010/7605e4f5/attachment.html -------------- next part -------------- From air at edam.speech.cs.cmu.edu Wed Oct 10 11:56:35 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Wed, 10 Oct 2007 11:56:35 -0400 Subject: [TeamTalk 295]: [831] branches/air/Tools/MakeGra/: Removed file/folder Message-ID: <200710101556.l9AFuZ2J000618@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071010/0e37b89f/attachment.html -------------- next part -------------- From air at edam.speech.cs.cmu.edu Wed Oct 10 11:58:02 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Wed, 10 Oct 2007 11:58:02 -0400 Subject: [TeamTalk 296]: [832] branches/air/Tools/MakeGra/: made a copy Message-ID: <200710101558.l9AFw2Es000629@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071010/2b160cc7/attachment.html -------------- next part -------------- Copied: branches/air/Tools/MakeGra (from rev 831, branches/air/Resources/Grammar) From air at edam.speech.cs.cmu.edu Wed Oct 10 12:05:38 2007 From: air at edam.speech.cs.cmu.edu (air@edam.speech.cs.cmu.edu) Date: Wed, 10 Oct 2007 12:05:38 -0400 Subject: [TeamTalk 297]: [833] branches/air/Tools/MakeGra/GRAMMAR/: Message-ID: <200710101605.l9AG5c9r000656@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071010/c652cccd/attachment.html -------------- next part -------------- From tk at edam.speech.cs.cmu.edu Thu Oct 11 01:21:53 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 11 Oct 2007 01:21:53 -0400 Subject: [TeamTalk 298]: [834] trunk/TeamTalk: 1) Removed unneeded pendecoder files. Message-ID: <200710110521.l9B5Lr2j002377@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071011/66d1da7d/attachment-0001.html -------------- next part -------------- Deleted: trunk/TeamTalk/Agents/PenDecoder/Untitled =================================================================== (Binary files differ) Deleted: trunk/TeamTalk/Agents/PenDecoder/botlocs.txt =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/botlocs.txt 2007-10-10 16:05:38 UTC (rev 833) +++ trunk/TeamTalk/Agents/PenDecoder/botlocs.txt 2007-10-11 05:21:52 UTC (rev 834) @@ -1 +0,0 @@ -pinky:-496.227:-541.485:1.61928 Property changes on: trunk/TeamTalk/TeamTalk-Setup ___________________________________________________________________ Name: svn:ignore + Debug Release Added: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj (rev 0) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-11 05:21:52 UTC (rev 834) @@ -0,0 +1,13629 @@ +?"DeployProject" +{ +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:TeamTalk-Setup" +"LanguageId" = "3:1033" +"CodePage" = "3:1252" +"UILanguageId" = "3:1033" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_002B6A85A7CC4F58A41C0E66559EF2F5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_013D1E52E00548FEB183B38D85900ABA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_023AB5B3B0664D3282EA8884B768A8B5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_02D281C4A32647A69930365189B7AE02" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_036849EDFA984EB5A466BB41D745E835" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_04C73E0A07764535927E0E8E14F71014" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_051684AF3AAB48B49D0F191E62C0709C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_055C3CD8FAE34ED390B204178A725267" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_065A0354B8604013AF59B80879C8B68D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_06A7755ADC154A69B1AD656F2AB01B39" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0754644A518C4A3C8C2DCAC878545BCE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_07CC39A92593463DB8BD0C93BB55B2CF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_07FE697CFF40452DBD25319EDD8C41DE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_085D0372C3134186AF16CF45480A427B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_08CE7B32B95B493885884BA58A019A13" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_096606B543534AD9A97470F724766D12" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0A66CFBEDB0B4D0F9528306ABD08012B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0AAEA9DF72984B99981580B6B3807D32" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0CB08A768A85469D87B038C55F6467FC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0D782BD5FBF747B69D5589AA31B10C87" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E0F087FA8F040378AD93B68B355AF09" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0ED1B7420A024714BFDFB26F9606EFC3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0F629A7F54064859A68CB96C0C7F2DCE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0FFAE47B421D476089B865A01D0F4A76" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_103A03BFC4CA465BAEEE93F5D37C8035" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_10927954FBA14624A8CC306674C07110" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_111DB222F3844F1BB88F9D5C67D23927" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_11C79C9A58214D9F94779F23DA8D6CAD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_11FE3E9271474D579E76E9A9C3E29037" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_129EA91987EE4A57A4260126F6C53305" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13C68E8847184ADBAF5D776878174596" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13D864D2C04048EA9A50F68142893A64" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_149C1A64FBA743039979B52DB0DC6816" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_15294B3DEB8C41BB8A72D8D673052600" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_157A468AA4A046298308B5812913A89E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_157C912CB9074B88A13B6B29C1C19021" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_16AE7F56E3924275AEEBAD1BF29D7523" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_173D57BA889741D1A46DF017FC1F64BD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1752DBBB83DE406BB907EC56B7295299" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_18059028970A41E08C528784AEC075ED" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_18D81FB0CF8B40E797171CEA151AA582" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_18DA3242B5E144C68C953A15963D888E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_18DF7681957444C98AB839E239BCD6FA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_197A36FAED66462A93C7778DEF05B744" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_19C0F6086C194ECEA1DEE1A219E11016" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1BC00614A184407BAC117FB840D1AC98" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1BF40C0346A04AA3A4DAEC2C14302D86" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1C05E811B1034246823D06FCA8D9E3CA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1F42C3E071BB42A7A5833617DB0733B9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_22A3EEF5F5314DD8A2A70E8E926F65BF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2310AADE34FD4EF0A6150107608F2D29" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_237DEAF485884F808CAB068A594A12FA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_23B9889CC1F1418F9E40DAC6AC7A2E67" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_23CC72EDE7194F82897DE192FEDE366C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_240FE191C02B4A97899248C05374FC42" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_241E26B163DF4E4795E8FC1715CB7247" + "OwnerKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_24320F46F3DE4F4BBBD065FA1B901FB4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2499211F1B524D089D9A7BF956059B5E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_24A163D1D7964683822BCEAA09EC4BC4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_252E12AF2C3445B586AC887EAE40115C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_25705CACBFA1425888CCDA89AFE0904C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_259488D2823E406385D39DC823CC1748" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_25F27C8CD0F141D8A42D559E53B2D4D7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2671B0CAD21044E79B6775FE96CF8B77" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_268DABE3C04F433FA8A0E56B893BA361" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_27179787273E4BEF9C3763CA602D6C82" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_27D6CDD0FCCA4EF7B712D10E6EB6F79A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_288702C5A8534A9F93063F20EF19CACE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_28E8E6161E044BF3AF1D68EA40083209" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2950EDCD6F3B4674B6060425A62196E0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_295A799C94CE4B9681B438B667685ABD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2A899318D1294E21985F54569D9DDA5D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2B11236292A7415C99A8530FB79BA962" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2B3B4601C9B34101807D94BC3293E4BE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2B82ED7A927C465888F416B9913877A1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2EC41DB979834FE68D3D131E7700673F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2F376035B83044618D6C2F77634217CC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2FA7BA352538487C88214E8E875056EE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3012F60AAD7F4E07BB71F6E4D8A06841" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3024263D0F14410CA4397B2B1AB51E7A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_30E927C62A844B60B59BBCC469B3AA1C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_312913B620C14287AAD9EAEC193ED12F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31F0E1E328CC4F90A032F10CC6A43C45" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31FA28E9BA654702B3B369E68E0D6419" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_320E86EC3144480E921C469FA2B27DB7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32E583E5823041D086FA46F5B4850F12" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3330C9457E4A4B1EBBCFE6CA63F883E4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_33361B5B013640789E87BC7448189001" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3464E2F644844DF993724DD0E1905DC4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3507904FA88848C59234454822C86A0D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3537512FD1644803A2681543E90479F6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_36B07A02F88E4B359E2547318F612D56" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_37C948CD80134F149B75A8DC12F2669E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38B79E88B495482A846EBD661CC48CB9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_38BEF3159E4F48DFBE3213861C20D9AA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3972733490124CBFA0D8C74FFC0BBC77" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3997743B1D134081946B974C0EADC59F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3AE14D315F8F4A4DA290E7E83D4ACF1A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3AF1512A77204866A88AB6E596306A2D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3AF2DDE0E77C423093C821AF49BCC2CD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3B732BFAE00B47069169870EF2DFABF6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3B7EBC2D417D4572A802AA698E1DC2A4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3BB5A183D7A5405F96C6DF35E207C93C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3BBC94F6A8FB40AD8D01037833A17ADE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3C32F4C00E4E4281971BFF839693CF24" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3CAE259A9C98476D815CF854B49D1AC7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3CF41306794D411D80333460715D77BB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3D453CDB3CF447E183DC9C4C91B83570" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3E140F045BE04B76882E45F5FF1373C2" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3E27C6D537FC45069B10CC5BFC318E97" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_402D9A3DA8FF4167A146C530E3C36771" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_40A84D4262FD4799B70966DC33DDE392" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_410EF6E6B87C495F88E2750B555561A6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_41173934B55D40D189A50A76AAF2C33C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_41B223D3494243549702393AEE3DF084" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_41F7327892E243C9981F4B37B28D0701" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_423032A9724D42C1809A7AC51CF50191" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_42BD5D4D671942D3BD67FA9C50A17D6C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_442835C0177844128123FBC47BF7E77E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_442FD38A55D34BE1B6E39373B2768DB6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_44B39D2EB97C4935A35AC5FF32B93848" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_44EB7EAB911E41FF988A39325369552C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_44EC6DE94E6C4C9E888461488D890307" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_45EA83A11C124D6F86B19692863C715D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_468DAE8A22AB41DEA1B09E80CE83FAFD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_46F3778A1DED4F508BFDE6284A06C7B5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_487AF3551A0F45F7A117EBFB88B0EEFA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_48A2787F5C0943169313F4629497687F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_48BA8F7BD5554A29810AADAEE8F683E6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_49F62D7F822A4C1481A1043081634286" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4A17876D35EC4DF687A89E49B7F24BC6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4AE2F5F110474AC8A3301F1149B409AE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4B38B76AF5E94288A03434673FBA5049" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4B498C0B7841420AB2C67476C9D7DEB7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4B5309FE4F80448691CCBAC5306A5D48" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4B74CCC9558249B1A562C0F9752176BC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4BC2A7190511410E8017D38F9D249486" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4BD03DD1F3ED4A628F0567644CB8634E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C83166FFCA2478BBD3CA531B87CA745" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4D0D55A9B23A4E7C9F86BE0F4885DCFB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4D1C7C9C7A6442A98F4685126F31E86A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4EB00B89547A43F8BC54E6A043B86A8E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4F289D41704942CF82EEED4F3326AD4B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5033C8E3E34F4DF8A64E9B941290F5F1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_503C41BEA57B4992A63B55AF1082B450" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5080C975D3BA4AA098B71A9778AEB871" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_50C5B9C7FE824C3A8AB54F42A5D54830" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_51658811F9B94DCC844B4710A9197512" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_516A232E41C7488D95A864723B883038" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5194314FB00E464E9C1C6E3AA6AAF2E0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_52E9A693BA1F460DB614E0A1F96B13A5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_539552E4560C42D6AB91EF125103B485" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_53DB67303B5B40739292A9A33694D342" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5495F5CFA0C64E5DBC0A747FAC0CEB89" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5508C6B830334EE6B61461B1DB8A1B60" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_553222DB9C29416C860E7E92436DA6D6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_559CBDA427784DAD89CE84AA41532E38" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_55AC21A01DE646E09CAFA8AAD410CE7A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_561024A72A394F11BF97355FF93F7DED" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_562875DE9F3A4123A11123744F2F1146" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_571279DC23124F2EB01A021EEFD47ECE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_57C68E8AD13141A48C849C1847BADE4E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_57CADA14951D46F5A34C8AC79DEEC98C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_58351606DFA343239887D3463965A060" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_584D2106059D4E849E4739FDCCF9D425" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_584E29C4FF9F4C229CB5559052F4341A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_58B1879047F5418987A109DA613CFCC3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_58CFCA13DA6A40CA962137BCA315EA0A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5B7A608E58994D38B6B92307732E8ACE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5BF29658C26C415D9193C2EC23C15955" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5C112EB6B56747938FBE262572CBA8D4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5C417CEBD5654CE58BEA12B3284413A3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5CDE9EFEBAC648EF8DCECA0E785F3969" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5DC5509DD12945EA9C9A69281C0DBB0B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5E10C7E28C0D463BA86ED1B27058B5BA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5E6B158AA7824BEC891B66D4C2C7927D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5EAFB512BABA4B60BACDF3ADBADD7E66" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5F4E23C0C1DE48D2B2DA90FDA6AECA4F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FD0D1A995674749A7645FCB00F3F8B5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_607C7E02512D46269D151D2E92671138" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_60E2C3F691B84FE9B5851E6825F54914" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_60F091D2F1D242B3AF019C9B894CD284" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6132B60CD0324988800AEF7725785391" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_627BDF7EEE8747A2A4517E388096D508" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_627C60D5154641B0925A2C5E8B00A06B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_65C7C38F53F64139B75E8AC0736D5C2C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_661AC83E07204593B5E51FE01A48B97A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_664348C5208E429682A759605959B0AF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6706A0FCB0BF40F1BBE061B9637847E9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6734D3F37E694069940AA98644661660" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6777845A689246DF8B7C633BB603B1AE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_678FD7E1FA65493EBC144B8CA42C9CF9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_67EB148ACF2A41B0BA8672BE57E2CEA1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_697F6CEF76EC4103AFC8C311BD044BBB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6A0E8D3A0F2E417D89FB9CDA634ACA60" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6A39D0B4D96A421C8A35CF6FCC895F01" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6BF3B812D50B4048B41A568BFD349DDA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6C2D9353C14242C3B03B9F5F3D848661" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6CCB74B592C9459EB96481861F42F503" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6CEC8D67A8BC445790E93638357CB92B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6CF69BFE028F4E7F83C6FD58BB3BA3FE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6D3A1C7980284ECBA805B00E51DAA75A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6DE168FFA5394B8ABCB8C5AA600A3B96" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6E0897159368493ABB25A4D4E22EA919" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6E09BB0FC9F94474BB492B01A2A55CF5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6EE575D99A0740D4A5935C6DD5032776" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6FAF0D690FA0409A8DC5FF48FD6D6C13" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_70ECB07B803F4B0E81CFF59B3C122AD2" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_70EF1F828D08453784B86C78D99E5498" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_70F631B6C15D441186C9D672C1CEE7C1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_71398CC116AE4ACFAD3EDD895F14FD1B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_726B4704FF88420DBF6DAF50DE404EA9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7418FD3E6BA242048BB35403610193E8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_743D22B657184B1793B26572F4525228" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_74F742B5B1B2433293FE9FC73031E09C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_753A2FBD7B504774892B4854429AE7BD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7833F54C4B6B468FAFFD10D177A162EB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_78B51DAA976843A2B9333FEFA9524F51" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_79A329109B72400F9B52A6C46ACC8153" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_79F198577989427AAF849CE56E9AAD16" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7AA4BBDC8F37429FA1AD4478C014809D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7AC97F09E7C84D848B27AF989A97D98C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7B477DF724BC4197B8F09A822EC43B0A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7C53D3B63A6847BEB6774AF8D30859DE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7CAD382D08EA41FAA109D66138E20D57" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7D120505561F4E969AFE0234527E5A6F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7E2DC16E2524442F91F4B69AE809D469" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7E3E5897BA504D4B9E582AB2F9953241" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7E49405797CC4314BD3CC2DF166B8095" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7EEE59FB31464877BBC989E034C89873" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7EF355190EC24729A1E33427FFB67122" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7FC5037AF5024FE495259CD2AF8AFC79" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_80393B4CE570461495602769F1058D5F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8039BA766D0C4038B7BF4FDF6CDB1654" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_80CAEC51C94E48349303490F66DF52F0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_80DB8A053E63409598FB73377018D9FF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_81030A41D705463888D2A184531F51EB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_818D2E7F1539401D9F287F34F7EC9DCF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_83F71C484A794D71AF877E40CC6C9C79" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_853E106563E44716AA89211FA42EE02C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8553C9431F85478A97BE69A75ECCF702" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8597A8F9A501487CA152C5CC3FE9A00C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_868FA11D28B3499FBD873A1D9FDD0995" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_86CC12EAF6964AC19B0805582678672A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_86DA24EA401E4B648A014DFA4F5F5E27" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_86E3A40402044147A79301D64445F4AE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8857E821247842099897B8BB51098F8B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_89B96E22A3174BBDA8524BC1B7BBC316" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A22C47FCFBB4B35A916B75AFD9A8B2E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A4A953177094518BFE9CFD900BFE996" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8B896672EC254841B59D3B30E7791552" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8CC84036685B4C098CBF8676AFB65384" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D5FFE3BBCBA462CBC0111FD5AA87BA9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E02282770A243E08174CA3D57739D00" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8EB64C6A75EE413196588D57D1B5ADDE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8EC875BBC7E9490CBB8E797C53046AEF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_907CD428AFC844BDB0E2FB1817F0EB57" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_90D5C991FE814090A79EDEAF0BD5E80A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_913FF223E00140C980E198ED1A79D28E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_91C4604A2A614FBDA91415149A7AB780" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9287DF52A7DD40BFB7B45D2B2459E10E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_93690B659FF84C93B0729EB746D4A427" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_937AD19F57AA47049D22C71581F54FE3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_947BF9E850AE4AFCA58C3BB792712F77" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949B2740EF3B42A28108F2386BE221FB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_94EC594877214FC0AE76B534A0A7854C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9511AF0830404963B2417DDA4E10A14F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9583D7E4A8D6443B984342ADAFAF2E48" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_962E6C24B5314EE3B0781F20D5A3DE4B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_982B084A58F542EEB599E36FF6AF5C96" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_98780EE60DFB47F5905F8153FB36FDAB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_99382FEE7E794FFF86C64C3DB6D5AFE7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_995D915E43DE4DBCA1157787FFB2E09A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9AF1A15791434472A5631A8233601E43" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9AFEEC8DF07341E7895D0C6751A1B8A6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9B80A7159B5640BEADC0835553227925" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9BB5C5B5C7094E79B4C0DC3788C50F2C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9C552C1D2D2F458B91C7875FEAA1AA04" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9D4730F8F4FD4B0BA87D73351C325E70" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9E0EBA23D6C14303AB08621E685BEEDA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9EB94B728D754A45AEEE15FA0FC66840" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9F88311D13AF46EABE977C15B8D8C794" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A06C1C500FE04076A6C8D1480172D406" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A22C2C43252B4F84A428C71471100857" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A2564C0826A3471AB0725A11D23BF814" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A30AA4F3F14B470DBD52B7C2E9937EBE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A359D7DF562849769570207D4BB5C896" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A45DE14E1159495EBF634AE1AE40901E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A4DE5D51C8584FBC8E6978C9C6DA6FBC" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A504ADE5D65B471BB7AE3CB686DA6CFD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A5C9D293284B46E5A08A504E22245CF3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A6A8C08A5EF44B1BACE19B9E096D8BCA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A70F927E8A0743039FC1EB34F5164029" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A71D81C51E9D4788891D0366A78689F0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A80B9A17987C4AA2965F5A30224C832A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A850E61134264469BB141D9B9D1930CA" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A8ED78A8869E40B59BF1B27FBBCE853D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A98501A06F524EE2921D723BC98E59E9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9A51C32C9F24B80AC9FFDE5D85A714C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9EC8D97B7264E60B25E0EB03DB4181C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9F9D63D5D7C486780F488C023DD4E6D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AB5B48D013874675A30652CEC3BE1C1E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ABA2E336ADCB4AC9BF83828499AC802D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ABDE5FD50A1F439FACE975B02119BB69" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AC9DF6413BA845219D43041022CE7707" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACAED84396274FBABB972450E4D53D62" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACBA7498BA3B48FE849264652BAB8A9E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ADD2D3A688A948E1BFAA183A60FCFC26" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AE289AD3D24443E98A482A45EDDB0DBD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AEE04A91BB4F4FD2A11B724A2083E32E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AF1048501C2F433FB31BEA7D28927311" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AFE12CB26133459C9AFDCFB8FE44D539" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B03AA3B64652425391950080AA5D1D35" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B05D2A4C3FE446DFAB209DD549FCED52" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B1A34A6EE27842E78549B9D435D8CA04" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B24555E3E7A94CC7AD7E3834803D3525" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B2500398370E44A2B07C366DDD693D9A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B31819459B2D4C48A787E10F487C9B45" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B33B8082F0B04B0B939B1CA15094DFC3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B3E7DEB30F8849EFA28C2E429F7CBDD4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B44AFD8DB8724186A57E182D3CCD1314" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B4C04373036E47F59621BE95ECAF539D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B4FC8A78CA1C46F58E92581738F1CCC1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B5686C2086554D3D942FAEE7ED2D8FDD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B57896E589FB4CD9999947E18147C074" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B645F8F69586446582F5EBC73C96F161" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7B1876BB92742C79C8176F4C14C48AB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7B4A76CA3F649E89F514D60B623F61F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7B520043CFC4851BBE75C628A4EB3C6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B7E9D135C74645CFB50E2EA3E811ED5D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B8445A783F96455EB87D6DB028413503" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B895089A76214D25A2314E0ECEE0057D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B8DFE8067A664045AB5384972EBCC0B6" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B91426D101854202925EE18A9D01D55E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BA4D83DE52204223A7423ED88061FA6F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BA72816999AD43698B7C50ACC762905C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BB07C016C33F4AA0B0ABF3195C1C68D7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BBA4BE10F798455E861D48624775E4E7" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BBDE7A8BC31C4EB19098FE6ABA6FC36B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BDF6C7CB9D0748FBBDC7F694C7993CA0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BE0B9AF0A466426794C4420FD93EB71E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BF5CB793CD6845E3A4A8BC459E15B000" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BF7961BD17424167A9C1C3F3CBF86D7E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BF7C3C3A9B954313A520777AFAC22536" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Thu Oct 11 01:28:46 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 11 Oct 2007 01:28:46 -0400 Subject: [TeamTalk 299]: [835] trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj: 1) Changed name of install program to TeamTalk Message-ID: <200710110528.l9B5Sk22002400@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071011/07964d85/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-11 05:21:52 UTC (rev 834) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-11 05:28:46 UTC (rev 835) @@ -309,6 +309,12 @@ } "Entry" { + "MsmKey" = "8:_1C1E3A5FC9D1479D99679369B687175D" + "OwnerKey" = "8:_932B1984BA5340B1A5F5A54A1CE8DD3F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1F42C3E071BB42A7A5833617DB0733B9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -544,6 +550,12 @@ "Entry" { "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "MsmSig" = "8:_UNDEFINED" } @@ -1671,6 +1683,12 @@ } "Entry" { + "MsmKey" = "8:_932B1984BA5340B1A5F5A54A1CE8DD3F" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_93690B659FF84C93B0729EB746D4A427" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2271,12 +2289,6 @@ } "Entry" { - "MsmKey" = "8:_C7FE9C37C35D4FBD87D8D163DC82723A" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C998541CF524475B9BA91D9C5DF3EBA3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2403,12 +2415,6 @@ } "Entry" { - "MsmKey" = "8:_D65169BE56EE43889D472E84478E3BEB" - "OwnerKey" = "8:_C7FE9C37C35D4FBD87D8D163DC82723A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D6E4AE65B95D46DAB0FBCC7EA207BD4E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -12174,6 +12180,17 @@ "Property" = "8:ProgramMenuFolder" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_1D82AFCBCCE44ADEB61F014ADF254978" + { + "Name" = "8:TeamTalk" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_2AFC5C00037B45A8A49C721D9A3F6AF6" + "Folders" + { + } + } } } "{1525181F-901A-416C-8A58-119130FE478E}:_64B72D992B224B408A410D86F2279BDD" @@ -12765,7 +12782,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:TeamTalk" "ProductCode" = "8:{60A088A9-DBEF-4ACF-82AF-0000FD2B730A}" - "PackageCode" = "8:{BD290CB6-8BEB-47BA-8ECA-B4E325D551A8}" + "PackageCode" = "8:{3A0818AD-AC92-4EA5-9AAF-4D2BEE8F040B}" "UpgradeCode" = "8:{56C41212-AB48-442F-9870-EE96D8E1DC6C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -12898,6 +12915,20 @@ "Icon" = "8:_4B5309FE4F80448691CCBAC5306A5D48" "Feature" = "8:" } + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_7D6BE4A7E0404BE289021ABD26B8581F" + { + "Name" = "8:Shortcut to DesktopConfiguration" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_BB1740A5B7384A8E8307E62A7E940632" + "Folder" = "8:_1D82AFCBCCE44ADEB61F014ADF254978" + "WorkingFolder" = "8:_A91082C41E924AD28AB0026E6F9A5A9A" + "Icon" = "8:" + "Feature" = "8:" + } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_7D7331E3B67145C9A73A3679B65E9DEF" { "Name" = "8:TeamTalk.exe" @@ -12907,7 +12938,7 @@ "IconIndex" = "3:0" "Transitive" = "11:FALSE" "Target" = "8:_18D81FB0CF8B40E797171CEA151AA582" - "Folder" = "8:_49B0817C10FC4896979BDF325B3EF63C" + "Folder" = "8:_1D82AFCBCCE44ADEB61F014ADF254978" "WorkingFolder" = "8:_BB1740A5B7384A8E8307E62A7E940632" "Icon" = "8:_4B5309FE4F80448691CCBAC5306A5D48" "Feature" = "8:" @@ -13308,11 +13339,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_241E26B163DF4E4795E8FC1715CB7247" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1C1E3A5FC9D1479D99679369B687175D" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" "Properties" { } @@ -13322,11 +13353,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_32D3F83D1FD74508BC12C3FA5E53FDCB" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_241E26B163DF4E4795E8FC1715CB7247" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -13336,11 +13367,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C7FE9C37C35D4FBD87D8D163DC82723A" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_32D3F83D1FD74508BC12C3FA5E53FDCB" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -13350,11 +13381,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D65169BE56EE43889D472E84478E3BEB" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_932B1984BA5340B1A5F5A54A1CE8DD3F" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" "Properties" { } From tk at edam.speech.cs.cmu.edu Thu Oct 11 10:46:58 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 11 Oct 2007 10:46:58 -0400 Subject: [TeamTalk 300]: [836] branches/mrmarge/PocketTeamTalk/Tools/: Fixed PocketTeamTalk branch' s MakeLM link since MakeLM was moved in the olympus trunk. Message-ID: <200710111446.l9BEkwCv003673@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071011/68906805/attachment.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Tools ___________________________________________________________________ Name: svn:externals - MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM/trunk VBScribe http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/VBScribe + MakeLM http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/MakeLM VBScribe http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Tools/VBScribe From tk at edam.speech.cs.cmu.edu Thu Oct 11 16:02:02 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 11 Oct 2007 16:02:02 -0400 Subject: [TeamTalk 301]: [837] trunk/TeamTalk/Resources: Merged Alex' s grammar and language model improvements, rev 821-828 on branches/air/ Resources. Message-ID: <200710112002.l9BK22Rk004164@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071011/9b1dda6c/attachment-0001.html -------------- next part -------------- Deleted: trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl =================================================================== --- trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl 2007-10-11 20:02:02 UTC (rev 837) @@ -1,12 +0,0 @@ -{ LanguageModel/zap2.def } -LanguageModel/zap2.arpa general { -[USERNAME] -[HOUR] -[NUMBER] -[DAY] -[MONTH] -[DAYORDINAL] -[ROOMNUMBER] -[ROOMLOCATION] -[AMPM] -} Deleted: trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def =================================================================== --- trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def 2007-10-11 20:02:02 UTC (rev 837) @@ -1,155 +0,0 @@ -LMCLASS [USERNAME] -ALEX_RUDNICKY -DAN_BOHUS -JUNE_SISON -YITAO_SUN -CECILY_HEINER -THOMAS_HARRIS -ANTOINE_RAUX -CHRIS_COLOHAN -GUEST -RIDY_LIE -END [USERNAME] - -LMCLASS [HOUR] -ONE:h -TWO -THREE -FOUR -FIVE -SIX -SEVEN -EIGHT -NINE -TEN -ELEVEN -TWELVE -NOON -END [HOUR] - -LMCLASS [NUMBER] -ONE:n -TWO:n -THREE:n -FOUR:n -FIVE:n -SIX:n -SEVEN:n -EIGHT:n -NINE:n -TEN:n -END [NUMBER] - -LMCLASS [DAY] -MONDAY -TUESDAY -WEDNESDAY -THURSDAY -FRIDAY -SATURDAY -SUNDAY -TODAY -TOMORROW -END [DAY] - -LMCLASS [MONTH] -JANUARY -FEBRUARY -MARCH -APRIL -MAY:m -JUNE -JULY -AUGUST -SEPTEMBER -OCTOBER -NOVEMBER -DECEMBER -END [MONTH] - -LMCLASS [DAYORDINAL] -EIGHTEENTH -EIGHTH -ELEVENTH -FIFTEENTH -FIFTH -FIRST:do -FOURTEENTH -FOURTH -NINETEENTH -NINTH -SECOND -SEVENTEENTH -SEVENTH -SIXTEENTH -SIXTH -TENTH -THIRD -THIRTEENTH -THIRTIETH -THIRTY_FIRST -TWELFTH -TWENTIETH -TWENTY_EIGHTH -TWENTY_FIFTH -TWENTY_FIRST -TWENTY_FOURTH -TWENTY_NINTH -TWENTY_SECOND -TWENTY_SEVENTH -TWENTY_SIXTH -TWENTY_THIRD -END [DAYORDINAL] - -LMCLASS [ROOMNUMBER] -FORTY_SIX_TWENTY_THREE -FOUR_SIX_TWO_THREE -FORTY_SIX_TWENTY_FIVE -FOUR_SIX_TWO_FIVE -SEVENTY_TWO_TWENTY -SEVEN_TWO_TWO_ZERO -EIGHTY_TWO_TWENTY -EIGHT_TWO_TWO_ZERO -FORTY_SIX_THIRTY_TWO -FOUR_SIX_THREE_TWO -FORTY_FIVE_THIRTEEN -FOUR_FIVE_ONE_THREE -THIRTY_FIVE_OH_NINE -THREE_FIVE_OH_NINE -THREE_FIVE_ZERO_NINE -FIFTEEN_OH_FIVE -FIFTEEN_ZERO_FIVE -ONE_FIVE_OH_FIVE -ONE_FIVE_ZERO_FIVE -FIFTEEN_OH_SEVEN -FIFTEEN_ZERO_SEVEN -ONE_FIVE_OH_SEVEN -ONE_FIVE_ZERO_SEVEN -TWENTY_FIVE_OH_SEVEN -TWENTY_FIVE_ZERO_SEVEN -TWO_FIVE_OH_SEVEN -TWO_FIVE_ZERO_SEVEN -THREE_THOUSAND_ONE -THREE_ZERO_ZERO_ONE -THREE_OH_OH_ONE -THIRTY_THREE_OH_FIVE -THIRTY_THREE_ZERO_FIVE -THREE_THREE_OH_FIVE -THREE_THREE_ZERO_FIVE -THIRTY_FIVE_OH_ONE -THIRTY_FIVE_ZERO_ONE -THREE_FIVE_OH_ONE -THREE_FIVE_ZERO_ONE -END [ROOMNUMBER] - -LMCLASS [ROOMLOCATION] -NEWELL_SIMON -NEWELL_SIMON_HALL -WEAN -WEAN_HALL -END [ROOMLOCATION] - -LMCLASS [AMPM] -A_M -P_M -END [AMPM] \ No newline at end of file Deleted: trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef =================================================================== --- trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef 2007-10-11 20:02:02 UTC (rev 837) @@ -1,155 +0,0 @@ -LMCLASS [USERNAME] -ALEX_RUDNICKY 0.05 -DAN_BOHUS 0.05 -JUNE_SISON 0.05 -YITAO_SUN 0.05 -CECILY_HEINER 0.05 -THOMAS_HARRIS 0.05 -ANTOINE_RAUX 0.05 -CHRIS_COLOHAN 0.05 -GUEST 0.55 -RIDY_LIE 0.05 -END [USERNAME] - -LMCLASS [HOUR] -ONE:h 0.076 -TWO 0.076 -THREE 0.076 -FOUR 0.076 -FIVE 0.076 -SIX 0.076 -SEVEN 0.076 -EIGHT 0.076 -NINE 0.076 -TEN 0.076 -ELEVEN 0.076 -TWELVE 0.076 -NOON 0.076 -END [HOUR] - -LMCLASS [NUMBER] -ONE:n 0.1 -TWO:n 0.1 -THREE:n 0.1 -FOUR:n 0.1 -FIVE:n 0.1 -SIX:n 0.1 -SEVEN:n 0.1 -EIGHT:n 0.1 -NINE:n 0.1 -TEN:n 0.1 -END [NUMBER] - -LMCLASS [DAY] -MONDAY 0.11 -TUESDAY 0.11 -WEDNESDAY 0.11 -THURSDAY 0.11 -FRIDAY 0.11 -SATURDAY 0.11 -SUNDAY 0.11 -TODAY 0.11 -TOMORROW 0.11 -END [DAY] - -LMCLASS [MONTH] -JANUARY 0.083 -FEBRUARY 0.083 -MARCH 0.083 -APRIL 0.083 -MAY:m 0.083 -JUNE 0.083 -JULY 0.083 -AUGUST 0.083 -SEPTEMBER 0.083 -OCTOBER 0.083 -NOVEMBER 0.083 -DECEMBER 0.083 -END [MONTH] - -LMCLASS [DAYORDINAL] -EIGHTEENTH 0.032 -EIGHTH 0.032 -ELEVENTH -FIFTEENTH 0.032 -FIFTH 0.032 -FIRST:do 0.032 -FOURTEENTH 0.032 -FOURTH 0.032 -NINETEENTH 0.032 -NINTH 0.032 -SECOND 0.032 -SEVENTEENTH 0.032 -SEVENTH 0.032 -SIXTEENTH 0.032 -SIXTH 0.032 -TENTH 0.032 -THIRD 0.032 -THIRTEENTH 0.032 -THIRTIETH 0.032 -THIRTY_FIRST 0.032 -TWELFTH 0.032 -TWENTIETH 0.032 -TWENTY_EIGHTH 0.032 -TWENTY_FIFTH 0.032 -TWENTY_FIRST 0.032 -TWENTY_FOURTH 0.032 -TWENTY_NINTH 0.032 -TWENTY_SECOND 0.032 -TWENTY_SEVENTH 0.032 -TWENTY_SIXTH 0.032 -TWENTY_THIRD 0.032 -END [DAYORDINAL] - -LMCLASS [ROOMNUMBER] -FORTY_SIX_TWENTY_THREE 0.026 -FOUR_SIX_TWO_THREE 0.026 -FORTY_SIX_TWENTY_FIVE 0.026 -FOUR_SIX_TWO_FIVE 0.026 -SEVENTY_TWO_TWENTY 0.026 -SEVEN_TWO_TWO_ZERO 0.026 -EIGHTY_TWO_TWENTY 0.026 -EIGHT_TWO_TWO_ZERO 0.026 -FORTY_SIX_THIRTY_TWO 0.026 -FOUR_SIX_THREE_TWO 0.026 -FORTY_FIVE_THIRTEEN 0.026 -FOUR_FIVE_ONE_THREE 0.026 -THIRTY_FIVE_OH_NINE 0.026 -THREE_FIVE_OH_NINE 0.026 -THREE_FIVE_ZERO_NINE 0.026 -FIFTEEN_OH_FIVE 0.026 -FIFTEEN_ZERO_FIVE 0.026 -ONE_FIVE_OH_FIVE 0.026 -ONE_FIVE_ZERO_FIVE 0.026 -FIFTEEN_OH_SEVEN 0.026 -FIFTEEN_ZERO_SEVEN 0.026 -ONE_FIVE_OH_SEVEN 0.026 -ONE_FIVE_ZERO_SEVEN 0.026 -TWENTY_FIVE_OH_SEVEN 0.026 -TWENTY_FIVE_ZERO_SEVEN 0.026 -TWO_FIVE_OH_SEVEN 0.026 -TWO_FIVE_ZERO_SEVEN 0.026 -THREE_THOUSAND_ONE 0.026 -THREE_ZERO_ZERO_ONE 0.026 -THREE_OH_OH_ONE 0.026 -THIRTY_THREE_OH_FIVE 0.026 -THIRTY_THREE_ZERO_FIVE 0.026 -THREE_THREE_OH_FIVE 0.026 -THREE_THREE_ZERO_FIVE 0.026 -THIRTY_FIVE_OH_ONE 0.026 -THIRTY_FIVE_ZERO_ONE 0.026 -THREE_FIVE_OH_ONE 0.026 -THREE_FIVE_ZERO_ONE 0.026 -END [ROOMNUMBER] - -LMCLASS [ROOMLOCATION] -NEWELL_SIMON 0.25 -NEWELL_SIMON_HALL 0.25 -WEAN 0.25 -WEAN_HALL 0.25 -END [ROOMLOCATION] - -LMCLASS [AMPM] -A_M 0.5 -P_M 0.5 -END [AMPM] \ No newline at end of file Property changes on: trunk/TeamTalk/Resources/Grammar ___________________________________________________________________ Name: svn:ignore - base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalk_flat.gra TeamTalk_abs.gra TeamTalkTask.gra TeamTalkRobots DynamicRobotName.class TeamTalk.corpus TeamTalk.ctl TeamTalk.probdef TeamTalk.token TeamTalk.words + base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalk_flat.gra TeamTalk_abs.gra TeamTalkRobots TeamTalk.corpus TeamTalk.ctl TeamTalk.probdef TeamTalk.token TeamTalk.words Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR (from rev 836, branches/air/Resources/Grammar/GRAMMAR) Property changes on: trunk/TeamTalk/Resources/Grammar/GRAMMAR ___________________________________________________________________ Name: svn:ignore + DynamicRobotName.class Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,21 +0,0 @@ - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class (from rev 836, branches/air/Resources/Grammar/GRAMMAR/Number-20.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,21 @@ + (zero) + (one) + (two) + (three) + (four) + (five) + (six) + (seven) + (eight) + (nine) + (ten) + (eleven) + (twelve) + (thirteen) + (fourteen) + (fifteen) + (sixteen) + (seventeen) + (eighteen) + (nineteen) + (twenty) Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,12 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class (from rev 836, branches/air/Resources/Grammar/GRAMMAR/Number-60-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,12 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,16 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class (from rev 836, branches/air/Resources/Grammar/GRAMMAR/Number-80-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,16 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,4 +0,0 @@ - (eighty) - (eighty five) - (ninety) - (ninety five) Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class (from rev 836, branches/air/Resources/Grammar/GRAMMAR/Number-85-95-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,4 @@ + (eighty) + (eighty five) + (ninety) + (ninety five) Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,19 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) #%%0.1%% there are more likely? - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) - (eighty five) - (ninety) #%%0.1%% - (ninety five) Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class (from rev 836, branches/air/Resources/Grammar/GRAMMAR/Number-95-by5.class) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,19 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) #%%0.1%% there are more likely? + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) + (eighty five) + (ninety) #%%0.1%% + (ninety five) Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-11 20:02:02 UTC (rev 837) @@ -1,43 +0,0 @@ -################################################################### -# -# TeamTalk Grammar -# -# Written by: June Sison -# -# This is the forms file corresponding to the phoenix grammar for -# the TeamTalk system -# -# -# HISTORY ------------------------------------------------------- -# -# [2005-09-21] (dbohus): added cancel -# [2005-09-21] (tk): added yes/no -# [2003-03-08] (sison): started working on this -# -################################################################### - -FUNCTION: Commands - NETS: - [InvokePlay] - [ControlRobot] - [QueryRobot] - [MoveRobot] - [RespondYesNo] -# [HumanGoodbyeCommand] -; - -FUNCTION: Features - NETS: - [AbsoluteDistance] - [TurnDirection] - [MoveDirection] -; - - - -# these auxiliaries are defined in order to capture some parses like -# next, this that, which o/w would parse as date-time -#FUNCTION: Auxiliaries -# NETS: -# [__datetime_junk] -#; \ No newline at end of file Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms (from rev 836, branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.forms) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,43 @@ +################################################################### +# +# TeamTalk Grammar +# +# Written by: June Sison +# +# This is the forms file corresponding to the phoenix grammar for +# the TeamTalk system +# +# +# HISTORY ------------------------------------------------------- +# +# [2005-09-21] (dbohus): added cancel +# [2005-09-21] (tk): added yes/no +# [2003-03-08] (sison): started working on this +# +################################################################### + +FUNCTION: Commands + NETS: + [InvokePlay] + [ControlRobot] + [QueryRobot] + [MoveRobot] + [RespondYesNo] +# [HumanGoodbyeCommand] +; + +FUNCTION: Features + NETS: + [AbsoluteDistance] + [TurnDirection] + [MoveDirection] +; + + + +# these auxiliaries are defined in order to capture some parses like +# next, this that, which o/w would parse as date-time +#FUNCTION: Auxiliaries +# NETS: +# [__datetime_junk] +#; \ No newline at end of file Deleted: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-11 20:02:02 UTC (rev 837) @@ -1,396 +0,0 @@ -################################################################### -# -# TEAMTALK T A S K G R A M M A R -# -# HISTORY: ------------------------------------------------------- -# -# [2003-03-08] (sison): started working on this -# -################################################################### - -[RobotName] - (everyone) - (%[DynamicRobotName]%) # class stub -; - -[OBJ-Robot] - ([RobotName]) -; - - -######### Main Nets ############## - -[InvokePlay] - ([HumanExploreCommand]) - ([HumanSearchCommand]) - ([HumanFollowCommand]) -; - -[ControlRobot] - ([HumanReportCommand]) - ([HumanPauseCommand]) - ([HumanContinueCommand]) - ([HumanHaltCommand]) - ([Cancel]) -; - -[QueryRobot] - ([HumanLocationQuery]) -; - -[MoveRobot] - ([HumanMoveCommand]) - ([HumanTurnCommand]) - ([MoveVectorRelative]) -# ([MoveVectorCardinal]) - ([MoveToGoal]) -; - -[RespondYesNo] - ([Yes]) - ([No]) -; - -########################################### - - - -[HumanExploreCommand] - (explore *[MapLocation]) -; - -[HumanSearchCommand] - (search *[MapLocation]) - (search [MoveDirection]) -; - -[HumanFollowCommand] - (*[RobotName] FOLLOW [OBJ-Robot]) -FOLLOW - (join) - (follow) - (find) -; - -[HumanPauseCommand] - (*[RobotName] pause *task *here) -; - -[HumanContinueCommand] - (*[RobotName] continue *task) -; - -[HumanReportCommand] - (*[RobotName] report) - ([RobotName]) -; - -[HumanLocationQuery] - (*[RobotName] where are you) - (*[RobotName] report location) -; - -[HumanHaltCommand] - (*[RobotName] all stop) - (*[RobotName] stop immediately) -; - -[Number-180-by5] - ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion - ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% -HUNDRED - ( a hundred ) - ( one hundred ) -; - -[Number-over180] - (*one hundred *and %[Number-95-by5]%) #%%0.1%% - (two hundred *and %[Number-95-by5]%) #%%0.5%% - (three hundred *and %[Number-60-by5]%) #%%0.4%% -; - -[TurnDirection] - (*PREP SIDE *[AngularQualifier]) - ([AngularQualifier] *PREP *SIDE) - (around) -SIDE - (right) - (left) -PREP - (to the) - (to your) -; - -[MoveDirection] - (*PREP SIDE) - (straight) - (forward) - (forwards) - (back) - (backward) - (backwards) -SIDE - (left) - (right) -PREP - (to the) - (to your) -; - -[AngularQualifier] - ([Number-180-by5] degrees) #%%0.667%% - ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's -; - - -[AbsoluteDistance] - (%[Number-20]% [Units]) -; - -[RelativeDistance] - ([TeamTalkAll] *of the way) - ([TeamTalkHalf] *of *the way) - ([TeamTalkThird] of the way) - ([TeamTalkTwoThird] of the way) - ([TeamTalkOneQuarter] of the way) - ([TeamTalkThreeQuarter] of the way) -; - -[MapLocation] - (this space) - (the area) - (around *PLACE) - (PLACE) -PLACE - (here) - (there) - (your location) -; - - -[TeamTalkAll] - (all) -; - -[TeamTalkHalf] - (*MOD half) -MOD - (one) - (a) -; - -[TeamTalkThird] - (MOD third) -MOD - (one) - (a) -; - -[TeamTalkTwoThird] - (two third) - (two thirds) -; - -[TeamTalkOneQuarter] - (one quarter) - (one fourth) - (a quarter) - (a fourth) -; - - -[TeamTalkThreeQuarter] - (three quarter) - (three quarters) - (three fourth) - (three fourths) -; - -[HumanMoveCommand] -# ([MoveVectorCardinal]) - ([MoveVectorRelative]) - ([MoveToGoal]) -; - -[Join] - (*[RobotName] join [RobotName]) -; - -#[MoveVectorCardinal] -# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) -# (*[RobotName] MOVE [CardinalDirection]) -# -#MOVE -# (move) -# (go) -#; - -[MoveVectorRelative] - (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) - (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) -MOVE - (move) - (go) - (drive) - (return) -; - -[HumanTurnCommand] - (*[RobotName] TURN [TurnDirection]) -TURN - (turn) - (face) - (move) - (go) -; -[MoveToGoal] - (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) - (*[RobotName] MOVE [Home]) -MOVE - (move *to) - (go *to) - (drive *to) -PREP - (toward) - (towards) - (to) - (down *to) - (down towards) - (up *to) - (up towards) -; - -[Side] - (the=north=end=of) - (the=east=end=of) - (the=south=end=of) - (the=west=end=of) - -[Goal] - ([Home]) - ([Xcoord] [Ycoord]) -; - -[Home] - (home) - (base) -; - -[Xcoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Ycoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Units] - (metres) - (metre) -# (feet) -# (foot) -# (yards) -# (yard) -; - -#[HumanGoodbyeCommand] -# (goodbye) -# (bye) -# (mission complete) -# (that's it) -; - - - - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (OKAY) - (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain - (STRONG_MOD) #%%0.10%% -YES - (yes) - (yeah) -# (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (absolutely) - (definitely) - (OKAY OKAY) -WEAK_MOD - (why not) - (i think so) - (i guess so) -OKAY - (okay) - (sure) - (of course) - (correct) - (perfect) - (great) - (acceptable) - (good *enough) -# (fine) -# (wonderful) -# (right) -# (alright) -; - -[No] - (no *MOD) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (nevermind) - (not really) - (negative) -# (nowhere) -DONT - (don't) - (do not) -MOD - (thanks) - (thank=you) # should be a lexeme - (not really) - (it's not) - (i'm not) -#NO -# (no) -# (not) -#GOOD -# (right) -# (correct) -# (good) -# (okay) -; - - -################################################################### -# CANCEL grammar -################################################################### - -[Cancel] - (CANCEL *COMMAND) -CANCEL - (abort) - (cancel) - (quit) -COMMAND - (*that command) - (that) -; \ No newline at end of file Copied: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra (from rev 836, branches/air/Resources/Grammar/GRAMMAR/TeamTalkTask.gra) =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra (rev 0) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-11 20:02:02 UTC (rev 837) @@ -0,0 +1,396 @@ +################################################################### +# +# TEAMTALK T A S K G R A M M A R +# +# HISTORY: ------------------------------------------------------- +# +# [2003-03-08] (sison): started working on this +# +################################################################### + +[RobotName] + (everyone) + (%[DynamicRobotName]%) # class stub +; + +[OBJ-Robot] + ([RobotName]) +; + + +######### Main Nets ############## + +[InvokePlay] + ([HumanExploreCommand]) + ([HumanSearchCommand]) + ([HumanFollowCommand]) +; + +[ControlRobot] + ([HumanReportCommand]) + ([HumanPauseCommand]) + ([HumanContinueCommand]) + ([HumanHaltCommand]) + ([Cancel]) +; + +[QueryRobot] + ([HumanLocationQuery]) +; + +[MoveRobot] + ([HumanMoveCommand]) + ([HumanTurnCommand]) + ([MoveVectorRelative]) +# ([MoveVectorCardinal]) + ([MoveToGoal]) +; + +[RespondYesNo] + ([Yes]) + ([No]) +; + +########################################### + + + +[HumanExploreCommand] + (explore *[MapLocation]) +; + +[HumanSearchCommand] + (search *[MapLocation]) + (search [MoveDirection]) +; + +[HumanFollowCommand] + (*[RobotName] FOLLOW [OBJ-Robot]) +FOLLOW + (join) + (follow) + (find) +; + +[HumanPauseCommand] + (*[RobotName] pause *task *here) +; + +[HumanContinueCommand] + (*[RobotName] continue *task) +; + +[HumanReportCommand] + (*[RobotName] report) + ([RobotName]) +; + +[HumanLocationQuery] + (*[RobotName] where are you) + (*[RobotName] report location) +; + +[HumanHaltCommand] + (*[RobotName] all stop) + (*[RobotName] stop immediately) +; + +[Number-180-by5] + ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion + ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + +[Number-over180] + (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% + (two hundred *and %[Number-95-by5]%) #%%0.5%% + (three hundred *and %[Number-60-by5]%) #%%0.4%% +; + +[TurnDirection] + (*PREP SIDE *[AngularQualifier]) + ([AngularQualifier] *PREP *SIDE) + (around) +SIDE + (right) + (left) +PREP + (to the) + (to your) +; + +[MoveDirection] + (*PREP SIDE) + (straight) + (forward) + (forwards) + (back) + (backward) + (backwards) +SIDE + (left) + (right) +PREP + (to the) + (to your) +; + +[AngularQualifier] + ([Number-180-by5] degrees) #%%0.667%% + ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's +; + + +[AbsoluteDistance] + (%[Number-20]% [Units]) +; + +[RelativeDistance] + ([TeamTalkAll] *of the way) + ([TeamTalkHalf] *of *the way) + ([TeamTalkThird] of the way) + ([TeamTalkTwoThird] of the way) + ([TeamTalkOneQuarter] of the way) + ([TeamTalkThreeQuarter] of the way) +; + +[MapLocation] + (this space) + (the area) + (around *PLACE) + (PLACE) +PLACE + (here) + (there) + (your location) +; + + +[TeamTalkAll] + (all) +; + +[TeamTalkHalf] + (*MOD half) +MOD + (one) + (a) +; + +[TeamTalkThird] + (MOD third) +MOD + (one) + (a) +; + +[TeamTalkTwoThird] + (two third) + (two thirds) +; + +[TeamTalkOneQuarter] + (one quarter) + (one fourth) + (a quarter) + (a fourth) +; + + +[TeamTalkThreeQuarter] + (three quarter) + (three quarters) + (three fourth) + (three fourths) +; + +[HumanMoveCommand] +# ([MoveVectorCardinal]) + ([MoveVectorRelative]) + ([MoveToGoal]) +; + +[Join] + (*[RobotName] join [RobotName]) +; + +#[MoveVectorCardinal] +# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) +# (*[RobotName] MOVE [CardinalDirection]) +# +#MOVE +# (move) +# (go) +#; + +[MoveVectorRelative] + (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) + (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) +MOVE + (move) + (go) + (drive) + (return) +; + +[HumanTurnCommand] + (*[RobotName] TURN [TurnDirection]) +TURN + (turn) + (face) + (move) + (go) +; +[MoveToGoal] + (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) + (*[RobotName] MOVE [Home]) +MOVE + (move *to) + (go *to) + (drive *to) +PREP + (toward) + (towards) + (to) + (down *to) + (down towards) + (up *to) + (up towards) +; + +[Side] + (the=north=end=of) + (the=east=end=of) + (the=south=end=of) + (the=west=end=of) + +[Goal] + ([Home]) + ([Xcoord] [Ycoord]) +; + +[Home] + (home) + (base) +; + +[Xcoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Ycoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Units] + (metres) + (metre) +# (feet) +# (foot) +# (yards) +# (yard) +; + +#[HumanGoodbyeCommand] +# (goodbye) +# (bye) +# (mission complete) +# (that's it) +; + + + + +################################################################### +# YES/NO grammar +################################################################### + +[Yes] + (YES *MOD) + (OKAY) + (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain + (STRONG_MOD) #%%0.10%% +YES + (yes) + (yeah) +# (yup) +MOD + (STRONG_MOD) + (WEAK_MOD) +STRONG_MOD + (absolutely) + (definitely) + (OKAY OKAY) +WEAK_MOD + (why not) + (i think so) + (i guess so) +OKAY + (okay) + (sure) + (of course) + (correct) + (perfect) + (great) + (acceptable) + (good *enough) +# (fine) +# (wonderful) +# (right) +# (alright) +; + +[No] + (no *MOD) + (*no absolutely not) + (nope) + (nah) + (no way) + (*no i DONT) + (*no i DONT think so) + (nevermind) + (not really) + (negative) +# (nowhere) +DONT + (don't) + (do not) +MOD + (thanks) + (thank=you) # should be a lexeme + (not really) + (it's not) + (i'm not) +#NO +# (no) +# (not) +#GOOD +# (right) +# (correct) +# (good) +# (okay) +; + + +################################################################### +# CANCEL grammar +################################################################### + +[Cancel] + (CANCEL *COMMAND) +CANCEL + (abort) + (cancel) + (quit) +COMMAND + (*that command) + (that) +; \ No newline at end of file Deleted: trunk/TeamTalk/Resources/Grammar/Generic.forms =================================================================== --- trunk/TeamTalk/Resources/Grammar/Generic.forms 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Generic.forms 2007-10-11 20:02:02 UTC (rev 837) @@ -1,54 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is the forms file corresponding to the phoenix grammar for -# common task-independ constructs (Generic.gra) that we are likely -# to use in most of the future developed spoken dialog systems. -# -# HISTORY ------------------------------------------------------- -# -# [2002-12-03] (dbohus): set DateTime as non top-level slot, -# renamed date_time (so it no longer -# appears in the forms) -# [2002-11-26] (antoine): set TimeRange and Date as non-top level -# slots renamed time_range and date -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -FUNCTION: Social - NETS: - [_i_want] - [_greeting] - [_can_you] - [_lets] - [_courtesy] - [_emphatic] - [_tentative] -; - -FUNCTION: GenericDialogMechanisms - NETS: - [Help] - [Repeat] - [Suspend] - [Resume] - [StartOver] - [EstablishContext] - [GoodEnough] - [Quit] -; - -FUNCTION: YesNo - NETS: - [Neither] - [Yes] - [No] -; Deleted: trunk/TeamTalk/Resources/Grammar/Generic.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/Generic.gra 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Generic.gra 2007-10-11 20:02:02 UTC (rev 837) @@ -1,1715 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is a phoenix grammar for common task-independ constructs -# that we are likely to use in most of the future developed -# spoken dialog systems. Its starting point were the task -# independent constructs in the CMU Communicator grammar. -# -# -# HISTORY: ------------------------------------------------------- -# -# [2004-07-06] (dbohus): added a number of things to improve -# coverage (based on an analysis of -# parsing statistics for the roomline -# corpus on sprocket) -# [2002-04-04] (dbohus): added (i'll take) to [_i_want] -# [2002-12-20] (antoine): changed ([time_range] *[date] -# *[period_of_day]) into two -# separate rules to reduce ambiguity: -# ([time_range] [period_of_day]) -# is no longer possible, the period -# of day is always parsed inside the -# time_range. -# [2002-12-03] (dbohus): demoted [DateTime] to [date_time] which -# is no longer a top-level slot -# [2002-11-26] (antoine): added an optional [period_of_day] after -# ([time_range] *[date]) to account for -# e.g. "six thirty tomorrow morning" -# [2002-11-26] (antoine): set TimeRange, Date, Number as non-top -# (dbohus): level slots renamed time_range, date, -# number -# [2002-10-18] (dbohus): Added [DateTime], by taking it from -# Communicator (and cleaning it a bit) -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -################################################################### -# Social plus this that, etc -################################################################### - -[_greeting] - (hello) - (hi *there) - (good morning) - (good afternoon) - (good evening) -; - -[_can_you] - (could you *also *[_courtesy]) - (can you *also *[_courtesy]) - (will you *also *[_courtesy]) - (can we *also *[_courtesy]) - (would you *also *[_courtesy]) -; - -[_can_i] - (could i *also *[_courtesy]) - (can i *also *[_courtesy]) -; - -[_tell_me] - (*[_can_you] tell me *about) - (how about) -; - -[_courtesy] - (please) - (THANK *MUCH) - (*YOU welcome) - -THANK - (thanks) - (thank you) -MUCH - (*very much) - (a lot) -YOU - (you are) - (you're) -; - -[_it] - (it) - (this *one) - (that *one) -; - -[_lets] - (let's *say) - (let us *say) -; - -[_that_is] - (that's) - (that is) - (that'll) - (that'd) - (that was) - (it is) - (it's) -; - -[_this_that] - ([_this]) - ([_that]) -; - -[_that] - (that *one) - (it) -; - -[_this] - (this *one) - (the) - (it) -; - -[_emphatic] - (i *already SAID) - (*are you sure) - (actually) -SAID - (said) - (told you) -; - -[_tentative] - (i guess) - (i think) - (i believe) -; - -[_it_does] - (it does) - (it did) -; - -[_i_want] - (i *just *will *also want *TO_HAVE) - (i *just *will *also need *TO_HAVE) - (i *just *also wanna) - (i *just *also wanted *TO_HAVE) - (i'd like *TO_HAVE) - (i would like *TO_HAVE) - (i'd prefer *TO_HAVE) - (i would prefer *TO_HAVE) - (give me) - (CAN i *also get) - (CAN i *also have) - (CAN i *also take) - (i'll *also take) - (i'll *also have) - (i *just have to) - (i *just had to) - (i must) - (how about) - (what about) - (do you have) -CAN - (can) - (could) -TO_HAVE - (to *also *have) - (to *also *get) - (to *also *know) -; - - -################################################################### -# HELP GRAMMAR -################################################################### -[Help] - (*[_i_want] [general_help]) - (*[_tell_me] [what_can_i_say] *now) - (*[_i_want] [give_me_tips]) - ([system_capabilities]) -; - -[general_help] - (*[_i_want] *some help) - (*[_can_you] help me) - (customer service) - (interactive info) - (interactive information) - -[what_can_i_say] - (what CAN i DO_SAY) - (*what *are *THE options) - (*[_i_want] *some instructions) - (*[_i_want] an example) - (i don't know what to DO_SAY) - (i don't know what i CAN DO_SAY) -CAN - (can) - (should) - (could) - (do) -DO_SAY - (do) - (say) -THE - (the) - (my) -; - -[give_me_tips] - (*[_tell_me] how *[_can_i] *to use the system) - (*[_tell_me] how things work) - (*some *more TIPS) - (more help) -TIPS - (*INTERACTION hints) - (*INTERACTION tips) - (*INTERACTION commands) -INTERACTION - (system) - (interaction) - (communication) -; - -[system_capabilities] - (*[_tell_me] what *else can you do) - (*[_tell_me] what *else do you offer) - (*[_tell_me] who are you) - (*[_tell_me] what *else do you do) - (*[_tell_me] how *else can you help *me) -; - -################################################################### -# REPEAT GRAMMAR -################################################################### - -[Repeat] - (*sorry REPEAT *[_courtesy]) - (excuse me) - (*i *beg *your pardon) - (pardon me) - (*sorry what was that *again) - (*sorry what's that *again) - (*sorry WHATD you *just say) - ( what ) - (*sorry i didn't HEAR YOU) - -WHATD - (what did) - (what'd) - -REPEAT - (repeat the question *again) - (repeat *[_it]) - (say [_it] *again) - (say again) -HEAR - (hear) - (understand) - (catch) - -YOU - (you) - (that) - (it) - (what you said) -; - -################################################################### -# SUSPEND/RESUME GRAMMAR -################################################################### - -[Suspend] - (*[_lets] TAKE_A_BREAK *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] HOLD_ON *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] TAKE_A_BREAK *FOR_TIME *[_courtesy]) -HOLD_ON - (hold on *[_courtesy]) - (stand by *[_courtesy]) -TAKE_A_BREAK - (take a *SHORT break) - (have a *SHORT break) - (break *[_this] ACTIVITY) - (pause *[_this] ACTIVITY) - (hold on) - (suspend *[_this] *ACTIVITY) -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -SHORT - (short) - (quick) - (small) - (little) -FOR_TIME - (*for a while) - (*for now) - (*for a second) - (*for a minute) - (*for a couple of minutes) -; - -[Resume] - (*[_courtesy] resume *[_this] *ACTIVITY *[_courtesy]) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -; - -################################################################### -# START-OVER GRAMMAR -################################################################### - -[StartOver] - (restart *IT) - (reset *IT) - (start *IT *all OVER) - (start from the *very BEGINNING) - (go back to the BEGINNING) - (START from scratch) - (main menu) - -IT - ([_it]) - (*[_this] ACTIVITY) - (*[_this] system) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (session) - (conversation) - -OVER - (again) - (over) - -BEGINNING - (beginning) - (start) - -START - (start) - (restart) -; - - -################################################################### -# ESTABLISH CONTEXT GRAMMAR -################################################################### - -[EstablishContext] - (where are we) - (where am i) - (what's going on) - (what are we doing) - (what am i doing) - (what is happening) - (where were we) - (where was i) -; - -################################################################### -# GOOD ENOUGH GRAMMAR -################################################################### -[GoodEnough] - (*[_that_is] *good enough) -; - -################################################################### -# QUIT GRAMMAR -################################################################### - -[Quit] - (*good bye) - (goodbye) - (byebye) - (bye bye) - (hang up *now) - (see you later) - (that's all) - (have a good day) - (good night) - (goodnight) - (quit) - ( *[_i_want] abort *SESSION *[_courtesy] ) - ( *[_i_want] exit *SESSION *[_courtesy] ) - ( *[_i_want] quit *SESSION *[_courtesy] ) - -SESSION - (*[_this] dialog) - (*[_this] dialogue) - (*[_this] session) - (*[_this] conversation) - (*[_this] system) -; - - -################################################################### -# NEITHER grammar -################################################################### -[Neither] - (*[_i_want] NEITHER *one *OF_THOSE) - (NEITHER *one *OF_THOSE IS_GOOD) - (NO_WANT any *OF_THOSE) -NEITHER - (neither) - (none) -OF_THOSE - (of them) - (of these) - (of those) -IS_GOOD - (is good) - (is right) -NO_WANT - (i don't want) - (i don't like) -; - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (STRONG_MOD) - ( OKAY ) - ( WEAK_MOD ) -YES - (yes) - (yeah) - (yep) - (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (*[_that_is] *be OKAY) - ([_this_that] sounds OKAY) - ([_this_that] works) - (you betcha) - (*let's go for it) - (absolutely) - (definitely) - ( OKAY OKAY ) -WEAK_MOD - (why not) - (i think so) - (i guess so) - (*[_that_is] close enough) -OKAY - (sure) - (of course) - (ok) - (okay) - (correct) - (fine) - (perfect) - (great) - (wonderful) - (acceptable) - (good *enough) - (right) - (alright) - (cool) -; - -[No] - (no *MOD) - ([_emphatic] no) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (*no i DONT like [_this_that]) - (*no i DONT want [_this_that]) - (never mind) - (nevermind) - (*no not really) - (nowhere) - (negative) -DONT - (don't) - (do not) -MOD - (thanks) - (thank you) - (not really) - (i *really don't want to) - (i *really don't want [_this_that]) - (it's not) - (i'm not) - ([_that_is] not what i want) - (*[_that_is] NO *GOOD) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) -; - - -################################################################### -# NUMBERS GRAMMAR -################################################################### - -# (dbohus): This is the numbers grammar, extracted from the -# original Communicator grammar - -[number] - (one) - (THOU_HUND *AND_NUM) - (NUM) - -AND_NUM - (and AND_NUM_OPTS) - -AND_NUM_OPTS - (TEN *ONE'S) - (TEEN) - (ONE'S) - -THOU_HUND - (*THOU HUND) - (THOU) - -NUM - (*THOU *HUND *TEN ONE'S) - (*THOU *HUND TEEN) - (*THOU *HUND TEN) - (ONE ONE *ONE *ONE *ONE *ONE'S) - (ONE ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE'S) - (TEEN ONE *ONE'S) - (TEN_ONE ONE TEN_ONE ONE'S) - (TEN_ONE TEN *ONE'S) - (TEN_ONE TEEN) - -START_TEEN - (TEEN TEEN) - (TEEN TEN *ONE'S) - -TEN_ONE - (TEN) - (ONE) - -THOU - (*THOU_OPTS thousand) - -THOU_OPTS - (HUND) - (HUND_OPTS) - -HUND - (HUND_OPTS hundred) - -HUND_OPTS - (*TEN A_ONE) - (TEEN) - (TEN) - -A_ONE - (a) - (an) - (ONE) - - -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - -TEN - (twenty) - (thirty) - (forty) - (fifty) - (sixty) - (seventy) - (eighty) - (ninety) - -ONE'S - (ONE) - (POS) -ONE'S-1 - (ONE-1) - (POS) -POS - (zero's) - (oh's) - (one's) - (two's) - (three's) - (four's) - (five's) - (six's) - (seven's) - (eight's) - (nine's) - (fourth) - (sixth) - (seventh) - (eighth) - (ninth) - -ONE - (one) - (ONE-1) -ONE-1 - (zero) - (oh) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -[date_time] - (DATE *[time_range] *[time_range]) - ([time_range] *DATE *[time_range]) - ([time_range] [time_range] *DATE) - ([period_mod] DATE *[period_of_day]) - (*[period_mod] [today_relative]) - (*[time_range] *the NEXT [period_of_day]) - (*[time_range] *the [date_relative] [time_range]) - (that [day_of_week]) - (that [time_range]) - ([time_range] is fine) -DATE - ([date] *[period_of_day]) - ([day_name]) -NEXT - ([d_next]) - ([d_previous]) -; - -[date] - (*SELECTOR *ON *the MONTH_DAY *YEAR *[period_of_day]) - (*a DAY_WEEK *OF_MONTH) - (*sometime [today_relative]) - (*ON *the DATE_REL *OF_MONTH) - (*SOMETIME [date_relative]) - (*sometime [date_relative] DAY) - ([date_relative] [today_relative]) - (*[date_relative] [holiday]) -SELECTOR - (DAY_WEEK) - (sometime) -SOMETIME - (sometime) - ([anyday]) -DATE_REL - ([date_relative]) - ([day_ordinal] *of [date_relative]) - ([holiday]) - ([anyday]) - ([everyday]) - (last day *of *[month_after]) - ([day_of_month] DAY *of *[month_after]) - (the [day_ordinal]) - ([day_ordinal] AND [day_ordinal]) -AND - (and) - (or) -MONTH_DAY - (*[month_name] the [day_ordinal]) - ([month_name] *the [day_ordinal]) - ([day_ordinal] *day *of [month_name]) - ([month_name] [day_number]) - ([day_number] [month_name]) -DAY - (day) - ([day_of_week]) -DAY_WEEK - (*A *MOD_DAY *ON [day_of_week] *OF_WEEK *AT_TIME) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -ON - (date) - (during) - (for) - (on *that) - (of) -THE - (a) - (an) - (the) -OF_MONTH - (*IN_OF *A [month_name]) - (*IN_OF *A THIS_LAST month) - (of the month) -MOD_DAY - ([week_after]) - (EACH) -AT_TIME - (*at *the same time) -OF_WEEK - (*IN_OF *A *this week) - (*IN_OF *A [date_relative]) -EACH - (any) - (each) - (every) -A - (a) - (an) - (the) -IN_OF - (in) - (of) -THIS_LAST - (this) - (last) -DAY - (day) - (date) - ([day_name]) -; - -[day_of_month] - (first) - (second) - (third) - (fourth) - (fifth) -; - -[everyday] - (EACH DAY *OF_WEEK) - (daily) - (dailies) - (everyday) - ([each_day]) -EACH - (all) - (every) -DAY - (day) - (days) -OF_WEEK - (of *the week) -; - -[each_day] - (EACH *of *the DAY *OF_WEEK) -DAY - (day) - (days) - (date) - (dates) -EACH - (*FOR each) - (ORDERED *BY) -ORDERED - (order) - (ordered) - (sort) - (sorted) - (arrange) - (arranged) -BY - (by) - (according *to) -OF_WEEK - (of *the week) -FOR - (for) - (on) -; - -[anyday] - (*IN_ON *the *FIRST_LAST WEEK_MONTH *OF_MONTH) - (any DAY *OF_WEEK) -DAY - (date) - (dates) - (day) - (days) -OF_WEEK - (of *the week) -FIRST_LAST - (first) - (previous) - (next) - (last) - (following) - (coming) -WEEK_MONTH - (week) - (month) -IN_ON - (in) - (on) -OF_MONTH - (*IN_OF [month_name]) - (*IN_OF THIS_NEXT month) -IN_OF - (in) - (of) -THIS_NEXT - (this) - (last) - (next) -; - -[holiday] - ([holiday_name]) - ([holiday_nameday]) -; - -[holiday_name] - (HOL *DAY) -HOL - (christmas) - (easter) - (*the fourth of july) - (new year's *eve) - (new years *eve) - (new year *eve) - (thanksgiving) - (april fool's) - (halloween) -DAY - (day) - (days) -; - -[holiday_nameday] - (HOL_1 DAY) -HOL_1 - (independence) - (labor) - (memorial) - (st patrick's) - (valentine) - (st valentine's) - (groundhog) - (flag) - (united nations) - (veterans) - (martin luther king) - (presidents') - (armed forces) - (mothers') - (fathers') - (parent's) - (columbus) -DAY - (day) - (days) -; - -[date_relative] - (*ON *the NEXT) - (*THE day [day_after] *that) - (*THE day [day_prior] *that) - (ONE DAY [day_after] *that) - ([week_after]) - ([week_prior]) - ([week_this]) - ([month_after]) - ([year_after]) - ([date_offset]) -ON - (on) - (for) -THE - (a) - (the) -NEXT - ([d_this]) - ([d_same]) - ([d_next]) - ([d_previous]) -PREVIOUS - (previous) - (preceeding) - (prior) - (last) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -DAY - (day) - (days) -; - -[d_this] - (this) -; - -[d_same] - (*that same) -; - -[d_next] - (next) - (following) - (coming) -; - -[d_previous] - (previous) - (preceeding) - (prior) - (last) -; - -[date_offset] - ([day_offset]) - ([week_offset]) -; - -[day_offset] - ([number] DAY OFFSET) - (in [number] DAY) -DAY - (day) - (days) -OFFSET - ([days_after]) - ([days_prior]) -; - -[week_offset] - ([weeks_after]) -; - -[weeks_after] - (in [number] weeks) - ([number] weeks LATER) -LATER - (later) - (after *that) -; - -[days_after] - (later) - (after *that) - (from now) -; - -[days_prior] - (before) - (prior to) - (earlier) -; - -[month_after] - (NEXT month) -NEXT - (next) - (coming) - (following) -; - -[year_after] - (*of next year) -; - -[week_this] - (this week) -; - -[week_after] - (in ONE week) - (ONE week later) - (*the NEXT week) - (a week AFTER) - (after *about a week) - (the week after) - (ONE week from) -ONE - (one) - (a) -NEXT - (next) - (coming) - (following) -AFTER - (after) - (afterwards) -; - -[week_prior] - (THE week before *that) - (the LAST week) -THE - (a) - (the) -LAST - (last) - (previous) -; - -[day_after] - (after) - (afterwards) - (from) -; - -[day_prior] - (before) - (prior to) -; - -[time_range] - ([time_duration]) - ([time_spec]) - (ANYTIME [after] *I_SAY [start_time] *DAY_PERIOD) - (START *at *I_SAY [start_time] *AND *[after]) - (*at *I_SAY [start_time] AND [after]) - (*ANYTIME BEFORE DAY_TIME) - (*END *at *I_SAY [end_time] AND [before]) - (END *at *I_SAY [end_time]) - (*START *at [start_time] TO [end_time]) - (between [start_time] and [end_time]) -TO - (*going to) - (until) - (til) - (till) -ANYTIME - (anytime) - (any time) - (any times) - (sometime) - (some time) - (some times) - (anything) -DAY_TIME - (*[on_day] [end_time]) - ([end_time] *ON *THE [on_day] [period_of_day]) -DAY_PERIOD - (*ON *THE [on_day] [period_of_day]) -AND - (and *or) - (or) -ON - (of) - (on) -THE - (a) - (an) - (the) -END - (end) - (ends) - (ending) -START - (from *like) - (start) - (starts) - (starting) - (begin) - (begins) - (beginning) -BEFORE - ([before]) - (until) - (til) - (till) - (by) -I_SAY - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[on_day] - ([day_of_week] *DAY_MONTH_SPEC) - (DAY_MONTH_SPEC) -DAY_MONTH_SPEC - ([month_name] *the [day_ordinal] *YEAR) - (*the [day_ordinal] *of [month_name] *YEAR) - ([month_name] [day_number]) - ([day_number] [month_name]) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -; - -[year] - (*nineteen DECADE *ONE) - (two thousand *and *ONE) - (twenty oh ONE) -DECADE - (seventy) - (eighty) - (ninety) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - -[day_number] - (ONE) - (ten) - (TEEN) - (twenty) - (twenty ONE) - (thirty) - (thirty one) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -TEEN - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -; - -[day_ordinal] - (SMALL_ORD) - (tenth) - (TEEN_ORD) - (twentieth) - (twenty SMALL_ORD) - (thirtieth) - (thirty first) -SMALL_ORD - (first) - (second) - (third) - (fourth) - (fifth) - (sixth) - (seventh) - (eighth) - (ninth) -TEEN_ORD - (eleventh) - (twelfth) - (thirteenth) - (fourteenth) - (fifteenth) - (sixteenth) - (seventeenth) - (eighteenth) - (nineteenth) -; - -[month_name] - (*THE_MONTH NAME) -NAME - (january) - (february) - (march) - (april) - (may) - (june) - (july) - (august) - (september) - (october) - (november) - (december) -THE_MONTH - (*the month *of) -; - -[start_time] - ([time_spec]) -; - -[end_time] - ([time_spec]) -; - -[time_spec] - (*at [time]) - ([time_of_day]) - ([aprox_time]) - ([time_relative]) - ([time_duration]) -; - -[aprox_time] - (*at APPROX [time] *AS_POSS) - (APPROX [time_of_day]) -APPROX - (*JUST AROUND_ABOUT) - (*SOMETIME AROUND_ABOUT) - (one AROUND_ABOUT) - (*as CLOSE *to) - (*at approximately) - (in *the vicinity *of) -AROUND_ABOUT - (around) - (round) - (about) - (bout) -CLOSE - (close) - (closest) - (closer) - (near) - (nearer) - (nearest) -SOMETIME - (sometime) - (somewhere) -AS_POSS - (*as possible) -JUST - (just) - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[time] - ([hour] *MIN *[time_of_day]) - ([hour] o'clock *[time_of_day]) - (*TIME_PERIOD BEFORE TIME *o'clock *[time_of_day]) - ([noon]) - ([midnight]) - ([twenty_four]) -TIME_PERIOD - ([minute_rel] *MINUTE) - (*a [quarter]) - (*a [half]) -BEFORE - ([before]) - ([after]) -TIME - ([hour] *MIN) - ([noon]) - ([midnight]) -MIN - ([minute]) -MINUTE - (minute) - (minutes) -; - -[twenty_four] - (oh [hour] MIN *hours) - ([hour] MIN hours) -MIN - (hundred) - ([minute]) -; - -[noon] - (*twelve noon) - (noontime) - (noon time) -; - -[midnight] - (midnight) -; - -[after] - (*JUST AFTER) -JUST - (*at just) - (shortly) -AFTER - (after) - (later than) - (afterwards) - (NOT BEFORE *that) - (past) -BEFORE - (before) - (sooner *than) - (earlier *than) - (prior to) -NOT - (not) - (no) -; - -[before] - (*JUST before) - (sooner than) - (*JUST prior to) - (*JUST earlier than) - (not AFTER *that) - (NOT later than *that) -JUST - (*at just) - (shortly) -AFTER - (after) - (afterwards) - (past) -NOT - (not) - (no) -; - - -[quarter] - (quarter) -; - -[half] - (half) -; - -[minute_rel] - ([minute]) -; - -[minute] - (T_TEN *T_ONE) - (TEEN) - (ZERO T_ONE) -T_ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -T_TEN - (twenty) - (thirty) - (forty) - (fifty) -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -ZERO - (zero) - (oh) -; - -[time_of_day] - (*SOMETIME *[period_mod] *in *the *[period_mod] [period_of_day]) - -SOMETIME - (sometime) - (some time) - (anytime) - (any time) -; - -[hour] - (an) - (one) - (a couple of) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (noon) -; - -[day_of_week] - ([day_name]) - ([weekend]) - ([weekday]) -; - -[day_name] - (monday) - (tuesday) - (wednesday) - (thursday) - (friday) - (saturday) - (sunday) - (mondays) - (tuesdays) - (wednesdays) - (thursdays) - (fridays) - (saturdays) - (sundays) - (monday's) - (tuesday's) - (wednesday's) - (thursday's) - (friday's) - (saturday's) - (sunday's) -; - -[weekend] - (weekend) - (weekends) -; - -[weekday] - (MIDDLE *of *THE week) - (midweek) - (weekday) - (weekdays) - (MONDAY *AND TUESDAY *AND WEDNESDAY *AND THURSDAY *AND FRIDAY) - -THE - (a) - (the) - -MIDDLE - (mid) - (middle) - -MONDAY - (monday) - (mondays) - -TUESDAY - (tuesday) - (tuesdays) - -WEDNESDAY - (wednesday) - (wednesdays) - -THURSDAY - (thursday) - (thursdays) - -FRIDAY - (friday) - (fridays) - -AND - (and *or) - (or) -; - -[today_relative] - (today) - (today's) - (tonight) - (this [time_range]) - (tomorrow) - (tomorrow's) - (yesterday) - (yesterday's) -; - -[period_mod] - ([early]) - ([late]) - ([mid]) -; - -[period_of_day] - ([am]) - ([pm]) - ([morning]) - ([afternoon]) - ([evening]) - ([night]) - ([early_day]) - ([late_day]) - ([mid_day]) - ([anytime]) -; - -[am] - (a_m) - (a m) -; - -[pm] - (p_m) - (pm) - (p m) -; - -[morning] - (morning) - (mornings) -; - -[afternoon] - (afternoon) - (after noon) - (afternoons) -; - -[evening] - (evening) - (evenings) -; - -[night] - (night) - (nights) -; - -[early_day] - (early in the day) - (*in the early part of the day) - (*at *the beginning of the day) -; - -[late_day] - (late in the day) - (late *in day) - (*at *the end of the day) -; - -[mid_day] - (midday) - (mid day) - (*in *the middle *part of the day) -; - -[anytime] - (any TIME) - (any_time) - (anytime) - (all TIME) - (regardless of time) - -TIME - (time) - (times) -; - -[early] - (*MOD early) -MOD - (very) - (real) - (really) -; - -[late] - (*MOD late) -MOD - (very) - (real) - (really) -; - -[mid] - (mid) - (*in *the middle of the) -; - -[time_relative] - ([now]) - ([time_relative_before]) - ([time_relative_after]) -; - -[now] - (*right now) - (as soon as possible) - (immediately) - (right away) -; - -[time_relative_before] - ([duration] ago) -; - -[time_relative_after] - (in [duration]) -; - -[duration] - ([hour] hour *AND_MINUTES) - ([hour] hours *AND_MINUTES) - ([minute] minutes) -AND_MINUTES - (*and [minute] *MINUTE) - (*and *a [d_quarter]) - (*and *a [d_half]) -MINUTE - (minute) - (minutes) -; - -[d_half] - (half) -; - -[d_quarter] - (quarter) -; - -[time_duration] - (*for *A_PERIOD_OF [duration]) - (*for [whole_day]) - -A_PERIOD_OF - (a period of) - (*just *around) - (about) - (approximately) -; - -[whole_day] - (*the whole day) - (all day *long) -; \ No newline at end of file Deleted: trunk/TeamTalk/Resources/Grammar/Number-20.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-20.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Number-20.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,21 +0,0 @@ - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) Deleted: trunk/TeamTalk/Resources/Grammar/Number-60-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-60-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Number-60-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,12 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) Deleted: trunk/TeamTalk/Resources/Grammar/Number-80-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-80-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Number-80-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,16 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) Deleted: trunk/TeamTalk/Resources/Grammar/Number-95-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/Number-95-by5.class 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/Number-95-by5.class 2007-10-11 20:02:02 UTC (rev 837) @@ -1,19 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) #%%0.1%% there are more likely? - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) - (eighty five) - (ninety) #%%0.1%% - (ninety five) Deleted: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-11 20:02:02 UTC (rev 837) @@ -1,43 +0,0 @@ -################################################################### -# -# TeamTalk Grammar -# -# Written by: June Sison -# -# This is the forms file corresponding to the phoenix grammar for -# the TeamTalk system -# -# -# HISTORY ------------------------------------------------------- -# -# [2005-09-21] (dbohus): added cancel -# [2005-09-21] (tk): added yes/no -# [2003-03-08] (sison): started working on this -# -################################################################### - -FUNCTION: Commands - NETS: - [InvokePlay] - [ControlRobot] - [QueryRobot] - [MoveRobot] - [RespondYesNo] -# [HumanGoodbyeCommand] -; - -FUNCTION: Features - NETS: - [AbsoluteDistance] - [TurnDirection] - [MoveDirection] -; - - - -# these auxiliaries are defined in order to capture some parses like -# next, this that, which o/w would parse as date-time -#FUNCTION: Auxiliaries -# NETS: -# [__datetime_junk] -#; \ No newline at end of file Deleted: trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-11 14:46:57 UTC (rev 836) +++ trunk/TeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-11 20:02:02 UTC (rev 837) @@ -1,396 +0,0 @@ -################################################################### -# -# TEAMTALK T A S K G R A M M A R -# -# HISTORY: ------------------------------------------------------- -# -# [2003-03-08] (sison): started working on this -# -################################################################### - -[RobotName] - (everyone) - (%[DynamicRobotName]%) # class stub -; - -[OBJ-Robot] - ([RobotName]) -; - - -######### Main Nets ############## - -[InvokePlay] - ([HumanExploreCommand]) - ([HumanSearchCommand]) - ([HumanFollowCommand]) -; - -[ControlRobot] - ([HumanReportCommand]) - ([HumanPauseCommand]) - ([HumanContinueCommand]) - ([HumanHaltCommand]) - ([Cancel]) -; - -[QueryRobot] - ([HumanLocationQuery]) -; - -[MoveRobot] - ([HumanMoveCommand]) - ([HumanTurnCommand]) - ([MoveVectorRelative]) -# ([MoveVectorCardinal]) - ([MoveToGoal]) -; - -[RespondYesNo] - ([Yes]) - ([No]) -; - -########################################### - - - -[HumanExploreCommand] - (explore *[MapLocation]) -; - -[HumanSearchCommand] - (search *[MapLocation]) - (search [MoveDirection]) -; - -[HumanFollowCommand] - (*[RobotName] FOLLOW [OBJ-Robot]) -FOLLOW - (join) - (follow) - (find) -; - -[HumanPauseCommand] - (*[RobotName] pause *tas*herek) -; - -[HumanContinueCommand] - (*[RobotName] continue *task) -; - -[HumanReportCommand] - (*[RobotName] report) - ([RobotName]) -; - -[HumanLocationQuery] - (*[RobotName] where are you) - (*[RobotName] report location) -; - -[HumanHaltCommand] - (*[RobotName] all stop) - (*[RobotName] stop immediately) -; - -[Number-180-by5] - ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion - ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% -HUNDRED - ( a hundred ) - ( one hundred ) -; - -[Number-over180] - (*one hundred *and %[Number-95-by5]%) #%%0.1%% - (two hundred *and %[Number-95-by5]%) #%%0.5%% - (three hundred *and %[Number-60-by5]%) #%%0.4%% -; - -[TurnDirection] - (*PREP SIDE *[AngularQualifier]) - ([AngularQualifier] *PREP *SIDE) - (around) -SIDE - (right) - (left) -PREP - (to the) - (to your) -; - -[MoveDirection] - (*PREP SIDE) - (straight) - (forward) - (forwards) - (back) - (backward) - (backwards) -SIDE - (left) - (right) -PREP - (to the) - (to your) -; - -[AngularQualifier] - ([Number-180-by5] degrees) #%%0.667%% - ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's -; - - -[AbsoluteDistance] - (%[Number-20]% [Units]) -; - -[RelativeDistance] - ([TeamTalkAll] *of the way) - ([TeamTalkHalf] *of *the way) - ([TeamTalkThird] of the way) - ([TeamTalkTwoThird] of the way) - ([TeamTalkOneQuarter] of the way) - ([TeamTalkThreeQuarter] of the way) -; - -[MapLocation] - (this space) - (the area) - (around *PLACE) - (PLACE) -PLACE - (here) - (there) - (your location) -; - - -[TeamTalkAll] - (all) -; - -[TeamTalkHalf] - (*MOD half) -MOD - (one) - (a) -; - -[TeamTalkThird] - (MOD third) -MOD - (one) - (a) -; - -[TeamTalkTwoThird] - (two third) - (two thirds) -; - -[TeamTalkOneQuarter] - (one quarter) - (one fourth) - (a quarter) - (a fourth) -; - - -[TeamTalkThreeQuarter] - (three quarter) - (three quarters) - (three fourth) - (three fourths) -; - -[HumanMoveCommand] -# ([MoveVectorCardinal]) - ([MoveVectorRelative]) - ([MoveToGoal]) -; - -[Join] - (*[RobotName] join [RobotName]) -; - -#[MoveVectorCardinal] -# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) -# (*[RobotName] MOVE [CardinalDirection]) -# -#MOVE -# (move) -# (go) -#; - -[MoveVectorRelative] - (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) - (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) -MOVE - (move) - (go) - (drive) - (return) -; - -[HumanTurnCommand] - (*[RobotName] TURN [TurnDirection]) -TURN - (turn) - (face) - (move) - (go) -; -[MoveToGoal] - (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) - (*[RobotName] MOVE [Home]) -MOVE - (move *to) - (go *to) - (drive *to) -PREP - (toward) - (towards) - (to) - (down *to) - (down towards) - (up *to) - (up towards) -; - -[Side] - (the=north=end=of) - (the=east=end=of) - (the=south=end=of) - (the=west=end=of) - -[Goal] - ([Home]) - ([Xcoord] [Ycoord]) -; - -[Home] - (home) - (base) -; - -[Xcoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Ycoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Units] - (metres) - (metre) -# (feet) -# (foot) -# (yards) -# (yard) -; - -#[HumanGoodbyeCommand] -# (goodbye) -# (bye) -# (mission complete) -# (that's it) -; - - - - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (OKAY) - (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain - (STRONG_MOD) #%%0.10%% -YES - (yes) - (yeah) -# (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (absolutely) - (definitely) - (OKAY OKAY) -WEAK_MOD - (why not) - (i think so) - (i guess so) -OKAY - (okay) - (sure) - (of course) - (correct) - (perfect) - (great) - (acceptable) - (good *enough) -# (fine) -# (wonderful) -# (right) -# (alright) -; - -[No] - (no *MOD) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (nevermind) - (not really) - (negative) -# (nowhere) -DONT - (don't) - (do not) -MOD - (thanks) - (thank=you) # should be a lexeme - (not really) - (it's not) - (i'm not) -#NO -# (no) -# (not) -#GOOD -# (right) -# (correct) -# (good) -# (okay) -; - - -################################################################### -# CANCEL grammar -################################################################### - -[Cancel] - (CANCEL *COMMAND) -CANCEL - (abort) - (cancel) - (quit) -COMMAND - (*that command) - (that) -; \ No newline at end of file Copied: trunk/TeamTalk/Resources/Grammar/bin (from rev 836, branches/air/Resources/Grammar/bin) Deleted: trunk/TeamTalk/Resources/Grammar/bin/compile.exe =================================================================== (Binary files differ) @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Fri Oct 12 02:49:23 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 12 Oct 2007 02:49:23 -0400 Subject: [TeamTalk 302]: [838] trunk/TeamTalk: 1) deleted unused configuration files Message-ID: <200710120649.l9C6nNcK006461@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071012/b0e2e3ab/attachment-0001.html -------------- next part -------------- Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop-simulated.bat =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop-simulated.bat 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop-simulated.bat 2007-10-12 06:49:22 UTC (rev 838) @@ -1,3 +0,0 @@ -set GAL_VERBOSE=1 -set SLS_VERBOSE=1 -..\..\Bin\x86-nt\processmonitor.exe -list startlist-desktop-simulated.txt -crashlog crash.log -restart_delay 100 -remedy nothing Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop.bat =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop.bat 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-desktop.bat 2007-10-12 06:49:22 UTC (rev 838) @@ -1,5 +0,0 @@ -rem set GAL_VERBOSE=1 -rem set SLS_VERBOSE=1 -set GC_HOME=..\..\ExternalLibraries\Galaxy -rem ..\..\Bin\x86-nt\processmonitor.exe -list startlist-desktop.txt -crashlog crash.log -restart_delay 100 -remedy nothing -python ..\..\Pythia\src\process_monitor.py startlist-desktop.config Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-Release.bat =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-Release.bat 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-Release.bat 2007-10-12 06:49:22 UTC (rev 838) @@ -1,3 +0,0 @@ -set GAL_VERBOSE=1 -set SLS_VERBOSE=1 -..\..\Bin\x86-nt\processmonitor.exe -list startlist-desktop-nopendecoder.txt -crashlog crash.log -restart_delay 100 -remedy nothing Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-simulated.bat =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-simulated.bat 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk_LaunchAll-nopendecoder-simulated.bat 2007-10-12 06:49:22 UTC (rev 838) @@ -1,3 +0,0 @@ -set GAL_VERBOSE=1 -set SLS_VERBOSE=1 -..\..\Bin\x86-nt\processmonitor.exe -list startlist-desktop-nopendecoder-simulated.txt -crashlog crash.log -restart_delay 100 -remedy nothing Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder-simulated.txt =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder-simulated.txt 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder-simulated.txt 2007-10-12 06:49:22 UTC (rev 838) @@ -1,71 +0,0 @@ -:10 -{ - -{ - title Simulator - dir . - path ..\..\Bin\x86-nt\backendstub.exe --peerfile peerfile.txt -} - -{ - title zap2Backend - dir . - path ..\..\Bin\x86-nt\zap2Backend.exe -verbosity 5 -maxconns 6 -pgm__template zap2-hub-desktop-nopendecoder-template.pgm - server_name zap2Backend -} - -{ - title Kalliope - dir . - path ..\..\Bin\x86-nt\KalliopeSwift.exe -maxconns 6 -config swift.cfg - server_name kalliope -} - -{ - title zap2NLG - dir ..\..\Agents\zap2NLG - path perl -I..\Rosetta bin\zap -} - -{ - title NLGServer2 - dir . - path ..\..\Bin\x86-nt\NlgServer2.exe -maxconns 6 -nlghost localhost - server_name nlg -} - -{ - title Phoenix2 - dir . - path ..\..\Bin\x86-nt\phoenix2.exe -maxconns 6 -grammardir ..\..\Resources\Grammar\ -grammarfn ..\..\Resources\Grammar\zap2.net - server_name phoenix -} - -{ - title SPHINX_AUDIO - dir . - path ..\..\Bin\x86-nt\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt - server_name sphinx -} - -{ - title SPHINX_MALE - dir ..\..\Resources\DecoderConfig\ - path ..\..\Bin\x86-nt\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990 - server_name sphinx_male -} - -{ - title TTYRecognitionServer2 - dir . - path ..\..\Bin\x86-nt\TTYRecognitionServer2.exe -maxconns 6 - server_name tty-server -} - -{ - title HUB - dir . - path ..\..\ExternalLibraries\Galaxy\bin\x86-nt\HUB.exe -verbosity 3 -pgm_file zap2-hub-desktop-nopendecoder-skeleton.pgm -} - -} \ No newline at end of file Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder.txt =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder.txt 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-nopendecoder.txt 2007-10-12 06:49:22 UTC (rev 838) @@ -1,65 +0,0 @@ -:9 -{ - -{ - title zap2Backend - dir . - path ..\..\Bin\x86-nt\zap2Backend.exe -verbosity 5 -maxconns 6 -pgm__template zap2-hub-desktop-nopendecoder-template.pgm - server_name zap2Backend -} - -{ - title Kalliope - dir . - path ..\..\Bin\x86-nt\KalliopeSwift.exe -maxconns 6 -config swift.cfg - server_name kalliope -} - -{ - title zap2NLG - dir ..\..\Agents\zap2NLG - path perl -I..\Rosetta bin\zap -} - -{ - title NLGServer2 - dir . - path ..\..\Bin\x86-nt\NlgServer2.exe -maxconns 6 -nlghost localhost - server_name nlg -} - -{ - title Phoenix2 - dir . - path ..\..\Bin\x86-nt\phoenix2.exe -maxconns 6 -grammardir ..\..\Resources\Grammar\ -grammarfn ..\..\Resources\Grammar\zap2.net - server_name phoenix -} - -{ - title SPHINX_AUDIO - dir . - path ..\..\Bin\x86-nt\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt - server_name sphinx -} - -{ - title SPHINX_MALE - dir ..\..\Resources\DecoderConfig\ - path ..\..\Bin\x86-nt\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990 - server_name sphinx_male -} - -{ - title TTYRecognitionServer2 - dir . - path ..\..\Bin\x86-nt\TTYRecognitionServer2.exe -maxconns 6 - server_name tty-server -} - -{ - title HUB - dir . - path ..\..\ExternalLibraries\Galaxy\bin\x86-nt\HUB.exe -verbosity 3 -pgm_file zap2-hub-desktop-nopendecoder-skeleton.pgm -} - -} \ No newline at end of file Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-simulated.txt =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-simulated.txt 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop-simulated.txt 2007-10-12 06:49:22 UTC (rev 838) @@ -1,81 +0,0 @@ -:11 -{ - -{ - title HUB - dir . - path ..\..\ExternalLibraries\Galaxy\bin\x86-nt\HUB.exe -verbosity 3 -pgm_file zap2-hub-desktop-skeleton.pgm - server_name hub -} - -{ - title Simulator - dir . - path ..\..\Bin\x86-nt\backendstub.exe --peerfile peerfile.txt - server_name simulator -} - -{ - title SPHINX_AUDIO - dir . - path ..\..\Bin\x86-nt\Audio_Server.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt - server_name sphinx -} - -{ - title SPHINX_MALE - dir ..\..\Resources\DecoderConfig\ - path ..\..\Bin\x86-nt\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990 - server_name sphinx_male -} - -{ - title PenDecoder - dir ..\..\Agents\PenDecoder - path java -classpath bsh-core-2.0b4.jar;bsh-util-2.0b4.jar;jiu.jar;dist/PenDecoder.jar;../../ExternalLibraries/galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 - server_name PenDecoder -} - -{ - title zap2Backend - dir . - path ..\..\Bin\x86-nt\zap2Backend.exe -verbosity 5 -maxconns 6 - server_name zap2Backend -} - -{ - title Kalliope - dir . - path ..\..\Bin\x86-nt\KalliopeSwift.exe -maxconns 6 -config swift.cfg - server_name kalliope -} - -{ - title zap2NLG - dir ..\..\Agents\zap2NLG - path perl -I..\Rosetta bin\zap - server_name zap2nlg -} - -{ - title NLGServer2 - dir . - path ..\..\Bin\x86-nt\NlgServer2.exe -maxconns 6 -nlghost localhost - server_name nlg -} - -{ - title Phoenix2 - dir . - path ..\..\Bin\x86-nt\phoenix2.exe -maxconns 6 -grammardir ..\..\Resources\Grammar\ -grammarfn ..\..\Resources\Grammar\zap2.net - server_name phoenix -} - -{ - title TTYRecognitionServer2 - dir . - path ..\..\Bin\x86-nt\TTYRecognitionServer2.exe -maxconns 6 - server_name tty-server -} - -} \ No newline at end of file Deleted: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.txt =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.txt 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.txt 2007-10-12 06:49:22 UTC (rev 838) @@ -1,65 +0,0 @@ -:9 -{ - -{ - title PenDecoder - dir ..\..\Agents\PenDecoder - path java -classpath bsh-core-2.0b4.jar;bsh-util-2.0b4.jar;jiu.jar;dist/PenDecoder.jar;../../Libraries/galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -verbosity 1 -peerfile ..\..\Configurations\DesktopConfiguration\peerfile.txt - server_name PenDecoder -} - -{ - title Kalliope - dir . - path ..\..\Bin\x86-nt\KalliopeSwift.exe -maxconns 6 -config swift.cfg - server_name kalliope -} - -{ - title TeamTalkBackend - dir . - path ..\..\Bin\x86-nt\TeamTalkBackend.exe -verbosity 1 -maxconns 6 - server_name TeamTalkBackend -} - -{ - title TeamTalkNLG - dir ..\..\Agents\TeamTalkNLG - path perl -I..\Rosetta bin\TeamTalk -} - -{ - title NLGServer2 - dir . - path ..\..\Bin\x86-nt\NlgServer2.exe -maxconns 6 -nlghost localhost - server_name nlg -} - -{ - title Phoenix2 - dir . - path ..\..\Bin\x86-nt\phoenix2.exe -maxconns 6 -grammardir ..\..\Resources\Grammar\ -grammarfn ..\..\Resources\Grammar\zap2.net - server_name phoenix -} - -{ - title SPHINX_AUDIO - dir . - path ..\..\Bin\x86-nt\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt - server_name sphinx -} - -{ - title SPHINX_MALE - dir ..\..\Resources\DecoderConfig\ - path ..\..\Bin\x86-nt\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990 - server_name sphinx_male -} - -{ - title HUB - dir . - path ..\..\ExternalLibraries\Galaxy\bin\x86-nt\HUB.exe -verbosity 3 -pgm_file TeamTalk-hub-desktop-skeleton.pgm -} - -} Modified: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-12 06:49:22 UTC (rev 838) @@ -96,17 +96,23 @@ ; [Number-180-by5] - ( %[Number-95-by5]% ) #%%0.54%% # equalize the relative proportion - ( HUNDRED *and %[Number-80-by5]% ) #%%0.46%% + ( %[Number-95-by5]% ) #%%0.53%% # equalize the relative proportion + ( HUNDRED ) #%%0.03%% # 1/36 + ( HUNDRED *and %[Number-80-by5]% ) #%%0.44%% HUNDRED ( a hundred ) ( one hundred ) ; [Number-over180] - (*one hundred *and %[Number-85-95-by5]%) #%%0.1%% - (two hundred *and %[Number-95-by5]%) #%%0.5%% - (three hundred *and %[Number-60-by5]%) #%%0.4%% + ( HUNDRED *and %[Number-85-95-by5]% ) #%%0.08%% + ( two hundred ) #%%0.03%% + ( two hundred *and %[Number-95-by5]% ) #%%0.53%% + ( three hundred ) #%%0.03%% + ( three hundred *and %[Number-60-by5]% ) #%%0.33%% +HUNDRED + ( a hundred ) + ( one hundred ) ; [TurnDirection] Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-11 20:02:02 UTC (rev 837) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-12 06:49:22 UTC (rev 838) @@ -15,31 +15,31 @@ { "Entry" { - "MsmKey" = "8:_002B6A85A7CC4F58A41C0E66559EF2F5" + "MsmKey" = "8:_00271E747A244BD1B0FD6534BCEAE9B3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_013D1E52E00548FEB183B38D85900ABA" + "MsmKey" = "8:_002B6A85A7CC4F58A41C0E66559EF2F5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_023AB5B3B0664D3282EA8884B768A8B5" + "MsmKey" = "8:_013D1E52E00548FEB183B38D85900ABA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_02D281C4A32647A69930365189B7AE02" + "MsmKey" = "8:_023AB5B3B0664D3282EA8884B768A8B5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_036849EDFA984EB5A466BB41D745E835" + "MsmKey" = "8:_02D281C4A32647A69930365189B7AE02" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -201,43 +201,85 @@ } "Entry" { - "MsmKey" = "8:_13C68E8847184ADBAF5D776878174596" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_13D864D2C04048EA9A50F68142893A64" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_149C1A64FBA743039979B52DB0DC6816" + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13C68E8847184ADBAF5D776878174596" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_15294B3DEB8C41BB8A72D8D673052600" + "MsmKey" = "8:_149C1A64FBA743039979B52DB0DC6816" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_157A468AA4A046298308B5812913A89E" + "MsmKey" = "8:_15294B3DEB8C41BB8A72D8D673052600" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_157C912CB9074B88A13B6B29C1C19021" + "MsmKey" = "8:_155BB77367F44C428F02F14EA4E8F80A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_16AE7F56E3924275AEEBAD1BF29D7523" + "MsmKey" = "8:_157A468AA4A046298308B5812913A89E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -309,8 +351,8 @@ } "Entry" { - "MsmKey" = "8:_1C1E3A5FC9D1479D99679369B687175D" - "OwnerKey" = "8:_932B1984BA5340B1A5F5A54A1CE8DD3F" + "MsmKey" = "8:_1E338A0764814461BD1A18185B970E5C" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -327,12 +369,6 @@ } "Entry" { - "MsmKey" = "8:_2310AADE34FD4EF0A6150107608F2D29" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_237DEAF485884F808CAB068A594A12FA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -357,12 +393,6 @@ } "Entry" { - "MsmKey" = "8:_241E26B163DF4E4795E8FC1715CB7247" - "OwnerKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_24320F46F3DE4F4BBBD065FA1B901FB4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -387,12 +417,6 @@ } "Entry" { - "MsmKey" = "8:_25705CACBFA1425888CCDA89AFE0904C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_259488D2823E406385D39DC823CC1748" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -489,12 +513,6 @@ } "Entry" { - "MsmKey" = "8:_2F376035B83044618D6C2F77634217CC" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2FA7BA352538487C88214E8E875056EE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -543,67 +561,13 @@ } "Entry" { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_32D3F83D1FD74508BC12C3FA5E53FDCB" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_32E583E5823041D086FA46F5B4850F12" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3330C9457E4A4B1EBBCFE6CA63F883E4" + "MsmKey" = "8:_32FDD600EDF74940AA84709644BF4927" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -621,12 +585,6 @@ } "Entry" { - "MsmKey" = "8:_3507904FA88848C59234454822C86A0D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3537512FD1644803A2681543E90479F6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -681,24 +639,12 @@ } "Entry" { - "MsmKey" = "8:_3AF2DDE0E77C423093C821AF49BCC2CD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3B732BFAE00B47069169870EF2DFABF6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3B7EBC2D417D4572A802AA698E1DC2A4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3BB5A183D7A5405F96C6DF35E207C93C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -747,6 +693,12 @@ } "Entry" { + "MsmKey" = "8:_3EEBAF75A48948C497B44AB7CA734A9F" + "OwnerKey" = "8:_12EE435426E1466ABFA477614471457A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_402D9A3DA8FF4167A146C530E3C36771" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -873,7 +825,7 @@ } "Entry" { - "MsmKey" = "8:_49F62D7F822A4C1481A1043081634286" + "MsmKey" = "8:_494F7AE4B14F4C3F82EF22A6E1F78C19" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -993,12 +945,6 @@ } "Entry" { - "MsmKey" = "8:_5194314FB00E464E9C1C6E3AA6AAF2E0" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_52E9A693BA1F460DB614E0A1F96B13A5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1041,12 +987,6 @@ } "Entry" { - "MsmKey" = "8:_553222DB9C29416C860E7E92436DA6D6" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_559CBDA427784DAD89CE84AA41532E38" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1089,12 +1029,6 @@ } "Entry" { - "MsmKey" = "8:_58351606DFA343239887D3463965A060" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_584D2106059D4E849E4739FDCCF9D425" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1155,12 +1089,6 @@ } "Entry" { - "MsmKey" = "8:_5E10C7E28C0D463BA86ED1B27058B5BA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5E6B158AA7824BEC891B66D4C2C7927D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1191,12 +1119,6 @@ } "Entry" { - "MsmKey" = "8:_607C7E02512D46269D151D2E92671138" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_60E2C3F691B84FE9B5851E6825F54914" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1281,6 +1203,12 @@ } "Entry" { + "MsmKey" = "8:_69BD5829EA4D45B6BB2542FFE4D61B32" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6A0E8D3A0F2E417D89FB9CDA634ACA60" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1311,12 +1239,6 @@ } "Entry" { - "MsmKey" = "8:_6CEC8D67A8BC445790E93638357CB92B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6CF69BFE028F4E7F83C6FD58BB3BA3FE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1383,18 +1305,12 @@ } "Entry" { - "MsmKey" = "8:_726B4704FF88420DBF6DAF50DE404EA9" + "MsmKey" = "8:_7234DF5999AD431697A04D4089498BFF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7418FD3E6BA242048BB35403610193E8" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_743D22B657184B1793B26572F4525228" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1413,7 +1329,7 @@ } "Entry" { - "MsmKey" = "8:_7833F54C4B6B468FAFFD10D177A162EB" + "MsmKey" = "8:_7561CE08A360454A8C97BED683111A93" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -1425,7 +1341,7 @@ } "Entry" { - "MsmKey" = "8:_79A329109B72400F9B52A6C46ACC8153" + "MsmKey" = "8:_78F51EFAC5DD4F11B75CDF657EC76B05" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -1683,8 +1599,8 @@ } "Entry" { - "MsmKey" = "8:_932B1984BA5340B1A5F5A54A1CE8DD3F" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmKey" = "8:_931F514BF03F4B1E924F3C669455A4C2" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1719,12 +1635,6 @@ } "Entry" { - "MsmKey" = "8:_9511AF0830404963B2417DDA4E10A14F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_9583D7E4A8D6443B984342ADAFAF2E48" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1737,12 +1647,6 @@ } "Entry" { - "MsmKey" = "8:_982B084A58F542EEB599E36FF6AF5C96" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_98780EE60DFB47F5905F8153FB36FDAB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1773,31 +1677,31 @@ } "Entry" { - "MsmKey" = "8:_9B80A7159B5640BEADC0835553227925" + "MsmKey" = "8:_9BB5C5B5C7094E79B4C0DC3788C50F2C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9BB5C5B5C7094E79B4C0DC3788C50F2C" + "MsmKey" = "8:_9C552C1D2D2F458B91C7875FEAA1AA04" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9C552C1D2D2F458B91C7875FEAA1AA04" + "MsmKey" = "8:_9D4730F8F4FD4B0BA87D73351C325E70" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9D4730F8F4FD4B0BA87D73351C325E70" + "MsmKey" = "8:_9E0EBA23D6C14303AB08621E685BEEDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9E0EBA23D6C14303AB08621E685BEEDA" + "MsmKey" = "8:_9E7E7220A5244F3E8DC1857B88D18FFF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -2001,12 +1905,6 @@ } "Entry" { - "MsmKey" = "8:_B05D2A4C3FE446DFAB209DD549FCED52" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B1A34A6EE27842E78549B9D435D8CA04" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2037,12 +1935,6 @@ } "Entry" { - "MsmKey" = "8:_B3E7DEB30F8849EFA28C2E429F7CBDD4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B44AFD8DB8724186A57E182D3CCD1314" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2091,12 +1983,6 @@ } "Entry" { - "MsmKey" = "8:_B7B520043CFC4851BBE75C628A4EB3C6" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B7E9D135C74645CFB50E2EA3E811ED5D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2211,26 +2097,26 @@ } "Entry" { - "MsmKey" = "8:_C1404FC7157B45C6811A665C84942AD3" + "MsmKey" = "8:_C1FA30C5F48C4649AB948B794BE5F6C1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C1FA30C5F48C4649AB948B794BE5F6C1" + "MsmKey" = "8:_C28236C24F1544A9AE582922113CECF0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C28236C24F1544A9AE582922113CECF0" + "MsmKey" = "8:_C3BD6A1B5AAB448A9A293428C911B311" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C3BD6A1B5AAB448A9A293428C911B311" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_C43F0F0F2CFF441B8B45EE7F18A57B84" + "OwnerKey" = "8:_FC28DAC6C4754B9BA6A2FCFF78FE3348" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2337,6 +2223,12 @@ } "Entry" { + "MsmKey" = "8:_CD4E12772134424391D9B1766A263503" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CE16BE7385924C91AE126A812C58B922" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2385,12 +2277,6 @@ } "Entry" { - "MsmKey" = "8:_D251E76ADF4C477EAF2CEEAB256910A6" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2494,7 +2380,7 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2506,13 +2392,13 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2541,12 +2427,6 @@ } "Entry" { - "MsmKey" = "8:_DE75885AF25C4696949C68AC2D350608" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_DE8FCA61078347EAAAD1F0003986508A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2583,12 +2463,6 @@ } "Entry" { - "MsmKey" = "8:_E073FCEBC3304C21BD558E2D3E5194D5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E16CADBC4CA944CEB6769D3B1BB4F1DF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2637,12 +2511,6 @@ } "Entry" { - "MsmKey" = "8:_E647698D69CC49578F3602CC474A6491" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E731AD6F5D324159A5AE976D3DB17D9E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2883,6 +2751,12 @@ } "Entry" { + "MsmKey" = "8:_FC28DAC6C4754B9BA6A2FCFF78FE3348" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FCC99F251F694A88A3364CE5C09D30E6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3005,6 +2879,26 @@ } "File" { + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_00271E747A244BD1B0FD6534BCEAE9B3" + { + "SourcePath" = "8:..\\Resources\\Grammar\\bin\\pqual.exe" + "TargetName" = "8:pqual.exe" + "Tag" = "8:" + "Folder" = "8:_39871BED3F514116ABDE29465F64591B" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_002B6A85A7CC4F58A41C0E66559EF2F5" { "SourcePath" = "8:..\\Tools\\MakeLM\\CMU-Cam_Toolkit_v2\\test_endian.exe" @@ -3085,26 +2979,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_036849EDFA984EB5A466BB41D745E835" - { - "SourcePath" = "8:..\\Resources\\Grammar\\pqual.exe" - "TargetName" = "8:pqual.exe" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_04C73E0A07764535927E0E8E14F71014" { "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\peerfile-example.txt" @@ -3625,26 +3499,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13D864D2C04048EA9A50F68142893A64" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\helios-BASHFUL.cfg" - "TargetName" = "8:helios-BASHFUL.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_149C1A64FBA743039979B52DB0DC6816" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\map" @@ -3685,12 +3539,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_157A468AA4A046298308B5812913A89E" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_155BB77367F44C428F02F14EA4E8F80A" { - "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\msgs\\en_gb.msg" - "TargetName" = "8:en_gb.msg" + "SourcePath" = "8:..\\Resources\\Grammar\\GRAMMAR\\Number-20.class" + "TargetName" = "8:Number-20.class" "Tag" = "8:" - "Folder" = "8:_FA6DA5D0A6D3407EA781E90C1AB4A42B" + "Folder" = "8:_00165ADB6DB945D3B4F6F86DA80F87BE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3705,12 +3559,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_157C912CB9074B88A13B6B29C1C19021" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_157A468AA4A046298308B5812913A89E" { - "SourcePath" = "8:..\\Resources\\Grammar\\Number-95-by5.class" - "TargetName" = "8:Number-95-by5.class" + "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\msgs\\en_gb.msg" + "TargetName" = "8:en_gb.msg" "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" + "Folder" = "8:_FA6DA5D0A6D3407EA781E90C1AB4A42B" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3725,26 +3579,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_16AE7F56E3924275AEEBAD1BF29D7523" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\LanguageModel\\zap2.ctl" - "TargetName" = "8:zap2.ctl" - "Tag" = "8:" - "Folder" = "8:_F8D56146346A4F95843ABFF20E4E4337" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_173D57BA889741D1A46DF017FC1F64BD" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\cp932.enc" @@ -3965,12 +3799,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F42C3E071BB42A7A5833617DB0733B9" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E338A0764814461BD1A18185B970E5C" { - "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\check.tcl" - "TargetName" = "8:check.tcl" + "SourcePath" = "8:..\\Resources\\Grammar\\bin\\train.exe" + "TargetName" = "8:train.exe" "Tag" = "8:" - "Folder" = "8:_1127C99C8AE54B5AB44A34FD078D018B" + "Folder" = "8:_39871BED3F514116ABDE29465F64591B" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -3985,12 +3819,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_22A3EEF5F5314DD8A2A70E8E926F65BF" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F42C3E071BB42A7A5833617DB0733B9" { - "SourcePath" = "8:..\\Libraries\\Galaxy\\bin\\x86-nt\\HUB_debug.exe" - "TargetName" = "8:HUB_debug.exe" + "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\check.tcl" + "TargetName" = "8:check.tcl" "Tag" = "8:" - "Folder" = "8:_D411185E6E044073825111AB7109F410" + "Folder" = "8:_1127C99C8AE54B5AB44A34FD078D018B" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -4005,12 +3839,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2310AADE34FD4EF0A6150107608F2D29" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_22A3EEF5F5314DD8A2A70E8E926F65BF" { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\expl-BASHFUL.pol" - "TargetName" = "8:expl-BASHFUL.pol" + "SourcePath" = "8:..\\Libraries\\Galaxy\\bin\\x86-nt\\HUB_debug.exe" + "TargetName" = "8:HUB_debug.exe" "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" + "Folder" = "8:_D411185E6E044073825111AB7109F410" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -4185,26 +4019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_25705CACBFA1425888CCDA89AFE0904C" - { - "SourcePath" = "8:..\\Resources\\Grammar\\TeamTalkTask.forms" - "TargetName" = "8:TeamTalkTask.forms" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_259488D2823E406385D39DC823CC1748" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\tearoff.tcl" @@ -4525,26 +4339,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2F376035B83044618D6C2F77634217CC" - { - "SourcePath" = "8:..\\Resources\\Grammar\\nets" - "TargetName" = "8:nets" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2FA7BA352538487C88214E8E875056EE" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\F.chmm" @@ -4725,12 +4519,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3330C9457E4A4B1EBBCFE6CA63F883E4" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_32FDD600EDF74940AA84709644BF4927" { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\peerfile.txt~" - "TargetName" = "8:peerfile.txt~" + "SourcePath" = "8:..\\Resources\\Grammar\\bin\\compile.exe" + "TargetName" = "8:compile.exe" "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" + "Folder" = "8:_39871BED3F514116ABDE29465F64591B" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -4785,26 +4579,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3507904FA88848C59234454822C86A0D" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\grounding-BASHFUL.policies" - "TargetName" = "8:grounding-BASHFUL.policies" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3537512FD1644803A2681543E90479F6" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\gb2312.enc" @@ -4965,26 +4739,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3AF2DDE0E77C423093C821AF49BCC2CD" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\helios-ALPHIE.cfg" - "TargetName" = "8:helios-ALPHIE.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B732BFAE00B47069169870EF2DFABF6" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\bgerror.tcl" @@ -5005,26 +4759,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B7EBC2D417D4572A802AA698E1DC2A4" - { - "SourcePath" = "8:..\\Resources\\Grammar\\train.exe" - "TargetName" = "8:train.exe" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BB5A183D7A5405F96C6DF35E207C93C" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\ldAout.tcl" @@ -5565,12 +5299,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49F62D7F822A4C1481A1043081634286" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_494F7AE4B14F4C3F82EF22A6E1F78C19" { - "SourcePath" = "8:..\\Resources\\Grammar\\cmp.pl" - "TargetName" = "8:cmp.pl" + "SourcePath" = "8:..\\Resources\\Grammar\\GRAMMAR\\Number-60-by5.class" + "TargetName" = "8:Number-60-by5.class" "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" + "Folder" = "8:_00165ADB6DB945D3B4F6F86DA80F87BE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -5965,26 +5699,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5194314FB00E464E9C1C6E3AA6AAF2E0" - { - "SourcePath" = "8:..\\Resources\\Grammar\\TeamTalk.gra" - "TargetName" = "8:TeamTalk.gra" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52E9A693BA1F460DB614E0A1F96B13A5" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\tclIndex" @@ -6085,26 +5799,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_553222DB9C29416C860E7E92436DA6D6" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\expl-ALPHIE.pol" - "TargetName" = "8:expl-ALPHIE.pol" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_559CBDA427784DAD89CE84AA41532E38" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\license.terms" @@ -6245,26 +5939,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_58351606DFA343239887D3463965A060" - { - "SourcePath" = "8:..\\Resources\\Grammar\\Number-60-by5.class" - "TargetName" = "8:Number-60-by5.class" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_584D2106059D4E849E4739FDCCF9D425" { "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop-simulated.txt" @@ -6465,26 +6139,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5E10C7E28C0D463BA86ED1B27058B5BA" - { - "SourcePath" = "8:..\\Resources\\Grammar\\compile.exe" - "TargetName" = "8:compile.exe" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5E6B158AA7824BEC891B66D4C2C7927D" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\EH.chmm" @@ -6565,26 +6219,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_607C7E02512D46269D151D2E92671138" - { - "SourcePath" = "8:..\\Resources\\Grammar\\TeamTalkRobots" - "TargetName" = "8:TeamTalkRobots" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_60E2C3F691B84FE9B5851E6825F54914" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\msgs\\el.msg" @@ -6865,6 +6499,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_69BD5829EA4D45B6BB2542FFE4D61B32" + { + "SourcePath" = "8:..\\Resources\\Grammar\\GRAMMAR\\TeamTalkTask.gra" + "TargetName" = "8:TeamTalkTask.gra" + "Tag" = "8:" + "Folder" = "8:_00165ADB6DB945D3B4F6F86DA80F87BE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A0E8D3A0F2E417D89FB9CDA634ACA60" { "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\Rosetta\\TeamTalk.pm~" @@ -6965,26 +6619,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6CEC8D67A8BC445790E93638357CB92B" - { - "SourcePath" = "8:..\\Resources\\Grammar\\base.dic" - "TargetName" = "8:base.dic" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6CF69BFE028F4E7F83C6FD58BB3BA3FE" { "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\Rosetta\\TeamTalk\\ImplicitConfirm.pm" @@ -7205,12 +6839,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_726B4704FF88420DBF6DAF50DE404EA9" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7234DF5999AD431697A04D4089498BFF" { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\grounding-ALPHIE.policies" - "TargetName" = "8:grounding-ALPHIE.policies" + "SourcePath" = "8:..\\Resources\\Grammar\\bin\\concept_leaf.exe" + "TargetName" = "8:concept_leaf.exe" "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" + "Folder" = "8:_39871BED3F514116ABDE29465F64591B" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -7225,26 +6859,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7418FD3E6BA242048BB35403610193E8" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\peerfile-example.txt~" - "TargetName" = "8:peerfile-example.txt~" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_743D22B657184B1793B26572F4525228" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\entry1.tcl" @@ -7305,12 +6919,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7833F54C4B6B468FAFFD10D177A162EB" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7561CE08A360454A8C97BED683111A93" { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop.config~" - "TargetName" = "8:startlist-desktop.config~" + "SourcePath" = "8:..\\Resources\\Grammar\\GRAMMAR\\Number-80-by5.class" + "TargetName" = "8:Number-80-by5.class" "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" + "Folder" = "8:_00165ADB6DB945D3B4F6F86DA80F87BE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -7345,12 +6959,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_79A329109B72400F9B52A6C46ACC8153" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_78F51EFAC5DD4F11B75CDF657EC76B05" { - "SourcePath" = "8:..\\Resources\\Grammar\\concept_leaf.exe" - "TargetName" = "8:concept_leaf.exe" + "SourcePath" = "8:..\\Resources\\Grammar\\GRAMMAR\\TeamTalkTask.forms" + "TargetName" = "8:TeamTalkTask.forms" "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" + "Folder" = "8:_00165ADB6DB945D3B4F6F86DA80F87BE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -8205,6 +7819,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_931F514BF03F4B1E924F3C669455A4C2" + { + "SourcePath" = "8:..\\Resources\\Grammar\\bin\\parse.exe" + "TargetName" = "8:parse.exe" + "Tag" = "8:" + "Folder" = "8:_39871BED3F514116ABDE29465F64591B" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_93690B659FF84C93B0729EB746D4A427" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\Dictionary\\readme.txt" @@ -8305,26 +7939,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9511AF0830404963B2417DDA4E10A14F" - { - "SourcePath" = "8:..\\Resources\\Grammar\\parse.exe" - "TargetName" = "8:parse.exe" - "Tag" = "8:" - "Folder" = "8:_EEC644A8E35B46C881C09643CA244E07" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9583D7E4A8D6443B984342ADAFAF2E48" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\cp1255.enc" @@ -8365,26 +7979,6 @@ "IsDependency" = "11:FALSE" @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Fri Oct 12 02:59:26 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 12 Oct 2007 02:59:26 -0400 Subject: [TeamTalk 303]: [839] trunk/TeamTalk: Removed Agents and Libraries solution in favor of TeamTalk solution. Message-ID: <200710120659.l9C6xQcr006625@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071012/6db9a7a7/attachment.html -------------- next part -------------- Deleted: trunk/TeamTalk/Agents/Agents.sln =================================================================== --- trunk/TeamTalk/Agents/Agents.sln 2007-10-12 06:49:22 UTC (rev 838) +++ trunk/TeamTalk/Agents/Agents.sln 2007-10-12 06:59:26 UTC (rev 839) @@ -1,130 +0,0 @@ -? -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "backendstub", "TeamTalkBackend\backendstub\backendstub.vcproj", "{596C5D37-C409-4C46-BA28-B7F5EFB96851}" - ProjectSection(ProjectDependencies) = postProject - {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkBackend", "TeamTalkBackend\TeamTalkBackend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" - ProjectSection(ProjectDependencies) = postProject - {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkDM", "TeamTalkDM\TeamTalkDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" - ProjectSection(ProjectDependencies) = postProject - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} = {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kalliope", "Kalliope\Kalliope.vcproj", "{9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" - ProjectSection(ProjectDependencies) = postProject - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" - ProjectSection(ProjectDependencies) = postProject - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Helios\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NlgServer2", "NlgServer\NlgServer2.vcproj", "{20678B74-4291-4384-B05A-A5EC04DC2BCF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phoenix2", "Phoenix\phoenix2.vcproj", "{B2C82072-32EB-4320-B2B1-C97B8D4C68E1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "..\Libraries\RavenClaw\RavenClaw.vcproj", "{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2", "..\Libraries\sphinx2msdev\libsphinx2\libsphinx2.vcproj", "{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2ad", "..\Libraries\sphinx2msdev\libsphinx2ad\libsphinx2ad.vcproj", "{B1A99CB7-705E-41D0-A461-6CE24CB83C50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "..\Libraries\sphinx2msdev\libsphinx2fe\libsphinx2fe.vcproj", "{D1928EF1-ABBB-4130-98E4-8BB293F982F3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\Libraries\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime4", "DateTime\DateTime4.vcproj", "{45BAAD46-E855-4963-9CB6-324A3E276851}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {596C5D37-C409-4C46-BA28-B7F5EFB96851}.Debug|Win32.ActiveCfg = Debug|Win32 - {596C5D37-C409-4C46-BA28-B7F5EFB96851}.Debug|Win32.Build.0 = Debug|Win32 - {596C5D37-C409-4C46-BA28-B7F5EFB96851}.Release|Win32.ActiveCfg = Release|Win32 - {596C5D37-C409-4C46-BA28-B7F5EFB96851}.Release|Win32.Build.0 = Release|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.Build.0 = Debug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.ActiveCfg = Release|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.Build.0 = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.Build.0 = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.Build.0 = Release|Win32 - {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Debug|Win32.ActiveCfg = SwiftDebug|Win32 - {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Debug|Win32.Build.0 = SwiftDebug|Win32 - {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Release|Win32.ActiveCfg = SwiftRelease|Win32 - {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Release|Win32.Build.0 = SwiftRelease|Win32 - {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.ActiveCfg = Debug|Win32 - {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.Build.0 = Debug|Win32 - {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.ActiveCfg = Release|Win32 - {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.Build.0 = Release|Win32 - {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Debug|Win32.ActiveCfg = Debug|Win32 - {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Debug|Win32.Build.0 = Debug|Win32 - {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Release|Win32.ActiveCfg = Release|Win32 - {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Release|Win32.Build.0 = Release|Win32 - {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Debug|Win32.ActiveCfg = Debug|Win32 - {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Debug|Win32.Build.0 = Debug|Win32 - {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Release|Win32.ActiveCfg = Release|Win32 - {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Release|Win32.Build.0 = Release|Win32 - {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Debug|Win32.ActiveCfg = Debug|Win32 - {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Debug|Win32.Build.0 = Debug|Win32 - {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Release|Win32.ActiveCfg = Release|Win32 - {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Release|Win32.Build.0 = Release|Win32 - {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Debug|Win32.Build.0 = Debug|Win32 - {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Release|Win32.ActiveCfg = Release|Win32 - {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Release|Win32.Build.0 = Release|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.ActiveCfg = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.Build.0 = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.ActiveCfg = ReleaseGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.Build.0 = ReleaseGalaxy|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.Build.0 = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.ActiveCfg = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.Build.0 = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.Build.0 = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.ActiveCfg = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.Build.0 = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.Build.0 = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.ActiveCfg = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.Build.0 = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.Build.0 = Release|Win32 - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.Build.0 = Debug|Win32 - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.ActiveCfg = Release|Win32 - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.Build.0 = Release|Win32 - {45BAAD46-E855-4963-9CB6-324A3E276851}.Debug|Win32.ActiveCfg = Debug|Win32 - {45BAAD46-E855-4963-9CB6-324A3E276851}.Debug|Win32.Build.0 = Debug|Win32 - {45BAAD46-E855-4963-9CB6-324A3E276851}.Release|Win32.ActiveCfg = Release|Win32 - {45BAAD46-E855-4963-9CB6-324A3E276851}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Deleted: trunk/TeamTalk/Libraries/Libraries.sln =================================================================== --- trunk/TeamTalk/Libraries/Libraries.sln 2007-10-12 06:49:22 UTC (rev 838) +++ trunk/TeamTalk/Libraries/Libraries.sln 2007-10-12 06:59:26 UTC (rev 839) @@ -1,88 +0,0 @@ -? -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2", "sphinx2msdev\libsphinx2\libsphinx2.vcproj", "{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2ad", "sphinx2msdev\libsphinx2ad\libsphinx2ad.vcproj", "{B1A99CB7-705E-41D0-A461-6CE24CB83C50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "sphinx2msdev\libsphinx2fe\libsphinx2fe.vcproj", "{D1928EF1-ABBB-4130-98E4-8BB293F982F3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "RavenClaw\RavenClaw.vcproj", "{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\Agents\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - DebugGalaxy|Win32 = DebugGalaxy|Win32 - DebugOAA|Win32 = DebugOAA|Win32 - Release|Win32 = Release|Win32 - ReleaseGalaxy|Win32 = ReleaseGalaxy|Win32 - ReleaseOAA|Win32 = ReleaseOAA|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.Build.0 = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugGalaxy|Win32.Build.0 = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugOAA|Win32.ActiveCfg = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugOAA|Win32.Build.0 = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.ActiveCfg = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.Build.0 = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseOAA|Win32.Build.0 = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.Build.0 = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugGalaxy|Win32.Build.0 = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugOAA|Win32.ActiveCfg = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugOAA|Win32.Build.0 = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.ActiveCfg = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.Build.0 = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseOAA|Win32.Build.0 = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.Build.0 = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugGalaxy|Win32.Build.0 = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugOAA|Win32.ActiveCfg = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugOAA|Win32.Build.0 = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.ActiveCfg = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.Build.0 = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseOAA|Win32.Build.0 = Release|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.ActiveCfg = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.Build.0 = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.ActiveCfg = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.Build.0 = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.ActiveCfg = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.Build.0 = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.ActiveCfg = ReleaseGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.Build.0 = ReleaseGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.Build.0 = ReleaseOAA|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugGalaxy|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugOAA|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.DebugOAA|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.Build.0 = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ReleaseOAA|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Modified: trunk/TeamTalk/TeamTalkBuild.bat =================================================================== --- trunk/TeamTalk/TeamTalkBuild.bat 2007-10-12 06:49:22 UTC (rev 838) +++ trunk/TeamTalk/TeamTalkBuild.bat 2007-10-12 06:59:26 UTC (rev 839) @@ -10,7 +10,7 @@ :Check to make sure the file is not running with a wrong working directory title TeamTalk Code Build - Win32 IF NOT EXIST TeamTalkBuild.bat goto Error -IF NOT EXIST Agents\Agents.sln goto Error +IF NOT EXIST TeamTalk.sln goto Error IF NOT EXIST Tools\MakeLM\makelm.pl goto Error :Make directories for logs, temp files, and builds if they do not exist already @@ -177,18 +177,9 @@ SET NetBeansDrive=Z :Compile -cd Agents -CALL "%VSHome%\devenv" Agents.sln /%BUILD_TYPE% %BUILD_CONF% -cd .. +CALL "%VSHome%\devenv" TeamTalk.sln /%BUILD_TYPE% %BUILD_CONF% pause -:: Do Not build TeamTalk Tools as there is nothing to build. -:TOOLS build -::echo Building TeamTalk Tools -- This may take 1-3 Minutes, Please Wait.. -::cd Tools -::CALL "%VSHome%\devenv" Tools.sln /%BUILD_TYPE% %BUILD_CONF% -::cd .. - :Ant Compilation :JBUILD CALL "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" -buildfile Agents\PenDecoder\build.xml From tk at edam.speech.cs.cmu.edu Fri Oct 12 16:10:39 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 12 Oct 2007 16:10:39 -0400 Subject: [TeamTalk 304]: [840] trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj: 1) Unused configuration files that were removed are now removed from the installation program as well . Message-ID: <200710122010.l9CKAd69010232@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071012/4f81edb3/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-12 06:59:26 UTC (rev 839) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-12 20:10:37 UTC (rev 840) @@ -201,60 +201,6 @@ } "Entry" { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_12EE435426E1466ABFA477614471457A" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_13C68E8847184ADBAF5D776878174596" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -387,6 +333,12 @@ } "Entry" { + "MsmKey" = "8:_23E62C9B7AD54B03BBDF214519EA569B" + "OwnerKey" = "8:_5FF55B125602447AA2764191719194E6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_240FE191C02B4A97899248C05374FC42" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -471,12 +423,6 @@ } "Entry" { - "MsmKey" = "8:_295A799C94CE4B9681B438B667685ABD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -519,12 +465,6 @@ } "Entry" { - "MsmKey" = "8:_3012F60AAD7F4E07BB71F6E4D8A06841" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3024263D0F14410CA4397B2B1AB51E7A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -693,12 +633,6 @@ } "Entry" { - "MsmKey" = "8:_3EEBAF75A48948C497B44AB7CA734A9F" - "OwnerKey" = "8:_12EE435426E1466ABFA477614471457A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_402D9A3DA8FF4167A146C530E3C36771" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -879,12 +813,6 @@ } "Entry" { - "MsmKey" = "8:_4C83166FFCA2478BBD3CA531B87CA745" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_4D0D55A9B23A4E7C9F86BE0F4885DCFB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1005,12 +933,6 @@ } "Entry" { - "MsmKey" = "8:_562875DE9F3A4123A11123744F2F1146" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_571279DC23124F2EB01A021EEFD47ECE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1029,12 +951,6 @@ } "Entry" { - "MsmKey" = "8:_584D2106059D4E849E4739FDCCF9D425" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_584E29C4FF9F4C229CB5559052F4341A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1113,6 +1029,60 @@ } "Entry" { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1215,12 +1185,6 @@ } "Entry" { - "MsmKey" = "8:_6A39D0B4D96A421C8A35CF6FCC895F01" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6BF3B812D50B4048B41A568BFD349DDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1737,6 +1701,12 @@ } "Entry" { + "MsmKey" = "8:_A2E7D7DD046846DA8D85103011EA0135" + "OwnerKey" = "8:_CDEF03DD4F7341768605A415BF74D4BD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A30AA4F3F14B470DBD52B7C2E9937EBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1959,12 +1929,6 @@ } "Entry" { - "MsmKey" = "8:_B57896E589FB4CD9999947E18147C074" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B645F8F69586446582F5EBC73C96F161" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2013,12 +1977,6 @@ } "Entry" { - "MsmKey" = "8:_BA4D83DE52204223A7423ED88061FA6F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_BA72816999AD43698B7C50ACC762905C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2115,12 +2073,6 @@ } "Entry" { - "MsmKey" = "8:_C43F0F0F2CFF441B8B45EE7F18A57B84" - "OwnerKey" = "8:_FC28DAC6C4754B9BA6A2FCFF78FE3348" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C47BF22EC9D04698A4B55D5E831BC7FC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2151,12 +2103,6 @@ } "Entry" { - "MsmKey" = "8:_C5D6B0990C3645CE86EEAEE1E6FB835C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C6F46C8DD5D70FDD2D97B095DAA8E95A" "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" "MsmSig" = "8:_UNDEFINED" @@ -2229,6 +2175,12 @@ } "Entry" { + "MsmKey" = "8:_CDEF03DD4F7341768605A415BF74D4BD" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CE16BE7385924C91AE126A812C58B922" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2343,6 +2295,12 @@ } "Entry" { + "MsmKey" = "8:_DB2A3D9D221A452D843E73C00B968EA0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DB9166EF43C643F285B92EB26FB3486B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2691,12 +2649,6 @@ } "Entry" { - "MsmKey" = "8:_F6D1A58C61454AC5850C9022B547B852" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F71CB301F712477985673E4B54CA53AC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2751,12 +2703,6 @@ } "Entry" { - "MsmKey" = "8:_FC28DAC6C4754B9BA6A2FCFF78FE3348" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FCC99F251F694A88A3364CE5C09D30E6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -4199,26 +4145,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_295A799C94CE4B9681B438B667685ABD" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop.txt" - "TargetName" = "8:startlist-desktop.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2A1CCFDD8F194F28A1F12756272FA9EA" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\B.chmm" @@ -4359,26 +4285,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3012F60AAD7F4E07BB71F6E4D8A06841" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk_LaunchAll-nopendecoder-Release.bat" - "TargetName" = "8:TeamTalk_LaunchAll-nopendecoder-Release.bat" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3024263D0F14410CA4397B2B1AB51E7A" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\DH.chmm" @@ -5479,26 +5385,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4C83166FFCA2478BBD3CA531B87CA745" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\Dictionary\\TeamTalk.dict" - "TargetName" = "8:TeamTalk.dict" - "Tag" = "8:" - "Folder" = "8:_C5B1C6695C8442A8A9B0C8C06D98DB35" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4D0D55A9B23A4E7C9F86BE0F4885DCFB" { "SourcePath" = "8:..\\Agents\\PenDecoder\\map.properties" @@ -5859,26 +5745,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_562875DE9F3A4123A11123744F2F1146" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk_LaunchAll-nopendecoder-simulated.bat" - "TargetName" = "8:TeamTalk_LaunchAll-nopendecoder-simulated.bat" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_571279DC23124F2EB01A021EEFD47ECE" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\cp861.enc" @@ -5939,26 +5805,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_584D2106059D4E849E4739FDCCF9D425" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop-simulated.txt" - "TargetName" = "8:startlist-desktop-simulated.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_584E29C4FF9F4C229CB5559052F4341A" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\cep.256.var" @@ -6539,26 +6385,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A39D0B4D96A421C8A35CF6FCC895F01" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk_LaunchAll-desktop-simulated.bat" - "TargetName" = "8:TeamTalk_LaunchAll-desktop-simulated.bat" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6BF3B812D50B4048B41A568BFD349DDA" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\macThai.enc" @@ -9019,26 +8845,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B57896E589FB4CD9999947E18147C074" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\Dictionary\\TeamTalk.dict.reduced_phoneset" - "TargetName" = "8:TeamTalk.dict.reduced_phoneset" - "Tag" = "8:" - "Folder" = "8:_C5B1C6695C8442A8A9B0C8C06D98DB35" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B645F8F69586446582F5EBC73C96F161" { "SourcePath" = "8:..\\Tools\\MakeLM\\CMU-Cam_Toolkit_v2\\bin\\idngram2stats.exe" @@ -9199,26 +9005,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA4D83DE52204223A7423ED88061FA6F" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop-nopendecoder.txt" - "TargetName" = "8:startlist-desktop-nopendecoder.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA72816999AD43698B7C50ACC762905C" { "SourcePath" = "8:..\\Tools\\MakeLM\\lexdata\\quality_test.pl" @@ -9639,26 +9425,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C5D6B0990C3645CE86EEAEE1E6FB835C" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop-nopendecoder-simulated.txt" - "TargetName" = "8:startlist-desktop-nopendecoder-simulated.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C6F46C8DD5D70FDD2D97B095DAA8E95A" { "SourcePath" = "8:swift.dll" @@ -9675,7 +9441,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -10259,6 +10025,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB2A3D9D221A452D843E73C00B968EA0" + { + "SourcePath" = "8:C:\\WINDOWS\\system32\\cygwin1.dll" + "TargetName" = "8:cygwin1.dll" + "Tag" = "8:" + "Folder" = "8:_24CD8B2388EF4DD082C82EC06F7E3234" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB9166EF43C643F285B92EB26FB3486B" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\rolodex" @@ -11279,26 +11065,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F6D1A58C61454AC5850C9022B547B852" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk_LaunchAll-desktop.bat" - "TargetName" = "8:TeamTalk_LaunchAll-desktop.bat" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F71CB301F712477985673E4B54CA53AC" { "SourcePath" = "8:..\\Agents\\PenDecoder\\dist\\PenDecoder.jar" @@ -12195,7 +11961,7 @@ "{9EF0B969-E518-4E46-987F-47570745A589}:_F8D56146346A4F95843ABFF20E4E4337" { "Name" = "8:LanguageModel" - "AlwaysCreate" = "11:FALSE" + "AlwaysCreate" = "11:TRUE" "Condition" = "8:" "Transitive" = "11:FALSE" "Property" = "8:_E8B21F794A144D2C8A7B0518C9BD6E81" @@ -12258,10 +12024,10 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:TeamTalk" "ProductCode" = "8:{60A088A9-DBEF-4ACF-82AF-0000FD2B730A}" - "PackageCode" = "8:{3EE01877-2D23-4FCF-B8EE-EC60D65B152E}" + "PackageCode" = "8:{5832483E-30EF-4871-B13A-A961A24EF5C4}" "UpgradeCode" = "8:{56C41212-AB48-442F-9870-EE96D8E1DC6C}" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" "ProductVersion" = "8:0.2.820" @@ -12274,7 +12040,7 @@ "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:" + "ARPPRODUCTICON" = "8:_4B5309FE4F80448691CCBAC5306A5D48" "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" @@ -12829,11 +12595,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_12EE435426E1466ABFA477614471457A" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_23E62C9B7AD54B03BBDF214519EA569B" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -12843,11 +12609,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3EEBAF75A48948C497B44AB7CA734A9F" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_5FF55B125602447AA2764191719194E6" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -12857,7 +12623,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C43F0F0F2CFF441B8B45EE7F18A57B84" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A2E7D7DD046846DA8D85103011EA0135" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -12871,7 +12637,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_FC28DAC6C4754B9BA6A2FCFF78FE3348" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CDEF03DD4F7341768605A415BF74D4BD" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" From tk at edam.speech.cs.cmu.edu Sat Oct 13 23:51:56 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Sat, 13 Oct 2007 23:51:56 -0400 Subject: [TeamTalk 305]: [841] trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj: 1) Re-exclude swift.dll in install, problem has been identified Message-ID: <200710140351.l9E3puHR018537@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071013/0d80f188/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-12 20:10:37 UTC (rev 840) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-14 03:51:54 UTC (rev 841) @@ -303,6 +303,12 @@ } "Entry" { + "MsmKey" = "8:_1ED9280F00524433BFB5837ED7830502" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1F42C3E071BB42A7A5833617DB0733B9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -333,12 +339,6 @@ } "Entry" { - "MsmKey" = "8:_23E62C9B7AD54B03BBDF214519EA569B" - "OwnerKey" = "8:_5FF55B125602447AA2764191719194E6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_240FE191C02B4A97899248C05374FC42" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -903,12 +903,6 @@ } "Entry" { - "MsmKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5508C6B830334EE6B61461B1DB8A1B60" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1029,60 +1023,6 @@ } "Entry" { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5FF55B125602447AA2764191719194E6" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1689,20 +1629,20 @@ } "Entry" { - "MsmKey" = "8:_A22C2C43252B4F84A428C71471100857" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_A17F6E72C8B148F6A39F40FED97A358E" + "OwnerKey" = "8:_1ED9280F00524433BFB5837ED7830502" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A2564C0826A3471AB0725A11D23BF814" + "MsmKey" = "8:_A22C2C43252B4F84A428C71471100857" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A2E7D7DD046846DA8D85103011EA0135" - "OwnerKey" = "8:_CDEF03DD4F7341768605A415BF74D4BD" + "MsmKey" = "8:_A2564C0826A3471AB0725A11D23BF814" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2001,6 +1941,12 @@ } "Entry" { + "MsmKey" = "8:_BDEFB96E13D940DD874054B868B18BF7" + "OwnerKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_BDF6C7CB9D0748FBBDC7F694C7993CA0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2104,7 +2050,7 @@ "Entry" { "MsmKey" = "8:_C6F46C8DD5D70FDD2D97B095DAA8E95A" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2175,12 +2121,6 @@ } "Entry" { - "MsmKey" = "8:_CDEF03DD4F7341768605A415BF74D4BD" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_CE16BE7385924C91AE126A812C58B922" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2338,19 +2278,19 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_54EF130B6AA344F9AF056DB6AB840E87" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2469,6 +2409,60 @@ } "Entry" { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_E731AD6F5D324159A5AE976D3DB17D9E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2703,6 +2697,12 @@ } "Entry" { + "MsmKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FCC99F251F694A88A3364CE5C09D30E6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -9441,7 +9441,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -12011,9 +12011,63 @@ } "LaunchCondition" { + "{836E08B8-0285-4809-BA42-01DB6754A45D}:_69A250259B744398830CEFF82F5BD973" + { + "Name" = "8:Condition1" + "Condition" = "8:REGISTRYVALUE1>0" + "Message" = "8:Please install ActivePerl" + "InstallUrl" = "8:http://www.activestate.com/store/activeperl/download/" + } + "{836E08B8-0285-4809-BA42-01DB6754A45D}:_F28F158D50244898965EF17C0517CD80" + { + "Name" = "8:Condition2" + "Condition" = "8:REGISTRYVALUE2 OR REGISTYVALUE3 OR REGISTRYVALUE4 OR REGISTRYVALUE5" + "Message" = "8:Install Cepstral swift voices Callie, David, Diane, and William" + "InstallUrl" = "8:http://www.cepstral.com/downloads/" + } } "Locator" { + "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_355B1DCCA5FE4393AFC01BC7796F8E2B" + { + "Name" = "8:Search for ActivePerl" + "Root" = "2:1" + "RegKey" = "8:SOFTWARE\\ActiveState\\ActivePerl" + "Value" = "8:CurrentVersion" + "Property" = "8:REGISTRYVALUE1" + } + "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_419AFD7FA15641B38B5BED3CA85174EF" + { + "Name" = "8:Search for David" + "Root" = "2:1" + "RegKey" = "8:SOFTWARE\\Cepstral\\Swift\\VoicePaths" + "Value" = "8:Cepstral_David" + "Property" = "8:REGISTRYVALUE3" + } + "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_D6D3AF3815F7461CB5D6DF90B22213CE" + { + "Name" = "8:Search for Callie" + "Root" = "2:1" + "RegKey" = "8:SOFTWARE\\Cepstral\\Swift\\VoicePaths" + "Value" = "8:Cepstral_Callie" + "Property" = "8:REGISTRYVALUE2" + } + "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_E35ECDDD8F5743E19BB9AF432655098F" + { + "Name" = "8:Search for William" + "Root" = "2:1" + "RegKey" = "8:SOFTWARE\\Cepstral\\Swift\\VoicePaths" + "Value" = "8:Cepstral_William" + "Property" = "8:REGISTRYVALUE5" + } + "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_F9199B8C30E4454093F7E07BB13F3C4C" + { + "Name" = "8:Search for Diane" + "Root" = "2:1" + "RegKey" = "8:SOFTWARE\\Cepstral\\Swift\\VoicePaths" + "Value" = "8:Cepstral_Diane" + "Property" = "8:REGISTRYVALUE4" + } } "MsiBootstrapper" { @@ -12022,19 +12076,19 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:TeamTalk" - "ProductCode" = "8:{60A088A9-DBEF-4ACF-82AF-0000FD2B730A}" - "PackageCode" = "8:{5832483E-30EF-4871-B13A-A961A24EF5C4}" + "ProductName" = "8:TeamTalk 0.2" + "ProductCode" = "8:{BBFACAC3-4817-4F36-B139-D89CFC3F1380}" + "PackageCode" = "8:{BC69C05F-8EB7-49F9-845A-9F077876A603}" "UpgradeCode" = "8:{56C41212-AB48-442F-9870-EE96D8E1DC6C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.2.820" + "ProductVersion" = "8:0.2.840" "Manufacturer" = "8:CMU-Boeing" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://edam.speech.cs.cmu.edu/teamtalk" - "Title" = "8:TeamTalk-Setup" + "Title" = "8:TeamTalk Installer" "Subject" = "8:" "ARPCONTACT" = "8:Carnegie Mellon University" "Keywords" = "8:" @@ -12595,11 +12649,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_23E62C9B7AD54B03BBDF214519EA569B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1ED9280F00524433BFB5837ED7830502" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" "Properties" { } @@ -12609,11 +12663,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_5FF55B125602447AA2764191719194E6" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A17F6E72C8B148F6A39F40FED97A358E" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" "Properties" { } @@ -12623,11 +12677,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A2E7D7DD046846DA8D85103011EA0135" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_BDEFB96E13D940DD874054B868B18BF7" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -12637,11 +12691,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CDEF03DD4F7341768605A415BF74D4BD" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E617026519BC40F0BE5E060A1709633F" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -12794,9 +12848,9 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_54EF130B6AA344F9AF056DB6AB840E87" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_602807E5A36A4D2DA3F11F49B2B94FE1" { - "SourcePath" = "8:..\\Agents\\Kalliope\\SwiftRelease\\KalliopeSwift.exe" + "SourcePath" = "8:..\\Agents\\TeamTalkBackend\\Release\\TeamTalkBackend.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04837C366F5845E79DE4D38182F651EB" @@ -12816,15 +12870,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}" + "OutputProjectGuid" = "8:{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_602807E5A36A4D2DA3F11F49B2B94FE1" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D2F322A157964CC38CA9E6F7426F3B21" { - "SourcePath" = "8:..\\Agents\\TeamTalkBackend\\Release\\TeamTalkBackend.exe" + "SourcePath" = "8:..\\Agents\\DateTime\\Release\\DateTime4.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04837C366F5845E79DE4D38182F651EB" @@ -12844,15 +12898,17 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" + "OutputProjectGuid" = "8:{45BAAD46-E855-4963-9CB6-324A3E276851}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { + "ExcludeFilter" = "8:*.tab.*" + "ExcludeFilter" = "8:lex.*" } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D2F322A157964CC38CA9E6F7426F3B21" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F58F05DC433C4028B81130B6E20CDD0F" { - "SourcePath" = "8:..\\Agents\\DateTime\\Release\\DateTime4.exe" + "SourcePath" = "8:..\\Agents\\Helios\\Release\\Helios3.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04837C366F5845E79DE4D38182F651EB" @@ -12872,17 +12928,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{45BAAD46-E855-4963-9CB6-324A3E276851}" + "OutputProjectGuid" = "8:{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { - "ExcludeFilter" = "8:*.tab.*" - "ExcludeFilter" = "8:lex.*" } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F58F05DC433C4028B81130B6E20CDD0F" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" { - "SourcePath" = "8:..\\Agents\\Helios\\Release\\Helios3.exe" + "SourcePath" = "8:..\\Agents\\Kalliope\\SwiftRelease\\KalliopeSwift.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04837C366F5845E79DE4D38182F651EB" @@ -12902,7 +12956,7 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" + "OutputProjectGuid" = "8:{9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { From tk at edam.speech.cs.cmu.edu Mon Oct 15 13:12:09 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 15 Oct 2007 13:12:09 -0400 Subject: [TeamTalk 306]: [842] trunk/TeamTalk/Libraries/boeingLib: Import commits from darcs repo, including location error messaging. Message-ID: <200710151712.l9FHC9Kq026242@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071015/a04d4042/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-15 17:12:08 UTC (rev 842) @@ -4,6 +4,10 @@ #include #include +#include +#include +#include + #include "boeing_map_server.h" #include "timer.h" #include "udpsocket.h" @@ -12,7 +16,6 @@ static const bool debug_flag = false; - //=== Debugging ================================ static void debug(char const *fmt,...) { @@ -59,19 +62,28 @@ //=== Recieving ======================================== -const MsgMapServer* MapServer::getNextMessage() +const MsgMapServer* MapServer::getNextMessage(struct sockaddr_in* addr) { + + //fprintf(stderr,"%s 1\n",__FUNCTION__); + //fprintf(stderr,"%s:2 0x%x \n",__FUNCTION__,addr); + if (!isConnected()) { printf("WARNING: mapserver Not connected\n"); return NULL; } + //fprintf(stderr,"%s:3 0x%x \n",__FUNCTION__,addr); + // is there anything to get? - if (!sock->isConnected() || !sock->readyForRecv()) + // if (!sock->isConnected() || !sock->readyForRecv()) + if (!sock->isConnected()) return (NULL); + // fprintf(stderr,"%s:4 0x%x \n",__FUNCTION__,addr); + // receive the header... - int rv = sock->recv(rxdata.buff,sizeof(rxdata)); + int rv = sock->recv(rxdata.buff,sizeof(rxdata),addr); if (rv>0 && rv!=rxdata.hdr.len) { printf("WARNING: size mismatch! %i, but packet says %i\n", @@ -85,33 +97,51 @@ //=== Sending ================================ // raw send methods...use wisely -bool MapServer::doSend(MsgHeader *msg) +bool MapServer::doSend(MsgHeader *msg, struct sockaddr_in* addr) { - if (!isConnected() && !sock->readyForSend()) + int ret; + + //fprintf(stderr,"%s:1 0x%x \n",__FUNCTION__,addr); + + if (!isConnected() && !sock->readyForSend()){ + fprintf(stderr,"%s:ERROR\n",__FUNCTION__); return (false); - + } + + //fprintf(stderr,"%s:2 0x%x \n",__FUNCTION__,addr); + msg->tstamp = Profiler::getTimeOfDay(); debug("DEBUG: sending msg hdr (t %x len %i t %f)\n", msg->type, msg->len, msg->tstamp); - return (sock->send(msg, msg->len)!=0); + if(NULL == addr){ + //fprintf(stderr,"%s:addr == NULL\n",__FUNCTION__); + ret = sock->send(msg, msg->len)!=0; + }else{ + //fprintf(stderr,"%s: %d %d\n",__FUNCTION__,addr->sin_addr.s_addr,addr->sin_port); + ret = sock->SendTo(addr,msg, msg->len)!=0; + } + + return ret; } // sending operations -bool MapServer::sendFullMap(MsgMap *msg) +bool MapServer::sendFullMap(MsgMap *msg,sockaddr_in *addr) { msg->len = msg->getSize(); msg->type = MAP_FULL; - return (doSend((MsgHeader *) msg)); + return (doSend((MsgHeader *) msg,addr)); } -bool MapServer::sendDiffMap(MsgMap *msg) +bool MapServer::sendDiffMap(MsgMap *msg,struct sockaddr_in *addr) { + //fprintf(stderr,"%s:1 %d %d\n",__FUNCTION__,addr->sin_addr.s_addr,addr->sin_port); msg->len = msg->getSize(); + //fprintf(stderr,"%s:2 0x%x \n",__FUNCTION__,addr); msg->type = MAP_DIFF; - return (doSend((MsgHeader *) msg)); + return (doSend((MsgHeader *) msg,addr)); } int MapServer::getFD() { Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-15 17:12:08 UTC (rev 842) @@ -5,6 +5,8 @@ #ifndef __BOEING_MAP_SERVER_H__ #define __BOEING_MAP_SERVER_H__ +#include + #include "boeing_map_packet.h" class UDPSocket; @@ -23,13 +25,13 @@ //=== Rx Methods ====================================== /// get the next message (if there is one). Returns NULL if there is none - const MsgMapServer* getNextMessage(); + const MsgMapServer* getNextMessage(struct sockaddr_in *addr=NULL); //=== Send Methods ==================================== // sending operations - bool sendFullMap(MsgMap *msg); - bool sendDiffMap(MsgMap *msg); + bool sendFullMap(MsgMap *msg,struct sockaddr_in *addr=NULL); + bool sendDiffMap(MsgMap *msg,struct sockaddr_in *addr=NULL); //=== Accessors ======================================== int getFD(); @@ -37,7 +39,7 @@ private: // raw send methods...use wisely - bool doSend(MsgHeader *msg); + bool doSend(MsgHeader *msg,struct sockaddr_in *addr=NULL); private: // socket controls Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-10-15 17:12:08 UTC (rev 842) @@ -2,7 +2,6 @@ Boeing robot client == */ -#include #include #include #include Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-15 17:12:08 UTC (rev 842) @@ -45,6 +45,10 @@ ROB_IMAGE,ROB_PLAY_HALT, ROB_EVAL }; + + enum RobotErrorID { + ROB_OK=0, ROB_POS_ERROR=1,ROB_LASER_ERROR=1,ROB_NO_ARCS=3 + }; static const uint16_t CmdMsgIdMask = 0x00FF; static const uint16_t RobMsgIdMask = 0xFF00; @@ -269,9 +273,10 @@ float x, y; float angle; int16_t moving; - static MsgRobLocation factory(float x, float y, float angle, int16_t moving) { + int16_t error; + static MsgRobLocation factory(float x, float y, float angle, int16_t moving, int16_t error) { MsgRobLocation m; - m.x = x; m.y = y; m.angle = angle; m.moving = moving; + m.x = x; m.y = y; m.angle = angle; m.moving = moving; m.error=error; return m; } bool operator!=(const MsgRobLocation& rhs) { Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-10-15 17:12:08 UTC (rev 842) @@ -294,7 +294,7 @@ return (doSend((MsgHeader *) &msg)); } - bool RobotServer::sendLocation(float x, float y, float a, bool moving) + bool RobotServer::sendLocation(float x, float y, float a, bool moving, int error) { MsgRobLocation msg; @@ -303,6 +303,7 @@ msg.y = y; msg.angle = a; msg.moving = moving; + msg.error = error; msg.len = sizeof(msg); msg.type = ROB_LOCATION; Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h 2007-10-15 17:12:08 UTC (rev 842) @@ -64,7 +64,7 @@ bool sendAborted(int taskid); /// send the updated robot pose - bool sendLocation(float x, float y, float a, bool moving); + bool sendLocation(float x, float y, float a, bool moving, int error=0); /** Send a compressed image to the server the image is a pointer to a jpeg image file Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/memfile.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/memfile.h 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/memfile.h 2007-10-15 17:12:08 UTC (rev 842) @@ -16,7 +16,7 @@ off_t len; int fd; public: - memfile() {buf=NULL; len=0;} + memfile() {buf=NULL; len=0; fd=0;} ~memfile() {mclose();} void *mopen(const char *filename,off_t &length); Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc 2007-10-14 03:51:54 UTC (rev 841) +++ trunk/TeamTalk/Libraries/boeingLib/coralshared/udpsocket.cc 2007-10-15 17:12:08 UTC (rev 842) @@ -9,6 +9,7 @@ /* LICENSE: */ +#include #include #include #include @@ -203,8 +204,11 @@ return status; } -int UDPSocket::recv(void* buf, int maxbytes) +int UDPSocket::recv(void* buf, int maxbytes,struct sockaddr_in* addr) { + + //fprintf(stderr,"%s: addr 0x%x\n",__FUNCTION__,addr); + if (status <= 0) return 0; @@ -228,11 +232,10 @@ ack(); } else { - // SERVER SIDE UDP // For UDP just read from the fd. while(last_message_bytes == 0){ - udpServerRecv(); + udpServerRecv(addr); } if (maxbytes > last_message_bytes) @@ -246,7 +249,7 @@ return rv; } -void UDPSocket::udpServerRecv() +void UDPSocket::udpServerRecv(struct sockaddr_in* addr) { struct sockaddr_in from; socklen_t fromlen = sizeof(from); @@ -254,7 +257,18 @@ last_message_bytes = recvfrom(fd, last_message, MaxMessageSize, 0, (sockaddr *) &from, &fromlen); + //fprintf(stderr,"%s: addr 0x%x\n",__FUNCTION__,addr); + + if(addr != NULL){ + //fprintf(stderr,"Adder is Not NULL\n"); + memcpy(addr,&from,sizeof(struct sockaddr_in)); + }else{ + //fprintf(stderr,"Adder IS NULL\n"); + } + acked(from); + + } int UDPSocket::send(const void* buf, int nbytes) @@ -317,9 +331,9 @@ // SERVER SIDE UDP // Write to the address of each client. - rv = ::sendto(fd, buf, nbytes, 0, + rv = MIN(rv,::sendto(fd, buf, nbytes, 0, (sockaddr *) &(udp_clients[cli].a), - sizeof(udp_clients[cli].a)); + sizeof(udp_clients[cli].a))); double tack = udp_clients[cli].lastacktime + ack_timeout; @@ -333,13 +347,22 @@ rv = 0; } - if (rv < 0) + if (rv < 0) perror("send (server, UDP)"); - return rv; + return 0; } +int UDPSocket::SendTo(struct sockaddr_in* addr,const void* buf, int nbytes){ + + for(unsigned int i=0; i #include #include #include @@ -102,7 +103,7 @@ char *last_message; int last_message_bytes; - void udpServerRecv(); + void udpServerRecv(struct sockaddr_in* addr=NULL); double getTime(); @@ -129,9 +130,10 @@ int isConnected() const { return status>0; } // Returns the number of bytes read or written. - int recv(void *buf, int maxbytes); + int recv(void *buf, int maxbytes, struct sockaddr_in *addr = NULL); int send(const void *buf, int nbytes); int send(int cli,const void *buf, int nbytes); + int SendTo(struct sockaddr_in *addr,const void *buf, int nbytes); int recvType(void *buf, int maxbytes, char &type) { int rv = recv(buf, maxbytes); type = ((char *) buf)[0]; return rv; } From tk at edam.speech.cs.cmu.edu Wed Oct 17 14:56:23 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 17 Oct 2007 14:56:23 -0400 Subject: [TeamTalk 307]: [843] trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h: Import gils error code bugfix Message-ID: <200710171856.l9HIuNsB032124@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071017/2fba940e/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-15 17:12:08 UTC (rev 842) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-17 18:56:22 UTC (rev 843) @@ -47,7 +47,7 @@ }; enum RobotErrorID { - ROB_OK=0, ROB_POS_ERROR=1,ROB_LASER_ERROR=1,ROB_NO_ARCS=3 + ROB_OK=0, ROB_POS_ERROR=1,ROB_LASER_ERROR=2,ROB_NO_ARCS=3 }; static const uint16_t CmdMsgIdMask = 0x00FF; From tk at edam.speech.cs.cmu.edu Wed Oct 17 22:35:42 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 17 Oct 2007 22:35:42 -0400 Subject: [TeamTalk 308]: [844] trunk/TeamTalk/Resources/Grammar: Tokenize with underscores since that's what phoenix understands. Message-ID: <200710180235.l9I2ZgL4032685@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071017/d6856c8b/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-17 18:56:22 UTC (rev 843) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-18 02:35:42 UTC (rev 844) @@ -267,10 +267,10 @@ ; [Side] - (the=north=end=of) - (the=east=end=of) - (the=south=end=of) - (the=west=end=of) + (the_north_end_of) + (the_east_end_of) + (the_south_end_of) + (the_west_end_of) [Goal] ([Home]) @@ -371,18 +371,10 @@ (do not) MOD (thanks) - (thank=you) # should be a lexeme + (thank_you) # should be a lexeme (not really) (it's not) (i'm not) -#NO -# (no) -# (not) -#GOOD -# (right) -# (correct) -# (good) -# (okay) ; Modified: trunk/TeamTalk/Resources/Grammar/tokenize.pl =================================================================== --- trunk/TeamTalk/Resources/Grammar/tokenize.pl 2007-10-17 18:56:22 UTC (rev 843) +++ trunk/TeamTalk/Resources/Grammar/tokenize.pl 2007-10-18 02:35:42 UTC (rev 844) @@ -81,7 +81,7 @@ $text = $line; $prob = undef; } $text =~ s/^\s*\((.+?)\)\s*$/$1/; # trim spaces from ends, strip ()'s - $text =~ s/\s+/=/g; # tokenize the text by substituting spaces + $text =~ s/\s+/_/g; # tokenize the text by substituting spaces $tokens{"$text:$classid"}++; $lexset{"$text:$classid"} = $prob; } From tk at edam.speech.cs.cmu.edu Wed Oct 17 23:17:54 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 17 Oct 2007 23:17:54 -0400 Subject: [TeamTalk 309]: [845] branches/mrmarge/PocketTeamTalk/Resources: Migrated grammar refactor from trunk (revisions 801-844) to pocketsphinx branch so that it may stay compatible with makelm. Message-ID: <200710180317.l9I3Hs4F000630@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071017/6535566d/attachment-0001.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel ___________________________________________________________________ Name: svn:ignore - TeamTalkLM.arpa + TeamTalk.arpa TeamTalk.ctl TeamTalk.probdef Deleted: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.ctl 2007-10-18 03:17:53 UTC (rev 845) @@ -1,12 +0,0 @@ -{ LanguageModel/zap2.def } -LanguageModel/zap2.arpa general { -[USERNAME] -[HOUR] -[NUMBER] -[DAY] -[MONTH] -[DAYORDINAL] -[ROOMNUMBER] -[ROOMLOCATION] -[AMPM] -} Deleted: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.def 2007-10-18 03:17:53 UTC (rev 845) @@ -1,155 +0,0 @@ -LMCLASS [USERNAME] -ALEX_RUDNICKY -DAN_BOHUS -JUNE_SISON -YITAO_SUN -CECILY_HEINER -THOMAS_HARRIS -ANTOINE_RAUX -CHRIS_COLOHAN -GUEST -RIDY_LIE -END [USERNAME] - -LMCLASS [HOUR] -ONE:h -TWO -THREE -FOUR -FIVE -SIX -SEVEN -EIGHT -NINE -TEN -ELEVEN -TWELVE -NOON -END [HOUR] - -LMCLASS [NUMBER] -ONE:n -TWO:n -THREE:n -FOUR:n -FIVE:n -SIX:n -SEVEN:n -EIGHT:n -NINE:n -TEN:n -END [NUMBER] - -LMCLASS [DAY] -MONDAY -TUESDAY -WEDNESDAY -THURSDAY -FRIDAY -SATURDAY -SUNDAY -TODAY -TOMORROW -END [DAY] - -LMCLASS [MONTH] -JANUARY -FEBRUARY -MARCH -APRIL -MAY:m -JUNE -JULY -AUGUST -SEPTEMBER -OCTOBER -NOVEMBER -DECEMBER -END [MONTH] - -LMCLASS [DAYORDINAL] -EIGHTEENTH -EIGHTH -ELEVENTH -FIFTEENTH -FIFTH -FIRST:do -FOURTEENTH -FOURTH -NINETEENTH -NINTH -SECOND -SEVENTEENTH -SEVENTH -SIXTEENTH -SIXTH -TENTH -THIRD -THIRTEENTH -THIRTIETH -THIRTY_FIRST -TWELFTH -TWENTIETH -TWENTY_EIGHTH -TWENTY_FIFTH -TWENTY_FIRST -TWENTY_FOURTH -TWENTY_NINTH -TWENTY_SECOND -TWENTY_SEVENTH -TWENTY_SIXTH -TWENTY_THIRD -END [DAYORDINAL] - -LMCLASS [ROOMNUMBER] -FORTY_SIX_TWENTY_THREE -FOUR_SIX_TWO_THREE -FORTY_SIX_TWENTY_FIVE -FOUR_SIX_TWO_FIVE -SEVENTY_TWO_TWENTY -SEVEN_TWO_TWO_ZERO -EIGHTY_TWO_TWENTY -EIGHT_TWO_TWO_ZERO -FORTY_SIX_THIRTY_TWO -FOUR_SIX_THREE_TWO -FORTY_FIVE_THIRTEEN -FOUR_FIVE_ONE_THREE -THIRTY_FIVE_OH_NINE -THREE_FIVE_OH_NINE -THREE_FIVE_ZERO_NINE -FIFTEEN_OH_FIVE -FIFTEEN_ZERO_FIVE -ONE_FIVE_OH_FIVE -ONE_FIVE_ZERO_FIVE -FIFTEEN_OH_SEVEN -FIFTEEN_ZERO_SEVEN -ONE_FIVE_OH_SEVEN -ONE_FIVE_ZERO_SEVEN -TWENTY_FIVE_OH_SEVEN -TWENTY_FIVE_ZERO_SEVEN -TWO_FIVE_OH_SEVEN -TWO_FIVE_ZERO_SEVEN -THREE_THOUSAND_ONE -THREE_ZERO_ZERO_ONE -THREE_OH_OH_ONE -THIRTY_THREE_OH_FIVE -THIRTY_THREE_ZERO_FIVE -THREE_THREE_OH_FIVE -THREE_THREE_ZERO_FIVE -THIRTY_FIVE_OH_ONE -THIRTY_FIVE_ZERO_ONE -THREE_FIVE_OH_ONE -THREE_FIVE_ZERO_ONE -END [ROOMNUMBER] - -LMCLASS [ROOMLOCATION] -NEWELL_SIMON -NEWELL_SIMON_HALL -WEAN -WEAN_HALL -END [ROOMLOCATION] - -LMCLASS [AMPM] -A_M -P_M -END [AMPM] \ No newline at end of file Deleted: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/LanguageModel/zap2.probdef 2007-10-18 03:17:53 UTC (rev 845) @@ -1,155 +0,0 @@ -LMCLASS [USERNAME] -ALEX_RUDNICKY 0.05 -DAN_BOHUS 0.05 -JUNE_SISON 0.05 -YITAO_SUN 0.05 -CECILY_HEINER 0.05 -THOMAS_HARRIS 0.05 -ANTOINE_RAUX 0.05 -CHRIS_COLOHAN 0.05 -GUEST 0.55 -RIDY_LIE 0.05 -END [USERNAME] - -LMCLASS [HOUR] -ONE:h 0.076 -TWO 0.076 -THREE 0.076 -FOUR 0.076 -FIVE 0.076 -SIX 0.076 -SEVEN 0.076 -EIGHT 0.076 -NINE 0.076 -TEN 0.076 -ELEVEN 0.076 -TWELVE 0.076 -NOON 0.076 -END [HOUR] - -LMCLASS [NUMBER] -ONE:n 0.1 -TWO:n 0.1 -THREE:n 0.1 -FOUR:n 0.1 -FIVE:n 0.1 -SIX:n 0.1 -SEVEN:n 0.1 -EIGHT:n 0.1 -NINE:n 0.1 -TEN:n 0.1 -END [NUMBER] - -LMCLASS [DAY] -MONDAY 0.11 -TUESDAY 0.11 -WEDNESDAY 0.11 -THURSDAY 0.11 -FRIDAY 0.11 -SATURDAY 0.11 -SUNDAY 0.11 -TODAY 0.11 -TOMORROW 0.11 -END [DAY] - -LMCLASS [MONTH] -JANUARY 0.083 -FEBRUARY 0.083 -MARCH 0.083 -APRIL 0.083 -MAY:m 0.083 -JUNE 0.083 -JULY 0.083 -AUGUST 0.083 -SEPTEMBER 0.083 -OCTOBER 0.083 -NOVEMBER 0.083 -DECEMBER 0.083 -END [MONTH] - -LMCLASS [DAYORDINAL] -EIGHTEENTH 0.032 -EIGHTH 0.032 -ELEVENTH -FIFTEENTH 0.032 -FIFTH 0.032 -FIRST:do 0.032 -FOURTEENTH 0.032 -FOURTH 0.032 -NINETEENTH 0.032 -NINTH 0.032 -SECOND 0.032 -SEVENTEENTH 0.032 -SEVENTH 0.032 -SIXTEENTH 0.032 -SIXTH 0.032 -TENTH 0.032 -THIRD 0.032 -THIRTEENTH 0.032 -THIRTIETH 0.032 -THIRTY_FIRST 0.032 -TWELFTH 0.032 -TWENTIETH 0.032 -TWENTY_EIGHTH 0.032 -TWENTY_FIFTH 0.032 -TWENTY_FIRST 0.032 -TWENTY_FOURTH 0.032 -TWENTY_NINTH 0.032 -TWENTY_SECOND 0.032 -TWENTY_SEVENTH 0.032 -TWENTY_SIXTH 0.032 -TWENTY_THIRD 0.032 -END [DAYORDINAL] - -LMCLASS [ROOMNUMBER] -FORTY_SIX_TWENTY_THREE 0.026 -FOUR_SIX_TWO_THREE 0.026 -FORTY_SIX_TWENTY_FIVE 0.026 -FOUR_SIX_TWO_FIVE 0.026 -SEVENTY_TWO_TWENTY 0.026 -SEVEN_TWO_TWO_ZERO 0.026 -EIGHTY_TWO_TWENTY 0.026 -EIGHT_TWO_TWO_ZERO 0.026 -FORTY_SIX_THIRTY_TWO 0.026 -FOUR_SIX_THREE_TWO 0.026 -FORTY_FIVE_THIRTEEN 0.026 -FOUR_FIVE_ONE_THREE 0.026 -THIRTY_FIVE_OH_NINE 0.026 -THREE_FIVE_OH_NINE 0.026 -THREE_FIVE_ZERO_NINE 0.026 -FIFTEEN_OH_FIVE 0.026 -FIFTEEN_ZERO_FIVE 0.026 -ONE_FIVE_OH_FIVE 0.026 -ONE_FIVE_ZERO_FIVE 0.026 -FIFTEEN_OH_SEVEN 0.026 -FIFTEEN_ZERO_SEVEN 0.026 -ONE_FIVE_OH_SEVEN 0.026 -ONE_FIVE_ZERO_SEVEN 0.026 -TWENTY_FIVE_OH_SEVEN 0.026 -TWENTY_FIVE_ZERO_SEVEN 0.026 -TWO_FIVE_OH_SEVEN 0.026 -TWO_FIVE_ZERO_SEVEN 0.026 -THREE_THOUSAND_ONE 0.026 -THREE_ZERO_ZERO_ONE 0.026 -THREE_OH_OH_ONE 0.026 -THIRTY_THREE_OH_FIVE 0.026 -THIRTY_THREE_ZERO_FIVE 0.026 -THREE_THREE_OH_FIVE 0.026 -THREE_THREE_ZERO_FIVE 0.026 -THIRTY_FIVE_OH_ONE 0.026 -THIRTY_FIVE_ZERO_ONE 0.026 -THREE_FIVE_OH_ONE 0.026 -THREE_FIVE_ZERO_ONE 0.026 -END [ROOMNUMBER] - -LMCLASS [ROOMLOCATION] -NEWELL_SIMON 0.25 -NEWELL_SIMON_HALL 0.25 -WEAN 0.25 -WEAN_HALL 0.25 -END [ROOMLOCATION] - -LMCLASS [AMPM] -A_M 0.5 -P_M 0.5 -END [AMPM] \ No newline at end of file Modified: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-18 03:17:53 UTC (rev 845) @@ -23,7 +23,7 @@ -fwdflatbeam 1e-8 -fwdflatnwbeam 3e-4 -rescorelw 9.5 - -lmfn LanguageModel\TeamTalkLM.arpa + -lmctlfn LanguageModel\TeamTalk.ctl -dictfn Dictionary\TeamTalk.dict.reduced_phoneset -ndictfn Dictionary\noise.dict -phnfn HMM-16khz.ss/phone Property changes on: branches/mrmarge/PocketTeamTalk/Resources/Grammar ___________________________________________________________________ Name: svn:ignore - base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalkflat.gra TeamTalkTask.gra TeamTalkRobots + base.dic forms log nets TeamTalk.gra TeamTalk.net TeamTalk_flat.gra TeamTalk_abs.gra TeamTalkRobots TeamTalk.corpus TeamTalk.ctl TeamTalk.probdef TeamTalk.token TeamTalk.words Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR) Property changes on: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR ___________________________________________________________________ Name: svn:ignore + DynamicRobotName.class Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-20.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-18 03:17:53 UTC (rev 845) @@ -1,21 +0,0 @@ - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-20.class (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-20.class) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-20.class (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-20.class 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,21 @@ + (zero) + (one) + (two) + (three) + (four) + (five) + (six) + (seven) + (eight) + (nine) + (ten) + (eleven) + (twelve) + (thirteen) + (fourteen) + (fifteen) + (sixteen) + (seventeen) + (eighteen) + (nineteen) + (twenty) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -1,12 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-60-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,12 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -1,16 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-80-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,16 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -1,4 +0,0 @@ - (eighty) - (eighty five) - (ninety) - (ninety five) Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-85-95-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,4 @@ + (eighty) + (eighty five) + (ninety) + (ninety five) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -1,19 +0,0 @@ - (five) - (ten) - (fifteen) - (twenty) - (twenty five) - (thirty) - (thirty five) - (forty) - (forty five) #%%0.1%% there are more likely? - (fifty) - (fifty five) - (sixty) - (sixty five) - (seventy) - (seventy five) - (eighty) - (eighty five) - (ninety) #%%0.1%% - (ninety five) Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/Number-95-by5.class 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,19 @@ + (five) + (ten) + (fifteen) + (twenty) + (twenty five) + (thirty) + (thirty five) + (forty) + (forty five) #%%0.1%% there are more likely? + (fifty) + (fifty five) + (sixty) + (sixty five) + (seventy) + (seventy five) + (eighty) + (eighty five) + (ninety) #%%0.1%% + (ninety five) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-18 03:17:53 UTC (rev 845) @@ -1,43 +0,0 @@ -################################################################### -# -# TeamTalk Grammar -# -# Written by: June Sison -# -# This is the forms file corresponding to the phoenix grammar for -# the TeamTalk system -# -# -# HISTORY ------------------------------------------------------- -# -# [2005-09-21] (dbohus): added cancel -# [2005-09-21] (tk): added yes/no -# [2003-03-08] (sison): started working on this -# -################################################################### - -FUNCTION: Commands - NETS: - [InvokePlay] - [ControlRobot] - [QueryRobot] - [MoveRobot] - [RespondYesNo] -# [HumanGoodbyeCommand] -; - -FUNCTION: Features - NETS: - [AbsoluteDistance] - [TurnDirection] - [MoveDirection] -; - - - -# these auxiliaries are defined in order to capture some parses like -# next, this that, which o/w would parse as date-time -#FUNCTION: Auxiliaries -# NETS: -# [__datetime_junk] -#; \ No newline at end of file Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.forms 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,43 @@ +################################################################### +# +# TeamTalk Grammar +# +# Written by: June Sison +# +# This is the forms file corresponding to the phoenix grammar for +# the TeamTalk system +# +# +# HISTORY ------------------------------------------------------- +# +# [2005-09-21] (dbohus): added cancel +# [2005-09-21] (tk): added yes/no +# [2003-03-08] (sison): started working on this +# +################################################################### + +FUNCTION: Commands + NETS: + [InvokePlay] + [ControlRobot] + [QueryRobot] + [MoveRobot] + [RespondYesNo] +# [HumanGoodbyeCommand] +; + +FUNCTION: Features + NETS: + [AbsoluteDistance] + [TurnDirection] + [MoveDirection] +; + + + +# these auxiliaries are defined in order to capture some parses like +# next, this that, which o/w would parse as date-time +#FUNCTION: Auxiliaries +# NETS: +# [__datetime_junk] +#; \ No newline at end of file Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-18 03:17:53 UTC (rev 845) @@ -1,394 +0,0 @@ -################################################################### -# -# TEAMTALK T A S K G R A M M A R -# -# HISTORY: ------------------------------------------------------- -# -# [2003-03-08] (sison): started working on this -# -################################################################### - -[RobotName] - (everyone) - (%[DynamicRobotName]%) # class stub -; - -[OBJ-Robot] - ([RobotName]) -; - - -######### Main Nets ############## - -[InvokePlay] - ([HumanExploreCommand]) - ([HumanSearchCommand]) - ([HumanFollowCommand]) -; - -[ControlRobot] - ([HumanReportCommand]) - ([HumanPauseCommand]) - ([HumanContinueCommand]) - ([HumanHaltCommand]) - ([Cancel]) -; - -[QueryRobot] - ([HumanLocationQuery]) -; - -[MoveRobot] - ([HumanMoveCommand]) - ([HumanTurnCommand]) - ([MoveVectorRelative]) -# ([MoveVectorCardinal]) - ([MoveToGoal]) -; - -[RespondYesNo] - ([Yes]) - ([No]) -; - -########################################### - - - -[HumanExploreCommand] - (explore *[MapLocation]) -; - -[HumanSearchCommand] - (search *[MapLocation]) - (search [MoveDirection]) -; - -[HumanFollowCommand] - (*[RobotName] FOLLOW [OBJ-Robot]) -FOLLOW - (join) - (follow) - (find) -; - -[HumanPauseCommand] - (*[RobotName] pause *task *here) -; - -[HumanContinueCommand] - (*[RobotName] continue *task) -; - -[HumanReportCommand] - (*[RobotName] report) - ([RobotName]) -; - -[HumanLocationQuery] - (*[RobotName] where are you) - (*[RobotName] report location) -; - -[HumanHaltCommand] - (*[RobotName] all stop) - (*[RobotName] stop immediately) -; - -[Number-180-by5] - ( %[Number-95-by5]% ) #%%0.53%% # equalize the relative proportion - ( HUNDRED ) #%%0.03%% # 1/36 - ( HUNDRED *and %[Number-80-by5]% ) #%%0.44%% -HUNDRED - ( a hundred ) - ( one hundred ) -; - -[Number-over180] - ( HUNDRED *and %[Number-85-95-by5]% ) #%%0.08%% - ( two hundred ) #%%0.03%% - ( two hundred *and %[Number-95-by5]% ) #%%0.53%% - ( three hundred ) #%%0.03%% - ( three hundred *and %[Number-60-by5]% ) #%%0.33%% -HUNDRED - ( a hundred ) - ( one hundred ) -; - -[TurnDirection] - (*PREP SIDE *[AngularQualifier]) - ([AngularQualifier] *PREP *SIDE) - (around) -SIDE - (right) - (left) -PREP - (to the) - (to your) -; - -[MoveDirection] - (*PREP SIDE) - (straight) - (forward) - (forwards) - (back) - (backward) - (backwards) -SIDE - (left) - (right) -PREP - (to the) - (to your) -; - -[AngularQualifier] - ([Number-180-by5] degrees) #%%0.667%% - ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's -; - - -[AbsoluteDistance] - (%[Number-20]% [Units]) -; - -[RelativeDistance] - ([TeamTalkAll] *of the way) - ([TeamTalkHalf] *of *the way) - ([TeamTalkThird] of the way) - ([TeamTalkTwoThird] of the way) - ([TeamTalkOneQuarter] of the way) - ([TeamTalkThreeQuarter] of the way) -; - -[MapLocation] - (this space) - (the area) - (around *PLACE) - (PLACE) -PLACE - (here) - (there) - (your location) -; - - -[TeamTalkAll] - (all) -; - -[TeamTalkHalf] - (*MOD half) -MOD - (one) - (a) -; - -[TeamTalkThird] - (MOD third) -MOD - (one) - (a) -; - -[TeamTalkTwoThird] - (two third) - (two thirds) -; - -[TeamTalkOneQuarter] - (one quarter) - (one fourth) - (a quarter) - (a fourth) -; - - -[TeamTalkThreeQuarter] - (three quarter) - (three quarters) - (three fourth) - (three fourths) -; - -[HumanMoveCommand] -# ([MoveVectorCardinal]) - ([MoveVectorRelative]) - ([MoveToGoal]) -; - -[Join] - (*[RobotName] join [RobotName]) -; - -#[MoveVectorCardinal] -# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) -# (*[RobotName] MOVE [CardinalDirection]) -# -#MOVE -# (move) -# (go) -#; - -[MoveVectorRelative] - (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) - (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) -MOVE - (move) - (go) - (drive) - (return) -; - -[HumanTurnCommand] - (*[RobotName] TURN [TurnDirection]) -TURN - (turn) - (face) - (move) - (go) -; -[MoveToGoal] - (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) - (*[RobotName] MOVE [Home]) -MOVE - (move *to) - (go *to) - (drive *to) -PREP - (toward) - (towards) - (to) - (down *to) - (down towards) - (up *to) - (up towards) -; - -[Side] - (the_north_end_of) - (the_east_end_of) - (the_south_end_of) - (the_west_end_of) - -[Goal] - ([Home]) - ([Xcoord] [Ycoord]) -; - -[Home] - (home) - (base) -; - -[Xcoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Ycoord] - (*NEG %[Number-20]%) -NEG - (negative) - (minus) -; - -[Units] - (metres) - (metre) -# (feet) -# (foot) -# (yards) -# (yard) -; - -#[HumanGoodbyeCommand] -# (goodbye) -# (bye) -# (mission complete) -# (that's it) -; - - - - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (OKAY) - (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain - (STRONG_MOD) #%%0.10%% -YES - (yes) - (yeah) -# (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (absolutely) - (definitely) - (OKAY OKAY) -WEAK_MOD - (why not) - (i think so) - (i guess so) -OKAY - (okay) - (sure) - (of course) - (correct) - (perfect) - (great) - (acceptable) - (good *enough) -# (fine) -# (wonderful) -# (right) -# (alright) -; - -[No] - (no *MOD) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (nevermind) - (not really) - (negative) -# (nowhere) -DONT - (don't) - (do not) -MOD - (thanks) - (thank_you) # should be a lexeme - (not really) - (it's not) - (i'm not) -; - - -################################################################### -# CANCEL grammar -################################################################### - -[Cancel] - (CANCEL *COMMAND) -CANCEL - (abort) - (cancel) - (quit) -COMMAND - (*that command) - (that) -; \ No newline at end of file Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra (from rev 844, trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra) =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-18 03:17:53 UTC (rev 845) @@ -0,0 +1,394 @@ +################################################################### +# +# TEAMTALK T A S K G R A M M A R +# +# HISTORY: ------------------------------------------------------- +# +# [2003-03-08] (sison): started working on this +# +################################################################### + +[RobotName] + (everyone) + (%[DynamicRobotName]%) # class stub +; + +[OBJ-Robot] + ([RobotName]) +; + + +######### Main Nets ############## + +[InvokePlay] + ([HumanExploreCommand]) + ([HumanSearchCommand]) + ([HumanFollowCommand]) +; + +[ControlRobot] + ([HumanReportCommand]) + ([HumanPauseCommand]) + ([HumanContinueCommand]) + ([HumanHaltCommand]) + ([Cancel]) +; + +[QueryRobot] + ([HumanLocationQuery]) +; + +[MoveRobot] + ([HumanMoveCommand]) + ([HumanTurnCommand]) + ([MoveVectorRelative]) +# ([MoveVectorCardinal]) + ([MoveToGoal]) +; + +[RespondYesNo] + ([Yes]) + ([No]) +; + +########################################### + + + +[HumanExploreCommand] + (explore *[MapLocation]) +; + +[HumanSearchCommand] + (search *[MapLocation]) + (search [MoveDirection]) +; + +[HumanFollowCommand] + (*[RobotName] FOLLOW [OBJ-Robot]) +FOLLOW + (join) + (follow) + (find) +; + +[HumanPauseCommand] + (*[RobotName] pause *task *here) +; + +[HumanContinueCommand] + (*[RobotName] continue *task) +; + +[HumanReportCommand] + (*[RobotName] report) + ([RobotName]) +; + +[HumanLocationQuery] + (*[RobotName] where are you) + (*[RobotName] report location) +; + +[HumanHaltCommand] + (*[RobotName] all stop) + (*[RobotName] stop immediately) +; + +[Number-180-by5] + ( %[Number-95-by5]% ) #%%0.53%% # equalize the relative proportion + ( HUNDRED ) #%%0.03%% # 1/36 + ( HUNDRED *and %[Number-80-by5]% ) #%%0.44%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + +[Number-over180] + ( HUNDRED *and %[Number-85-95-by5]% ) #%%0.08%% + ( two hundred ) #%%0.03%% + ( two hundred *and %[Number-95-by5]% ) #%%0.53%% + ( three hundred ) #%%0.03%% + ( three hundred *and %[Number-60-by5]% ) #%%0.33%% +HUNDRED + ( a hundred ) + ( one hundred ) +; + +[TurnDirection] + (*PREP SIDE *[AngularQualifier]) + ([AngularQualifier] *PREP *SIDE) + (around) +SIDE + (right) + (left) +PREP + (to the) + (to your) +; + +[MoveDirection] + (*PREP SIDE) + (straight) + (forward) + (forwards) + (back) + (backward) + (backwards) +SIDE + (left) + (right) +PREP + (to the) + (to your) +; + +[AngularQualifier] + ([Number-180-by5] degrees) #%%0.667%% + ([Number-over180] degrees) #%%0.333%% # can do up to 360 deg's +; + + +[AbsoluteDistance] + (%[Number-20]% [Units]) +; + +[RelativeDistance] + ([TeamTalkAll] *of the way) + ([TeamTalkHalf] *of *the way) + ([TeamTalkThird] of the way) + ([TeamTalkTwoThird] of the way) + ([TeamTalkOneQuarter] of the way) + ([TeamTalkThreeQuarter] of the way) +; + +[MapLocation] + (this space) + (the area) + (around *PLACE) + (PLACE) +PLACE + (here) + (there) + (your location) +; + + +[TeamTalkAll] + (all) +; + +[TeamTalkHalf] + (*MOD half) +MOD + (one) + (a) +; + +[TeamTalkThird] + (MOD third) +MOD + (one) + (a) +; + +[TeamTalkTwoThird] + (two third) + (two thirds) +; + +[TeamTalkOneQuarter] + (one quarter) + (one fourth) + (a quarter) + (a fourth) +; + + +[TeamTalkThreeQuarter] + (three quarter) + (three quarters) + (three fourth) + (three fourths) +; + +[HumanMoveCommand] +# ([MoveVectorCardinal]) + ([MoveVectorRelative]) + ([MoveToGoal]) +; + +[Join] + (*[RobotName] join [RobotName]) +; + +#[MoveVectorCardinal] +# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) +# (*[RobotName] MOVE [CardinalDirection]) +# +#MOVE +# (move) +# (go) +#; + +[MoveVectorRelative] + (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) + (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) +MOVE + (move) + (go) + (drive) + (return) +; + +[HumanTurnCommand] + (*[RobotName] TURN [TurnDirection]) +TURN + (turn) + (face) + (move) + (go) +; +[MoveToGoal] + (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) + (*[RobotName] MOVE [Home]) +MOVE + (move *to) + (go *to) + (drive *to) +PREP + (toward) + (towards) + (to) + (down *to) + (down towards) + (up *to) + (up towards) +; + +[Side] + (the_north_end_of) + (the_east_end_of) + (the_south_end_of) + (the_west_end_of) + +[Goal] + ([Home]) + ([Xcoord] [Ycoord]) +; + +[Home] + (home) + (base) +; + +[Xcoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Ycoord] + (*NEG %[Number-20]%) +NEG + (negative) + (minus) +; + +[Units] + (metres) + (metre) +# (feet) +# (foot) +# (yards) +# (yard) +; + +#[HumanGoodbyeCommand] +# (goodbye) +# (bye) +# (mission complete) +# (that's it) +; + + + + +################################################################### +# YES/NO grammar +################################################################### + +[Yes] + (YES *MOD) + (OKAY) + (WEAK_MOD) #%%0.10%% # weaks don't seem likely in this domain + (STRONG_MOD) #%%0.10%% +YES + (yes) + (yeah) +# (yup) +MOD + (STRONG_MOD) + (WEAK_MOD) +STRONG_MOD + (absolutely) + (definitely) + (OKAY OKAY) +WEAK_MOD + (why not) + (i think so) + (i guess so) +OKAY + (okay) + (sure) + (of course) + (correct) + (perfect) + (great) + (acceptable) + (good *enough) +# (fine) +# (wonderful) +# (right) +# (alright) +; + +[No] + (no *MOD) + (*no absolutely not) + (nope) + (nah) + (no way) + (*no i DONT) + (*no i DONT think so) + (nevermind) + (not really) + (negative) +# (nowhere) +DONT + (don't) + (do not) +MOD + (thanks) + (thank_you) # should be a lexeme + (not really) + (it's not) + (i'm not) +; + + +################################################################### +# CANCEL grammar +################################################################### + +[Cancel] + (CANCEL *COMMAND) +CANCEL + (abort) + (cancel) + (quit) +COMMAND + (*that command) + (that) +; \ No newline at end of file Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.forms =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.forms 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.forms 2007-10-18 03:17:53 UTC (rev 845) @@ -1,54 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is the forms file corresponding to the phoenix grammar for -# common task-independ constructs (Generic.gra) that we are likely -# to use in most of the future developed spoken dialog systems. -# -# HISTORY ------------------------------------------------------- -# -# [2002-12-03] (dbohus): set DateTime as non top-level slot, -# renamed date_time (so it no longer -# appears in the forms) -# [2002-11-26] (antoine): set TimeRange and Date as non-top level -# slots renamed time_range and date -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -FUNCTION: Social - NETS: - [_i_want] - [_greeting] - [_can_you] - [_lets] - [_courtesy] - [_emphatic] - [_tentative] -; - -FUNCTION: GenericDialogMechanisms - NETS: - [Help] - [Repeat] - [Suspend] - [Resume] - [StartOver] - [EstablishContext] - [GoodEnough] - [Quit] -; - -FUNCTION: YesNo - NETS: - [Neither] - [Yes] - [No] -; Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.gra =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.gra 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/Generic.gra 2007-10-18 03:17:53 UTC (rev 845) @@ -1,1715 +0,0 @@ -################################################################### -# GENERIC, TASK-INDEPENDENT SLOTS -# -# Written by: Dan Bohus, May 2002 -# Checked/Updated by: Tina Bennett, May 2002 -# -# This is a phoenix grammar for common task-independ constructs -# that we are likely to use in most of the future developed -# spoken dialog systems. Its starting point were the task -# independent constructs in the CMU Communicator grammar. -# -# -# HISTORY: ------------------------------------------------------- -# -# [2004-07-06] (dbohus): added a number of things to improve -# coverage (based on an analysis of -# parsing statistics for the roomline -# corpus on sprocket) -# [2002-04-04] (dbohus): added (i'll take) to [_i_want] -# [2002-12-20] (antoine): changed ([time_range] *[date] -# *[period_of_day]) into two -# separate rules to reduce ambiguity: -# ([time_range] [period_of_day]) -# is no longer possible, the period -# of day is always parsed inside the -# time_range. -# [2002-12-03] (dbohus): demoted [DateTime] to [date_time] which -# is no longer a top-level slot -# [2002-11-26] (antoine): added an optional [period_of_day] after -# ([time_range] *[date]) to account for -# e.g. "six thirty tomorrow morning" -# [2002-11-26] (antoine): set TimeRange, Date, Number as non-top -# (dbohus): level slots renamed time_range, date, -# number -# [2002-10-18] (dbohus): Added [DateTime], by taking it from -# Communicator (and cleaning it a bit) -# [2002-10-14] (dbohus): Added [Number], by taking it from -# Communicator (erased the old one) -# [2002-09-11] (dbohus): added [Digit] and [Number], but will -# need to update with all the number -# grammar from Communicator -# -################################################################### - -################################################################### -# Social plus this that, etc -################################################################### - -[_greeting] - (hello) - (hi *there) - (good morning) - (good afternoon) - (good evening) -; - -[_can_you] - (could you *also *[_courtesy]) - (can you *also *[_courtesy]) - (will you *also *[_courtesy]) - (can we *also *[_courtesy]) - (would you *also *[_courtesy]) -; - -[_can_i] - (could i *also *[_courtesy]) - (can i *also *[_courtesy]) -; - -[_tell_me] - (*[_can_you] tell me *about) - (how about) -; - -[_courtesy] - (please) - (THANK *MUCH) - (*YOU welcome) - -THANK - (thanks) - (thank you) -MUCH - (*very much) - (a lot) -YOU - (you are) - (you're) -; - -[_it] - (it) - (this *one) - (that *one) -; - -[_lets] - (let's *say) - (let us *say) -; - -[_that_is] - (that's) - (that is) - (that'll) - (that'd) - (that was) - (it is) - (it's) -; - -[_this_that] - ([_this]) - ([_that]) -; - -[_that] - (that *one) - (it) -; - -[_this] - (this *one) - (the) - (it) -; - -[_emphatic] - (i *already SAID) - (*are you sure) - (actually) -SAID - (said) - (told you) -; - -[_tentative] - (i guess) - (i think) - (i believe) -; - -[_it_does] - (it does) - (it did) -; - -[_i_want] - (i *just *will *also want *TO_HAVE) - (i *just *will *also need *TO_HAVE) - (i *just *also wanna) - (i *just *also wanted *TO_HAVE) - (i'd like *TO_HAVE) - (i would like *TO_HAVE) - (i'd prefer *TO_HAVE) - (i would prefer *TO_HAVE) - (give me) - (CAN i *also get) - (CAN i *also have) - (CAN i *also take) - (i'll *also take) - (i'll *also have) - (i *just have to) - (i *just had to) - (i must) - (how about) - (what about) - (do you have) -CAN - (can) - (could) -TO_HAVE - (to *also *have) - (to *also *get) - (to *also *know) -; - - -################################################################### -# HELP GRAMMAR -################################################################### -[Help] - (*[_i_want] [general_help]) - (*[_tell_me] [what_can_i_say] *now) - (*[_i_want] [give_me_tips]) - ([system_capabilities]) -; - -[general_help] - (*[_i_want] *some help) - (*[_can_you] help me) - (customer service) - (interactive info) - (interactive information) - -[what_can_i_say] - (what CAN i DO_SAY) - (*what *are *THE options) - (*[_i_want] *some instructions) - (*[_i_want] an example) - (i don't know what to DO_SAY) - (i don't know what i CAN DO_SAY) -CAN - (can) - (should) - (could) - (do) -DO_SAY - (do) - (say) -THE - (the) - (my) -; - -[give_me_tips] - (*[_tell_me] how *[_can_i] *to use the system) - (*[_tell_me] how things work) - (*some *more TIPS) - (more help) -TIPS - (*INTERACTION hints) - (*INTERACTION tips) - (*INTERACTION commands) -INTERACTION - (system) - (interaction) - (communication) -; - -[system_capabilities] - (*[_tell_me] what *else can you do) - (*[_tell_me] what *else do you offer) - (*[_tell_me] who are you) - (*[_tell_me] what *else do you do) - (*[_tell_me] how *else can you help *me) -; - -################################################################### -# REPEAT GRAMMAR -################################################################### - -[Repeat] - (*sorry REPEAT *[_courtesy]) - (excuse me) - (*i *beg *your pardon) - (pardon me) - (*sorry what was that *again) - (*sorry what's that *again) - (*sorry WHATD you *just say) - ( what ) - (*sorry i didn't HEAR YOU) - -WHATD - (what did) - (what'd) - -REPEAT - (repeat the question *again) - (repeat *[_it]) - (say [_it] *again) - (say again) -HEAR - (hear) - (understand) - (catch) - -YOU - (you) - (that) - (it) - (what you said) -; - -################################################################### -# SUSPEND/RESUME GRAMMAR -################################################################### - -[Suspend] - (*[_lets] TAKE_A_BREAK *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] HOLD_ON *FOR_TIME *[_courtesy]) - (*[_courtesy] *[_can_you] TAKE_A_BREAK *FOR_TIME *[_courtesy]) -HOLD_ON - (hold on *[_courtesy]) - (stand by *[_courtesy]) -TAKE_A_BREAK - (take a *SHORT break) - (have a *SHORT break) - (break *[_this] ACTIVITY) - (pause *[_this] ACTIVITY) - (hold on) - (suspend *[_this] *ACTIVITY) -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -SHORT - (short) - (quick) - (small) - (little) -FOR_TIME - (*for a while) - (*for now) - (*for a second) - (*for a minute) - (*for a couple of minutes) -; - -[Resume] - (*[_courtesy] resume *[_this] *ACTIVITY *[_courtesy]) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (conversation) - (session) -; - -################################################################### -# START-OVER GRAMMAR -################################################################### - -[StartOver] - (restart *IT) - (reset *IT) - (start *IT *all OVER) - (start from the *very BEGINNING) - (go back to the BEGINNING) - (START from scratch) - (main menu) - -IT - ([_it]) - (*[_this] ACTIVITY) - (*[_this] system) - -ACTIVITY - (activity) - (dialog) - (dialogue) - (session) - (conversation) - -OVER - (again) - (over) - -BEGINNING - (beginning) - (start) - -START - (start) - (restart) -; - - -################################################################### -# ESTABLISH CONTEXT GRAMMAR -################################################################### - -[EstablishContext] - (where are we) - (where am i) - (what's going on) - (what are we doing) - (what am i doing) - (what is happening) - (where were we) - (where was i) -; - -################################################################### -# GOOD ENOUGH GRAMMAR -################################################################### -[GoodEnough] - (*[_that_is] *good enough) -; - -################################################################### -# QUIT GRAMMAR -################################################################### - -[Quit] - (*good bye) - (goodbye) - (byebye) - (bye bye) - (hang up *now) - (see you later) - (that's all) - (have a good day) - (good night) - (goodnight) - (quit) - ( *[_i_want] abort *SESSION *[_courtesy] ) - ( *[_i_want] exit *SESSION *[_courtesy] ) - ( *[_i_want] quit *SESSION *[_courtesy] ) - -SESSION - (*[_this] dialog) - (*[_this] dialogue) - (*[_this] session) - (*[_this] conversation) - (*[_this] system) -; - - -################################################################### -# NEITHER grammar -################################################################### -[Neither] - (*[_i_want] NEITHER *one *OF_THOSE) - (NEITHER *one *OF_THOSE IS_GOOD) - (NO_WANT any *OF_THOSE) -NEITHER - (neither) - (none) -OF_THOSE - (of them) - (of these) - (of those) -IS_GOOD - (is good) - (is right) -NO_WANT - (i don't want) - (i don't like) -; - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (STRONG_MOD) - ( OKAY ) - ( WEAK_MOD ) -YES - (yes) - (yeah) - (yep) - (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (*[_that_is] *be OKAY) - ([_this_that] sounds OKAY) - ([_this_that] works) - (you betcha) - (*let's go for it) - (absolutely) - (definitely) - ( OKAY OKAY ) -WEAK_MOD - (why not) - (i think so) - (i guess so) - (*[_that_is] close enough) -OKAY - (sure) - (of course) - (ok) - (okay) - (correct) - (fine) - (perfect) - (great) - (wonderful) - (acceptable) - (good *enough) - (right) - (alright) - (cool) -; - -[No] - (no *MOD) - ([_emphatic] no) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (*no i DONT like [_this_that]) - (*no i DONT want [_this_that]) - (never mind) - (nevermind) - (*no not really) - (nowhere) - (negative) -DONT - (don't) - (do not) -MOD - (thanks) - (thank you) - (not really) - (i *really don't want to) - (i *really don't want [_this_that]) - (it's not) - (i'm not) - ([_that_is] not what i want) - (*[_that_is] NO *GOOD) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) -; - - -################################################################### -# NUMBERS GRAMMAR -################################################################### - -# (dbohus): This is the numbers grammar, extracted from the -# original Communicator grammar - -[number] - (one) - (THOU_HUND *AND_NUM) - (NUM) - -AND_NUM - (and AND_NUM_OPTS) - -AND_NUM_OPTS - (TEN *ONE'S) - (TEEN) - (ONE'S) - -THOU_HUND - (*THOU HUND) - (THOU) - -NUM - (*THOU *HUND *TEN ONE'S) - (*THOU *HUND TEEN) - (*THOU *HUND TEN) - (ONE ONE *ONE *ONE *ONE *ONE'S) - (ONE ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE *ONE'S) - (TEEN ONE *ONE'S) - (TEN_ONE ONE TEN_ONE ONE'S) - (TEN_ONE TEN *ONE'S) - (TEN_ONE TEEN) - -START_TEEN - (TEEN TEEN) - (TEEN TEN *ONE'S) - -TEN_ONE - (TEN) - (ONE) - -THOU - (*THOU_OPTS thousand) - -THOU_OPTS - (HUND) - (HUND_OPTS) - -HUND - (HUND_OPTS hundred) - -HUND_OPTS - (*TEN A_ONE) - (TEEN) - (TEN) - -A_ONE - (a) - (an) - (ONE) - - -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - -TEN - (twenty) - (thirty) - (forty) - (fifty) - (sixty) - (seventy) - (eighty) - (ninety) - -ONE'S - (ONE) - (POS) -ONE'S-1 - (ONE-1) - (POS) -POS - (zero's) - (oh's) - (one's) - (two's) - (three's) - (four's) - (five's) - (six's) - (seven's) - (eight's) - (nine's) - (fourth) - (sixth) - (seventh) - (eighth) - (ninth) - -ONE - (one) - (ONE-1) -ONE-1 - (zero) - (oh) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -################################################################### -# DATE-TIME GRAMMAR -################################################################### - -[date_time] - (DATE *[time_range] *[time_range]) - ([time_range] *DATE *[time_range]) - ([time_range] [time_range] *DATE) - ([period_mod] DATE *[period_of_day]) - (*[period_mod] [today_relative]) - (*[time_range] *the NEXT [period_of_day]) - (*[time_range] *the [date_relative] [time_range]) - (that [day_of_week]) - (that [time_range]) - ([time_range] is fine) -DATE - ([date] *[period_of_day]) - ([day_name]) -NEXT - ([d_next]) - ([d_previous]) -; - -[date] - (*SELECTOR *ON *the MONTH_DAY *YEAR *[period_of_day]) - (*a DAY_WEEK *OF_MONTH) - (*sometime [today_relative]) - (*ON *the DATE_REL *OF_MONTH) - (*SOMETIME [date_relative]) - (*sometime [date_relative] DAY) - ([date_relative] [today_relative]) - (*[date_relative] [holiday]) -SELECTOR - (DAY_WEEK) - (sometime) -SOMETIME - (sometime) - ([anyday]) -DATE_REL - ([date_relative]) - ([day_ordinal] *of [date_relative]) - ([holiday]) - ([anyday]) - ([everyday]) - (last day *of *[month_after]) - ([day_of_month] DAY *of *[month_after]) - (the [day_ordinal]) - ([day_ordinal] AND [day_ordinal]) -AND - (and) - (or) -MONTH_DAY - (*[month_name] the [day_ordinal]) - ([month_name] *the [day_ordinal]) - ([day_ordinal] *day *of [month_name]) - ([month_name] [day_number]) - ([day_number] [month_name]) -DAY - (day) - ([day_of_week]) -DAY_WEEK - (*A *MOD_DAY *ON [day_of_week] *OF_WEEK *AT_TIME) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -ON - (date) - (during) - (for) - (on *that) - (of) -THE - (a) - (an) - (the) -OF_MONTH - (*IN_OF *A [month_name]) - (*IN_OF *A THIS_LAST month) - (of the month) -MOD_DAY - ([week_after]) - (EACH) -AT_TIME - (*at *the same time) -OF_WEEK - (*IN_OF *A *this week) - (*IN_OF *A [date_relative]) -EACH - (any) - (each) - (every) -A - (a) - (an) - (the) -IN_OF - (in) - (of) -THIS_LAST - (this) - (last) -DAY - (day) - (date) - ([day_name]) -; - -[day_of_month] - (first) - (second) - (third) - (fourth) - (fifth) -; - -[everyday] - (EACH DAY *OF_WEEK) - (daily) - (dailies) - (everyday) - ([each_day]) -EACH - (all) - (every) -DAY - (day) - (days) -OF_WEEK - (of *the week) -; - -[each_day] - (EACH *of *the DAY *OF_WEEK) -DAY - (day) - (days) - (date) - (dates) -EACH - (*FOR each) - (ORDERED *BY) -ORDERED - (order) - (ordered) - (sort) - (sorted) - (arrange) - (arranged) -BY - (by) - (according *to) -OF_WEEK - (of *the week) -FOR - (for) - (on) -; - -[anyday] - (*IN_ON *the *FIRST_LAST WEEK_MONTH *OF_MONTH) - (any DAY *OF_WEEK) -DAY - (date) - (dates) - (day) - (days) -OF_WEEK - (of *the week) -FIRST_LAST - (first) - (previous) - (next) - (last) - (following) - (coming) -WEEK_MONTH - (week) - (month) -IN_ON - (in) - (on) -OF_MONTH - (*IN_OF [month_name]) - (*IN_OF THIS_NEXT month) -IN_OF - (in) - (of) -THIS_NEXT - (this) - (last) - (next) -; - -[holiday] - ([holiday_name]) - ([holiday_nameday]) -; - -[holiday_name] - (HOL *DAY) -HOL - (christmas) - (easter) - (*the fourth of july) - (new year's *eve) - (new years *eve) - (new year *eve) - (thanksgiving) - (april fool's) - (halloween) -DAY - (day) - (days) -; - -[holiday_nameday] - (HOL_1 DAY) -HOL_1 - (independence) - (labor) - (memorial) - (st patrick's) - (valentine) - (st valentine's) - (groundhog) - (flag) - (united nations) - (veterans) - (martin luther king) - (presidents') - (armed forces) - (mothers') - (fathers') - (parent's) - (columbus) -DAY - (day) - (days) -; - -[date_relative] - (*ON *the NEXT) - (*THE day [day_after] *that) - (*THE day [day_prior] *that) - (ONE DAY [day_after] *that) - ([week_after]) - ([week_prior]) - ([week_this]) - ([month_after]) - ([year_after]) - ([date_offset]) -ON - (on) - (for) -THE - (a) - (the) -NEXT - ([d_this]) - ([d_same]) - ([d_next]) - ([d_previous]) -PREVIOUS - (previous) - (preceeding) - (prior) - (last) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -DAY - (day) - (days) -; - -[d_this] - (this) -; - -[d_same] - (*that same) -; - -[d_next] - (next) - (following) - (coming) -; - -[d_previous] - (previous) - (preceeding) - (prior) - (last) -; - -[date_offset] - ([day_offset]) - ([week_offset]) -; - -[day_offset] - ([number] DAY OFFSET) - (in [number] DAY) -DAY - (day) - (days) -OFFSET - ([days_after]) - ([days_prior]) -; - -[week_offset] - ([weeks_after]) -; - -[weeks_after] - (in [number] weeks) - ([number] weeks LATER) -LATER - (later) - (after *that) -; - -[days_after] - (later) - (after *that) - (from now) -; - -[days_prior] - (before) - (prior to) - (earlier) -; - -[month_after] - (NEXT month) -NEXT - (next) - (coming) - (following) -; - -[year_after] - (*of next year) -; - -[week_this] - (this week) -; - -[week_after] - (in ONE week) - (ONE week later) - (*the NEXT week) - (a week AFTER) - (after *about a week) - (the week after) - (ONE week from) -ONE - (one) - (a) -NEXT - (next) - (coming) - (following) -AFTER - (after) - (afterwards) -; - -[week_prior] - (THE week before *that) - (the LAST week) -THE - (a) - (the) -LAST - (last) - (previous) -; - -[day_after] - (after) - (afterwards) - (from) -; - -[day_prior] - (before) - (prior to) -; - -[time_range] - ([time_duration]) - ([time_spec]) - (ANYTIME [after] *I_SAY [start_time] *DAY_PERIOD) - (START *at *I_SAY [start_time] *AND *[after]) - (*at *I_SAY [start_time] AND [after]) - (*ANYTIME BEFORE DAY_TIME) - (*END *at *I_SAY [end_time] AND [before]) - (END *at *I_SAY [end_time]) - (*START *at [start_time] TO [end_time]) - (between [start_time] and [end_time]) -TO - (*going to) - (until) - (til) - (till) -ANYTIME - (anytime) - (any time) - (any times) - (sometime) - (some time) - (some times) - (anything) -DAY_TIME - (*[on_day] [end_time]) - ([end_time] *ON *THE [on_day] [period_of_day]) -DAY_PERIOD - (*ON *THE [on_day] [period_of_day]) -AND - (and *or) - (or) -ON - (of) - (on) -THE - (a) - (an) - (the) -END - (end) - (ends) - (ending) -START - (from *like) - (start) - (starts) - (starting) - (begin) - (begins) - (beginning) -BEFORE - ([before]) - (until) - (til) - (till) - (by) -I_SAY - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[on_day] - ([day_of_week] *DAY_MONTH_SPEC) - (DAY_MONTH_SPEC) -DAY_MONTH_SPEC - ([month_name] *the [day_ordinal] *YEAR) - (*the [day_ordinal] *of [month_name] *YEAR) - ([month_name] [day_number]) - ([day_number] [month_name]) -YEAR - (*YR_PREP [year]) -YR_PREP - (*in the year) -; - -[year] - (*nineteen DECADE *ONE) - (two thousand *and *ONE) - (twenty oh ONE) -DECADE - (seventy) - (eighty) - (ninety) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -; - -[day_number] - (ONE) - (ten) - (TEEN) - (twenty) - (twenty ONE) - (thirty) - (thirty one) -ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -TEEN - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -; - -[day_ordinal] - (SMALL_ORD) - (tenth) - (TEEN_ORD) - (twentieth) - (twenty SMALL_ORD) - (thirtieth) - (thirty first) -SMALL_ORD - (first) - (second) - (third) - (fourth) - (fifth) - (sixth) - (seventh) - (eighth) - (ninth) -TEEN_ORD - (eleventh) - (twelfth) - (thirteenth) - (fourteenth) - (fifteenth) - (sixteenth) - (seventeenth) - (eighteenth) - (nineteenth) -; - -[month_name] - (*THE_MONTH NAME) -NAME - (january) - (february) - (march) - (april) - (may) - (june) - (july) - (august) - (september) - (october) - (november) - (december) -THE_MONTH - (*the month *of) -; - -[start_time] - ([time_spec]) -; - -[end_time] - ([time_spec]) -; - -[time_spec] - (*at [time]) - ([time_of_day]) - ([aprox_time]) - ([time_relative]) - ([time_duration]) -; - -[aprox_time] - (*at APPROX [time] *AS_POSS) - (APPROX [time_of_day]) -APPROX - (*JUST AROUND_ABOUT) - (*SOMETIME AROUND_ABOUT) - (one AROUND_ABOUT) - (*as CLOSE *to) - (*at approximately) - (in *the vicinity *of) -AROUND_ABOUT - (around) - (round) - (about) - (bout) -CLOSE - (close) - (closest) - (closer) - (near) - (nearer) - (nearest) -SOMETIME - (sometime) - (somewhere) -AS_POSS - (*as possible) -JUST - (just) - (*I'D_WE SAY) -I'D_WE - (i'd) - (we'd) - (*I_WE WILL_WOULD) - (I_WE) - (let's) - (let *us *me) -I_WE - (i) - (we) - (you) -WILL_WOULD - (will) - (would) -SAY - (say) - (said) -; - -[time] - ([hour] *MIN *[time_of_day]) - ([hour] o'clock *[time_of_day]) - (*TIME_PERIOD BEFORE TIME *o'clock *[time_of_day]) - ([noon]) - ([midnight]) - ([twenty_four]) -TIME_PERIOD - ([minute_rel] *MINUTE) - (*a [quarter]) - (*a [half]) -BEFORE - ([before]) - ([after]) -TIME - ([hour] *MIN) - ([noon]) - ([midnight]) -MIN - ([minute]) -MINUTE - (minute) - (minutes) -; - -[twenty_four] - (oh [hour] MIN *hours) - ([hour] MIN hours) -MIN - (hundred) - ([minute]) -; - -[noon] - (*twelve noon) - (noontime) - (noon time) -; - -[midnight] - (midnight) -; - -[after] - (*JUST AFTER) -JUST - (*at just) - (shortly) -AFTER - (after) - (later than) - (afterwards) - (NOT BEFORE *that) - (past) -BEFORE - (before) - (sooner *than) - (earlier *than) - (prior to) -NOT - (not) - (no) -; - -[before] - (*JUST before) - (sooner than) - (*JUST prior to) - (*JUST earlier than) - (not AFTER *that) - (NOT later than *that) -JUST - (*at just) - (shortly) -AFTER - (after) - (afterwards) - (past) -NOT - (not) - (no) -; - - -[quarter] - (quarter) -; - -[half] - (half) -; - -[minute_rel] - ([minute]) -; - -[minute] - (T_TEN *T_ONE) - (TEEN) - (ZERO T_ONE) -T_ONE - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) -T_TEN - (twenty) - (thirty) - (forty) - (fifty) -TEEN - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) -ZERO - (zero) - (oh) -; - -[time_of_day] - (*SOMETIME *[period_mod] *in *the *[period_mod] [period_of_day]) - -SOMETIME - (sometime) - (some time) - (anytime) - (any time) -; - -[hour] - (an) - (one) - (a couple of) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (noon) -; - -[day_of_week] - ([day_name]) - ([weekend]) - ([weekday]) -; - -[day_name] - (monday) - (tuesday) - (wednesday) - (thursday) - (friday) - (saturday) - (sunday) - (mondays) - (tuesdays) - (wednesdays) - (thursdays) - (fridays) - (saturdays) - (sundays) - (monday's) - (tuesday's) - (wednesday's) - (thursday's) - (friday's) - (saturday's) - (sunday's) -; - -[weekend] - (weekend) - (weekends) -; - -[weekday] - (MIDDLE *of *THE week) - (midweek) - (weekday) - (weekdays) - (MONDAY *AND TUESDAY *AND WEDNESDAY *AND THURSDAY *AND FRIDAY) - -THE - (a) - (the) - -MIDDLE - (mid) - (middle) - -MONDAY - (monday) - (mondays) - -TUESDAY - (tuesday) - (tuesdays) - -WEDNESDAY - (wednesday) - (wednesdays) - -THURSDAY - (thursday) - (thursdays) - -FRIDAY - (friday) - (fridays) - -AND - (and *or) - (or) -; - -[today_relative] - (today) - (today's) - (tonight) - (this [time_range]) - (tomorrow) - (tomorrow's) - (yesterday) - (yesterday's) -; - -[period_mod] - ([early]) - ([late]) - ([mid]) -; - -[period_of_day] - ([am]) - ([pm]) - ([morning]) - ([afternoon]) - ([evening]) - ([night]) - ([early_day]) - ([late_day]) - ([mid_day]) - ([anytime]) -; - -[am] - (a_m) - (a m) -; - -[pm] - (p_m) - (pm) - (p m) -; - -[morning] - (morning) - (mornings) -; - -[afternoon] - (afternoon) - (after noon) - (afternoons) -; - -[evening] - (evening) - (evenings) -; - -[night] - (night) - (nights) -; - -[early_day] - (early in the day) - (*in the early part of the day) - (*at *the beginning of the day) -; - -[late_day] - (late in the day) - (late *in day) - (*at *the end of the day) -; - -[mid_day] - (midday) - (mid day) - (*in *the middle *part of the day) -; - -[anytime] - (any TIME) - (any_time) - (anytime) - (all TIME) - (regardless of time) - -TIME - (time) - (times) -; - -[early] - (*MOD early) -MOD - (very) - (real) - (really) -; - -[late] - (*MOD late) -MOD - (very) - (real) - (really) -; - -[mid] - (mid) - (*in *the middle of the) -; - -[time_relative] - ([now]) - ([time_relative_before]) - ([time_relative_after]) -; - -[now] - (*right now) - (as soon as possible) - (immediately) - (right away) -; - -[time_relative_before] - ([duration] ago) -; - -[time_relative_after] - (in [duration]) -; - -[duration] - ([hour] hour *AND_MINUTES) - ([hour] hours *AND_MINUTES) - ([minute] minutes) -AND_MINUTES - (*and [minute] *MINUTE) - (*and *a [d_quarter]) - (*and *a [d_half]) -MINUTE - (minute) - (minutes) -; - -[d_half] - (half) -; - -[d_quarter] - (quarter) -; - -[time_duration] - (*for *A_PERIOD_OF [duration]) - (*for [whole_day]) - -A_PERIOD_OF - (a period of) - (*just *around) - (about) - (approximately) -; - -[whole_day] - (*the whole day) - (all day *long) -; \ No newline at end of file Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.forms =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.forms 2007-10-18 03:17:53 UTC (rev 845) @@ -1,84 +0,0 @@ -################################################################### -# -# TeamTalk Grammar -# -# Written by: June Sison -# -# This is the forms file corresponding to the phoenix grammar for -# the TeamTalk system -# -# -# HISTORY ------------------------------------------------------- -# -# [2005-09-21] (dbohus): added cancel -# [2005-09-21] (tk): added yes/no -# [2003-03-08] (sison): started working on this -# -################################################################### - -FUNCTION: Commands - NETS: - [HumanReportCommand] - [HumanLocationQuery] - [HumanMoveCommand] -# [MoveVectorCardinal] - [MoveVectorRelative] - [MoveToGoal] - [HumanGoodbyeCommand] - [HumanTurnCommand] - [HumanHaltCommand] - [HumanFollowCommand] - [HumanPauseCommand] - [HumanContinueCommand] - [HumanExploreCommand] - [HumanSearchCommand] -; - -FUNCTION: Features - NETS: - [AbsoluteDistance] - [TurnDirection] - [MoveDirection] - [Units] -; - -FUNCTION: YesNo - NETS: -# [Neither] - [Yes] - [No] -; - -FUNCTION: Cancel - NETS: - [Cancel] -; - -#FUNCTION: Queries -# NETS: -# [QueryProjector] -# [QueryWhiteboard] -# [QueryComputer] -# [QueryNetworking] -# [QueryLocation] -# [QueryRoomSize] -# [QueryRoomSizeSpec] -# [QueryOtherRooms] -# [QueryRoomDetails] -#; - -#FUNCTION: Responses -# NETS: -# [Indifferent] -# [Satisfied] -# [SomewhatSatisfied] -# [FirstOne] -# [SecondOne] -#; - -# these auxiliaries are defined in order to capture some parses like -# next, this that, which o/w would parse as date-time -#FUNCTION: Auxiliaries -# NETS: -# [__datetime_junk] -#; \ No newline at end of file Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.gra =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-18 02:35:42 UTC (rev 844) +++ branches/mrmarge/PocketTeamTalk/Resources/Grammar/TeamTalkTask.gra 2007-10-18 03:17:53 UTC (rev 845) @@ -1,368 +0,0 @@ -################################################################### -# -# TEAMTALK T A S K G R A M M A R -# -# HISTORY: ------------------------------------------------------- -# -# [2003-03-08] (sison): started working on this -# -################################################################### - -[RobotName] - (everyone) -; - -[OBJ-Robot] - ([RobotName]) -; - -[HumanExploreCommand] - (explore) -; - -[HumanSearchCommand] - (search) -; - -[HumanFollowCommand] - (*[RobotName] FOLLOW [OBJ-Robot]) - -FOLLOW - (join) - (follow) - (find) -; - -[HumanPauseCommand] - (*[RobotName] pause) -; - -[HumanContinueCommand] - (*[RobotName] continue) -; - -[HumanReportCommand] - (*[RobotName] report) - ([RobotName]) -; - -[HumanLocationQuery] - (*[RobotName] where are you) -; - -[HumanHaltCommand] - (*[RobotName] all stop) -; - -[TurnDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) - (around) -; - -[MoveDirection] - (right *[AngularQualifier]) - (left *[AngularQualifier]) - (straight) - (forward) - (forwards) - (back) - (backward) - (backwards) -; - -[AngularQualifier] - ([Number-180-by5] degrees) -; - -[Number-180-by5] - (five) - (ten) - (fifteen) - (twenty *five) - (thirty *five) - (forty *five) - (fifty *five) - (sixty *five) - (seventy *five) - (eighty *five) - (ninety *five) - (HUNDRED) - (HUNDRED *and five) - (HUNDRED *and ten) - (HUNDRED *and fifteen) - (HUNDRED *and twenty *five) - (HUNDRED *and thirty *five) - (HUNDRED *and fourty *five) - (HUNDRED *and fifty *five) - (HUNDRED *and sixty *five) - (HUNDRED *and seventy *five) - (HUNDRED *and eighty) - -HUNDRED - (a hundred) - (one hundred) -; - -[AbsoluteDistance] - ([Number-20] [Units]) -; - -[RelativeDistance] - ([TeamTalkAll] *of the way) - ([TeamTalkHalf] *of *the way) - ([TeamTalkThird] of the way) - ([TeamTalkTwoThird] of the way) - ([TeamTalkOneQuarter] of the way) - ([TeamTalkThreeQuarter] of the way) -; - -[TeamTalkAll] - (all) -; - -[TeamTalkHalf] - (halfway) - (one half) - (a half) - (half) -; - -[TeamTalkThird] - (one third) - (a third) -; - -[TeamTalkTwoThird] - (two third) - (two thirds) -; - -[TeamTalkOneQuarter] - (one quarters) - (one quarter) - (one forth) - (a quarters) - (a quarter) - (a forth) -; - - -[TeamTalkThreeQuarter] - (three quarter) - (three quarters) - (three forth) - (three forths) -; - -[HumanMoveCommand] -# ([MoveVectorCardinal]) - ([MoveVectorRelative]) - ([MoveToGoal]) -; - -[Join] - (*[RobotName] join [RobotName]) -; - -#[MoveVectorCardinal] -# (*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance]) -# (*[RobotName] MOVE [CardinalDirection]) -# -#MOVE -# (move) -# (go) -#; - -[MoveVectorRelative] - (*[RobotName] MOVE *[MoveDirection] [AbsoluteDistance]) - (*[RobotName] MOVE *[AbsoluteDistance] [MoveDirection]) - -MOVE - (move) - (go) - (drive) - (return) -; - -[MoveToGoal] - (*[RobotName] MOVE *[RelativeDistance] PREP *[Side] [Goal]) - (*[RobotName] MOVE [Home]) - -MOVE - (move) - (go) - (drive) - -PREP - (toward) - (towards) - (to) - (down *to) - (down towards) - (up *to) - (up towards) -; - -[Side] - (the=north=end=of) - (the=east=end=of) - (the=south=end=of) - (the=west=end=of) - -[Goal] - ([Home]) - ([Xcoord] [Ycoord]) -; - -[Home] - (home) -; - -[Xcoord] - (*negative [Number-20]) -; - -[Ycoord] - (*negative [Number-20]) -; - -[Units] - (meters) - (meter) -# (feet) -# (foot) -# (yards) -# (yard) -; - -[HumanGoodbyeCommand] - (goodbye) - (bye bye) - (mission complete) - (that's it) -; - -[HumanTurnCommand] - (TURN [TurnDirection]) - -TURN - (turn) - (face) -; - -[Number-20] - (zero) - (one) - (two) - (three) - (four) - (five) - (six) - (seven) - (eight) - (nine) - (ten) - (eleven) - (twelve) - (thirteen) - (fourteen) - (fifteen) - (sixteen) - (seventeen) - (eighteen) - (nineteen) - (twenty) -; - -################################################################### -# YES/NO grammar -################################################################### - -[Yes] - (YES *MOD) - (STRONG_MOD) - (OKAY) - (WEAK_MOD) -YES - (yes) - (yeah) - (yep) - (yup) -MOD - (STRONG_MOD) - (WEAK_MOD) -STRONG_MOD - (you betcha) -#tk hack: interferes with "go forward" (*let's go for it) - (absolutely) - (definitely) - (OKAY OKAY) -WEAK_MOD - (why not) - (i think so) - (i guess so) -OKAY - (sure) - (of course) - (ok) - (okay) - (correct) - (fine) - (perfect) - (great) - (wonderful) - (acceptable) - (good *enough) - (right) - (alright) - (cool) -; - -[No] - (no *MOD) - (*no absolutely not) - (nope) - (nah) - (no way) - (*no i DONT) - (*no i DONT think so) - (never mind) - (nevermind) - (*no not really) - (nowhere) - (negative) -DONT - (don't) - (do not) -MOD - (thanks) - (thank you) - (not really) - (i *really don't want to) - (it's not) - (i'm not) -NO - (no) - (not) -GOOD - (right) - (correct) - (good) - (okay) -; - - -################################################################### -# CANCEL grammar -################################################################### - -[Cancel] - (CANCEL *COMMAND) -CANCEL - (cancel) - (quit) -COMMAND - (*that command) - (that) -; \ No newline at end of file Copied: branches/mrmarge/PocketTeamTalk/Resources/Grammar/bin (from rev 844, trunk/TeamTalk/Resources/Grammar/bin) Deleted: branches/mrmarge/PocketTeamTalk/Resources/Grammar/bin/compile.exe =================================================================== (Binary files differ) @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Thu Oct 18 00:50:42 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 00:50:42 -0400 Subject: [TeamTalk 310]: [846] trunk/TeamTalk: 1) Minor bugfix on requestwaitforcommands. Message-ID: <200710180450.l9I4ogT9000821@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/dcb8ac22/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-18 04:50:42 UTC (rev 846) @@ -351,7 +351,7 @@ // /TeamTalk/Task/RequestWaitForCommands //----------------------------------------------------------------------------- DEFINE_REQUEST_AGENT( CRequestWaitForCommands, - // PROMPT("request idle {DEBUG}) { print "generate:\n"; } - my $reply = ' '; for my $k (keys %frame) { $frame{$k} =~ s/[\cA-\cZ]+//g; if($self->{DEBUG}) { @@ -250,8 +249,8 @@ } } - $reply .= $self->getBestReply(%frame); - if ($reply) { + my $reply = $self->getBestReply(%frame); + if (defined $reply) { # substitute named slots for which a value is not given # with frame contents (ANTOINE: values can be specified by # , in which case the output string is value) Modified: trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk =================================================================== --- trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk 2007-10-18 04:50:42 UTC (rev 846) @@ -6,5 +6,6 @@ my $debug_flag = shift; -my $TeamTalk = new Rosetta::TeamTalk(port => 22345); +$|++; #autoflush +my $TeamTalk = new Rosetta::TeamTalk(port => 22345, DEBUG => $debug_flag); $TeamTalk->tcp_server($debug_flag); Deleted: trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains =================================================================== --- trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains 2007-10-18 04:50:42 UTC (rev 846) @@ -1,38 +0,0 @@ -#!/usr/bin/perl - -my $mod = 0; - -if (-t STDIN) { - print map &beautifyHotelChain($_), <>; - print STDERR "# $mod modifications\n"; -} - -sub beautifyHotelChain { - $_ = shift; - - chomp; - - s/\b Int l? \.? (\Z|\b)/International/x and $mod++; - s/\b Grp \.? (\Z|\b)/Group/x and $mod++; - s/\b Conf \.? (\Z|\b)/Conference/x and $mod++; - s/\b Inc \.? (\Z|\b)/Incorporated/x and $mod++; - - s/\b Lm?td \.? /Limited/x and $mod++; - s/\b Htl \.? /Hotel/x and $mod++; - - s/\b Corp \.? (\Z|\b)/Corporation/x and $mod++; - s/\b Mktg \.? (\Z|\b)/Marketing/x and $mod++; - s/\b Ser \.? (\Z|\b)/Service/x and $mod++; - s/\b Rst \.? /Resort/x and $mod++; - s/\b Tvl \.? /Travel/x and $mod++; - - s/\b(Srv|Svc)\.?/Service/ and $mod++; - - s/\b hotels (\Z|\b)/Hotel/xi and $mod++; - s/\b inns (\Z|\b)/Inn/xi and $mod++; - s/\b 6 $/Six/x and $mod++; - - s/\// /g; - - $_ . "\n"; -} Deleted: trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl =================================================================== --- trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl 2007-10-18 04:50:42 UTC (rev 846) @@ -1,38 +0,0 @@ -#!/usr/bin/perl - -my $mod = 0; - -if (-t STDIN) { - print map &beautifyHotelChain($_), <>; - print STDERR "# $mod modifications\n"; -} - -sub beautifyHotelChain { - $_ = shift; - - chomp; - - s/\b Int l? \.? (\Z|\b)/International/x and $mod++; - s/\b Grp \.? (\Z|\b)/Group/x and $mod++; - s/\b Conf \.? (\Z|\b)/Conference/x and $mod++; - s/\b Inc \.? (\Z|\b)/Incorporated/x and $mod++; - - s/\b Lm?td \.? /Limited/x and $mod++; - s/\b Htl \.? /Hotel/x and $mod++; - - s/\b Corp \.? (\Z|\b)/Corporation/x and $mod++; - s/\b Mktg \.? (\Z|\b)/Marketing/x and $mod++; - s/\b Ser \.? (\Z|\b)/Service/x and $mod++; - s/\b Rst \.? /Resort/x and $mod++; - s/\b Tvl \.? /Travel/x and $mod++; - - s/\b(Srv|Svc)\.?/Service/ and $mod++; - - s/\b hotels (\Z|\b)/Hotel/xi and $mod++; - s/\b inns (\Z|\b)/Inn/xi and $mod++; - s/\b 6 $/Six/x and $mod++; - - s/\// /g; - - $_ . "\n"; -} Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm 2007-10-18 04:50:42 UTC (rev 846) @@ -137,32 +137,6 @@ LOG_IN: :inframe LOG_OUT: :outframe -;;PROGRAM: robot_message - -;;RULE: :goal | --> PenDecoder.speak -;;IN: :robot_name :speaktext -;;OUT: - -;;RULE: :type = "location" --> PenDecoder.set_bot -;;IN: :robot_name :x :y :r -;;OUT: - -;;RULE: :type = "goal" --> PenDecoder.set_goal -;;IN: :robot_name :relative :x :y -;;OUT: - -;;RULE: :type = "halt" --> PenDecoder.set_halt -;;IN: :robot_name -;;OUT: - -;;RULE: :type = "follow" --> PenDecoder.set_follow -;;IN: :robot_name :followee -;;OUT: - -;;RULE: :type = "cover" --> PenDecoder.set_cover -;;IN: :robot_name :x :y -;;OUT: - PROGRAM: restart_decoder RULE: --> sphinx.restart_decoder Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-18 04:50:42 UTC (rev 846) @@ -138,7 +138,7 @@ const Boeing::MsgRobLocation* brl = reinterpret_cast(m.c_str()); return new MsgRobLocation(sender, brl->tstamp, - geometry::Point(brl->x, brl->y), brl->angle, (brl->moving != 0)); + geometry::Point(brl->x, brl->y), brl->angle, (brl->moving != 0), brl->error); } if(type == Boeing::ROB_ACK) { debug("packet") << "got: ROB_ACK" << endl; @@ -565,14 +565,15 @@ MsgRobLocation::MsgRobLocation(Point loc, float angle, bool moving, string sender) : Msg(sender), loc_(loc), angle_(angle), moving_(moving) {} -MsgRobLocation::MsgRobLocation(string sender, double tstamp, Point loc, float angle, bool moving) -: Msg(sender, tstamp), loc_(loc), angle_(angle), moving_(moving) {} +MsgRobLocation::MsgRobLocation(string sender, double tstamp, Point loc, float angle, bool moving, short error_state) +: Msg(sender, tstamp), loc_(loc), angle_(angle), moving_(moving), error_state_(error_state) {} Point MsgRobLocation::getLocation() const {return loc_;} float MsgRobLocation::getX() const {return loc_.x;} float MsgRobLocation::getY() const {return loc_.y;} float MsgRobLocation::getAngle() const {return angle_;} bool MsgRobLocation::isMoving() const {return moving_;} +short MsgRobLocation::getErrorState() const {return error_state_;} bool MsgRobLocation::operator==(const MsgRobLocation& x) const { return (loc_-x.loc_).length() <= tolerance && @@ -588,6 +589,7 @@ ostringstream out; out << "roblocation: " << loc_ << angle_ << "rad " << (moving_? "MOVING": "STILL"); + if(error_state_) out << " ERROR: " << error_state_; return out.str(); } Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-18 04:50:42 UTC (rev 846) @@ -277,17 +277,19 @@ Point loc_; float angle_; bool moving_; + short error_state_; public: //normal instantiation MsgRobLocation(); MsgRobLocation(Point loc, float angle, bool moving, string sender=string()); //instantiation from a Boeing packet - MsgRobLocation(string sender, double tstamp, Point loc, float angle, bool moving); + MsgRobLocation(string sender, double tstamp, Point loc, float angle, bool moving, short error_state); Point getLocation() const; float getX() const; float getY() const; float getAngle() const; bool isMoving() const; + short getErrorState() const; bool operator==(const MsgRobLocation& x) const; bool operator!=(const MsgRobLocation& x) const; string render() const; Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-18 04:50:42 UTC (rev 846) @@ -211,7 +211,7 @@ } } -int UDPSocket::recv(void* buf, int maxbytes) +int UDPSocket::recv(void* buf, int maxbytes, struct sockaddr_in* addr) { if (status <= 0) return 0; @@ -314,6 +314,8 @@ return rv; } +int UDPSocket::SendTo(struct sockaddr_in* addr, const void* msg, int len) {return 0;} + void UDPSocket::accept() { if (status != Server) Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-18 04:50:42 UTC (rev 846) @@ -136,10 +136,11 @@ bool isConnected() {return status>0; } // Returns the number of bytes read or written. - int recv(void *buf, int maxbytes); + int recv(void *buf, int maxbytes, struct sockaddr_in* addr=NULL); int send(const void *buf, int nbytes); + int SendTo(struct sockaddr_in* addr, const void* msg, int length); int recvType(void *buf, int maxbytes, char &type) { - int rv = recv(buf, maxbytes); type = ((char *) buf)[0]; return rv; } + int rv = recv(buf, maxbytes); type = ((char *) buf)[0]; return rv; } // Server specific methods void accept(); Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-18 04:50:42 UTC (rev 846) @@ -1,12 +1,13 @@ #ifndef WIN32 #include +#include +#include #endif + #include #include #include -#include -#include #include "boeing_map_server.h" #include "timer.h" Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-18 04:50:42 UTC (rev 846) @@ -5,7 +5,11 @@ #ifndef __BOEING_MAP_SERVER_H__ #define __BOEING_MAP_SERVER_H__ +#ifndef WIN32 #include +#else +#include +#endif #include "boeing_map_packet.h" Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h =================================================================== --- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-18 04:50:42 UTC (rev 846) @@ -239,7 +239,6 @@ return m; }; } PACKED; - /// evaluation message for play manager //this should eventually be multiple data types, not just int16_t @@ -274,7 +273,7 @@ float angle; int16_t moving; int16_t error; - static MsgRobLocation factory(float x, float y, float angle, int16_t moving, int16_t error) { + static MsgRobLocation factory(float x, float y, float angle, int16_t moving, int16_t error=ROB_OK) { MsgRobLocation m; m.x = x; m.y = y; m.angle = angle; m.moving = moving; m.error=error; return m; @@ -285,6 +284,7 @@ bool operator==(const MsgRobLocation& rhs) { return !this->operator!=(rhs); } + bool hasError() {return error!=ROB_OK;} } PACKED; /// Handshaking...why is this so large??? Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 03:17:53 UTC (rev 845) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 04:50:42 UTC (rev 846) @@ -75,6 +75,12 @@ } "Entry" { + "MsmKey" = "8:_06C53A0A79144BF3B20E6D091BA5AF66" + "OwnerKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0754644A518C4A3C8C2DCAC878545BCE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -303,7 +309,7 @@ } "Entry" { - "MsmKey" = "8:_1ED9280F00524433BFB5837ED7830502" + "MsmKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" "MsmSig" = "8:_UNDEFINED" } @@ -423,6 +429,60 @@ } "Entry" { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1389,12 +1449,6 @@ } "Entry" { - "MsmKey" = "8:_868FA11D28B3499FBD873A1D9FDD0995" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_86CC12EAF6964AC19B0805582678672A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1629,12 +1683,6 @@ } "Entry" { - "MsmKey" = "8:_A17F6E72C8B148F6A39F40FED97A358E" - "OwnerKey" = "8:_1ED9280F00524433BFB5837ED7830502" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A22C2C43252B4F84A428C71471100857" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1677,6 +1725,12 @@ } "Entry" { + "MsmKey" = "8:_A54BC1128444473EAB4C5E0D68C78407" + "OwnerKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A5C9D293284B46E5A08A504E22245CF3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1941,12 +1995,6 @@ } "Entry" { - "MsmKey" = "8:_BDEFB96E13D940DD874054B868B18BF7" - "OwnerKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_BDF6C7CB9D0748FBBDC7F694C7993CA0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2278,31 +2326,31 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2325,12 +2373,6 @@ } "Entry" { - "MsmKey" = "8:_DE8FCA61078347EAAAD1F0003986508A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_DEF0051FA91E428C896D3D23444D0E1A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2409,60 +2451,6 @@ } "Entry" { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E731AD6F5D324159A5AE976D3DB17D9E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -7265,26 +7253,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_868FA11D28B3499FBD873A1D9FDD0995" - { - "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\bin\\beautify_chains" - "TargetName" = "8:beautify_chains" - "Tag" = "8:" - "Folder" = "8:_B6BD363182FB405191A30FACF312AC2E" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_86CC12EAF6964AC19B0805582678672A" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\browse" @@ -10205,26 +10173,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE8FCA61078347EAAAD1F0003986508A" - { - "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\bin\\beautify_chains.pl" - "TargetName" = "8:beautify_chains.pl" - "Tag" = "8:" - "Folder" = "8:_B6BD363182FB405191A30FACF312AC2E" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DEF0051FA91E428C896D3D23444D0E1A" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\labelframe.tcl" @@ -12649,11 +12597,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1ED9280F00524433BFB5837ED7830502" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_06C53A0A79144BF3B20E6D091BA5AF66" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" "Properties" { } @@ -12663,11 +12611,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A17F6E72C8B148F6A39F40FED97A358E" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1F27A38B07F54BB1A085F7B8F01D27AF" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" "Properties" { } @@ -12677,11 +12625,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_BDEFB96E13D940DD874054B868B18BF7" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_29CD188AB7D24EC88B5923B2D9A797CC" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -12691,11 +12639,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E617026519BC40F0BE5E060A1709633F" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A54BC1128444473EAB4C5E0D68C78407" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } From tk at edam.speech.cs.cmu.edu Thu Oct 18 00:57:41 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 00:57:41 -0400 Subject: [TeamTalk 311]: [847] tags/2007-tt-fallback/: A tested fallback. Message-ID: <200710180457.l9I4vf7X000836@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/e09833f2/attachment.html -------------- next part -------------- Copied: tags/2007-tt-fallback (from rev 846, trunk/TeamTalk) From tk at edam.speech.cs.cmu.edu Thu Oct 18 02:50:36 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 02:50:36 -0400 Subject: [TeamTalk 312]: [848] trunk/TeamTalk: 1) Use dist directory for Pendecoder's external jars. Message-ID: <200710180650.l9I6oaal001124@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/5bcd6cf7/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-18 04:57:41 UTC (rev 847) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-18 06:50:36 UTC (rev 848) @@ -1,5 +1,4 @@ EXPAND: $GC_HOME ..\..\Libraries\Galaxy -EXPAND: $MITRE_ROOT $GC_HOME\contrib\MITRE EXPAND: $TEAMTALK ..\.. EXPAND: $CONFIGURATION $TEAMTALK\Configurations\DesktopConfiguration EXPAND: $AGENTS $TEAMTALK\Agents @@ -15,7 +14,7 @@ TITLE: TeamTalk -PROCESS: $JAVAEXE -classpath bsh-core-2.0b4.jar;bsh-util-2.0b4.jar;jiu.jar;dist/PenDecoder.jar;$MITRE_ROOT/bindings/java/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt +PROCESS: $JAVAEXE -classpath dist/lib/bsh-core-2.0b4.jar;dist/lib/bsh-util-2.0b4.jar;dist/PenDecoder.jar;dist/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt PROCESS_WORKDIR: $PENDECODER PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: PenDecoder Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 04:57:41 UTC (rev 847) +++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 06:50:36 UTC (rev 848) @@ -75,12 +75,6 @@ } "Entry" { - "MsmKey" = "8:_06C53A0A79144BF3B20E6D091BA5AF66" - "OwnerKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0754644A518C4A3C8C2DCAC878545BCE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -309,12 +303,6 @@ } "Entry" { - "MsmKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_1F42C3E071BB42A7A5833617DB0733B9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -357,12 +345,6 @@ } "Entry" { - "MsmKey" = "8:_2499211F1B524D089D9A7BF956059B5E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_24A163D1D7964683822BCEAA09EC4BC4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -429,60 +411,6 @@ } "Entry" { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -717,6 +645,12 @@ } "Entry" { + "MsmKey" = "8:_41AB24BCC22B416C9FCA5AF352B628C3" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_41B223D3494243549702393AEE3DF084" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -783,12 +717,6 @@ } "Entry" { - "MsmKey" = "8:_468DAE8A22AB41DEA1B09E80CE83FAFD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_46F3778A1DED4F508BFDE6284A06C7B5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -873,6 +801,60 @@ } "Entry" { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_4D0D55A9B23A4E7C9F86BE0F4885DCFB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1035,12 +1017,6 @@ } "Entry" { - "MsmKey" = "8:_5C112EB6B56747938FBE262572CBA8D4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5C417CEBD5654CE58BEA12B3284413A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1113,12 +1089,6 @@ } "Entry" { - "MsmKey" = "8:_627C60D5154641B0925A2C5E8B00A06B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_65C7C38F53F64139B75E8AC0736D5C2C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1179,12 +1149,6 @@ } "Entry" { - "MsmKey" = "8:_6A0E8D3A0F2E417D89FB9CDA634ACA60" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6BF3B812D50B4048B41A568BFD349DDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1245,12 +1209,6 @@ } "Entry" { - "MsmKey" = "8:_70ECB07B803F4B0E81CFF59B3C122AD2" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_70EF1F828D08453784B86C78D99E5498" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1335,6 +1293,12 @@ } "Entry" { + "MsmKey" = "8:_7BD97888280B4F7E8BCC2EDF987202FA" + "OwnerKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7C53D3B63A6847BEB6774AF8D30859DE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1575,6 +1539,12 @@ } "Entry" { + "MsmKey" = "8:_94248070525E4B75898BF37DA33AB582" + "OwnerKey" = "8:_41AB24BCC22B416C9FCA5AF352B628C3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_947BF9E850AE4AFCA58C3BB792712F77" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1725,12 +1695,6 @@ } "Entry" { - "MsmKey" = "8:_A54BC1128444473EAB4C5E0D68C78407" - "OwnerKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A5C9D293284B46E5A08A504E22245CF3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1821,12 +1785,6 @@ } "Entry" { - "MsmKey" = "8:_ACAED84396274FBABB972450E4D53D62" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_ACBA7498BA3B48FE849264652BAB8A9E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2043,12 +2001,6 @@ } "Entry" { - "MsmKey" = "8:_C0AA28DD7D234CCEB6D53338D81E29B5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C1FA30C5F48C4649AB948B794BE5F6C1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2235,12 +2187,6 @@ } "Entry" { - "MsmKey" = "8:_D56A07DB81FA430E9A5E53BC2182BC11" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D6E4AE65B95D46DAB0FBCC7EA207BD4E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2326,31 +2272,31 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -3893,26 +3839,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2499211F1B524D089D9A7BF956059B5E" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\raw.log" - "TargetName" = "8:raw.log" - "Tag" = "8:" - "Folder" = "8:_D39C71DC61D04B49BA453B3D8259563F" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24A163D1D7964683822BCEAA09EC4BC4" { "SourcePath" = "8:..\\Tools\\MakeLM\\lexdata\\cmudict.0.6d_SPHINX_NEW" @@ -5093,26 +5019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_468DAE8A22AB41DEA1B09E80CE83FAFD" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\sphinx_male-16khz.log" - "TargetName" = "8:sphinx_male-16khz.log" - "Tag" = "8:" - "Folder" = "8:_D39C71DC61D04B49BA453B3D8259563F" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_46F3778A1DED4F508BFDE6284A06C7B5" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\ER.chmm" @@ -5893,26 +5799,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C112EB6B56747938FBE262572CBA8D4" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalkDM-ALPHIE.cfg" - "TargetName" = "8:TeamTalkDM-ALPHIE.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C417CEBD5654CE58BEA12B3284413A3" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tk84.dll" @@ -6133,26 +6019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_627C60D5154641B0925A2C5E8B00A06B" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk-hub-desktop-ALPHIE.pgm" - "TargetName" = "8:TeamTalk-hub-desktop-ALPHIE.pgm" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65C7C38F53F64139B75E8AC0736D5C2C" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\bitmap.tcl" @@ -6353,26 +6219,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A0E8D3A0F2E417D89FB9CDA634ACA60" - { - "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\Rosetta\\TeamTalk.pm~" - "TargetName" = "8:TeamTalk.pm~" - "Tag" = "8:" - "Folder" = "8:_CBC7749CB66F43E18BE95A434B8E6B87" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6BF3B812D50B4048B41A568BFD349DDA" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\macThai.enc" @@ -6573,26 +6419,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_70ECB07B803F4B0E81CFF59B3C122AD2" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk-hub-desktop-BASHFUL.pgm" - "TargetName" = "8:TeamTalk-hub-desktop-BASHFUL.pgm" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_70EF1F828D08453784B86C78D99E5498" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\CH.chmm" @@ -8473,26 +8299,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACAED84396274FBABB972450E4D53D62" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop.config.user" - "TargetName" = "8:startlist-desktop.config.user" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACBA7498BA3B48FE849264652BAB8A9E" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\items.tcl" @@ -9213,26 +9019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0AA28DD7D234CCEB6D53338D81E29B5" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\peerfile.txt" - "TargetName" = "8:peerfile.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1FA30C5F48C4649AB948B794BE5F6C1" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\license.terms" @@ -9833,26 +9619,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D56A07DB81FA430E9A5E53BC2182BC11" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalkDM-BASHFUL.cfg" - "TargetName" = "8:TeamTalkDM-BASHFUL.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D6E4AE65B95D46DAB0FBCC7EA207BD4E" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\macUkraine.enc" @@ -12597,11 +12363,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_06C53A0A79144BF3B20E6D091BA5AF66" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_41AB24BCC22B416C9FCA5AF352B628C3" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" "Properties" { } @@ -12611,11 +12377,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1F27A38B07F54BB1A085F7B8F01D27AF" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4CBACE42EA574B26AED906543FCB4B34" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -12625,11 +12391,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_29CD188AB7D24EC88B5923B2D9A797CC" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7BD97888280B4F7E8BCC2EDF987202FA" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -12639,11 +12405,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A54BC1128444473EAB4C5E0D68C78407" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_94248070525E4B75898BF37DA33AB582" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" "Properties" { } Modified: trunk/TeamTalk/TeamTalkBuild.bat =================================================================== --- trunk/TeamTalk/TeamTalkBuild.bat 2007-10-18 04:57:41 UTC (rev 847) +++ trunk/TeamTalk/TeamTalkBuild.bat 2007-10-18 06:50:36 UTC (rev 848) @@ -100,97 +100,98 @@ :NBA SET NetBeansDrive=A -goto Compile +goto Ant :NBB SET NetBeansDrive=B -goto Compile +goto Ant :NBC SET NetBeansDrive=C -goto Compile +goto Ant :NBD SET NetBeansDrive=D -goto Compile +goto Ant :NBE SET NetBeansDrive=E -goto Compile +goto Ant :NBF SET NetBeansDrive=F -goto Compile +goto Ant :NBG SET NetBeansDrive=G -goto Compile +goto Ant :NBH SET NetBeansDrive=H -goto Compile +goto Ant :NBI SET NetBeansDrive=I -goto Compile +goto Ant :NBJ SET NetBeansDrive=J -goto Compile +goto Ant :NBK SET NetBeansDrive=K -goto Compile +goto Ant :NBL SET NetBeansDrive=L -goto Compile +goto Ant :NBM SET NetBeansDrive=M -goto Compile +goto Ant :NBN SET NetBeansDrive=N -goto Compile +goto Ant :NBO SET NetBeansDrive=O -goto Compile +goto Ant :NBP SET NetBeansDrive=P -goto Compile +goto Ant :NBQ SET NetBeansDrive=Q -goto Compile +goto Ant :NBR SET NetBeansDrive=R -goto Compile +goto Ant :NBS SET NetBeansDrive=S -goto Compile +goto Ant :NBT SET NetBeansDrive=T -goto Compile +goto Ant :NBU SET NetBeansDrive=U -goto Compile +goto Ant :NBV SET NetBeansDrive=V -goto Compile +goto Ant :NBW SET NetBeansDrive=W -goto Compile +goto Ant :NBX SET NetBeansDrive=X -goto Compile +goto Ant :NBY SET NetBeansDrive=Y -goto Compile +goto Ant :NBZ SET NetBeansDrive=Z -:Compile -CALL "%VSHome%\devenv" TeamTalk.sln /%BUILD_TYPE% %BUILD_CONF% -pause - :Ant Compilation :JBUILD CALL "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" -buildfile Agents\PenDecoder\build.xml pause +:Compile +CALL "%VSHome%\devenv" TeamTalk.sln /%BUILD_TYPE% %BUILD_CONF% +IF "%BUILD_CONF%"=="Publish" GOTO Pause +pause + :Run MakeLM echo Now Executing MakeLM cd Tools\MakeLM perl makelm.pl --projectname TeamTalk cd ..\.. -goto Pause +GOTO Pause :VSERROR echo Can't find Visual Studio 8.0. Is it installed? Added: trunk/TeamTalk/TeamTalkPublish.bat =================================================================== --- trunk/TeamTalk/TeamTalkPublish.bat (rev 0) +++ trunk/TeamTalk/TeamTalkPublish.bat 2007-10-18 06:50:36 UTC (rev 848) @@ -0,0 +1,5 @@ + at echo off + +SET BUILD_CONF=Publish + +TeamTalkBuild.bat From tk at edam.speech.cs.cmu.edu Thu Oct 18 02:51:42 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 02:51:42 -0400 Subject: [TeamTalk 313]: [849] trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties: Use libraries instead of simple jars. Message-ID: <200710180651.l9I6pgcQ001138@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/2c5e526e/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties 2007-10-18 06:50:36 UTC (rev 848) +++ trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties 2007-10-18 06:51:42 UTC (rev 849) @@ -16,15 +16,11 @@ dist.dir=dist dist.jar=${dist.dir}/PenDecoder.jar dist.javadoc.dir=${dist.dir}/javadoc -file.reference.bsh-core-2.0b4.jar=bsh-core-2.0b4.jar -file.reference.bsh-util-2.0b4.jar=bsh-util-2.0b4.jar -file.reference.galaxy.jar-1=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar file.reference.PenDecoder-src=src jar.compress=false javac.classpath=\ - ${file.reference.galaxy.jar-1}:\ - ${file.reference.bsh-util-2.0b4.jar}:\ - ${file.reference.bsh-core-2.0b4.jar} + ${libs.BeanShell.classpath}:\ + ${libs.Galaxy.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint javac.deprecation=false @@ -45,6 +41,12 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= +# Property libs.BeanShell.classpath is set here just to make sharing of project simpler. +# The library definition has always preference over this property. +libs.BeanShell.classpath=bsh-core-2.0b4.jar;bsh-util-2.0b4.jar +# Property libs.Galaxy.classpath is set here just to make sharing of project simpler. +# The library definition has always preference over this property. +libs.Galaxy.classpath=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar main.class=edu.cmu.ravenclaw.pendecoder.PenDecoderServer manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF From matt at edam.speech.cs.cmu.edu Thu Oct 18 11:27:43 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 11:27:43 -0400 Subject: [TeamTalk 314]: [850] branches/mrmarge/PocketTeamTalk: Message-ID: <200710181527.l9IFRho8006884@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/db148585/attachment-0001.html -------------- next part -------------- Modified: branches/mrmarge/PocketTeamTalk/Agents/Agents.sln =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/Agents.sln 2007-10-18 06:51:42 UTC (rev 849) +++ branches/mrmarge/PocketTeamTalk/Agents/Agents.sln 2007-10-18 15:27:41 UTC (rev 850) @@ -8,8 +8,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkBackend", "TeamTalkBackend\TeamTalkBackend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" ProjectSection(ProjectDependencies) = postProject + {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} - {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkDM", "TeamTalkDM\TeamTalkDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" @@ -21,16 +21,18 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" ProjectSection(ProjectDependencies) = postProject - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} = {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} + {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} + {1D29B734-1BA2-400C-877A-9F6A8DC44698} = {1D29B734-1BA2-400C-877A-9F6A8DC44698} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" ProjectSection(ProjectDependencies) = postProject - {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} - {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} - {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} + {16A55B24-B636-4479-B306-1EEA66CCA3E7} = {16A55B24-B636-4479-B306-1EEA66CCA3E7} + {1D29B734-1BA2-400C-877A-9F6A8DC44698} = {1D29B734-1BA2-400C-877A-9F6A8DC44698} + {B3C39248-7981-41D3-AB2C-89A8D507BD9E} = {B3C39248-7981-41D3-AB2C-89A8D507BD9E} + {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} = {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Helios\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" @@ -41,16 +43,20 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "..\Libraries\RavenClaw\RavenClaw.vcproj", "{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2", "..\Libraries\sphinx2msdev\libsphinx2\libsphinx2.vcproj", "{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\Libraries\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2ad", "..\Libraries\sphinx2msdev\libsphinx2ad\libsphinx2ad.vcproj", "{B1A99CB7-705E-41D0-A461-6CE24CB83C50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "..\Libraries\sphinx2msdev\libsphinx2fe\libsphinx2fe.vcproj", "{D1928EF1-ABBB-4130-98E4-8BB293F982F3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinxad", "..\Libraries\sphinxbase\win32\libsphinxad\libsphinxad.vcproj", "{236E9D9C-A5D7-40CE-A459-F98456A74472}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\Libraries\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinxfe", "..\Libraries\sphinxbase\win32\libsphinxfe\libsphinxfe.vcproj", "{72C9C9C6-90DC-4BB2-A570-D636F3E46E86}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythiaDynamicClient", "Pythia\PythiaDynamicClient\PythiaDynamicClient.vcproj", "{BC3C2AF0-EF36-4587-B384-E154B6EDCC33}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinxfeat", "..\Libraries\sphinxbase\win32\libsphinxfeat\libsphinxfeat.vcproj", "{16A55B24-B636-4479-B306-1EEA66CCA3E7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinxutil", "..\Libraries\sphinxbase\win32\libsphinxutil\libsphinxutil.vcproj", "{1D29B734-1BA2-400C-877A-9F6A8DC44698}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpocketsphinx", "..\Libraries\pocketsphinx\win32\msdev\libpocketsphinx\libpocketsphinx.vcproj", "{B3C39248-7981-41D3-AB2C-89A8D507BD9E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -97,18 +103,6 @@ {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.Build.0 = DebugGalaxy|Win32 {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.ActiveCfg = ReleaseGalaxy|Win32 {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.Build.0 = ReleaseGalaxy|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.Build.0 = Debug|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.ActiveCfg = Release|Win32 - {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.Build.0 = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.Build.0 = Debug|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.ActiveCfg = Release|Win32 - {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.Build.0 = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.Build.0 = Debug|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.ActiveCfg = Release|Win32 - {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.Build.0 = Release|Win32 {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.ActiveCfg = Debug|Win32 {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32 {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32 @@ -117,6 +111,26 @@ {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Debug|Win32.Build.0 = Debug|Win32 {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.ActiveCfg = Release|Win32 {BC3C2AF0-EF36-4587-B384-E154B6EDCC33}.Release|Win32.Build.0 = Release|Win32 + {236E9D9C-A5D7-40CE-A459-F98456A74472}.Debug|Win32.ActiveCfg = Debug|Win32 + {236E9D9C-A5D7-40CE-A459-F98456A74472}.Debug|Win32.Build.0 = Debug|Win32 + {236E9D9C-A5D7-40CE-A459-F98456A74472}.Release|Win32.ActiveCfg = Release|Win32 + {236E9D9C-A5D7-40CE-A459-F98456A74472}.Release|Win32.Build.0 = Release|Win32 + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86}.Debug|Win32.ActiveCfg = Debug|Win32 + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86}.Debug|Win32.Build.0 = Debug|Win32 + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86}.Release|Win32.ActiveCfg = Release|Win32 + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86}.Release|Win32.Build.0 = Release|Win32 + {16A55B24-B636-4479-B306-1EEA66CCA3E7}.Debug|Win32.ActiveCfg = Debug|Win32 + {16A55B24-B636-4479-B306-1EEA66CCA3E7}.Debug|Win32.Build.0 = Debug|Win32 + {16A55B24-B636-4479-B306-1EEA66CCA3E7}.Release|Win32.ActiveCfg = Release|Win32 + {16A55B24-B636-4479-B306-1EEA66CCA3E7}.Release|Win32.Build.0 = Release|Win32 + {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Debug|Win32.Build.0 = Debug|Win32 + {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Release|Win32.ActiveCfg = Release|Win32 + {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Release|Win32.Build.0 = Release|Win32 + {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Debug|Win32.Build.0 = Debug|Win32 + {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Release|Win32.ActiveCfg = Release|Win32 + {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Added: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/hub4_cd_continuous_8gau_1s_c_d_dd/mdef =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/hub4_cd_continuous_8gau_1s_c_d_dd/mdef (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/hub4_cd_continuous_8gau_1s_c_d_dd/mdef 2007-10-18 15:27:41 UTC (rev 850) @@ -0,0 +1,133558 @@ +0.3 +48 n_base +133500 n_tri +534192 n_state_map +4144 n_tied_state +144 n_tied_ci_state +48 n_tied_tmat +# +# Columns definitions +#base lft rt p attrib tmat ... state id's ... ++BREATH+ - - - filler 0 0 1 2 N ++COUGH+ - - - filler 1 3 4 5 N ++GARBAGE+ - - - filler 2 6 7 8 N ++NOISE+ - - - filler 3 9 10 11 N ++SMACK+ - - - filler 4 12 13 14 N + +UH+ - - - filler 5 15 16 17 N ++UHUM+ - - - filler 6 18 19 20 N + +UM+ - - - filler 7 21 22 23 N + AA - - - n/a 8 24 25 26 N + AE - - - n/a 9 27 28 29 N + AH - - - n/a 10 30 31 32 N + AO - - - n/a 11 33 34 35 N + AW - - - n/a 12 36 37 38 N + AY - - - n/a 13 39 40 41 N + B - - - n/a 14 42 43 44 N + CH - - - n/a 15 45 46 47 N + D - - - n/a 16 48 49 50 N + DH - - - n/a 17 51 52 53 N + EH - - - n/a 18 54 55 56 N + ER - - - n/a 19 57 58 59 N + EY - - - n/a 20 60 61 62 N + F - - - n/a 21 63 64 65 N + G - - - n/a 22 66 67 68 N + HH - - - n/a 23 69 70 71 N + IH - - - n/a 24 72 73 74 N + IY - - - n/a 25 75 76 77 N + JH - - - n/a 26 78 79 80 N + K - - - n/a 27 81 82 83 N + L - - - n/a 28 84 85 86 N + M - - - n/a 29 87 88 89 N + N - - - n/a 30 90 91 92 N + NG - - - n/a 31 93 94 95 N + OW - - - n/a 32 96 97 98 N + OY - - - n/a 33 99 100 101 N + P - - - n/a 34 102 103 104 N + R - - - n/a 35 105 106 107 N + S - - - n/a 36 108 109 110 N + SH - - - n/a 37 111 112 113 N + SIL - - - filler 38 114 115 116 N + T - - - n/a 39 117 118 119 N + TH - - - n/a 40 120 121 122 N + UH - - - n/a 41 123 124 125 N + UW - - - n/a 42 126 127 128 N + V - - - n/a 43 129 130 131 N + W - - - n/a 44 132 133 134 N + Y - - - n/a 45 135 136 137 N + Z - - - n/a 46 138 139 140 N + ZH - - - n/a 47 141 142 143 N + AA AA AA s n/a 8 178 210 228 N + AA AA AE s n/a 8 178 210 228 N + AA AA AH s n/a 8 178 210 228 N + AA AA AO s n/a 8 178 210 228 N + AA AA AW s n/a 8 178 210 228 N + AA AA AY s n/a 8 178 210 228 N + AA AA B b n/a 8 178 201 240 N + AA AA B s n/a 8 178 210 240 N + AA AA CH b n/a 8 178 183 244 N + AA AA CH s n/a 8 178 210 244 N + AA AA D b n/a 8 178 186 233 N + AA AA D s n/a 8 178 210 233 N + AA AA DH s n/a 8 178 210 244 N + AA AA EH s n/a 8 178 210 228 N + AA AA ER b n/a 8 177 211 229 N + AA AA ER s n/a 8 177 212 228 N + AA AA EY s n/a 8 178 210 228 N + AA AA F b n/a 8 178 199 241 N + AA AA F s n/a 8 178 210 241 N + AA AA G b n/a 8 178 186 243 N + AA AA G s n/a 8 178 210 244 N + AA AA HH b n/a 8 178 199 241 N + AA AA HH s n/a 8 178 210 241 N + AA AA IH s n/a 8 178 210 228 N + AA AA IY b n/a 8 178 199 229 N + AA AA IY s n/a 8 178 210 228 N + AA AA JH b n/a 8 178 183 244 N + AA AA JH s n/a 8 178 210 244 N + AA AA K b n/a 8 178 186 242 N + AA AA K i n/a 8 178 186 242 N + AA AA K s n/a 8 178 210 243 N + AA AA L b n/a 8 178 199 231 N + AA AA L s n/a 8 178 210 231 N + AA AA M b n/a 8 178 199 239 N + AA AA M s n/a 8 178 210 239 N + AA AA N b n/a 8 178 199 237 N + AA AA N s n/a 8 178 210 238 N + AA AA NG b n/a 8 178 199 237 N + AA AA OW s n/a 8 178 210 228 N + AA AA OY s n/a 8 178 210 228 N + AA AA P b n/a 8 178 201 241 N + AA AA P s n/a 8 178 210 240 N + AA AA R b n/a 8 177 211 229 N + AA AA R s n/a 8 177 212 223 N + AA AA S b n/a 8 178 199 247 N + AA AA S s n/a 8 178 210 247 N + AA AA SH b n/a 8 178 199 246 N + AA AA SH s n/a 8 178 210 246 N + AA AA SIL s n/a 8 178 210 250 N + AA AA T b n/a 8 178 186 233 N + AA AA T s n/a 8 178 210 233 N + AA AA TH b n/a 8 178 199 241 N + AA AA TH s n/a 8 178 210 241 N + AA AA UH s n/a 8 178 210 228 N + AA AA UW b n/a 8 178 199 229 N + AA AA UW s n/a 8 178 210 228 N + AA AA V b n/a 8 178 199 240 N + AA AA V s n/a 8 178 210 240 N + AA AA W b n/a 8 178 199 231 N + AA AA W s n/a 8 178 210 231 N + AA AA Y b n/a 8 178 199 229 N + AA AA Y s n/a 8 178 210 228 N + AA AA Z b n/a 8 178 199 246 N + AA AA Z s n/a 8 178 210 246 N + AA AA ZH s n/a 8 178 210 246 N + AA AE AA s n/a 8 147 210 228 N + AA AE AE s n/a 8 147 210 228 N + AA AE AH s n/a 8 147 210 228 N + AA AE AO s n/a 8 147 210 228 N + AA AE AW s n/a 8 147 210 228 N + AA AE AY s n/a 8 147 210 228 N + AA AE B b n/a 8 148 201 240 N + AA AE B s n/a 8 147 210 240 N + AA AE CH b n/a 8 148 183 244 N + AA AE CH s n/a 8 147 210 244 N + AA AE D b n/a 8 148 185 233 N + AA AE D s n/a 8 147 210 233 N + AA AE DH s n/a 8 147 210 244 N + AA AE EH s n/a 8 147 210 228 N + AA AE ER b n/a 8 147 211 227 N + AA AE ER s n/a 8 147 212 228 N + AA AE EY s n/a 8 147 210 228 N + AA AE F b n/a 8 148 197 241 N + AA AE F s n/a 8 147 210 241 N + AA AE G b n/a 8 148 185 243 N + AA AE G s n/a 8 147 210 244 N + AA AE HH b n/a 8 148 197 241 N + AA AE HH s n/a 8 147 210 241 N + AA AE IH s n/a 8 147 210 228 N + AA AE IY b n/a 8 148 197 227 N + AA AE IY s n/a 8 147 210 228 N + AA AE JH b n/a 8 148 183 244 N + AA AE JH s n/a 8 147 210 244 N + AA AE K b n/a 8 148 185 242 N + AA AE K s n/a 8 147 210 243 N + AA AE L b n/a 8 148 197 231 N + AA AE L s n/a 8 147 210 231 N + AA AE M b n/a 8 148 197 239 N + AA AE M s n/a 8 147 210 239 N + AA AE N b n/a 8 148 197 237 N + AA AE N s n/a 8 147 210 238 N + AA AE NG b n/a 8 148 197 237 N + AA AE OW s n/a 8 147 210 228 N + AA AE OY s n/a 8 147 210 228 N + AA AE P b n/a 8 148 201 241 N + AA AE P s n/a 8 147 210 240 N + AA AE R b n/a 8 147 211 227 N + AA AE R s n/a 8 147 212 223 N + AA AE S b n/a 8 148 197 247 N + AA AE S s n/a 8 147 210 247 N + AA AE SH b n/a 8 148 197 246 N + AA AE SH s n/a 8 147 210 246 N + AA AE SIL s n/a 8 147 210 250 N + AA AE T b n/a 8 148 185 233 N + AA AE T s n/a 8 147 210 233 N + AA AE TH b n/a 8 148 197 241 N + AA AE TH s n/a 8 147 210 241 N + AA AE UH s n/a 8 147 210 228 N + AA AE UW b n/a 8 148 197 227 N + AA AE UW s n/a 8 147 210 228 N + AA AE V b n/a 8 148 197 240 N + AA AE V s n/a 8 147 210 240 N + AA AE W b n/a 8 148 197 231 N + AA AE W s n/a 8 147 210 231 N + AA AE Y b n/a 8 148 197 227 N + AA AE Y s n/a 8 147 210 228 N + AA AE Z b n/a 8 148 197 246 N + AA AE Z s n/a 8 147 210 246 N + AA AE ZH s n/a 8 147 210 246 N + AA AH AA s n/a 8 148 210 228 N + AA AH AE s n/a 8 148 210 228 N + AA AH AH s n/a 8 148 210 228 N + AA AH AO s n/a 8 148 210 228 N + AA AH AW s n/a 8 148 210 228 N + AA AH AY s n/a 8 148 210 228 N + AA AH B b n/a 8 148 201 240 N + AA AH B s n/a 8 148 210 240 N + AA AH CH b n/a 8 148 183 244 N + AA AH CH s n/a 8 148 210 244 N + AA AH D b n/a 8 148 185 233 N + AA AH D s n/a 8 148 210 233 N + AA AH DH s n/a 8 148 210 244 N + AA AH EH s n/a 8 148 210 228 N + AA AH ER b n/a 8 148 211 226 N + AA AH ER s n/a 8 148 212 228 N + AA AH EY s n/a 8 148 210 228 N + AA AH F b n/a 8 148 197 241 N + AA AH F s n/a 8 148 210 241 N + AA AH G b n/a 8 148 185 243 N + AA AH G s n/a 8 148 210 244 N + AA AH HH b n/a 8 148 197 241 N + AA AH HH s n/a 8 148 210 241 N + AA AH IH s n/a 8 148 210 228 N + AA AH IY b n/a 8 148 197 226 N + AA AH IY s n/a 8 148 210 228 N + AA AH JH b n/a 8 148 183 244 N + AA AH JH s n/a 8 148 210 244 N + AA AH K b n/a 8 148 185 242 N + AA AH K i n/a 8 148 185 242 N + AA AH K s n/a 8 148 210 243 N + AA AH L b n/a 8 148 197 231 N + AA AH L s n/a 8 148 210 231 N + AA AH M b n/a 8 148 197 239 N + AA AH M s n/a 8 148 210 239 N + AA AH N b n/a 8 148 197 237 N + AA AH N i n/a 8 148 184 236 N + AA AH N s n/a 8 148 210 236 N + AA AH NG b n/a 8 148 197 237 N + AA AH OW s n/a 8 148 210 228 N + AA AH OY s n/a 8 148 210 228 N + AA AH P b n/a 8 148 201 241 N + AA AH P s n/a 8 148 210 240 N + AA AH R b n/a 8 148 211 226 N + AA AH R i n/a 8 148 212 223 N + AA AH R s n/a 8 148 212 223 N + AA AH S b n/a 8 148 197 247 N + AA AH S s n/a 8 148 210 247 N + AA AH SH b n/a 8 148 197 246 N + AA AH SH s n/a 8 148 210 246 N + AA AH SIL s n/a 8 148 210 250 N + AA AH T b n/a 8 148 185 233 N + AA AH T s n/a 8 148 210 233 N + AA AH TH b n/a 8 148 197 241 N + AA AH TH i n/a 8 148 190 241 N + AA AH TH s n/a 8 148 210 241 N + AA AH UH s n/a 8 148 210 228 N + AA AH UW b n/a 8 148 197 226 N + AA AH UW s n/a 8 148 210 228 N + AA AH V b n/a 8 148 197 240 N + AA AH V s n/a 8 148 210 240 N + AA AH W b n/a 8 148 197 231 N + AA AH W s n/a 8 148 210 231 N + AA AH Y b n/a 8 148 197 226 N + AA AH Y s n/a 8 148 210 228 N + AA AH Z b n/a 8 148 197 246 N + AA AH Z s n/a 8 148 210 246 N + AA AH ZH s n/a 8 148 210 246 N + AA AO AA s n/a 8 178 210 228 N + AA AO AE s n/a 8 178 210 228 N + AA AO AH s n/a 8 178 210 228 N + AA AO AO s n/a 8 178 210 228 N + AA AO AW s n/a 8 178 210 228 N + AA AO AY s n/a 8 178 210 228 N + AA AO B b n/a 8 178 201 240 N + AA AO B s n/a 8 178 210 240 N + AA AO CH b n/a 8 178 183 244 N + AA AO CH s n/a 8 178 210 244 N + AA AO D b n/a 8 178 186 233 N + AA AO D s n/a 8 178 210 233 N + AA AO DH s n/a 8 178 210 244 N + AA AO EH s n/a 8 178 210 228 N + AA AO ER b n/a 8 177 211 229 N + AA AO ER s n/a 8 177 212 228 N + AA AO EY s n/a 8 178 210 228 N + AA AO F b n/a 8 178 199 241 N + AA AO F s n/a 8 178 210 241 N + AA AO G b n/a 8 178 186 243 N + AA AO G s n/a 8 178 210 244 N + AA AO HH b n/a 8 178 199 241 N + AA AO HH s n/a 8 178 210 241 N + AA AO IH s n/a 8 178 210 228 N + AA AO IY b n/a 8 178 199 229 N + AA AO IY s n/a 8 178 210 228 N + AA AO JH b n/a 8 178 183 244 N + AA AO JH s n/a 8 178 210 244 N + AA AO K b n/a 8 178 186 243 N + AA AO K s n/a 8 178 210 243 N + AA AO L b n/a 8 178 199 231 N + AA AO L s n/a 8 178 210 231 N + AA AO M b n/a 8 178 199 239 N + AA AO M s n/a 8 178 210 239 N + AA AO N b n/a 8 178 199 237 N + AA AO N s n/a 8 178 210 238 N + AA AO NG b n/a 8 178 199 237 N + AA AO OW s n/a 8 178 210 228 N + AA AO OY s n/a 8 178 210 228 N + AA AO P b n/a 8 178 201 241 N + AA AO P s n/a 8 178 210 240 N + AA AO R b n/a 8 177 211 229 N + AA AO R s n/a 8 177 212 223 N + AA AO S b n/a 8 178 199 247 N + AA AO S s n/a 8 178 210 247 N + AA AO SH b n/a 8 178 199 246 N + AA AO SH s n/a 8 178 210 246 N + AA AO SIL s n/a 8 178 210 250 N + AA AO T b n/a 8 178 186 233 N + AA AO T s n/a 8 178 210 233 N + AA AO TH b n/a 8 178 199 241 N + AA AO TH s n/a 8 178 210 241 N + AA AO UH s n/a 8 178 210 228 N + AA AO UW b n/a 8 178 199 229 N + AA AO UW s n/a 8 178 210 228 N + AA AO V b n/a 8 178 199 240 N + AA AO V s n/a 8 178 210 240 N + AA AO W b n/a 8 178 199 231 N + AA AO W s n/a 8 178 210 231 N + AA AO Y b n/a 8 178 199 229 N + AA AO Y s n/a 8 178 210 228 N + AA AO Z b n/a 8 178 199 246 N + AA AO Z s n/a 8 178 210 246 N + AA AO ZH s n/a 8 178 210 246 N + AA AW AA s n/a 8 178 210 228 N + AA AW AE s n/a 8 178 210 228 N + AA AW AH s n/a 8 178 210 228 N + AA AW AO s n/a 8 178 210 228 N + AA AW AW s n/a 8 178 210 228 N + AA AW AY s n/a 8 178 210 228 N + AA AW B b n/a 8 178 222 240 N + AA AW B s n/a 8 178 210 240 N + AA AW CH b n/a 8 178 220 244 N + AA AW CH s n/a 8 178 210 244 N + AA AW D b n/a 8 178 222 233 N + AA AW D s n/a 8 178 210 233 N + AA AW DH s n/a 8 173 181 244 N + AA AW EH s n/a 8 178 210 228 N + AA AW ER b n/a 8 177 213 229 N + AA AW ER s n/a 8 177 212 228 N + AA AW EY s n/a 8 178 210 228 N + AA AW F b n/a 8 178 222 241 N + AA AW F s n/a 8 178 210 241 N + AA AW G b n/a 8 178 222 243 N + AA AW G s n/a 8 178 210 244 N + AA AW HH b n/a 8 178 222 241 N + AA AW HH s n/a 8 178 210 241 N + AA AW IH s n/a 8 178 210 228 N + AA AW IY b n/a 8 178 213 229 N + AA AW IY s n/a 8 178 210 228 N + AA AW JH b n/a 8 178 220 244 N + AA AW JH s n/a 8 178 210 244 N + AA AW K b n/a 8 178 222 242 N + AA AW K s n/a 8 178 210 243 N + AA AW L b n/a 8 178 213 231 N + AA AW L i n/a 8 178 212 231 N + AA AW L s n/a 8 178 210 231 N + AA AW M b n/a 8 178 222 239 N + AA AW M i n/a 8 178 222 239 N + AA AW M s n/a 8 178 210 239 N + AA AW N b n/a 8 178 222 236 N + AA AW N i n/a 8 178 222 236 N + AA AW N s n/a 8 178 210 236 N + AA AW NG b n/a 8 178 222 236 N + AA AW OW s n/a 8 178 210 228 N + AA AW OY s n/a 8 178 210 228 N + AA AW P b n/a 8 178 222 241 N + AA AW P s n/a 8 178 210 240 N + AA AW R b n/a 8 177 213 229 N + AA AW R i n/a 8 177 212 223 N + AA AW R s n/a 8 177 212 223 N + AA AW S b n/a 8 178 222 248 N + AA AW S s n/a 8 178 210 248 N + AA AW SH b n/a 8 178 220 248 N + AA AW SH s n/a 8 178 210 248 N + AA AW SIL s n/a 8 178 210 245 N + AA AW T b n/a 8 178 222 233 N + AA AW T i n/a 8 178 222 233 N + AA AW T s n/a 8 178 210 233 N + AA AW TH b n/a 8 178 222 241 N + AA AW TH s n/a 8 178 210 241 N + AA AW UH s n/a 8 178 210 228 N + AA AW UW b n/a 8 178 213 229 N + AA AW UW s n/a 8 178 210 228 N + AA AW V b n/a 8 173 181 240 N + AA AW V s n/a 8 173 181 240 N + AA AW W b n/a 8 178 213 231 N + AA AW W s n/a 8 178 210 231 N + AA AW Y b n/a 8 178 213 229 N + AA AW Y s n/a 8 178 210 228 N + AA AW Z b n/a 8 173 182 245 N + AA AW Z s n/a 8 173 182 245 N + AA AW ZH s n/a 8 173 181 245 N + AA AY AA e n/a 8 147 195 228 N + AA AY AA s n/a 8 147 210 228 N + AA AY AE e n/a 8 147 195 228 N + AA AY AE s n/a 8 147 210 228 N + AA AY AH e n/a 8 147 195 228 N + AA AY AH s n/a 8 147 210 228 N + AA AY AO e n/a 8 147 195 228 N + AA AY AO s n/a 8 147 210 228 N + AA AY AW e n/a 8 147 195 228 N + AA AY AW s n/a 8 147 210 228 N + AA AY AY e n/a 8 147 195 228 N + AA AY AY s n/a 8 147 210 228 N + AA AY B b n/a 8 148 201 240 N + AA AY B e n/a 8 147 201 240 N + AA AY B s n/a 8 147 210 240 N + AA AY CH b n/a 8 148 183 244 N + AA AY CH e n/a 8 147 183 244 N + AA AY CH s n/a 8 147 210 244 N + AA AY D b n/a 8 148 186 233 N + AA AY D e n/a 8 147 186 233 N + AA AY D i n/a 8 147 186 233 N + AA AY D s n/a 8 147 210 233 N + AA AY DH e n/a 8 147 190 243 N + AA AY DH s n/a 8 147 210 244 N + AA AY EH e n/a 8 147 195 228 N + AA AY EH s n/a 8 147 210 228 N + AA AY ER b n/a 8 147 211 227 N + AA AY ER e n/a 8 147 212 228 N + AA AY ER s n/a 8 147 212 228 N + AA AY EY e n/a 8 147 195 228 N + AA AY EY s n/a 8 147 210 228 N + AA AY F b n/a 8 148 197 241 N + AA AY F e n/a 8 147 195 241 N + AA AY F s n/a 8 147 210 241 N + AA AY G b n/a 8 148 186 243 N + AA AY G e n/a 8 147 186 243 N + AA AY G i n/a 8 147 186 243 N + AA AY G s n/a 8 147 210 244 N + AA AY HH b n/a 8 148 197 241 N + AA AY HH e n/a 8 147 195 241 N + AA AY HH s n/a 8 147 210 241 N + AA AY IH e n/a 8 147 195 228 N + AA AY IH s n/a 8 147 210 228 N + AA AY IY b n/a 8 148 197 227 N + AA AY IY e n/a 8 147 195 228 N + AA AY IY s n/a 8 147 210 228 N + AA AY JH b n/a 8 148 183 244 N + AA AY JH e n/a 8 147 183 244 N + AA AY JH s n/a 8 147 210 244 N + AA AY K b n/a 8 148 186 242 N + AA AY K e n/a 8 147 186 242 N + AA AY K i n/a 8 147 186 242 N + AA AY K s n/a 8 147 210 243 N + AA AY L b n/a 8 148 197 231 N + AA AY L e n/a 8 147 195 231 N + AA AY L i n/a 8 147 190 231 N + AA AY L s n/a 8 147 210 231 N + AA AY M b n/a 8 148 197 239 N + AA AY M e n/a 8 147 195 239 N + AA AY M i n/a 8 147 190 239 N + AA AY M s n/a 8 147 210 239 N + AA AY N b n/a 8 148 197 237 N + AA AY N e n/a 8 147 184 238 N + AA AY N i n/a 8 147 184 238 N + AA AY N s n/a 8 147 210 238 N + AA AY NG b n/a 8 148 197 237 N + AA AY OW e n/a 8 147 195 228 N + AA AY OW s n/a 8 147 210 228 N + AA AY OY e n/a 8 147 195 228 N + AA AY OY s n/a 8 147 210 228 N + AA AY P b n/a 8 148 201 241 N + AA AY P e n/a 8 147 201 241 N + AA AY P i n/a 8 147 201 241 N + AA AY P s n/a 8 147 210 240 N + AA AY R b n/a 8 147 211 227 N + AA AY R e n/a 8 147 212 223 N + AA AY R i n/a 8 147 212 223 N + AA AY R s n/a 8 147 212 223 N + AA AY S b n/a 8 148 197 247 N + AA AY S e n/a 8 147 190 247 N + AA AY S i n/a 8 147 190 247 N + AA AY S s n/a 8 147 210 247 N + AA AY SH b n/a 8 148 197 246 N + AA AY SH e n/a 8 147 195 246 N + AA AY SH i n/a 8 147 190 246 N + AA AY SH s n/a 8 147 210 246 N + AA AY SIL e n/a 8 147 195 250 N + AA AY SIL s n/a 8 147 210 250 N + AA AY T b n/a 8 148 186 233 N + AA AY T e n/a 8 147 186 233 N + AA AY T i n/a 8 147 186 233 N + AA AY T s n/a 8 147 210 233 N + AA AY TH b n/a 8 148 197 241 N + AA AY TH e n/a 8 147 190 241 N + AA AY TH s n/a 8 147 210 241 N + AA AY UH e n/a 8 147 195 228 N + AA AY UH s n/a 8 147 210 228 N + AA AY UW b n/a 8 148 197 227 N + AA AY UW e n/a 8 147 195 228 N + AA AY UW s n/a 8 147 210 228 N + AA AY V b n/a 8 148 197 240 N + AA AY V e n/a 8 147 195 240 N + AA AY V s n/a 8 147 210 240 N + AA AY W b n/a 8 148 197 231 N + AA AY W e n/a 8 147 195 231 N + AA AY W s n/a 8 147 210 231 N + AA AY Y b n/a 8 148 197 227 N + AA AY Y e n/a 8 147 195 228 N + AA AY Y s n/a 8 147 210 228 N + AA AY Z b n/a 8 148 197 246 N + AA AY Z e n/a 8 147 190 246 N + AA AY Z s n/a 8 147 210 246 N + AA AY ZH e n/a 8 147 195 246 N + AA AY ZH s n/a 8 147 210 246 N + AA B AA e n/a 8 151 195 224 N + AA B AA s n/a 8 151 210 224 N + AA B AE e n/a 8 151 195 224 N + AA B AE s n/a 8 151 210 224 N + AA B AH e n/a 8 151 195 224 N + AA B AH i n/a 8 151 195 224 N + AA B AH s n/a 8 151 210 224 N + AA B AO e n/a 8 151 195 224 N + AA B AO s n/a 8 151 210 224 N + AA B AW e n/a 8 151 195 224 N + AA B AW s n/a 8 151 210 224 N + AA B AY e n/a 8 151 195 224 N + AA B AY s n/a 8 151 210 224 N + AA B B b n/a 8 151 202 240 N + AA B B e n/a 8 151 202 240 N + AA B B i n/a 8 151 202 240 N + AA B B s n/a 8 151 210 240 N + AA B CH b n/a 8 151 188 244 N + AA B CH e n/a 8 151 188 244 N + AA B CH i n/a 8 151 188 244 N + AA B CH s n/a 8 151 210 244 N + AA B D b n/a 8 153 189 235 N + AA B D e n/a 8 153 189 235 N + AA B D i n/a 8 153 189 235 N + AA B D s n/a 8 153 210 235 N + AA B DH e n/a 8 151 193 243 N + AA B DH i n/a 8 151 193 243 N + AA B DH s n/a 8 151 210 244 N + AA B EH e n/a 8 151 195 224 N + AA B EH s n/a 8 151 210 224 N + AA B ER b n/a 8 152 215 226 N + AA B ER e n/a 8 152 219 224 N + AA B ER s n/a 8 152 219 224 N + AA B EY e n/a 8 151 195 224 N + AA B EY s n/a 8 151 210 224 N + AA B F b n/a 8 151 199 241 N + AA B F e n/a 8 151 195 241 N + AA B F i n/a 8 151 195 241 N + AA B F s n/a 8 151 210 241 N + AA B G b n/a 8 151 189 243 N + AA B G e n/a 8 151 189 243 N + AA B G i n/a 8 151 189 243 N + AA B G s n/a 8 151 210 244 N + AA B HH b n/a 8 151 199 241 N + AA B HH e n/a 8 151 195 241 N + AA B HH i n/a 8 151 195 241 N + AA B HH s n/a 8 151 210 241 N + AA B IH e n/a 8 151 195 224 N + AA B IH s n/a 8 151 210 224 N + AA B IY b n/a 8 151 199 226 N + AA B IY e n/a 8 151 195 224 N + AA B IY i n/a 8 151 195 224 N + AA B IY s n/a 8 151 210 224 N + AA B JH b n/a 8 151 188 244 N + AA B JH e n/a 8 151 188 244 N + AA B JH i n/a 8 151 188 244 N + AA B JH s n/a 8 151 210 244 N + AA B K b n/a 8 151 188 242 N + AA B K e n/a 8 151 188 242 N + AA B K i n/a 8 151 188 242 N + AA B K s n/a 8 151 210 243 N + AA B L b n/a 8 151 199 231 N + AA B L e n/a 8 151 195 231 N + AA B L i n/a 8 151 195 231 N + AA B L s n/a 8 151 210 231 N + AA B M b n/a 8 151 199 239 N + AA B M e n/a 8 151 195 239 N + AA B M i n/a 8 151 195 239 N + AA B M s n/a 8 151 210 239 N + AA B N b n/a 8 151 199 237 N + AA B N e n/a 8 151 194 236 N + AA B N i n/a 8 151 194 236 N + AA B N s n/a 8 151 210 236 N + AA B NG b n/a 8 151 199 237 N + AA B NG i n/a 8 151 195 236 N + AA B OW e n/a 8 151 195 224 N + AA B OW i n/a 8 151 195 224 N + AA B OW s n/a 8 151 210 224 N + AA B OY e n/a 8 151 195 224 N + AA B OY s n/a 8 151 210 224 N + AA B P b n/a 8 151 202 241 N + AA B P e n/a 8 151 202 241 N + AA B P i n/a 8 151 202 241 N + AA B P s n/a 8 151 210 240 N + AA B R b n/a 8 152 215 226 N + AA B R e n/a 8 152 219 224 N + AA B R i n/a 8 152 219 224 N + AA B R s n/a 8 152 219 224 N + AA B S b n/a 8 151 199 247 N + AA B S e n/a 8 151 193 247 N + AA B S i n/a 8 151 193 247 N + AA B S s n/a 8 151 210 247 N + AA B SH b n/a 8 151 199 247 N + AA B SH e n/a 8 151 195 247 N + AA B SH i n/a 8 151 195 247 N + AA B SH s n/a 8 151 210 247 N + AA B SIL e n/a 8 151 195 250 N + AA B SIL s n/a 8 151 210 250 N + AA B T b n/a 8 151 188 233 N + AA B T e n/a 8 151 188 233 N + AA B T i n/a 8 151 188 233 N + AA B T s n/a 8 151 210 233 N + AA B TH b n/a 8 151 199 241 N + AA B TH e n/a 8 151 193 241 N + AA B TH i n/a 8 151 193 241 N + AA B TH s n/a 8 151 210 241 N + AA B UH e n/a 8 151 195 224 N + AA B UH s n/a 8 151 210 224 N + AA B UW b n/a 8 151 199 226 N + AA B UW e n/a 8 151 195 224 N + AA B UW s n/a 8 151 210 224 N + AA B V b n/a 8 151 199 240 N + AA B V e n/a 8 151 195 240 N + AA B V i n/a 8 151 195 240 N + AA B V s n/a 8 151 210 240 N + AA B W b n/a 8 151 199 231 N + AA B W e n/a 8 151 195 231 N + AA B W i n/a 8 151 195 231 N + AA B W s n/a 8 151 210 231 N + AA B Y b n/a 8 151 199 226 N + AA B Y e n/a 8 151 195 224 N + AA B Y i n/a 8 151 195 224 N + AA B Y s n/a 8 151 210 224 N + AA B Z b n/a 8 151 199 246 N + AA B Z e n/a 8 151 193 246 N + AA B Z i n/a 8 151 193 246 N + AA B Z s n/a 8 151 210 246 N + AA B ZH e n/a 8 151 195 246 N + AA B ZH s n/a 8 151 210 246 N + AA CH AA e n/a 8 164 195 223 N + AA CH AA s n/a 8 172 210 223 N + AA CH AE e n/a 8 164 195 223 N + AA CH AE s n/a 8 172 210 223 N + AA CH AH e n/a 8 164 195 223 N + AA CH AH s n/a 8 172 210 223 N + AA CH AO e n/a 8 164 195 223 N + AA CH AO s n/a 8 172 210 223 N + AA CH AW e n/a 8 164 195 223 N + AA CH AW s n/a 8 172 210 223 N + AA CH AY e n/a 8 164 195 223 N + AA CH AY s n/a 8 172 210 223 N + AA CH B b n/a 8 164 205 240 N + AA CH B e n/a 8 164 205 240 N + AA CH B s n/a 8 172 210 240 N + AA CH CH b n/a 8 164 183 244 N + AA CH CH e n/a 8 164 183 244 N + AA CH CH i n/a 8 164 183 244 N + AA CH CH s n/a 8 172 210 244 N + AA CH D b n/a 8 164 185 233 N + AA CH D e n/a 8 164 185 233 N + AA CH D i n/a 8 164 185 233 N + AA CH D s n/a 8 172 210 233 N + AA CH DH e n/a 8 164 191 243 N + AA CH DH s n/a 8 172 210 244 N + AA CH EH e n/a 8 164 195 223 N + AA CH EH s n/a 8 172 210 223 N + AA CH ER b n/a 8 164 211 227 N + AA CH ER e n/a 8 164 212 223 N + AA CH ER s n/a 8 172 212 223 N + AA CH EY e n/a 8 164 195 223 N + AA CH EY s n/a 8 172 210 223 N + AA CH F b n/a 8 164 198 241 N + AA CH F e n/a 8 164 195 241 N + AA CH F s n/a 8 172 210 241 N + AA CH G b n/a 8 164 185 243 N + AA CH G e n/a 8 164 185 243 N + AA CH G i n/a 8 164 185 243 N + AA CH G s n/a 8 172 210 244 N + AA CH HH b n/a 8 164 198 241 N + AA CH HH e n/a 8 164 195 241 N + AA CH HH s n/a 8 172 210 241 N + AA CH IH e n/a 8 164 195 223 N + AA CH IH i n/a 8 164 191 223 N + AA CH IH s n/a 8 172 210 223 N + AA CH IY b n/a 8 164 198 227 N + AA CH IY e n/a 8 164 195 223 N + AA CH IY i n/a 8 164 191 223 N + AA CH IY s n/a 8 172 210 223 N + AA CH JH b n/a 8 164 183 244 N + AA CH JH e n/a 8 164 183 244 N + AA CH JH s n/a 8 172 210 244 N + AA CH K b n/a 8 164 185 242 N + AA CH K e n/a 8 164 185 242 N + AA CH K i n/a 8 164 185 242 N + AA CH K s n/a 8 172 210 243 N + AA CH L b n/a 8 164 198 231 N + AA CH L e n/a 8 164 195 231 N + AA CH L i n/a 8 164 191 231 N + AA CH L s n/a 8 172 210 231 N + AA CH M b n/a 8 164 198 239 N + AA CH M e n/a 8 164 195 239 N + AA CH M i n/a 8 164 191 239 N + AA CH M s n/a 8 172 210 239 N + AA CH N b n/a 8 164 198 237 N + AA CH N e n/a 8 164 184 238 N + AA CH N i n/a 8 164 184 238 N + AA CH N s n/a 8 172 210 238 N + AA CH NG b n/a 8 164 198 237 N + AA CH NG i n/a 8 164 191 238 N + AA CH OW e n/a 8 164 195 223 N + AA CH OW s n/a 8 172 210 223 N + AA CH OY e n/a 8 164 195 223 N + AA CH OY s n/a 8 172 210 223 N + AA CH P b n/a 8 164 206 241 N + AA CH P e n/a 8 164 206 241 N + AA CH P i n/a 8 164 206 241 N + AA CH P s n/a 8 172 210 240 N + AA CH R b n/a 8 164 211 227 N + AA CH R e n/a 8 164 212 223 N + AA CH R i n/a 8 164 212 223 N + AA CH R s n/a 8 172 212 223 N + AA CH S b n/a 8 164 198 247 N + AA CH S e n/a 8 164 192 247 N + AA CH S s n/a 8 172 210 247 N + AA CH SH b n/a 8 164 198 246 N + AA CH SH e n/a 8 164 195 246 N + AA CH SH s n/a 8 172 210 246 N + AA CH SIL e n/a 8 164 195 250 N + AA CH SIL s n/a 8 172 210 250 N + AA CH T b n/a 8 164 185 233 N + AA CH T e n/a 8 164 185 233 N + AA CH T i n/a 8 164 185 233 N + AA CH T s n/a 8 172 210 233 N + AA CH TH b n/a 8 164 198 241 N + AA CH TH e n/a 8 164 191 241 N + AA CH TH s n/a 8 172 210 241 N + AA CH UH e n/a 8 164 195 223 N + AA CH UH s n/a 8 172 210 223 N + AA CH UW b n/a 8 164 198 227 N + AA CH UW e n/a 8 164 195 223 N + AA CH UW s n/a 8 172 210 223 N + AA CH V b n/a 8 164 198 240 N + AA CH V e n/a 8 164 195 240 N + AA CH V i n/a 8 164 191 240 N + AA CH V s n/a 8 172 210 240 N + AA CH W b n/a 8 164 198 231 N + AA CH W e n/a 8 164 195 231 N + AA CH W s n/a 8 172 210 231 N + AA CH Y b n/a 8 164 198 227 N + AA CH Y e n/a 8 164 195 223 N + AA CH Y s n/a 8 172 210 223 N + AA CH Z b n/a 8 164 198 246 N + AA CH Z e n/a 8 164 192 246 N + AA CH Z i n/a 8 164 192 246 N + AA CH Z s n/a 8 172 210 246 N + AA CH ZH e n/a 8 164 195 246 N + AA CH ZH s n/a 8 172 210 246 N + AA D AA e n/a 8 144 209 223 N + AA D AA s n/a 8 144 210 223 N + AA D AE e n/a 8 144 209 223 N + AA D AE s n/a 8 144 210 223 N + AA D AH e n/a 8 144 209 223 N + AA D AH i n/a 8 144 209 223 N + AA D AH s n/a 8 144 210 223 N + AA D AO e n/a 8 144 209 223 N + AA D AO s n/a 8 144 210 223 N + AA D AW e n/a 8 144 209 223 N + AA D AW s n/a 8 144 210 223 N + AA D AY e n/a 8 144 209 223 N + AA D AY s n/a 8 144 210 223 N + AA D B b n/a 8 146 201 240 N + AA D B e n/a 8 144 201 240 N + AA D B i n/a 8 144 201 240 N + AA D B s n/a 8 144 210 240 N + AA D CH b n/a 8 146 208 244 N + AA D CH e n/a 8 144 209 244 N + AA D CH i n/a 8 144 208 244 N + AA D CH s n/a 8 144 210 244 N + AA D D b n/a 8 146 209 235 N + AA D D e n/a 8 144 209 234 N + AA D D i n/a 8 144 209 235 N + AA D D s n/a 8 144 210 235 N + AA D DH e n/a 8 144 209 243 N + AA D DH s n/a 8 144 210 244 N + AA D EH e n/a 8 144 209 223 N + AA D EH s n/a 8 144 210 223 N + AA D ER b n/a 8 146 211 226 N + AA D ER e n/a 8 144 212 223 N + AA D ER i n/a 8 144 212 223 N + AA D ER s n/a 8 144 212 223 N + AA D EY e n/a 8 144 209 223 N + AA D EY s n/a 8 144 210 223 N + AA D F b n/a 8 146 200 241 N + AA D F e n/a 8 144 200 241 N + AA D F i n/a 8 144 200 241 N + AA D F s n/a 8 144 210 241 N + AA D G b n/a 8 146 209 243 N + AA D G e n/a 8 144 209 243 N + AA D G i n/a 8 144 209 243 N + AA D G s n/a 8 144 210 244 N + AA D HH b n/a 8 146 209 241 N + AA D HH e n/a 8 144 209 241 N + AA D HH i n/a 8 144 209 241 N + AA D HH s n/a 8 144 210 241 N + AA D IH e n/a 8 144 209 223 N + AA D IH s n/a 8 144 210 223 N + AA D IY b n/a 8 146 209 226 N + AA D IY e n/a 8 144 209 223 N + AA D IY i n/a 8 144 209 223 N + AA D IY s n/a 8 144 210 223 N + AA D JH b n/a 8 146 208 244 N + AA D JH e n/a 8 144 209 244 N + AA D JH i n/a 8 144 208 244 N + AA D JH s n/a 8 144 210 244 N + AA D K b n/a 8 146 209 242 N + AA D K e n/a 8 144 208 242 N + AA D K i n/a 8 144 208 242 N + AA D K s n/a 8 144 210 243 N + AA D L b n/a 8 146 206 232 N + AA D L e n/a 8 144 206 232 N + AA D L i n/a 8 144 206 232 N + AA D L s n/a 8 144 210 232 N + AA D M b n/a 8 146 200 239 N + AA D M e n/a 8 144 200 239 N + AA D M i n/a 8 144 200 239 N + AA D M s n/a 8 144 210 239 N + AA D N b n/a 8 146 197 237 N + AA D N e n/a 8 144 184 238 N + AA D N i n/a 8 144 184 238 N + AA D N s n/a 8 144 210 238 N + AA D NG b n/a 8 146 209 237 N + AA D NG i n/a 8 144 209 238 N + AA D OW e n/a 8 144 209 223 N + AA D OW s n/a 8 144 210 223 N + AA D OY e n/a 8 144 209 223 N + AA D OY s n/a 8 144 210 223 N + AA D P b n/a 8 146 201 241 N + AA D P e n/a 8 144 201 241 N + AA D P i n/a 8 144 201 241 N + AA D P s n/a 8 144 210 240 N + AA D R b n/a 8 146 211 226 N + AA D R e n/a 8 144 212 223 N + AA D R i n/a 8 144 212 223 N + AA D R s n/a 8 144 212 223 N + AA D S b n/a 8 146 197 247 N + AA D S e n/a 8 144 193 247 N + AA D S i n/a 8 144 193 247 N + AA D S s n/a 8 144 210 247 N + AA D SH b n/a 8 146 209 247 N + AA D SH e n/a 8 144 209 247 N + AA D SH i n/a 8 144 209 247 N + AA D SH s n/a 8 144 210 247 N + AA D SIL e n/a 8 144 209 250 N + AA D SIL s n/a 8 144 210 250 N + AA D T b n/a 8 146 209 233 N + AA D T e n/a 8 144 208 233 N + AA D T i n/a 8 144 208 233 N + AA D T s n/a 8 144 210 233 N + AA D TH b n/a 8 146 209 241 N + AA D TH e n/a 8 144 209 241 N + AA D TH i n/a 8 144 209 241 N + AA D TH s n/a 8 144 210 241 N + AA D UH e n/a 8 144 209 223 N + AA D UH s n/a 8 144 210 223 N + AA D UW b n/a 8 146 209 226 N + AA D UW e n/a 8 144 209 223 N + AA D UW s n/a 8 144 210 223 N + AA D V b n/a 8 146 200 240 N + AA D V e n/a 8 144 200 240 N + AA D V i n/a 8 144 200 240 N + AA D V s n/a 8 144 210 240 N + AA D W b n/a 8 146 200 232 N + AA D W e n/a 8 144 200 232 N + AA D W i n/a 8 144 200 232 N + AA D W s n/a 8 144 210 232 N + AA D Y b n/a 8 146 209 226 N + AA D Y e n/a 8 144 209 223 N + AA D Y s n/a 8 144 210 223 N + AA D Z b n/a 8 146 197 246 N + AA D Z e n/a 8 144 193 246 N + AA D Z i n/a 8 144 193 246 N + AA D Z s n/a 8 144 210 246 N + AA D ZH e n/a 8 144 209 246 N + AA D ZH i n/a 8 144 209 246 N + AA D ZH s n/a 8 144 210 246 N + AA DH AA e n/a 8 167 195 228 N + AA DH AA s n/a 8 172 210 228 N + AA DH AE e n/a 8 167 195 228 N + AA DH AE s n/a 8 172 210 228 N + AA DH AH e n/a 8 167 195 228 N + AA DH AH s n/a 8 172 210 228 N + AA DH AO e n/a 8 167 195 228 N + AA DH AO s n/a 8 172 210 228 N + AA DH AW e n/a 8 167 195 228 N + AA DH AW s n/a 8 172 210 228 N + AA DH AY e n/a 8 167 195 228 N + AA DH AY s n/a 8 172 210 228 N + AA DH B b n/a 8 167 201 240 N + AA DH B e n/a 8 167 201 240 N + AA DH B s n/a 8 172 210 240 N + AA DH CH b n/a 8 167 183 244 N + AA DH CH e n/a 8 165 183 244 N + AA DH CH s n/a 8 172 210 244 N + AA DH D b n/a 8 167 185 233 N + AA DH D e n/a 8 167 185 233 N + AA DH D s n/a 8 172 210 233 N + AA DH DH e n/a 8 167 193 243 N + AA DH DH s n/a 8 172 210 244 N + AA DH EH e n/a 8 167 195 228 N + AA DH EH s n/a 8 172 210 228 N + AA DH ER b n/a 8 165 211 226 N + AA DH ER e n/a 8 165 212 228 N + AA DH ER s n/a 8 172 212 228 N + AA DH EY e n/a 8 167 195 228 N + AA DH EY s n/a 8 172 210 228 N + AA DH F b n/a 8 167 198 241 N + AA DH F e n/a 8 165 195 241 N + AA DH F s n/a 8 172 210 241 N + AA DH G b n/a 8 167 185 243 N + AA DH G e n/a 8 167 185 243 N + AA DH G s n/a 8 172 210 244 N + AA DH HH b n/a 8 167 198 241 N + AA DH HH e n/a 8 165 195 241 N + AA DH HH s n/a 8 172 210 241 N + AA DH IH e n/a 8 167 195 228 N + AA DH IH s n/a 8 172 210 228 N + AA DH IY b n/a 8 167 198 226 N + AA DH IY e n/a 8 167 195 228 N + AA DH IY i n/a 8 167 193 228 N + AA DH IY s n/a 8 172 210 228 N + AA DH JH b n/a 8 167 183 244 N + AA DH JH e n/a 8 167 183 244 N + AA DH JH s n/a 8 172 210 244 N + AA DH K b n/a 8 167 185 242 N + AA DH K e n/a 8 167 185 242 N + AA DH K s n/a 8 172 210 243 N + AA DH L b n/a 8 167 198 231 N + AA DH L e n/a 8 167 195 231 N + AA DH L s n/a 8 172 210 231 N + AA DH M b n/a 8 167 198 239 N + AA DH M e n/a 8 167 195 239 N + AA DH M s n/a 8 172 210 239 N + AA DH N b n/a 8 167 198 237 N + AA DH N e n/a 8 167 184 238 N + AA DH N s n/a 8 172 210 238 N + AA DH NG b n/a 8 167 198 237 N + AA DH OW e n/a 8 167 195 228 N + AA DH OW s n/a 8 172 210 228 N + AA DH OY e n/a 8 167 195 228 N + AA DH OY s n/a 8 172 210 228 N + AA DH P b n/a 8 167 201 241 N + AA DH P e n/a 8 167 201 241 N + AA DH P s n/a 8 172 210 240 N + AA DH R b n/a 8 165 211 226 N + AA DH R e n/a 8 165 212 223 N + AA DH R s n/a 8 172 212 223 N + AA DH S b n/a 8 167 198 247 N + AA DH S e n/a 8 165 193 247 N + AA DH S s n/a 8 172 210 247 N + AA DH SH b n/a 8 167 198 246 N + AA DH SH e n/a 8 165 195 246 N + AA DH SH s n/a 8 172 210 246 N + AA DH SIL e n/a 8 165 195 250 N + AA DH SIL s n/a 8 172 210 250 N + AA DH T b n/a 8 167 185 233 N + AA DH T e n/a 8 165 185 233 N + AA DH T s n/a 8 172 210 233 N + AA DH TH b n/a 8 167 198 241 N + AA DH TH e n/a 8 165 193 241 N + AA DH TH s n/a 8 172 210 241 N + AA DH UH e n/a 8 167 195 228 N + AA DH UH s n/a 8 172 210 228 N + AA DH UW b n/a 8 167 198 226 N + AA DH UW e n/a 8 167 195 228 N + AA DH UW s n/a 8 172 210 228 N + AA DH V b n/a 8 167 198 240 N + AA DH V e n/a 8 167 195 240 N + AA DH V s n/a 8 172 210 240 N + AA DH W b n/a 8 167 198 231 N + AA DH W e n/a 8 167 195 231 N + AA DH W s n/a 8 172 210 231 N + AA DH Y b n/a 8 167 198 226 N + AA DH Y e n/a 8 167 195 228 N + AA DH Y s n/a 8 172 210 228 N + AA DH Z b n/a 8 167 198 246 N + AA DH Z e n/a 8 167 193 246 N + AA DH Z s n/a 8 172 210 246 N + AA DH ZH e n/a 8 167 195 246 N + AA DH ZH s n/a 8 172 210 246 N + AA EH AA s n/a 8 147 210 228 N + AA EH AE s n/a 8 147 210 228 N + AA EH AH s n/a 8 147 210 228 N + AA EH AO s n/a 8 147 210 228 N + AA EH AW s n/a 8 147 210 228 N + AA EH AY s n/a 8 147 210 228 N + AA EH B b n/a 8 148 201 240 N + AA EH B s n/a 8 147 210 240 N + AA EH CH b n/a 8 148 183 244 N + AA EH CH s n/a 8 147 210 244 N + AA EH D b n/a 8 148 185 233 N + AA EH D s n/a 8 147 210 233 N + AA EH DH s n/a 8 147 210 244 N + AA EH EH s n/a 8 147 210 228 N + AA EH ER b n/a 8 148 211 226 N + AA EH ER s n/a 8 148 212 228 N + AA EH EY s n/a 8 147 210 228 N + AA EH F b n/a 8 148 197 241 N + AA EH F s n/a 8 147 210 241 N + AA EH G b n/a 8 148 185 243 N + AA EH G s n/a 8 147 210 244 N + AA EH HH b n/a 8 148 197 241 N + AA EH HH s n/a 8 147 210 241 N + AA EH IH s n/a 8 147 210 228 N + AA EH IY b n/a 8 148 197 226 N @@ Diff output truncated at 60000 characters. @@ From matt at edam.speech.cs.cmu.edu Thu Oct 18 17:27:11 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 17:27:11 -0400 Subject: [TeamTalk 315]: [851] branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/: Branching MultiDecoder Message-ID: <200710182127.l9ILRBYE007346@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/9e6b9cca/attachment.html -------------- next part -------------- From matt at edam.speech.cs.cmu.edu Thu Oct 18 17:29:23 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Thu, 18 Oct 2007 17:29:23 -0400 Subject: [TeamTalk 316]: [852] branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder: Add (not branch, because this is a different repository...) custom audioserver and sphinxengine. Message-ID: <200710182129.l9ILTNoM007356@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/0cb3665d/attachment-0001.html -------------- next part -------------- Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.sln =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.sln (rev 0) +++ branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.sln 2007-10-18 21:29:22 UTC (rev 852) @@ -0,0 +1,19 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj (rev 0) +++ branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-10-18 21:29:22 UTC (rev 852) @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.cpp =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.cpp (rev 0) +++ branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.cpp 2007-10-18 21:29:22 UTC (rev 852) @@ -0,0 +1,437 @@ +//============================================================================= +// +// Copyright (c) 2000-2005, Carnegie Mellon University. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// +// This work was supported in part by funding from the Defense Advanced +// Research Projects Agency and the National Science Foundation of the +// United States of America, and the CMU Sphinx Speech Consortium. +// +// THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND +// ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY +// NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +//============================================================================= + +//----------------------------------------------------------------------------- +// +// UTILS.CPP - implementation of various functions useful throughout the +// components of the architecture +// +// ---------------------------------------------------------------------------- +// +// BEFORE MAKING CHANGES TO THIS CODE, please read the appropriate +// documentation, available in the Documentation folder. +// +// ANY SIGNIFICANT CHANGES made should be reflected back in the documentation +// file(s) +// +// ANY CHANGES made (even small bug fixes, should be reflected in the history +// below, in reverse chronological order +// +// HISTORY -------------------------------------------------------------------- +// +// [2005-06-29] (antoine): started working on this by copying Utils.cpp from +// RavenClaw +//----------------------------------------------------------------------------- + +#include +#include "Utils.h" + +// D: Static buffer commonly used by string routines +static char szBuffer[STRING_MAX]; + +//----------------------------------------------------------------------------- +// Functions for extending the string STL class with some desired but +// missing functionality +//----------------------------------------------------------------------------- +// D: implements the printf functionality in a string +string FormatString(const char *lpszFormat, ...) { + va_list pArgs; + va_start(pArgs, lpszFormat); + + // print into the buffer + _vsnprintf(szBuffer, STRING_MAX, lpszFormat, pArgs); + + // return a string object initialized from that buffer + return((string)szBuffer); +} + +// D: implements the + operator for strings +string operator + (const string sString1, const string sString2) { + string sResult = sString1; + sResult += sString2; + return sResult; +} + +// D: conversion from bool to string +string BoolToString(bool bBool) { + return bBool?"true":"false"; +} + +// A: conversion from int to string +string IntToString(int iInt) { + return FormatString("%d", iInt); +} + +// D: conversion from float to string +string FloatToString(float fFloat) { + return FormatString("%f", fFloat); +} + +// D: make a string uppercase +string ToUpperCase(string sString) { + strcpy(szBuffer, sString.c_str()); + _strupr(szBuffer); + return (string)szBuffer; +} + +// D: makes a string lowercase +string ToLowerCase(string sString) { + strcpy(szBuffer, sString.c_str()); + _strlwr(szBuffer); + return (string)szBuffer; +} + +// A: trim specified characters (default spaces) from the string on the left +string TrimLeft(string sString, char * pToTrim) { + unsigned int i = 0; + while(i < sString.length()) + { + char * c = pToTrim; + while ( *c != '\0' && *c != sString[i] ) + c++; + if ( *c == '\0' ) + break; + i++; + } + string sResult = sString.substr(i, sString.length() - i); + return sResult; +} + +// A: trim specified characters (default spaces) from the string on the right +string TrimRight(string sString, char * pToTrim) { + size_t i = sString.length()-1; + while((i >= 0) ) + { + char * c = pToTrim; + while ( *c != '\0' && *c != sString[i] ) + c++; + if ( *c == '\0' ) + break; + i--; + } + string sResult = sString.substr(0, i+1); + return sResult; +} + +// A: trim specified characters (default space) from the string at both ends +string Trim(string sString, char * pToTrim) { + return TrimLeft(TrimRight(sString, pToTrim), pToTrim); +} + +// D: extracts the first line of a string, and returns it (the string is +// chopped) +string ExtractFirstLine(string& rString) { + string sResult; + SplitOnFirst(rString, "\n", sResult, rString); + return sResult; +} + +// A: splits the string in 2 parts, around and not including the first +// occurence of any of a set of specified characters. Returns true on success +bool SplitOnFirst(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart) { + + size_t iCharPos = sOriginal.find_first_of(pDividers); + if(iCharPos == -1) { + // if the character was not found + rsFirstPart = sOriginal; + rsSecondPart = ""; + return false; + } else { + // if the character was found + rsFirstPart = sOriginal.substr(0, iCharPos); + rsSecondPart = sOriginal.substr(iCharPos + 1, + sOriginal.length() - iCharPos); + return true; + } +} + +// D: function similar to SplitOnFirst. It takes as an extra argument a char +// that act as quote characters, and therefore any occurence of the dividers +// within that is not considered +bool SplitOnFirst(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart, char cQuote) { + + size_t i = 0; + bool bWithinQuotes = false; + size_t l = sOriginal.length(); + while(i < l) { + // if we/re within quotes, just skip over everything until + // a new quote character is met + if(bWithinQuotes) { + while((sOriginal[i] != cQuote) && (i < l)) + i++; + // check that we didn't reach the end + if(i == l) { + rsFirstPart = sOriginal; + rsSecondPart = ""; + return false; + } + // o/w increment i; + i++; + // and set ourselves out of quotes + bWithinQuotes = false; + } else if(sOriginal[i] == cQuote) { + // o/w if we just saw a quote, put ourselves in quote mode + bWithinQuotes = true; + // and move on + i++; + } else if(strchr(pDividers, sOriginal[i]) != NULL) { + // o/w if we hit on one of the dividers + rsFirstPart = sOriginal.substr(0, i); + rsSecondPart = sOriginal.substr(i + 1, sOriginal.length() - i); + return true; + } else { + i++; + } + } + + // if we got out of the loop, it means we reached the end without returning, + // so then there are no dividers + rsFirstPart = sOriginal; + rsSecondPart = ""; + return false; +} + +// A: splits the string in 2 parts, around and not including the last +// occurence of any of a set of specified characters. Returns true on success +bool SplitOnLast(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart) { + size_t iCharPos = sOriginal.find_last_of(pDividers); + if(iCharPos == -1) { + // if the character was not found + rsFirstPart = ""; + rsSecondPart = sOriginal; + return false; + } else { + // if the character was found + rsFirstPart = sOriginal.substr(0, iCharPos); + rsSecondPart = sOriginal.substr(iCharPos + 1, + sOriginal.length() - iCharPos); + return true; + } +} + +// A: partitions a string into tokens divided by any of a set of specified +// characters. +vector PartitionString(string sString, char * pDividers) { + vector saResult; + string sTemp; + while (sString != "" ) + { + SplitOnFirst(sString, pDividers, sTemp, sString); + if ( sTemp != "" ) + saResult.push_back(sTemp); + } + return saResult; +} + +// A: partitions a string into tokens divided by any of a set of specified +// characters. +vector PartitionString(string sString, char * pDividers, char cQuote) { + vector saResult; + string sTemp; + while (sString != "" ) + { + SplitOnFirst(sString, pDividers, sTemp, sString, cQuote); + if ( sTemp != "" ) + saResult.push_back(sTemp); + } + return saResult; +} + +// D: replaces all the occurences of a substring in a string with another +// substring +string ReplaceSubString(string sSource, string sToReplace, string sReplacement) { + // the resulting string + string sResult = sSource; + size_t pos; + while((pos = sResult.find(sToReplace)) >= 0) { + sResult.replace(pos, pos + sToReplace.length(), sReplacement); + } + return sResult; +} + +// D: find the corresponding closing quote +unsigned int FindClosingQuoteChar(string sString, unsigned int iStartPos, + char cOpenQuote, char cCloseQuote) { + + unsigned int iOpenBraces = 1; + unsigned int iPos = iStartPos; + while((iOpenBraces > 0) && (iPos < sString.length())) { + if(sString[iPos] == cOpenQuote) + iOpenBraces++; + else if(sString[iPos] == cCloseQuote) + iOpenBraces--; + iPos++; + } + + // finally return the position + return iPos; +} + +//----------------------------------------------------------------------------- +// Functions for constructing unique IDs +//----------------------------------------------------------------------------- + +static int __ID = 0; + +// D: creates a uniques string ID +string GetUniqueStringID() { + // make sure we're not starting from 0 again + __ID++; + assert( __ID ); + + return (FormatString("%d", __ID - 1)); +} + +// D: creates a unique integer ID +int GetUniqueIntID() { + // make sure we're not starting from 0 again + __ID++; + assert( __ID ); + return ( __ID - 1 ); +} + +// D: creates a random integer ID +int GetRandomIntID() { + return rand(); +} + + +//----------------------------------------------------------------------------- +// Time related functions and variables +//----------------------------------------------------------------------------- + +// D: variable that holds the counter frequency +static LARGE_INTEGER iHighResCounterFrequency; + +// D: variable that holds the start-up counter value +static LARGE_INTEGER iStartUpCounterValue; + +// D: variable that holds the start-up counter value +static LONGLONG iStartUpCounterValueMs; + +// D: variable that holds the start-up clock +static _timeb tStartUpTime; + +// D: initializes the high resolution timer +void InitializeHighResolutionTimer() { + // obtain the counter frequency (ticks per second) + QueryPerformanceFrequency(&iHighResCounterFrequency); + + // obtain the current time (starting time) (actually sit in a loop + // until the current time changes so that we can avoid as much as + // possible granularity effects + _timeb tTimeNow, tLastTime; + _ftime(&tTimeNow); + do { + tLastTime = tTimeNow; + _ftime(&tTimeNow); + } while(tTimeNow.millitm == tLastTime.millitm); + tStartUpTime = tTimeNow; + + // and obtain the current initial counter time + QueryPerformanceCounter(&iStartUpCounterValue); + + // converts it into milliseconds + iStartUpCounterValueMs = 1000*iStartUpCounterValue.QuadPart/ + iHighResCounterFrequency.QuadPart; +} + +// D: returns the time of day as a _timeb structure +_timeb GetTime() { + + _timeb theTime; + + // now compute obtain the current value for the high resolution timer + LARGE_INTEGER iCurrentCounterValue; + QueryPerformanceCounter(&iCurrentCounterValue); + + // compute the number of milliseconds elapsed + LONGLONG liMillisecElapsed = + (1000*(iCurrentCounterValue.QuadPart - iStartUpCounterValue.QuadPart))/ + iHighResCounterFrequency.QuadPart; + + // now add those milliseconds to the time structure + theTime = tStartUpTime; + unsigned short ms = theTime.millitm; + theTime.millitm = (unsigned short)((ms + liMillisecElapsed) % 1000); + // and the seconds + theTime.time = (time_t)(theTime.time + + (long int)((ms + liMillisecElapsed)/1000)); + + // finally, return the updated time + return(theTime); +} + +// A: transforms a string into a time (as a _timeb structure) +LONGLONG GetCurrentAbsoluteTimeStamp() { + + // now compute obtain the current value for the high resolution timer + LARGE_INTEGER iCurrentCounterValue; + QueryPerformanceCounter(&iCurrentCounterValue); + + // compute the number of milliseconds elapsed + LONGLONG liTimeStamp = 1000*iCurrentCounterValue.QuadPart/ + iHighResCounterFrequency.QuadPart; + + return liTimeStamp; +} + +// A: transforms a string into a time (as a _timeb structure) +long GetSessionTimeStamp(LONGLONG liTimeStamp) { + + long lTimeStamp = (long)(liTimeStamp-iStartUpCounterValueMs); + + return lTimeStamp; +} + +// D: transforms a time (as a _timeb structure) into a string +string TimeToString(_timeb time) { + tm* tmTime; + string sResult; + // convert to local timezone + tmTime = localtime(&time.time); + + // and format it as a string and return it + return FormatString("%02d:%02d:%02d.%03d", tmTime->tm_hour, + tmTime->tm_min, tmTime->tm_sec, time.millitm); +} + +// D: returns the time as a long int. Used mainly for logging purposes +string GetTimeAsString() { + return TimeToString(GetTime()); +} Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.h =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.h (rev 0) +++ branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/Utils.h 2007-10-18 21:29:22 UTC (rev 852) @@ -0,0 +1,241 @@ +//============================================================================= +// +// Copyright (c) 2000-2004, Carnegie Mellon University. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// +// This work was supported in part by funding from the Defense Advanced +// Research Projects Agency and the National Science Foundation of the +// United States of America, and the CMU Sphinx Speech Consortium. +// +// THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND +// ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY +// NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +//============================================================================= + +//----------------------------------------------------------------------------- +// +// UTILS.H - definition of various functions useful throughout the +// components of the architecture +// +// ---------------------------------------------------------------------------- +// +// BEFORE MAKING CHANGES TO THIS CODE, please read the appropriate +// documentation, available in the Documentation folder. +// +// ANY SIGNIFICANT CHANGES made should be reflected back in the documentation +// file(s) +// +// ANY CHANGES made (even small bug fixes, should be reflected in the history +// below, in reverse chronological order +// +// HISTORY -------------------------------------------------------------------- +// +// [2005-02-08] (antoine): added the Sleep function that waits for a number +// milliseconds +// [2004-12-24] (antoine): Added a version of PartitionString with quotation. +// [2004-04-01] (dbohus): corrected buffer overrun problem in FormatString +// [2003-10-15] (dbohus): added ReplaceSubString for strings +// [2003-10-08] (dbohus): added SplitOnFirst variant which takes into account +// quoted strings +// [2003-04-23] (dbohus): added GetRandomIntID +// [2002-06-26] (dbohus): Added a static buffer to be commonly used by string +// routines +// [2002-05-30] (agh): Fixed PartitionString() so that it doesn't push +// empty strings into the resultant vector +// [2002-05-25] (dbohus): deemed preliminary stable version 0.5 +// [2002-04-28] (agh): added functionality to Trim() functions and added +// PartitionString() +// [2001-12-29] (dbohus): started working on this +// +//----------------------------------------------------------------------------- + +#pragma once +#ifndef __UTILS_H__ +#define __UTILS_H__ + +// avoid warning messages which occur +// when including the some of the headers (at least this is the case with +// VC++ 6.0 +#pragma warning (disable:4786) +#pragma warning (disable:4710) +#pragma warning (disable:4702) +#pragma warning (disable:4514) +#pragma warning (push, 1) + +// D: Other includes for generic headers +#include +#include +#include +#include +#include +#include +#include +#include + +// D: now include the standard template library headers +#include +#include +#include +#include +#include +#include +#include +#include + +#pragma warning (pop) + +using namespace std; + +//----------------------------------------------------------------------------- +// Various defines used throughout the system +//----------------------------------------------------------------------------- +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + +#define STRING_MAX 65535 + +// D: defines for common data types derived from STL +typedef vector > TIntVector; +typedef vector > TStringVector; +typedef map , allocator > STRING2STRING; + +// D: defines for OAAS and GALAXYS (these defines are used to specify +// strings that appear only under an OAA or a GALAXY configuration (i.e. +// a common use is in the dialog task specification for specifying prompts) +#ifdef OAA + #define OAAS(STRING) STRING + #define GALS(STRING) +#endif + +#ifdef GALAXY + #define OAAS(STRING) + #define GALS(STRING) STRING +#endif + +//----------------------------------------------------------------------------- +// Functions for extending the string STL class with missing functionality +//----------------------------------------------------------------------------- +// D: implements the printf functionality in a string +string FormatString(const char *lpszFormat, ...); + +// D: implements the + operator for strings +string operator + (const string sString1, const string sString2); + +// D: conversion from bool to string +string BoolToString(bool bBool); + +// A: conversion from int to string +string IntToString(int iInt); + +// D: conversion from float to string +string FloatToString(float fFloat); + +// D: make a string uppercase +string ToUpperCase(string sString); + +// D: make a string lowercase +string ToLowerCase(string sString); + +// D: trim specified characters (default spaces) from the string on the left +string TrimLeft(string sString, char * pToTrim = " \n\t"); + +// D: trim specified characters (default spaces) from the string on the right +string TrimRight(string sString, char * pToTrim = " \n\t"); + +// D: trim specified characters (default space) from the string at both ends +string Trim(string sString, char * pToTrim = " \n\t"); + +// D: extracts the first line of a string, and returns it (the string is +// chopped) +string ExtractFirstLine(string& rString); + +// D: splits the string in 2 parts, around and not including the first +// occurence of any of a set of specified characters. Returns true on success +bool SplitOnFirst(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart); + +// D: splits the string in 2 parts, around and not including the first +// occurence of any of a set of specified characters, also taking into account +// a quote character. Returns true on success +bool SplitOnFirst(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart, char cQuote); + +// D: splits the string in 2 parts, around and not including the last +// occurence of any of a set of specified characters. Returns true on success +bool SplitOnLast(string sOriginal, char* pDividers, + string& rsFirstPart, string& rsSecondPart); + +// D: partitions a string into tokens divided by any of a set of specified +// characters. +vector PartitionString(string sString, char * pDividers); + +// D: partitions a string into tokens divided by any of a set of specified +// characters. This takes into account a quote character. +vector PartitionString(string sString, char * pDividers, char cQuote); + +// D: replaces a substring ocurring in a string with another string +string ReplaceSubString(string sSource, string sToReplace, string sReplacement); + +// D: find the corresponding closing quote +unsigned int FindClosingQuoteChar(string sString, unsigned int iStartPos, + char cOpenQuote, char cCloseQuote); + +//----------------------------------------------------------------------------- +// Functions for constructing unique IDs +//----------------------------------------------------------------------------- + +// D: creates a uniques string ID +string GetUniqueStringID(); + +// D: creates a unique integer ID +int GetUniqueIntID(); + +// D: creates a random integer ID +int GetRandomIntID(); + +//----------------------------------------------------------------------------- +// Time related functions +//----------------------------------------------------------------------------- + +// D: initializes the high resolution timer used for logging +void InitializeHighResolutionTimer(); + +// D: returns the time of day as a _timeb structure +_timeb GetTime(); + +// A: returns the current value of the internal counter +_int64 GetCurrentAbsoluteTimeStamp(); + +// A: converts an absolute timestamp into a session timestamp +// (by substracting the session start timestamp) +long GetSessionTimeStamp(_int64 liTimeStamp); + +// D: transforms a time (as a _timeb structure) into a string +string TimeToString(_timeb time); + +// D: returns the time of day as a string. Used mainly for logging purposes +string GetTimeAsString(); + +#endif // __UTILS_H__ \ No newline at end of file Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/WRSTBEEP.wav =================================================================== (Binary files differ) Property changes on: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/WRSTBEEP.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/main.cpp =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/main.cpp (rev 0) +++ branches/mrmarge/PocketTeamTalk/Agents/MultiDecoder/Audio_Server/main.cpp 2007-10-18 21:29:22 UTC (rev 852) @@ -0,0 +1,1887 @@ +#include +#include +#include +#include + +#include "Utils.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#define SERVER_FUNCTIONS_INCLUDE "sphinx-server.h" +#define USE_SERVER_DATA +#include + +#include /* CMU sphinx data type definition */ +#include /* CMU A2D routines/data structures */ +#include /* CMU continuous listener */ +#include /* CMU front-end processing */ +#include +#include "sock.h" + +#ifdef __cplusplus +} +#endif + +#include + +using namespace std; + +#define DEFAULT_SPS "8000" /* only support 8000, 11025, 16000 now */ + + +#define DEFAULT_MFC_WRITE "0" /* Whether to write MFCs to the logdir */ +#define DEFAULT_LOG_SESSION_AUDIO "0" /* Whether to Log whole sessions audio */ +#define DEFAULT_LOG "1" /* Whether to Log events/warnings/errors */ + +static float **mfcbuf; +static int32 n_rawfr = 0; +static double silence_secs = 0.1f; /* let n seconds of silence pass after utterance (user may still speak)*/ +static int only_listen_for_dtmf = 0; +#define MAX_UTT_LEN 6000 /* #frames */ +#define MAX_CEP_LEN (MAX_UTT_LEN*CEP_SIZE) +#define MAX_POW_LEN (MAX_UTT_LEN*POW_SIZE) + +#define MAX_FILENAME_SIZE 2048 +#define MAX_LINE_SIZE 2048 +#define CONT_AD_BUFFER_SIZE 4096 + +#define MAX_NUM_ENGINES 10 +static int MAX_ENGINE_WAIT_ITERATIONS=100; +#define NUM_FEATURES_FROM_ENGINE 9 + +#define FRAME_EQUALS_SIGN "= \t" + +#define MAX_STRING_SIZE 2048 + +/* Default engine_list file name */ +#define DEFAULT_CLIENT_LIST "sphinx_engines.txt" +#define MAX_NAME_SIZE 256 +#define MAX_HOST_SIZE 256 +#define MAX_PORT_SIZE 256 + +/* Engine list specifications */ +int n_engines; +char **engine_name; +char **engine_host; +int *engine_port; + +/* Variables for handling input file list in batch mode */ +int n_input_files, i_next_input_file; +char **input_files; + + +SOCKET *engine_socket; + + +/* Data structure to receive message from engine */ +#define RETURN_BUF_SIZE 131072 +#define MAX_HYP_SIZE 2048 +#define MAX_FRAMELIST_SIZE 4096 +#define MAX_UTTID_SIZE 256 +char **engine_buffer; +int *engine_P; + +int mfc_write; /* boolean */ +int log_session_audio; /* boolean */ +int log_messages; /* boolean */ +int batch_mode; /* boolean */ +fe_t *fe; + +Gal_Frame *gfResult; +int *ready; + +char Message[RETURN_BUF_SIZE + 1]; + +/* Definition of the server control block */ +typedef struct { + int state; + int mode; + ad_rec_t *ad; + cont_ad_t *cont; + int n_frm; + int ts; + short buf[CONT_AD_BUFFER_SIZE]; + int n_rd; + double utt_maxpow; + double conf_thresh; +} srvcb_t; +static srvcb_t *srvcb; +int SPS; + +#define ST_IDLE 0 +#define ST_LISTENING 1 +#define ST_DECODING 2 +#define ST_EXITING 3 + +#define MD_DECODING 0 +#define MD_LISTENING 1 + +#define STD_STREAM 0 +#define DBG_STREAM 1 +#define ERR_STREAM 2 + +#define MAX_CIRCULAR_RAW_BUF 512000 + +/* if want to change to decoding mode from listening mode + and sphinx is currently recording an utterance + then switch to decoding mode after the current utterance is finished + (xw 26nov00) */ +static int about_to_change_to_decoding_mode = 0; + +static char *hub_log_dir = NULL; +static char *hub_log_prefix = NULL; +static FILE *session_rawfp = NULL; +static FILE *rawfp = NULL; +static FILE *mfcfp = NULL; +static FILE *logfp = NULL; +static int utt_cnt = 0; +static int interrupt_cnt = 0; //(xw 26nov00) +static int usr_speaking = 0; //xw 26nov00 + +// (dbohus): store the incoming audio data in a circular raw buffer +// this is used for performing the clipping detection annotation +static short sCircRawBuf[MAX_CIRCULAR_RAW_BUF]; +static int iCircRawBufPtr = 0; +// (dbohus): store the max signal level value +static short sMaxSignalValue = 0; +// (dbohus): define the number of bins for the clipping histogram +#define CLIPPING_NUM_BINS 10 + + +/* (antoine 2004-04-03): Utterance ID management to prevent desync */ +int utt_id; +char utt_id_str[MAX_UTTID_SIZE]; + +// Timestamp (in samples since the continuous listener was started) +// at the beginning of the current utterance +int utt_start_timestamp; + +/* This array of structures defines the command line arguments for + * the OA command line processing routines in the GalaxyCommunicator + * distribution + */ +static char *oas[] = { + "-sps ", "Samples per second", DEFAULT_SPS, + "-engine_list ", "File containing list of sphinx engines", DEFAULT_CLIENT_LIST, + "-mfc_write <0/1>", "Whether .mfc files should be written", DEFAULT_MFC_WRITE, + "-log <0/1>", "Turns logging to a file on and off.", DEFAULT_LOG, + "-log_full_session_input <0/1>", + "Whether a single raw file for whole sessions should be stored (in additiotn to turn raw files)", + DEFAULT_LOG_SESSION_AUDIO, + "-ctl_file ", "Control file containing list of raw files to recognize (batch mode)", NULL, +NULL +}; + +//tk +vector sv_comms; + +#ifdef _DEBUG +int bDebug = 1; +#endif + +#ifndef _DEBUG +int bDebug = 0; +#endif + +void srvtt_idle(void *arg); +void srvtt_listen(void *arg); +void srvtt_utt(void *arg); +void srvtt_end(void *arg); +static void audio_stop_flush (); +int get_word(char **string, char *word); +int get_frame(char **string, char *word); +void wait_for_return(); +int send_message_to_engine(int engine_id, char *message); +int is_dtmf_engine(int); + +char *get_timestamp() { + SYSTEMTIME time; + char *timestamp; + + timestamp = (char*)malloc(MAX_LINE_SIZE); + GetLocalTime(&time); + sprintf( timestamp, "%.2d:%.2d:%.2d.%.3d", time.wHour, time.wMinute, + time.wSecond, time.wMilliseconds); + + return timestamp; +} + +void Log(int stream, const char *message, ...) { + va_list ap; + char *str_id; + char *timestamp = get_timestamp(); + + // Define the stream id + switch (stream) { + case DBG_STREAM: + str_id = "DBG"; + break; + case STD_STREAM: + str_id = "STD"; + break; + case ERR_STREAM: + str_id = "ERR"; + break; + default: + str_id = "UNK"; + } + + // Debug stream is displayed on console only in debug mode + if (stream == DBG_STREAM) { + if (bDebug) { + fprintf( stderr, "[%s@%s] ", str_id, timestamp); + va_start (ap, message); + vfprintf( stderr, message, ap); + fprintf( stderr, "\n"); + } + } + else { + fprintf( stderr, "[%s@%s] ", str_id, timestamp); + va_start (ap, message); + vfprintf( stderr, message, ap); + fprintf( stderr, "\n"); + } + + // Output message to Log file + if (logfp) { + fprintf( logfp, "[%s@%s] ", str_id, timestamp); + va_start (ap, message); + vfprintf (logfp, message, ap); + fprintf( logfp, "\n"); + fflush( logfp); + } + + va_end (ap); + + free(timestamp); +} + +void read_engine_list( const char *engine_list) { + int i; + char line[MAX_LINE_SIZE]; + FILE *stream; + + /* Reads engine list */ + if( (stream = fopen( engine_list, "r" )) == NULL ) { + Log( ERR_STREAM, "failed to open engine list file %s", engine_list ); + exit(-1); + } + + /* Traverses the file once to get the number of lines */ + n_engines = 0; + while (fgets( line, MAX_FILENAME_SIZE, stream)) + if ((strlen(line) > 1)&&(line[0] != '#')) n_engines++; + fseek( stream, 0, SEEK_SET); + + /* initializes engine description arrays */ + engine_name = (char**)malloc( n_engines * sizeof(char*)); + engine_host = (char**)malloc( n_engines * sizeof(char*)); + engine_port = (int*)malloc( n_engines * sizeof(int)); + engine_socket = (SOCKET*)malloc( n_engines * sizeof( SOCKET)); + engine_buffer = (char**)malloc( n_engines * sizeof(char*)); + engine_P = (int*)malloc( n_engines * sizeof(int)); + ready = (int*)malloc( n_engines * sizeof(int)); + gfResult = (Gal_Frame*)malloc( n_engines * sizeof(Gal_Frame)); + + /* initializes each engine's parameters */ + for (i = 0; i < n_engines; i++) { + engine_name[i] = (char*)malloc( MAX_NAME_SIZE + 1); + engine_host[i] = (char*)malloc( MAX_HOST_SIZE + 1); + engine_buffer[i] = (char*)malloc( RETURN_BUF_SIZE + 1); + engine_P[i] = 0; + + /* reads from the file the description of the engines (name host port) */ + fgets( line, MAX_FILENAME_SIZE, stream); + while ((strlen(line) <= 1)||(line[0] == '#')) { + if (!fgets( line, MAX_FILENAME_SIZE, stream)) { + Log( ERR_STREAM, "invalid format in list file %s", engine_list ); + exit(-1); + } + } + + sscanf( line, "%s %s %d", engine_name[i], engine_host[i], &engine_port[i]); + Log( STD_STREAM, "%s: host %s port %d", engine_name[i], engine_host[i], engine_port[i]); + + engine_socket[i] = INVALID_SOCKET; + + } + + return; +} + +/* Reads a list of audio files from a control file */ +/* for batch mode processing */ +void read_ctl_file( const char *ctl_file) { + int i; + char line[MAX_FILENAME_SIZE]; + FILE *stream; + + /* Reads ctl file */ + if( (stream = fopen( ctl_file, "r" )) == NULL ) + Log( ERR_STREAM, "failed to open ctl file %s", ctl_file ); + + /* Traverses the file once to get the number of lines */ + i_next_input_file = 0; + n_input_files = 0; + while (fgets( line, MAX_FILENAME_SIZE, stream)) + // Counts line that are neither empty nor messages + // (messages start with ">") + if (strlen(line) > 1) n_input_files++; + fseek( stream, 0, SEEK_SET); + + /* Reads the raw audio input file names */ + input_files = (char**)malloc( n_input_files * sizeof(char*)); + for (i = 0; i < n_input_files; i++) { + input_files[i] = (char*)malloc( MAX_FILENAME_SIZE * sizeof(char)); + fgets( input_files[i], MAX_FILENAME_SIZE, stream); + + // Don't count empty lines as file names + if (strlen(input_files[i]) <= 1) + i--; + else { + // Gets rid of the newline + if (input_files[i][strlen(input_files[i])-1] == '\n') + input_files[i][strlen(input_files[i])-1] = '\0'; + + if (input_files[i][0] != '>') { + // Adds the file extension +// input_files[i] = strcat(input_files[i], ".raw"); + } + } + } + + fclose(stream); + + return; +} + +/************************************** interface for hub *************************************************/ + +/* + * This routine is called by GalaxyCommunicator once at + * program startup time. + */ +void *_GalSS_init_server(Gal_Server *s, int argc, char **argv) +{ + int i, k; + char ctl_fn[MAX_FILENAME_SIZE]; + char engine_list_fn[MAX_FILENAME_SIZE]; + char *p; + + GalUtil_Print (-1, "Compiled on %s at %s\n", __DATE__, __TIME__); + + if (!GalUtil_OACheckUsage(argc, argv, oas, &i)) + exit(1); + + if (!GalUtil_OAExtract(argc, argv, oas, "-sps", GAL_OA_STRING, &p)) { + SPS = atoi(DEFAULT_SPS); + } + else + SPS = atoi(p); + + if (!GalUtil_OAExtract(argc, argv, oas, "-engine_list", GAL_OA_STRING, &p)) { + strncpy(engine_list_fn, DEFAULT_CLIENT_LIST, MAX_FILENAME_SIZE-1); + } + else + strncpy(engine_list_fn, p, MAX_FILENAME_SIZE-1); + + if (!GalUtil_OAExtract(argc, argv, oas, "-mfc_write", GAL_OA_STRING, &p)) { + mfc_write = atoi(DEFAULT_MFC_WRITE); + } + else + mfc_write = atoi(p); + + if (!GalUtil_OAExtract(argc, argv, oas, "-log_full_session_input", GAL_OA_STRING, &p)) { + log_session_audio = atoi(DEFAULT_LOG_SESSION_AUDIO); + } + else + log_session_audio = atoi(p); + + if (!GalUtil_OAExtract(argc, argv, oas, "-log", GAL_OA_STRING, &p)) { + log_messages = atoi(DEFAULT_LOG); + } + else + log_messages = atoi(p); + + if (!GalUtil_OAExtract(argc, argv, oas, "-ctl_file", GAL_OA_STRING, &p)) { + batch_mode = 0; + } + else { + batch_mode = 1; + strncpy(ctl_fn, p, MAX_FILENAME_SIZE-1); + + // In batch mode, no real time constraint, so we + // can wait for responses from engines longer + MAX_ENGINE_WAIT_ITERATIONS=1000; + } + + if (mfc_write) + { + // copied from uttproc.c + param_t *fe_param; + fe_param = (param_t*)ckd_calloc(1, sizeof(param_t)); + fe_param->SAMPLING_RATE = (float32)SPS; + fe_param->FRAME_RATE = 100; + fe_param->PRE_EMPHASIS_ALPHA = (float32)0.97; + fe = fe_init(fe_param); + free(fe_param); + + mfcbuf = (float **) ckd_calloc (MAX_UTT_LEN+10, sizeof(float *)); + mfcbuf[0] = (float *) ckd_calloc ((MAX_UTT_LEN+10)*fe->NUM_CEPSTRA, sizeof(float)); + for (k = 1; k < MAX_UTT_LEN+10; k++) + mfcbuf[k] = mfcbuf[k-1] + fe->NUM_CEPSTRA; + } + + // Reads engine specifications + read_engine_list( engine_list_fn); + + // Reads input audio file list + if (batch_mode) { + read_ctl_file( ctl_fn); + } + + Log( STD_STREAM, "Sampling Rate: %d", SPS); + + /* Initialize and test audio device, to make sure we can use it */ + if (!batch_mode) { + srvcb = (srvcb_t *)calloc(1, sizeof(srvcb_t)); + if (srvcb == NULL) { + GalUtil_Fatal("Unable to alloc memory for server control block\n"); + } + if ((srvcb->ad = ad_open_sps (SPS)) == NULL) { + GalUtil_Fatal("ad_open failed\n"); + } + ad_close (srvcb->ad); + + srvcb->state = ST_IDLE; + srvcb->mode = MD_DECODING; //default is decoding mode (xw 26nov00) + } + + return NULL; +} + + +/* This is invoked by the hub when it connects to the server (when else???) */ +Gal_Frame reinitialize(Gal_Frame f, void *server_data) +{ + int i; + + GalIO_CommStruct *comm = GalSS_EnvComm((GalSS_Environment *)server_data); + + if (Gal_GetObject(f, ":greeting")) { + GalUtil_Print(-1, "H: %s\n", Gal_GetString(f, ":greeting")); + } + + if (!batch_mode) { + srvcb->state = ST_IDLE; + srvcb->mode = MD_DECODING; //default is decoding mode (xw 26nov00) + if (!sv_comms.empty()) { + Gal_RemoveTimedTask(srvtt_idle, sv_comms.back()); + } + } + + sv_comms.push_back(comm); + + for (i = 0; i < n_engines; i++) { + if (engine_socket[i] != INVALID_SOCKET) { + sock_close(engine_socket[i]); + engine_socket[i] = INVALID_SOCKET; + } + } + + if (!batch_mode) { + GalUtil_Print(-1, "*** -> IDLE ***\n"); + Gal_AddTimedTask(srvtt_idle, (void *)comm, 1); + } + + return f; +} + +/* This is invoked by the hub when it connects to the server (when else???) */ +Gal_Frame begin_session( Gal_Frame f, void *server_data) +{ + //char to_engine[256]; + fprintf(stderr, "beginning session\n"); + + if (batch_mode) { + utt_id = 0; + } + else { + // (antoine 12/22/2004) Calibrates the continuous listener for the new session + cont_ad_calib(srvcb->cont); + } + + // Announces the beginning of a new session to the engines + //sprintf(to_engine, "%s\n", "engine_new_session"); + //for (i = 0; i < n_engines; i++) { + // send_message_to_engine(i, to_engine); + //} + + fprintf(stderr, "session begun\n"); + return f; +} + +/* This is invoked at the end of a session */ +Gal_Frame end_session( Gal_Frame f, void *server_data) +{ + Log( STD_STREAM, "end_session received"); + + if (logfp) { + fflush(logfp); + fclose(logfp); + logfp = NULL; + } + + return f; +} + +/* set configuration (was previously set_lm) */ +Gal_Frame set_config(Gal_Frame f, void *server_data) +{ + int i; + char to_engine[256]; + char *slotvalue; + + GalIO_CommStruct *comm = GalSS_EnvComm((GalSS_Environment *)server_data); + + if (Gal_GetObject(f, ":set_lm")) { + Log( DBG_STREAM, ":set_lm found"); + slotvalue = Gal_GetString(f, ":set_lm"); + + for (i = 0; i < n_engines; i++) { + if (!is_dtmf_engine(i)) { + // engine is *not* DTMF, so send it the LM + Log( STD_STREAM, "Setting LM for engine %s to %s", engine_name[i], slotvalue); + sprintf(to_engine, "%s %s \n", "engine_set_lm", slotvalue); + send_message_to_engine(i, to_engine); + } + } + } + if (Gal_GetObject(f, ":set_dtmf_len")) { + Log( DBG_STREAM, ":set_dtmf_len found"); + slotvalue = Gal_GetString(f, ":set_dtmf_len"); + + for (i = 0; i < n_engines; i++) { + if (is_dtmf_engine(i)) { + // engine *is* DTMF, so send it the LM + Log( STD_STREAM, "Setting LM for engine %s to %s", engine_name[i], slotvalue); + sprintf(to_engine, "%s %s \n", "engine_set_lm", slotvalue); + send_message_to_engine(i, to_engine); + } + } + } + if (Gal_GetObject(f, ":set_silence_secs")) { + Log( DBG_STREAM, ":set_silence_secs found"); + slotvalue = Gal_GetString(f, ":set_silence_secs"); + silence_secs = atof(slotvalue); + } + if (Gal_GetObject(f, ":only_listen_for_dtmf")) { + Log( DBG_STREAM, ":only_listen_for_dtmf found"); + slotvalue = Gal_GetString(f, ":only_listen_for_dtmf"); + only_listen_for_dtmf = atoi(slotvalue); + } + return f; +} + + +/* Synchronous hub scripts will call this routine when token processing + * for an utterance has finished and the system is ready for any new + * utterances. */ +Gal_Frame start_listening(Gal_Frame f, void *server_data) +{ + fprintf(stderr, "starting listening\n"); + char session_rawfn[1024]; + char logfn[1024]; + char to_engine[256]; + int i; + int32 delta_sil, delta_speech, min_noise, max_noise, + winsize, speech_onset, sil_onset, leader, + trailer; + float32 adapt_rate; + + if (!batch_mode) { + srvcb->state = ST_LISTENING; + srvcb->mode = MD_DECODING; //default is decoding mode (xw 26nov00) + utt_cnt = 0; + interrupt_cnt = 0; //xw 26nov00 + } + + if (hub_log_dir) { + free(hub_log_dir); + hub_log_dir = NULL; + } + if (hub_log_prefix) { + free(hub_log_prefix); + hub_log_prefix = NULL; + } + if (Gal_GetObject(f, ":hub_logdir")) { + hub_log_dir = _strdup(Gal_GetString(f, ":hub_logdir")); + } + else + fprintf( stderr, "Can't find :hub_logdir\n"); + + if (Gal_GetObject(f, ":hub_log_prefix")) { + hub_log_prefix = _strdup(Gal_GetString(f, ":hub_log_prefix")); + } + else + fprintf( stderr, "Can't find :hub_log_prefix\n"); + + if (log_messages) { + if (logfp) + fclose(logfp); + sprintf(logfn, "%s%s-audio_server.log", hub_log_dir, hub_log_prefix); + logfp = fopen( logfn, "wb"); + } + + Log( STD_STREAM, "hub_logdir= |%s|", + (hub_log_dir ? hub_log_dir : "null")); + Log( STD_STREAM, "hub_log_prefix= |%s|", + (hub_log_prefix ? hub_log_prefix : "null")); + + if ((srvcb->ad = ad_open_sps (SPS)) == NULL) { + GalUtil_Fatal("ad_open failed\n"); + } + /* Open the continuous listening/silence filtering module and calibrate it */ + if ((srvcb->cont = cont_ad_init (srvcb->ad, ad_read)) == NULL) { + ad_close (srvcb->ad); + GalUtil_Fatal("cont_ad_init failed\n"); + } + + // (antoine 07/24/2006) Log detailed information about the endpointer + // (for debug purposes) + //cont_ad_set_logfp(srvcb->cont, logfp); + + // (antoine 03/07/2005) Eventually modify some parameters + // of the continuous listener + cont_ad_get_params (srvcb->cont, &delta_sil, &delta_speech, + &min_noise, &max_noise, + &winsize, &speech_onset, &sil_onset, + &leader, &trailer, &adapt_rate); + // Set a high min_noise threshold to ignore absolute zeros in the + // estimation of noise level (these might be sent by cell phones + // during non-speech phases) + min_noise = 10; + cont_ad_set_params (srvcb->cont, delta_sil, delta_speech, + min_noise, max_noise, winsize, speech_onset, sil_onset, + leader, trailer, adapt_rate); + + + + // (antoine 01/03/2005) Raw audio file to store the whole session + // (regardless of endpointing) + if (log_session_audio) { + sprintf(session_rawfn, "%s%s-input.raw", hub_log_dir, hub_log_prefix); + session_rawfp = fopen( session_rawfn, "wb"); + cont_ad_set_rawfp( srvcb->cont, session_rawfp); + } + + ad_start_rec (srvcb->ad); // start the flow of data from the A2D + + // Sends the path to the new Log folder to the engines + sprintf(to_engine, "%s %s%s\n", "engine_new_session", hub_log_dir, hub_log_prefix); + for (i = 0; i < n_engines; i++) { + send_message_to_engine(i, to_engine); + } + fprintf(stderr, "ending listening\n"); + + return (Gal_Frame) f; +} + + +Gal_Frame stop_listening(Gal_Frame f, void *server_data) +{ + if (!batch_mode) + srvcb->state = ST_IDLE; + + return (Gal_Frame) f; +} + + + +// D: This function serves as a file feeder for cont_ad in batch mode +// (it's essentially copied from sphinx2's file_ad_read); it assumes +// the file is opened and pointed to by fpBatchRaw +static FILE* fpBatchRaw; +static int32 my_file_ad_read (ad_rec_t *r, int16 *buf, int32 max) +{ + int32 k; + + k = (int32)fread (buf, sizeof(int16), max, fpBatchRaw); + + return ((k > 0) ? k : -1); +} + +// A: This function reads audio through the standard ad_read function +// (from Sphinx's ad library) but keeps a buffer in memory. +// It allows to set the point from which to read (from the buffer), +// thus allowing to "rewind" and restart streaming from some point +// in the past. This is used when an external module does endpointing +// and specifies where an utterance started (originally for Antoine's +// Interaction Manager architecture). +#define AUDIO_BUFFER_SIZE 65536 +static int32 iABShiftSize = 8192; +static int16 pAudioBuffer[AUDIO_BUFFER_SIZE]; +static int32 iABReadPointer = 0; +static int32 iABFillPointer = 0; +static int32 iABStartTimeStamp = 0; +static int32 buffered_ad_read (ad_rec_t *r, int16 *buf, int32 max) +{ + // Get the latest audio from the AD device + int iNumRead = ad_read(r, buf, max); + + // Test if we filled up the buffer + if (iABFillPointer + iNumRead > AUDIO_BUFFER_SIZE) { + // Shift the content of the buffer (losing the first slice of + // size iABShiftSize samples) + memcpy(pAudioBuffer, pAudioBuffer + iABShiftSize * sizeof(int16), + iABFillPointer * sizeof(int16)); + + // Adjust the pointers + iABFillPointer -= iABShiftSize; + iABReadPointer -= iABShiftSize; + if (iABReadPointer < 0) iABReadPointer = 0; + iABStartTimeStamp += iABShiftSize; + } + + // Add the new audio at the end of the buffer + memcpy(pAudioBuffer + iABFillPointer, buf, max * sizeof(int16)); + iABFillPointer += iNumRead; + + int iNumOut = iNumRead; + + // If the reading pointer has been set at some point in the past + if (iABReadPointer != iABFillPointer) { + // Number of samples up to the last one + iNumOut = iABFillPointer - iABReadPointer; + // Should return at most max samples + if (iNumRead > max) iNumRead = max; + + // Fill in the output buffer + memcpy(buf, pAudioBuffer + iABReadPointer, iNumRead * sizeof(int16)); + } + + return iNumOut; +} + +// A: Sets the reading pointerfor buffered_ad_read +static void set_buffered_ad_pointer(int32 iTimeStamp) { + iABReadPointer = iTimeStamp - iABStartTimeStamp; +} + +/* (antoine 2005-01-04) + * In batch mode: decodes all files and sends the results to galaxy + * In live mode: switch to listening mode (waits for data from + * continuous listener + */ +Gal_Frame start_decoding(Gal_Frame f, void *server_data) +{ + int16 cpRawBuffer[CONT_AD_BUFFER_SIZE+1]; + char sToEngine[256], sGalaxyCommand[256], sGalaxyArg[2048]; + int i, j, iNumRead, iNumSamplesRead; + int bGotResult = 0; + cont_ad_t *cont; + ad_rec_t ad; + float batchPow=0, batchNPow=0; + + + Gal_Object *pgoUtterances; + Gal_Frame repl; + GalIO_CommStruct *comm = GalSS_EnvComm((GalSS_Environment *)server_data); + + // In batch mode, send all the files from the ctl file + // to the engines now + if (batch_mode) { + + char logfn[1024]; + if (logfp) + fclose(logfp); + sprintf(logfn, "audio_server.log"); + logfp = fopen( logfn, "wb"); + + // Look for the next input file path in the ctl file + while ((i_next_input_file < n_input_files) + &&(input_files[i_next_input_file][0] == '>')) { + + // Message line (e.g. begin/end session) + // Send the message to Galaxy + + // Get the command to send + sGalaxyCommand[0] = ':'; + for (i = 1; + (i < (signed)strlen(input_files[i_next_input_file]))&& + (input_files[i_next_input_file][i] != ' '); i++) { + sGalaxyCommand[i] = input_files[i_next_input_file][i]; + } + sGalaxyCommand[i] = '\0'; + i++; + + // Get the arguments to send + j=0; + while (i < (signed)strlen(input_files[i_next_input_file])) { + sGalaxyArg[j] = input_files[i_next_input_file][i]; + i++; + j++; + } + sGalaxyArg[j] = '\0'; + + // If it's a begin_session command build a frame with the + // directory of the Log file for helios + if (!strcmp( sGalaxyCommand, ":begin_session")) { + Log( STD_STREAM, "New Session (%s)", sGalaxyArg); + + // Reinitializes the utterance ID + utt_id = 0; + + repl = Gal_MakeFrame("main", GAL_CLAUSE); + Gal_SetProp(repl, ":begin_session", Gal_StringObject("")); + Gal_SetProp(repl, ":batch_logdir", Gal_StringObject(sGalaxyArg)); + + // Announces the beginning of a new session to the engines + sprintf(sToEngine, "%s\n", "engine_new_session"); + for (i = 0; i < n_engines; i++) { + send_message_to_engine(i, sToEngine); + } + } + else { + Log( STD_STREAM, "Sending to hub: %s=%s", sGalaxyCommand, sGalaxyArg); + + // Send the command to the Galaxy hub + repl = Gal_MakeFrame("main", GAL_CLAUSE); + Gal_SetProp(repl, sGalaxyCommand, Gal_StringObject(sGalaxyArg)); + } + + GalIO_CommWriteFrame(comm, repl, GAL_TRUE /* blocking calls */); + i_next_input_file++; + } + + // Check if we've done all the input files + if (i_next_input_file == n_input_files) { + repl = Gal_MakeFrame("main", GAL_CLAUSE); + Gal_SetProp(repl, ":endofctlfile", Gal_StringObject( "")); + GalIO_CommWriteFrame(comm, repl, GAL_FALSE /* don't block */); + return repl; + } + + // Extract state name (separated from path by a tab char) + char *sState = strchr(input_files[i_next_input_file],'\t'); + if (sState) { + // There was a state name specified + + // Split the string between path and state + *sState = '\0'; + sState++; + + // Sends the state name to all (non-dtmf) engines + for (i = 0; i < n_engines; i++) { + if (!is_dtmf_engine(i)) { + // engine is *not* DTMF, so send it the LM + Log( STD_STREAM, "Setting LM for engine %s to %s", engine_name[i], sState); + sprintf(sToEngine, "%s %s \n", "engine_set_lm", sState); + send_message_to_engine(i, sToEngine); + } + } + + } + + // Start processing the next input file + fpBatchRaw = fopen( input_files[i_next_input_file], "rb"); + if (fpBatchRaw == NULL) { + Log( ERR_STREAM, "Couldn't open raw input file %s", input_files[i_next_input_file]); + exit(1); + } + Log( DBG_STREAM, "Opening RAW file %s...", input_files[i_next_input_file]); + + // For each file, open the continuous listening/silence filtering + // module and calibrate it; open it so that it reads from the + // specified file, also use the cont_ad_init_raw_mode opening + // function so that the files are not chopped prematurely + ad.sps = SPS; + ad.bps = sizeof(int16); + if ((cont = cont_ad_init_rawmode(&ad, my_file_ad_read)) == NULL) { + ad_close (&ad); + GalUtil_Fatal("cont_ad_init failed\n"); + } + + // Announce coming data to engines + sprintf(utt_id_str, "%.3d", utt_id); + sprintf(sToEngine, "%s %s 0\n", "engine_begin_utt", utt_id_str); + for (i = 0; i < n_engines; i++) { + send_message_to_engine(i, sToEngine); + } + + // also compute batchPow + batchPow = -1; + + // Reads raw audio data block by block and sends it to the engines + iNumSamplesRead = cont_ad_read (cont, cpRawBuffer, CONT_AD_BUFFER_SIZE); + iNumRead = iNumSamplesRead * ad.bps; + if(batchPow < cont->siglvl) { + batchPow = (float)cont->siglvl; + } + + Log( DBG_STREAM, "Read %d bytes from file...", iNumRead); + + while (iNumRead >= 0) { + sprintf(sToEngine, "%s %d \n", "engine_proc_raw", iNumRead); + for (i = 0; i < n_engines; i++) { + if (!only_listen_for_dtmf || is_dtmf_engine(i)) { + if (send_message_to_engine(i, sToEngine)) { + if (sock_send_block(engine_socket[i], (char*)cpRawBuffer, iNumRead) != iNumRead) + Log( ERR_STREAM, "problems on sending data to %s decoding engine: raw data", engine_name[i]); + else + Log( DBG_STREAM, "%d bytes raw data sent to %s decoding engine", iNumRead, engine_name[i]); + } + } + } + // set the raw mode for the sphinx decoder so that it does not + // chop the utterance before it ends + iNumSamplesRead = cont_ad_read (cont, cpRawBuffer, CONT_AD_BUFFER_SIZE); + iNumRead = iNumSamplesRead * ad.bps; + if(batchPow < cont->siglvl) { + batchPow = (float)cont->siglvl; + } + + Log( DBG_STREAM, "Read %d bytes from file...", iNumRead); + } + + batchNPow = (float)cont->noise_level; + + // asks results to engines + Log( STD_STREAM, "Sent utterance %s to engines ... ", utt_id_str); + for (i = 0; i < n_engines; i++) { + send_message_to_engine(i, "engine_end_utt \n"); + send_message_to_engine(i, "engine_proc_result \n"); + } + + wait_for_return(); + + repl = Gal_MakeFrame("main", GAL_CLAUSE); + + // Gets the hypothesis from each engine + + // (dbohus): first count how many hyps we will have total + int iHypsCount = 0; + for(i = 0; i < n_engines; i++) { + int iNumHyps; + Gal_GetList(gfResult[i], ":results", &iNumHyps); + if(iNumHyps) + iHypsCount += iNumHyps; + else + iHypsCount++; + } + + // (dbohus): now allocate the utterances + pgoUtterances = (Gal_Object *)malloc(sizeof(Gal_Object)*iHypsCount); + int iIndex = 0; + // (dbohus): and fill them in + for (i = 0; i < n_engines; i++) { + if(gfResult[i]) { + int iNumHyps = 0; @@ Diff output truncated at 60000 characters. @@ From matt at edam.speech.cs.cmu.edu Fri Oct 19 12:27:58 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Fri, 19 Oct 2007 12:27:58 -0400 Subject: [TeamTalk 317]: [853] branches/mrmarge/PocketTeamTalk: Committing remainder of conversion to PocketSphinx. Message-ID: <200710191627.l9JGRwmp012320@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071019/984be286/attachment.html -------------- next part -------------- Property changes on: branches/mrmarge/PocketTeamTalk/Agents ___________________________________________________________________ Name: svn:externals - Pythia http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Pythia Helios http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Audio_Server MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Sphinx_Engine NlgServer http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/NlgServer2 Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Phoenix2 + Pythia http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Pythia Helios http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Kalliope NlgServer http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/NlgServer2 Phoenix http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Phoenix2 Modified: branches/mrmarge/PocketTeamTalk/Agents/Agents.sln =================================================================== --- branches/mrmarge/PocketTeamTalk/Agents/Agents.sln 2007-10-18 21:29:22 UTC (rev 852) +++ branches/mrmarge/PocketTeamTalk/Agents/Agents.sln 2007-10-19 16:27:56 UTC (rev 853) @@ -8,8 +8,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkBackend", "TeamTalkBackend\TeamTalkBackend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" ProjectSection(ProjectDependencies) = postProject + {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} = {BC3C2AF0-EF36-4587-B384-E154B6EDCC33} - {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamTalkDM", "TeamTalkDM\TeamTalkDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" @@ -21,18 +21,18 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" ProjectSection(ProjectDependencies) = postProject + {1D29B734-1BA2-400C-877A-9F6A8DC44698} = {1D29B734-1BA2-400C-877A-9F6A8DC44698} + {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} = {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} - {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} - {1D29B734-1BA2-400C-877A-9F6A8DC44698} = {1D29B734-1BA2-400C-877A-9F6A8DC44698} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" ProjectSection(ProjectDependencies) = postProject {16A55B24-B636-4479-B306-1EEA66CCA3E7} = {16A55B24-B636-4479-B306-1EEA66CCA3E7} + {C18844B6-86D9-49CF-B7B4-A165B0B64EE0} = {C18844B6-86D9-49CF-B7B4-A165B0B64EE0} + {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} = {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} + {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} {1D29B734-1BA2-400C-877A-9F6A8DC44698} = {1D29B734-1BA2-400C-877A-9F6A8DC44698} - {B3C39248-7981-41D3-AB2C-89A8D507BD9E} = {B3C39248-7981-41D3-AB2C-89A8D507BD9E} - {236E9D9C-A5D7-40CE-A459-F98456A74472} = {236E9D9C-A5D7-40CE-A459-F98456A74472} - {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} = {72C9C9C6-90DC-4BB2-A570-D636F3E46E86} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Helios\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" @@ -55,7 +55,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinxutil", "..\Libraries\sphinxbase\win32\libsphinxutil\libsphinxutil.vcproj", "{1D29B734-1BA2-400C-877A-9F6A8DC44698}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpocketsphinx", "..\Libraries\pocketsphinx\win32\msdev\libpocketsphinx\libpocketsphinx.vcproj", "{B3C39248-7981-41D3-AB2C-89A8D507BD9E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpocketsphinx", "..\Libraries\pocketsphinx\win32\msdev\libpocketsphinx\libpocketsphinx.vcproj", "{C18844B6-86D9-49CF-B7B4-A165B0B64EE0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -127,10 +127,10 @@ {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Debug|Win32.Build.0 = Debug|Win32 {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Release|Win32.ActiveCfg = Release|Win32 {1D29B734-1BA2-400C-877A-9F6A8DC44698}.Release|Win32.Build.0 = Release|Win32 - {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Debug|Win32.Build.0 = Debug|Win32 - {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Release|Win32.ActiveCfg = Release|Win32 - {B3C39248-7981-41D3-AB2C-89A8D507BD9E}.Release|Win32.Build.0 = Release|Win32 + {C18844B6-86D9-49CF-B7B4-A165B0B64EE0}.Debug|Win32.ActiveCfg = Debug|Win32 + {C18844B6-86D9-49CF-B7B4-A165B0B64EE0}.Debug|Win32.Build.0 = Debug|Win32 + {C18844B6-86D9-49CF-B7B4-A165B0B64EE0}.Release|Win32.ActiveCfg = Release|Win32 + {C18844B6-86D9-49CF-B7B4-A165B0B64EE0}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config =================================================================== --- branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-18 21:29:22 UTC (rev 852) +++ branches/mrmarge/PocketTeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-19 16:27:56 UTC (rev 853) @@ -45,7 +45,7 @@ PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Audio_Server -PROCESS: $BIN\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990 +PROCESS: $BIN\Sphinx_Engine-DEBUG.exe -name male -argfn male-16khz.arg -port 9990 PROCESS_WORKDIR: $DECODER PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: Sphinx_Male Added: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/Dictionary/Teamtalk.dict.40phone =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/Dictionary/Teamtalk.dict.40phone (rev 0) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/Dictionary/Teamtalk.dict.40phone 2007-10-19 16:27:56 UTC (rev 853) @@ -0,0 +1,228 @@ +A AH +A(2) EY +ABORT AH B AO R T +ABSOLUTELY AE B S AH L UW T L IY +ACCEPTABLE AE K S EH P T AH B AH L +ACCEPTABLE(2) AH K S EH P T AH B AH L +ALL AO L +ALPHIE:C01 AE L F IY +AND AE N D +AND(2) AH N D +ARE AA R +ARE(2) ER +AREA EH R IY AH +AROUND ER AW N +AROUND(2) ER AW N D +BACK B AE K +BACKWARD B AE K W ER D +BACKWARDS B AE K W ER D Z +BASE B EY S +BASHFUL:C01 B AE SH F AH L +CANCEL K AE N S AH L +CLYDE:C01 K L AY D +COMMAND K AH M AE N D +CONTINUE K AH N T IH N Y UW +CORRECT K ER EH K T +COURSE K AO R S +DECKER:C01 D EH K AH R +DEFINITELY D EH F AH N AH T L IY +DEGREES D AH G R IY Z +DO D UW +DON'T D OW N +DON'T(2) D OW N T +DOWN D AW N +DRIVE D R AY V +EIGHT:C06 EY T +EIGHTEEN:C06 EY T IY N +EIGHTY:C02 EY T IY +EIGHTY:C03 EY T IY +EIGHTY:C04 EY T IY +EIGHTY_FIVE:C02 EY T IY F AY V +EIGHTY_FIVE:C04 EY T IY F AY V +ELEVEN:C06 AH L EH V AH N +ELEVEN:C06(2) IY L EH V AH N +ENOUGH AH N AH F +EVERYONE EH V R IY W AH N +EXPLORE AH K S P L AO R +FACE F EY S +FIFTEEN:C02 F IH F T IY N +FIFTEEN:C02(2) F AH F T IY N +FIFTEEN:C03 F IH F T IY N +FIFTEEN:C03(2) F AH F T IY N +FIFTEEN:C05 F IH F T IY N +FIFTEEN:C05(2) F AH F T IY N +FIFTEEN:C06 F IH F T IY N +FIFTEEN:C06(2) F AH F T IY N +FIFTY:C02 F IH F T IY +FIFTY:C03 F IH F T IY +FIFTY:C05 F IH F T IY +FIFTY_FIVE:C02 F IH F T IY F AY V +FIFTY_FIVE:C03 F IH F T IY F AY V +FIFTY_FIVE:C05 F IH F T IY F AY V +FIND F AY N D +FIVE:C02 F AY V +FIVE:C03 F AY V +FIVE:C05 F AY V +FIVE:C06 F AY V +FOLLOW F AA L OW +FORTY:C02 F AO R T IY +FORTY:C03 F AO R T IY +FORTY:C05 F AO R T IY +FORTY_FIVE:C02 F AO R T IY F AY V +FORTY_FIVE:C03 F AO R T IY F AY V +FORTY_FIVE:C05 F AO R T IY F AY V +FORWARD F AO R W ER D +FORWARDS F AO R W ER D Z +FOUR:C06 F AO R +FOURTEEN:C06 F AO R T IY N +FOURTH F AO R TH +FOURTHS F AO R S +FOURTHS(2) F AO R TH S +GO G OW +GOOD G AH D +GOOD(2) G UH D +GREAT G R EY T +GUESS G EH S +HALF HH AE F +HERE HH IH R +HOME HH OW M +HUNDRED HH AH N ER D +HUNDRED(2) HH AH N D ER D +HUNDRED(3) HH AH N D R AH D +HUNDRED(4) HH AH N D R AH D +I AY +I'M AY M +IMMEDIATELY AH M IY T IY AH T L IY +IT'S IH T S +IT'S(2) AH T S +JOIN JH OY N +LEFT L EH F T +LOCATION L OW K EY SH AH N +METRE M IY T ER +METRES M IY T ER Z +MINUS M AY N AH S +MOVE M UW V +NAH N AA +NEGATIVE N EH G AH T AH V +NEVERMIND N EH V ER M AY N D +NINE:C06 N AY N +NINETEEN:C06 N AY N T IY N +NINETY:C02 N AY N T IY +NINETY:C04 N AY N T IY +NINETY_FIVE:C02 N AY N T IY F AY V +NINETY_FIVE:C04 N AY N T IY F AY V +NO N OW +NOPE N OW P +NOT N AA T +OF AH V +OF(2) AH V +OKAY OW K EY +ONE HH W AH N +ONE(2) W AH N +ONE:C06 HH W AH N +ONE:C06(2) W AH N +PAUSE P AO Z +PERFECT P ER F EH K T +PERFECT(2) P ER F IH K T +QUARTER K AO R T ER +QUARTER(2) K W AO R T ER +QUARTERS K W AO R T ER Z +QUIT K W IH T +REALLY R IH L IY +REALLY(2) R IY L IY +REPORT R AH P AO R T +REPORT(2) R IY P AO R T +RETURN R AH T ER N +RETURN(2) R IY T ER N +RIGHT R AY T +SEARCH S ER CH +SEVEN:C06 S EH V AH N +SEVENTEEN:C06 S EH V AH N T IY N +SEVENTY:C02 S EH V AH N IY +SEVENTY:C02(2) S EH V AH N T IY +SEVENTY:C03 S EH V AH N IY +SEVENTY:C03(2) S EH V AH N T IY +SEVENTY_FIVE:C02 S EH V AH N IY F AY V +SEVENTY_FIVE:C03 S EH V AH N IY F AY V +SIX:C06 S IH K S +SIXTEEN:C06 S IH K S T IY N +SIXTEEN:C06(2) S AH K S T IY N +SIXTY:C02 S IH K S T IY +SIXTY:C03 S IH K S T IY +SIXTY:C05 S IH K S T IY +SIXTY_FIVE:C02 S IH K S T IY F AY V +SIXTY_FIVE:C03 S IH K S T IY F AY V +SO S OW +SPACE S P EY S +STOP S T AA P +STRAIGHT S T R EY T +SURE SH UH R +TASK T AE S K +TEN:C02 T EH N +TEN:C03 T EH N +TEN:C05 T EH N +TEN:C06 T EH N +THANK_YOU TH AE NG K Y UW +THANKS TH AE NG K S +THAT DH AE T +THAT(2) DH AH T +THE DH AH +THE(2) DH AH +THE(3) DH IY +THE_EAST_END_OF DH AH IY S T EH N D AH V +THE_NORTH_END_OF DH AH N AO R TH EH N D AH V +THE_SOUTH_END_OF DH AH S AW TH EH N D AH V +THE_WEST_END_OF DH AH W EH S T EH N D AH V +THERE DH EH R +THINK TH IH NG K +THIRD TH ER D +THIRDS TH ER D Z +THIRTEEN:C06 TH ER T IY N +THIRTY:C02 TH ER T IY +THIRTY:C02(2) TH ER T IY +THIRTY:C03 TH ER T IY +THIRTY:C03(2) TH ER T IY +THIRTY:C05 TH ER T IY +THIRTY:C05(2) TH ER T IY +THIRTY_FIVE:C02 TH ER T IY F AY V +THIRTY_FIVE:C03 TH ER T IY F AY V +THIRTY_FIVE:C05 TH ER T IY F AY V +THIS DH IH S +THIS(2) DH AH S +THREE TH R IY +THREE:C06 TH R IY +TO T AH +TO(2) T AH +TO(3) T UW +TOWARD T AO R D +TOWARD(2) T AH W AO R D +TOWARDS T AO R D Z +TOWARDS(2) T AH W AO R D Z +TURN T ER N +TWELVE:C06 T W EH L V +TWENTY:C02 T W EH N IY +TWENTY:C02(2) T W EH N T IY +TWENTY:C03 T W EH N IY +TWENTY:C03(2) T W EH N T IY +TWENTY:C05 T W EH N IY +TWENTY:C05(2) T W EH N T IY +TWENTY:C06 T W EH N IY +TWENTY:C06(2) T W EH N T IY +TWENTY_FIVE:C02 T W EH N IY F AY V +TWENTY_FIVE:C03 T W EH N IY F AY V +TWENTY_FIVE:C05 T W EH N IY F AY V +TWO T UW +TWO:C06 T UW +UP AH P +WAY W EY +WHERE HH W EH R +WHERE(2) W EH R +WHY HH W AY +WHY(2) W AY +YEAH Y AE +YES Y EH S +YOU Y UW +YOUR Y AO R +YOUR(2) Y UH R +ZERO:C06 Z IH R OW +ZERO:C06(2) Z IY R OW Modified: branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg =================================================================== --- branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-18 21:29:22 UTC (rev 852) +++ branches/mrmarge/PocketTeamTalk/Resources/DecoderConfig/male-16khz.arg 2007-10-19 16:27:56 UTC (rev 853) @@ -1,11 +1,11 @@ - -samprate 16000 - -nfilt 40 - -lowerf 133 - -upperf 6855 - -hmm hub4_cd_continuous_8gau_1s_c_d_dd - -feat 1s_c_d_dd - -cmn prior - -agc none - -lm LanguageModel\TeamTalkLM.arpa - -dict Dictionary\TeamTalk.dict.reduced_phoneset - -logfn .\sphinx_male-16khz.log +-samprate 16000 +-nfilt 40 +-lowerf 133 +-upperf 6855 +-hmm hub4_cd_continuous_8gau_1s_c_d_dd +-feat 1s_c_d_dd +-cmn prior +-agc none +-lmctlfn LanguageModel\TeamTalk.ctl +-dict Dictionary\Teamtalk.dict.40phone +-logfn .\sphinx_male-16khz.log From tk at edam.speech.cs.cmu.edu Fri Oct 19 13:53:19 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 19 Oct 2007 13:53:19 -0400 Subject: [TeamTalk 318]: [854] tags/2007-tt-fallback: Small changes to get installation working. Message-ID: <200710191753.l9JHrJUe012413@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071019/7f46eeb4/attachment-0001.html -------------- next part -------------- Modified: tags/2007-tt-fallback/Agents/PenDecoder/nbproject/project.properties =================================================================== --- tags/2007-tt-fallback/Agents/PenDecoder/nbproject/project.properties 2007-10-19 16:27:56 UTC (rev 853) +++ tags/2007-tt-fallback/Agents/PenDecoder/nbproject/project.properties 2007-10-19 17:53:19 UTC (rev 854) @@ -16,15 +16,11 @@ dist.dir=dist dist.jar=${dist.dir}/PenDecoder.jar dist.javadoc.dir=${dist.dir}/javadoc -file.reference.bsh-core-2.0b4.jar=bsh-core-2.0b4.jar -file.reference.bsh-util-2.0b4.jar=bsh-util-2.0b4.jar -file.reference.galaxy.jar-1=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar file.reference.PenDecoder-src=src jar.compress=false javac.classpath=\ - ${file.reference.galaxy.jar-1}:\ - ${file.reference.bsh-util-2.0b4.jar}:\ - ${file.reference.bsh-core-2.0b4.jar} + ${libs.BeanShell.classpath}:\ + ${libs.Galaxy.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint javac.deprecation=false @@ -45,6 +41,12 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= +# Property libs.BeanShell.classpath is set here just to make sharing of project simpler. +# The library definition has always preference over this property. +libs.BeanShell.classpath=bsh-core-2.0b4.jar;bsh-util-2.0b4.jar +# Property libs.Galaxy.classpath is set here just to make sharing of project simpler. +# The library definition has always preference over this property. +libs.Galaxy.classpath=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar main.class=edu.cmu.ravenclaw.pendecoder.PenDecoderServer manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF Modified: tags/2007-tt-fallback/Configurations/DesktopConfiguration/startlist-desktop.config =================================================================== --- tags/2007-tt-fallback/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-19 16:27:56 UTC (rev 853) +++ tags/2007-tt-fallback/Configurations/DesktopConfiguration/startlist-desktop.config 2007-10-19 17:53:19 UTC (rev 854) @@ -1,5 +1,4 @@ EXPAND: $GC_HOME ..\..\Libraries\Galaxy -EXPAND: $MITRE_ROOT $GC_HOME\contrib\MITRE EXPAND: $TEAMTALK ..\.. EXPAND: $CONFIGURATION $TEAMTALK\Configurations\DesktopConfiguration EXPAND: $AGENTS $TEAMTALK\Agents @@ -15,7 +14,7 @@ TITLE: TeamTalk -PROCESS: $JAVAEXE -classpath bsh-core-2.0b4.jar;bsh-util-2.0b4.jar;jiu.jar;dist/PenDecoder.jar;$MITRE_ROOT/bindings/java/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt +PROCESS: $JAVAEXE -classpath dist/lib/bsh-core-2.0b4.jar;dist/lib/bsh-util-2.0b4.jar;dist/PenDecoder.jar;dist/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt PROCESS_WORKDIR: $PENDECODER PROCESS_MONITOR_ARGS: --start PROCESS_TITLE: PenDecoder Modified: tags/2007-tt-fallback/TeamTalk-Setup/TeamTalk-Setup.vdproj =================================================================== --- tags/2007-tt-fallback/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-19 16:27:56 UTC (rev 853) +++ tags/2007-tt-fallback/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-19 17:53:19 UTC (rev 854) @@ -75,12 +75,6 @@ } "Entry" { - "MsmKey" = "8:_06C53A0A79144BF3B20E6D091BA5AF66" - "OwnerKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0754644A518C4A3C8C2DCAC878545BCE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -309,12 +303,6 @@ } "Entry" { - "MsmKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_1F42C3E071BB42A7A5833617DB0733B9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -357,12 +345,6 @@ } "Entry" { - "MsmKey" = "8:_2499211F1B524D089D9A7BF956059B5E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_24A163D1D7964683822BCEAA09EC4BC4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -429,60 +411,6 @@ } "Entry" { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -717,6 +645,12 @@ } "Entry" { + "MsmKey" = "8:_41AB24BCC22B416C9FCA5AF352B628C3" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_41B223D3494243549702393AEE3DF084" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -783,12 +717,6 @@ } "Entry" { - "MsmKey" = "8:_468DAE8A22AB41DEA1B09E80CE83FAFD" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_46F3778A1DED4F508BFDE6284A06C7B5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -873,6 +801,60 @@ } "Entry" { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_4D0D55A9B23A4E7C9F86BE0F4885DCFB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1035,12 +1017,6 @@ } "Entry" { - "MsmKey" = "8:_5C112EB6B56747938FBE262572CBA8D4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5C417CEBD5654CE58BEA12B3284413A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1113,12 +1089,6 @@ } "Entry" { - "MsmKey" = "8:_627C60D5154641B0925A2C5E8B00A06B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_65C7C38F53F64139B75E8AC0736D5C2C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1179,12 +1149,6 @@ } "Entry" { - "MsmKey" = "8:_6A0E8D3A0F2E417D89FB9CDA634ACA60" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6BF3B812D50B4048B41A568BFD349DDA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1245,12 +1209,6 @@ } "Entry" { - "MsmKey" = "8:_70ECB07B803F4B0E81CFF59B3C122AD2" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_70EF1F828D08453784B86C78D99E5498" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1335,6 +1293,12 @@ } "Entry" { + "MsmKey" = "8:_7BD97888280B4F7E8BCC2EDF987202FA" + "OwnerKey" = "8:_4CBACE42EA574B26AED906543FCB4B34" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7C53D3B63A6847BEB6774AF8D30859DE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1575,6 +1539,12 @@ } "Entry" { + "MsmKey" = "8:_94248070525E4B75898BF37DA33AB582" + "OwnerKey" = "8:_41AB24BCC22B416C9FCA5AF352B628C3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_947BF9E850AE4AFCA58C3BB792712F77" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1725,12 +1695,6 @@ } "Entry" { - "MsmKey" = "8:_A54BC1128444473EAB4C5E0D68C78407" - "OwnerKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A5C9D293284B46E5A08A504E22245CF3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1821,12 +1785,6 @@ } "Entry" { - "MsmKey" = "8:_ACAED84396274FBABB972450E4D53D62" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_ACBA7498BA3B48FE849264652BAB8A9E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2043,12 +2001,6 @@ } "Entry" { - "MsmKey" = "8:_C0AA28DD7D234CCEB6D53338D81E29B5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C1FA30C5F48C4649AB948B794BE5F6C1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2235,12 +2187,6 @@ } "Entry" { - "MsmKey" = "8:_D56A07DB81FA430E9A5E53BC2182BC11" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D6E4AE65B95D46DAB0FBCC7EA207BD4E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2326,31 +2272,31 @@ "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" + "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" + "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242" + "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F" + "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DDAEE798AA6303A334273AF055949421" - "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B" + "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -3893,26 +3839,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2499211F1B524D089D9A7BF956059B5E" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\raw.log" - "TargetName" = "8:raw.log" - "Tag" = "8:" - "Folder" = "8:_D39C71DC61D04B49BA453B3D8259563F" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24A163D1D7964683822BCEAA09EC4BC4" { "SourcePath" = "8:..\\Tools\\MakeLM\\lexdata\\cmudict.0.6d_SPHINX_NEW" @@ -5093,26 +5019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_468DAE8A22AB41DEA1B09E80CE83FAFD" - { - "SourcePath" = "8:..\\Resources\\DecoderConfig\\sphinx_male-16khz.log" - "TargetName" = "8:sphinx_male-16khz.log" - "Tag" = "8:" - "Folder" = "8:_D39C71DC61D04B49BA453B3D8259563F" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_46F3778A1DED4F508BFDE6284A06C7B5" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\ER.chmm" @@ -5893,26 +5799,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C112EB6B56747938FBE262572CBA8D4" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalkDM-ALPHIE.cfg" - "TargetName" = "8:TeamTalkDM-ALPHIE.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C417CEBD5654CE58BEA12B3284413A3" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tk84.dll" @@ -6133,26 +6019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_627C60D5154641B0925A2C5E8B00A06B" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk-hub-desktop-ALPHIE.pgm" - "TargetName" = "8:TeamTalk-hub-desktop-ALPHIE.pgm" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65C7C38F53F64139B75E8AC0736D5C2C" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\bitmap.tcl" @@ -6353,26 +6219,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A0E8D3A0F2E417D89FB9CDA634ACA60" - { - "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\Rosetta\\TeamTalk.pm~" - "TargetName" = "8:TeamTalk.pm~" - "Tag" = "8:" - "Folder" = "8:_CBC7749CB66F43E18BE95A434B8E6B87" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6BF3B812D50B4048B41A568BFD349DDA" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\macThai.enc" @@ -6573,26 +6419,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_70ECB07B803F4B0E81CFF59B3C122AD2" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalk-hub-desktop-BASHFUL.pgm" - "TargetName" = "8:TeamTalk-hub-desktop-BASHFUL.pgm" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_70EF1F828D08453784B86C78D99E5498" { "SourcePath" = "8:..\\Resources\\DecoderConfig\\HMM-16khz.ss\\CH.chmm" @@ -8473,26 +8299,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACAED84396274FBABB972450E4D53D62" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\startlist-desktop.config.user" - "TargetName" = "8:startlist-desktop.config.user" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACBA7498BA3B48FE849264652BAB8A9E" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\items.tcl" @@ -9213,26 +9019,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0AA28DD7D234CCEB6D53338D81E29B5" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\peerfile.txt" - "TargetName" = "8:peerfile.txt" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1FA30C5F48C4649AB948B794BE5F6C1" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\license.terms" @@ -9833,26 +9619,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D56A07DB81FA430E9A5E53BC2182BC11" - { - "SourcePath" = "8:..\\Configurations\\DesktopConfiguration\\TeamTalkDM-BASHFUL.cfg" - "TargetName" = "8:TeamTalkDM-BASHFUL.cfg" - "Tag" = "8:" - "Folder" = "8:_BB1740A5B7384A8E8307E62A7E940632" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D6E4AE65B95D46DAB0FBCC7EA207BD4E" { "SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tcl8.4\\encoding\\macUkraine.enc" @@ -12597,11 +12363,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_06C53A0A79144BF3B20E6D091BA5AF66" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_41AB24BCC22B416C9FCA5AF352B628C3" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" "Properties" { } @@ -12611,11 +12377,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1F27A38B07F54BB1A085F7B8F01D27AF" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4CBACE42EA574B26AED906543FCB4B34" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -12625,11 +12391,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_29CD188AB7D24EC88B5923B2D9A797CC" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7BD97888280B4F7E8BCC2EDF987202FA" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -12639,11 +12405,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A54BC1128444473EAB4C5E0D68C78407" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_94248070525E4B75898BF37DA33AB582" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" "Properties" { } Modified: tags/2007-tt-fallback/TeamTalkBuild.bat =================================================================== --- tags/2007-tt-fallback/TeamTalkBuild.bat 2007-10-19 16:27:56 UTC (rev 853) +++ tags/2007-tt-fallback/TeamTalkBuild.bat 2007-10-19 17:53:19 UTC (rev 854) @@ -100,97 +100,98 @@ :NBA SET NetBeansDrive=A -goto Compile +goto Ant :NBB SET NetBeansDrive=B -goto Compile +goto Ant :NBC SET NetBeansDrive=C -goto Compile +goto Ant :NBD SET NetBeansDrive=D -goto Compile +goto Ant :NBE SET NetBeansDrive=E -goto Compile +goto Ant :NBF SET NetBeansDrive=F -goto Compile +goto Ant :NBG SET NetBeansDrive=G -goto Compile +goto Ant :NBH SET NetBeansDrive=H -goto Compile +goto Ant :NBI SET NetBeansDrive=I -goto Compile +goto Ant :NBJ SET NetBeansDrive=J -goto Compile +goto Ant :NBK SET NetBeansDrive=K -goto Compile +goto Ant :NBL SET NetBeansDrive=L -goto Compile +goto Ant :NBM SET NetBeansDrive=M -goto Compile +goto Ant :NBN SET NetBeansDrive=N -goto Compile +goto Ant :NBO SET NetBeansDrive=O -goto Compile +goto Ant :NBP SET NetBeansDrive=P -goto Compile +goto Ant :NBQ SET NetBeansDrive=Q -goto Compile +goto Ant :NBR SET NetBeansDrive=R -goto Compile +goto Ant :NBS SET NetBeansDrive=S -goto Compile +goto Ant :NBT SET NetBeansDrive=T -goto Compile +goto Ant :NBU SET NetBeansDrive=U -goto Compile +goto Ant :NBV SET NetBeansDrive=V -goto Compile +goto Ant :NBW SET NetBeansDrive=W -goto Compile +goto Ant :NBX SET NetBeansDrive=X -goto Compile +goto Ant :NBY SET NetBeansDrive=Y -goto Compile +goto Ant :NBZ SET NetBeansDrive=Z -:Compile -CALL "%VSHome%\devenv" TeamTalk.sln /%BUILD_TYPE% %BUILD_CONF% -pause - :Ant Compilation :JBUILD CALL "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" -buildfile Agents\PenDecoder\build.xml pause +:Compile +CALL "%VSHome%\devenv" TeamTalk.sln /%BUILD_TYPE% %BUILD_CONF% +IF "%BUILD_CONF%"=="Publish" GOTO Pause +pause + :Run MakeLM echo Now Executing MakeLM cd Tools\MakeLM perl makelm.pl --projectname TeamTalk cd ..\.. -goto Pause +GOTO Pause :VSERROR echo Can't find Visual Studio 8.0. Is it installed? Copied: tags/2007-tt-fallback/TeamTalkPublish.bat (from rev 849, trunk/TeamTalk/TeamTalkPublish.bat) =================================================================== --- tags/2007-tt-fallback/TeamTalkPublish.bat (rev 0) +++ tags/2007-tt-fallback/TeamTalkPublish.bat 2007-10-19 17:53:19 UTC (rev 854) @@ -0,0 +1,5 @@ + at echo off + +SET BUILD_CONF=Publish + +TeamTalkBuild.bat From tk at edam.speech.cs.cmu.edu Sun Oct 21 13:24:27 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Sun, 21 Oct 2007 13:24:27 -0400 Subject: [TeamTalk 319]: [855] trunk/TeamTalk: 1) Fixed hard-coded tool ordering dependency in pendecoder. Message-ID: <200710211724.l9LHORLX013592@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071021/d839b719/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/AbstractDecoderTool.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/AbstractDecoderTool.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/AbstractDecoderTool.java 2007-10-21 17:24:26 UTC (rev 855) @@ -4,6 +4,7 @@ protected MapCanvas canvas; protected String tooltip; + public int index; protected AbstractDecoderTool(MapCanvas canvas, String name, String tooltip) { super(canvas, name); Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java 2007-10-21 17:24:26 UTC (rev 855) @@ -59,6 +59,11 @@ protected TaskStatus goal_status; /** + * certainly boolean + */ + protected boolean certainty = true; + + /** * last known good position and orientation of robot (in centimeters and radians) * when the uncertainty about the robots position and orientation reach some threashhold * we just keep showing this last known good postition @@ -151,6 +156,16 @@ } /** + * set certainty + */ + public boolean setCertainty(boolean certainty) { + if(!certainty) System.err.println("uncertain robot location"); + boolean what_was = certainty; + certainty = this.certainty; + return what_was; + } + + /** * bots are iconified as triangles * makes an isocelese triangle, length 80cm, width 48cm, as an * AWT Shape @@ -205,7 +220,7 @@ } else { g.setColor(unselected_color); } - if(alpha > 0.5F) g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F)); + if(!certainty) g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F)); g.fill(arrow); } @@ -230,7 +245,7 @@ myG.scale(at.getScaleX(), at.getScaleY()); //recover screen's scale, i.e. don't zoom text //draw the label background - if(alpha < 0.01F) myG.setFont(uncertainFont); + if(!certainty) myG.setFont(uncertainFont); Rectangle2D labelBackground = myG.getFontMetrics().getStringBounds(name, myG); myG.setColor(labelBackgroundColor); myG.fill(labelBackground); Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java 2007-10-21 17:24:26 UTC (rev 855) @@ -23,11 +23,12 @@ return obj_created; } - public boolean setBot(String name, float x, float y, float r) { + public boolean setBot(String name, float x, float y, float r, boolean certainty) { name.toUpperCase(); //names are always case insensitive boolean bot_created = false; BotShape bot = getBot(name); bot.setLocation(x, y, r); + bot.setCertainty(certainty); canvas.repaint(); return bot_created; } Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java 2007-10-21 17:24:26 UTC (rev 855) @@ -43,6 +43,8 @@ try { if(tool.getName() == "Zoom Out") { mapCanvas.zoomOut(); + } else if(tool.getName() == "E-STOP") { + eStop(); } else if(tool.getName() == "Undock") { undock(); } else if(tool.getName() == "Cancel Task") { @@ -53,12 +55,23 @@ startSession(); ToggleButtonTool bt = (ToggleButtonTool)tool; bt.toggleState(); - ((JToggleButton)((JPanel)toolbar).getComponent(0)).setText(bt.getName()); + ((JToggleButton)((JPanel)toolbar).getComponent(bt.index)).setText(bt.getName()); } else if(tool.getName() == "Stop Session") { endSession(); ToggleButtonTool bt = (ToggleButtonTool)tool; bt.toggleState(); - ((JToggleButton)((JPanel)toolbar).getComponent(0)).setText(bt.getName()); + toolbar.validate(); + ((JToggleButton)((JPanel)toolbar).getComponent(bt.index)).setText(bt.getName()); + } else if(tool.getName() == "Pause") { + pauseRobot(); + ToggleButtonTool bt = (ToggleButtonTool)tool; + bt.toggleState(); + ((JToggleButton)((JPanel)toolbar).getComponent(bt.index)).setText(bt.getName()); + } else if(tool.getName() == "Continue") { + unpauseRobot(); + ToggleButtonTool bt = (ToggleButtonTool)tool; + bt.toggleState(); + ((JToggleButton)((JPanel)toolbar).getComponent(bt.index)).setText(bt.getName()); } } catch (NullPointerException e) {} } @@ -339,6 +352,12 @@ "Click to start speaking", "Stop Session", "Click to mute")); + t.addTool(new ToggleButtonTool(mapCanvas, + "Pause", + "Pause a robot", + "Continue", + "Unpause a robot")); + t.addTool(new ButtonTool(mapCanvas, "E-STOP", "Emergency Stop")); t.addTool(new PointTool(mapCanvas, "Select", "Click on a robot to select it.", @@ -446,6 +465,27 @@ } /** + * Send emergency stop to all robots + */ + public void eStop() { + for(PenDecoderServer server: servers) server.eStop(); + } + + /** + * Send a message to the dialog manager to pause a robot. + */ + public void pauseRobot() { + for(PenDecoderServer server: servers) server.pauseRobot(); + } + + /** + * Send a message to the dialog manage to unpause a robot. + */ + public void unpauseRobot() { + for(PenDecoderServer server: servers) server.unpauseRobot(); + } + + /** * Send a message to the dialog manager that the user has indicated a set of * waypoints along which to search. * @param shape A polyline to search along. Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java 2007-10-21 17:24:26 UTC (rev 855) @@ -42,7 +42,7 @@ public void serverOpReinitialize(GFrame f) { String botName = (String)f.getProperty(":user_id"); if(!botName.equals("TeamTalk")) { - botTracker.setBot(botName, 0, 0, 0); + botTracker.setBot(botName, 0, 0, 0, true); } } @@ -52,8 +52,9 @@ float x = 100*((Float)f.getProperty(":x")).floatValue(); float y = 100*((Float)f.getProperty(":y")).floatValue(); float r = ((Float)f.getProperty(":r")).floatValue(); + short error = f.getInt(":error").shortValue(); - botTracker.setBot(name, x, y, r); + botTracker.setBot(name, x, y, r, (error==0)); return (GFrame) null; } @@ -303,6 +304,23 @@ send_to_hub(f); } + public void eStop() { + System.err.println("estop..."); + sayToBot("Commands", "[HumanHaltCommand]", null); + } + + public void pauseRobot() { + System.err.println("Pausing..."); + //Map loc = new HashMap(); + sayToBot("Commands", "[HumanPauseCommand]", null); + } + + public void unpauseRobot() { + System.err.println("Unpausing..."); + //Map loc = new HashMap(); + sayToBot("Commands", "[HumanContinueCommand]", null); + } + public void say(String utt) { GFrame f = new Clause("main"); @@ -334,21 +352,22 @@ String parse = new String(); //constructing the nets + if(net == null) net = new HashMap(); Iterator> i = net.entrySet().iterator(); while(i.hasNext()) { - Map.Entry pair = i.next(); - GFrame gfNet = new Clause("net"); - gfNet.setProperty(":name", pair.getKey()); - gfNet.setProperty(":contents", pair.getValue()); - hyp += pair.getValue(); - parse += "( " + pair.getKey() + " ( " + pair.getValue() + " ) )"; - if(i.hasNext()) { - hyp += " "; - parse += " "; - } - pgoNets.addElement(gfNet); + Map.Entry pair = i.next(); + GFrame gfNet = new Clause("net"); + gfNet.setProperty(":name", pair.getKey()); + gfNet.setProperty(":contents", pair.getValue()); + hyp += pair.getValue(); + parse += "( " + pair.getKey() + " ( " + pair.getValue() + " ) )"; + if(i.hasNext()) { + hyp += " "; + parse += " "; + } + pgoNets.addElement(gfNet); } - + //then construct the encompassing slot gfSlot.setProperty(":nets", pgoNets); gfSlot.setProperty(":numnets", net.size()); Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/ToolKit.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/ToolKit.java 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/ToolKit.java 2007-10-21 17:24:26 UTC (rev 855) @@ -19,6 +19,7 @@ public int addTool(AbstractDecoderTool tool) { if (tool != null) { tools.add(tool); + tool.index = tools.size() - 1; return (tools.size() - 1); } return -1; Modified: trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp 2007-10-21 17:24:26 UTC (rev 855) @@ -35,7 +35,7 @@ ostringstream cmd, title; cmd << HUB << " -verbosity 3 -pgm_file " << cfilename; title << uppername << " Hub"; - debug << "sending to pythia: " << cmd.str() << endl; + debug("agent") << "sending to pythia: " << cmd.str() << endl; Pythia::Message(cmd.str(), title.str()).send("localhost"); } @@ -51,7 +51,7 @@ ostringstream cmd, title; cmd << HELIOS << " -port " << iHeliosPort << " -config " << cfilename; title << uppername << " Helios"; - debug << "sending to pythia: " << cmd.str() << endl; + debug("agent") << "sending to pythia: " << cmd.str() << endl; Pythia::Message(cmd.str(), title.str()).send("localhost"); } @@ -81,7 +81,7 @@ ostringstream cmd, title; cmd << DM << " -maxconns 6 -config " << cfilename; title << uppername << " DM"; - debug << "sending to pythia: " << cmd.str() << endl; + debug("agent") << "sending to pythia: " << cmd.str() << endl; Pythia::Message(cmd.str(), title.str()).send("localhost"); } @@ -134,6 +134,7 @@ Gal_SetProp(f, ":x", Gal_FloatObject((float)rloc->getX())); Gal_SetProp(f, ":y", Gal_FloatObject((float)rloc->getY())); Gal_SetProp(f, ":r", Gal_FloatObject((float)rloc->getAngle())); + Gal_SetProp(f, ":error", Gal_IntObject(rloc->getErrorState())); return f; } @@ -630,18 +631,18 @@ debug << '"' << token << '"' << endl; f_xcoord = static_cast(GetNumber999(token)); } - debug << "got x" << endl; + debug("agent") << "got x" << endl; issOrdinal >> token; if(token == "NEGATIVE") { - debug << "got negative y" << endl; + debug("agent") << "got negative y" << endl; issOrdinal >> token; - debug << '"' << token << '"' << endl; + debug("agent") << '"' << token << '"' << endl; f_ycoord = static_cast(-GetNumber999(token)); } else { - debug << '"' << token << '"' << endl; + debug("agent") << '"' << token << '"' << endl; f_ycoord = static_cast(GetNumber999(token)); } - debug << "got y" << endl; + debug("agent") << "got y" << endl; MsgCmdGoTo go(Point(f_xcoord, f_ycoord), true); #ifdef USE_TXT_COMMANDS sendAction(&go); @@ -655,7 +656,7 @@ void Agent::turn_command(const Gal_Frame& inframe) { - debug << "got turn command" << endl; + debug("agent") << "got turn command" << endl; string sDirection(Gal_GetString(inframe, ":direction")); bool bRel(false); double fRad; @@ -714,7 +715,7 @@ void Agent::set_pose_command(const Gal_Frame& inframe) { - debug << "got set pose command" << endl; + debug("agent") << "got set pose command" << endl; const char* x = Gal_GetString(inframe, ":x"); const char* y = Gal_GetString(inframe, ":y"); const char* a = Gal_GetString(inframe, ":angle"); @@ -731,11 +732,23 @@ return; } MsgCmdSetPos set_pos((float)atof(x), (float)atof(y), (float)atof(a)); - debug << "setpos (" << x << ' ' << y << ") " << a; + debug("agent") << "setpos (" << x << ' ' << y << ") " << a; sendAction(&set_pos); } +void Agent::pause_command() { + debug("agent") << "got pause command" << endl; + MsgCmdPause pause; + sendAction(&pause); +} + +void Agent::continue_command() { + debug("agent") << "got continue command" << endl; + MsgCmdResume resume; + sendAction(&resume); +} + string Agent::getName() const {return name_;} TeamTalk::RobotClient* Agent::getRobotClient() {return robotClient_;} const TeamTalk::RobotClient* Agent::getRobotClient() const {return robotClient_;} Modified: trunk/TeamTalk/Agents/TeamTalkBackend/agent.h =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/agent.h 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/TeamTalkBackend/agent.h 2007-10-21 17:24:26 UTC (rev 855) @@ -54,6 +54,8 @@ void move_to_goal_command(const Gal_Frame& inframe); void turn_command(const Gal_Frame& inframe); void set_pose_command(const Gal_Frame& inframe); + void pause_command(); + void continue_command(); //forming outgoing Galaxy Frames void writeFrame(Gal_Frame f) const; Modified: trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp 2007-10-21 17:24:26 UTC (rev 855) @@ -36,7 +36,7 @@ // [2006-07-14] (tk): this restarts sphinx for a newly created dict and lm void restartDecoder() { - debug << "sending restart_decoder" << endl; + debug("gal_be") << "sending restart_decoder" << endl; Gal_Frame gfInput = Gal_MakeFrame("restart_decoder", GAL_CLAUSE); galaxyRobots->writeFrameSkeletonHub(gfInput); }; @@ -73,8 +73,11 @@ void *init_server(Gal_Server *s, int argc, char **argv) { DebugStream::threashold_ = DebugStream::D; - debug.on("client"); - debug.on("packet"); + debug.off("client"); + debug.off("packet"); + debug.off("agent"); + debug.off("gal_be"); + debug.on("adapter"); srand((unsigned int)time(NULL)); @@ -93,13 +96,13 @@ const char *user_id = Gal_GetString(f, ":user_id"); if(!user_id) error << "no user_id" << endl; else if(!strcmp(user_id, "TeamTalk")) { - debug << "reinit: setting skeleton comm" << endl; + debug("gal_be") << "reinit: setting skeleton comm" << endl; galaxyRobots->setSkeletonComm(GalSS_EnvComm((GalSS_Environment*)server_data)); restartDecoder(); galaxyRobots->setRobotVoices(); } else { - debug << "reinit: adding robot" << endl; + debug("gal_be") << "reinit: adding robot" << endl; galaxyRobots->addRobot(user_id, GalSS_EnvComm((GalSS_Environment*)server_data)); } return f; @@ -115,7 +118,7 @@ return f; } - debug << "frame: " << f << endl; + debug("gal_be") << "frame: " << f << endl; char* s_inframe = Gal_StringValue(aStr); if(!s_inframe) { error << "couldn't get string value for inframe" << endl; @@ -137,14 +140,14 @@ inotfixed.getline(cpVal, 254); fixed << '"' << cpVal << "\" "; } while(inotfixed); - debug << "working with fixed version: " << fixed.str() << endl; + debug("gal_be") << "working with fixed version: " << fixed.str() << endl; Gal_Frame inframe = Gal_ReadFrameFromString(fixed.str().c_str()); if(!inframe) { error << "couldn't find :inframe" << endl; return f; } - debug << inframe << endl; + debug("gal_be") << inframe << endl; galaxyRobots->processGalaxyMessage(inframe); Gal_SetProp(inframe, ":outframe", aStr); Modified: trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp 2007-10-21 17:24:26 UTC (rev 855) @@ -8,9 +8,9 @@ vector GalaxyRobots::processPeerfile(const string& fname) { vector names; - debug << "about to add robots" << endl; + debug("adapter") << "about to add robots" << endl; ifstream Frobotips(fname.c_str()); - if(!Frobotips) error << "problem opening " << fname << endl; + if(!Frobotips) error("adapter") << "problem opening " << fname << endl; string rname; while(Frobotips >> rname) { if(rname.at(0) == '#') { @@ -57,7 +57,7 @@ void GalaxyRobots::addRobotNamesToGrammar(const vector& names) { - debug << "adding robot names to grammar:"; + debug("adapter") << "adding robot names to grammar:"; ofstream namefile("..\\..\\Resources\\Grammar\\TeamTalkRobots"); for(vector::const_iterator i = names.begin(); i != names.end(); i++) { namefile << tolower(*i) << endl; @@ -84,14 +84,14 @@ Gal_Frame f = Gal_MakeFrame("trader_message", GAL_CLAUSE); if(msg->hdr.type == Boeing::INFO) { Gal_SetProp(f, ":type", Gal_StringObject("info")); - debug << "got info message: " << msg->info.task << endl; + debug("adapter") << "got info message: " << msg->info.task << endl; istringstream input(msg->info.task); string token; string ip; string object; float x, y; input >> token; - debug << "got info token " << token << endl; + debug("adapter") << "got info token " << token << endl; if(token != "object") { ip = token; input >> token; @@ -101,29 +101,33 @@ } } input >> object; - debug << "got info object " << object << endl; + debug("adapter") << "got info object " << object << endl; input >> token; - debug << "got info token " << token << endl; + debug("adapter") << "got info token " << token << endl; if(token != "at") { error << "was expecting 'at'" << endl; continue; } input >> token; - debug << "got info token " << token << endl; + debug("adapter") << "got info token " << token << endl; if(token.empty() || token.at(0) != '(') { error << "was expecting (..." << endl; continue; } if(token == "(") { input >> token; - debug << "got info token " << token << endl; - x = (float)atof(token.c_str()); + debug("adapter") << "got info token " << token << endl; + if(!token.empty() && token.at(0) == '(') { + x = (float)atof(token.c_str()+1); + } else { + x = (float)atof(token.c_str()); + } } else { x = (float)atof(token.c_str()+1); } - debug << "got info x: " << x << endl; + debug("adapter") << "got info x: " << x << endl; input >> token; - debug << "got info token " << token << endl; + debug("adapter") << "got info token " << token << endl; if(token.empty()) { error << "was expecting ...)" << endl; continue; @@ -138,12 +142,12 @@ } else if(msg->hdr.type == Boeing::TASK_ACK) { Gal_SetProp(f, ":type", Gal_StringObject("ack")); Gal_SetProp(f, ":taskid", Gal_IntObject(msg->ack.taskid)); - debug << "got task ack: " << msg->ack.taskid << endl; + debug("adapter") << "got task ack: " << msg->ack.taskid << endl; } else if(msg->hdr.type == Boeing::TASK_DONE) { Gal_SetProp(f, ":type", Gal_StringObject("done")); Gal_SetProp(f, ":taskid", Gal_IntObject(msg->done.taskid)); Gal_SetProp(f, ":status", Gal_IntObject(msg->done.status)); - debug << "got task done: " << msg->done.taskid << ' ' << msg->done.status << endl; + debug("adapter") << "got task done: " << msg->done.taskid << ' ' << msg->done.status << endl; } else { warn << "unknown message type '" << msg->hdr.type << "' in traderlistener" << endl; Gal_FreeFrame(f); @@ -196,7 +200,7 @@ Gal_SetProp(f, ":resolution", Gal_IntObject(msg->map.resolution)); int *temp = new int[msg->map.array_length]; for(int i=0; imap.array_length; i++) temp[i] = msg->map.map[i]; - debug << "got raw: " << temp[0] + debug("adapter") << "got raw: " << temp[0] << " rl: " << ((temp[0]&0xFFFFFF00)>>8) << " rv: " << (temp[0]&0x000000FF) << endl; Gal_SetProp(f, ":encoded_map", @@ -210,7 +214,7 @@ { GalaxyRobots* me = (GalaxyRobots*)thisp; Boeing::MapClient* m_client = me->m_client; - debug << "starting trackmap thread" << endl; + debug("adapter") << "starting trackmap thread" << endl; for(int t=0; true; t++) { Sleep(1000); if(!(t%3)) { //send map keepalive every 3 seconds @@ -221,7 +225,7 @@ void GalaxyRobots::writeFrameAllHubs(Gal_Frame f) { - debug << "writing to all hubs" << endl; + debug("adapter") << "writing to all hubs" << endl; for(set::iterator i = agents_.begin(); i != agents_.end(); i++) { i->writeFrame(f); } @@ -246,7 +250,7 @@ iTraderTaskId = rand(); - debug << "about to get the p_client" << endl; + debug("adapter") << "about to get the p_client" << endl; try { t_client = new Boeing::TraderClient(); m_client = new Boeing::MapClient(); @@ -270,7 +274,7 @@ if(!t_client->isConnected()) { fatal << "optraderserver not found" << endl; } else { - debug << "connected to trader" << endl; + debug("adapter") << "connected to trader" << endl; //start listening threads _beginthread(traderlistener, 0, (void*) this); } @@ -295,12 +299,12 @@ void GalaxyRobots::setRobotVoices() { - debug << "attempting to set robot voices" << endl; + debug("adapter") << "attempting to set robot voices" << endl; for(TeamTalk::RobotsClient::const_iterator i = r_client->begin(); i != r_client->end(); i++) { string name(toupper((*i)->getName())); string voice(toupper((*i)->getVoice())); - debug << "adding voice " << voice << " to name " << name << endl; + debug("adapter") << "adding voice " << voice << " to name " << name << endl; SendRobotConfigMessage(name, voice); } } @@ -341,7 +345,7 @@ Gal_Frame f = Agent::galaxyFrame(m); char *frame_name = Gal_FrameName(f); if(frame_name != NULL && strcmp(frame_name, "robot_message")) { - debug << "sending to skeleton hub: " << m->render() << endl; + debug("adapter") << "sending to skeleton hub: " << m->render() << endl; writeFrameSkeletonHub(f); Gal_FreeFrame(f); } @@ -349,7 +353,7 @@ void GalaxyRobots::halt_command() { - debug << "sending halt query to backend" << endl; + debug("adapter") << "sending halt query to backend" << endl; for(set::iterator i = agents_.begin(); i != agents_.end(); i++) { i->halt_command(); } @@ -358,9 +362,9 @@ void GalaxyRobots::search_or_explore(const char* query, const Gal_Frame& inframe) { if(!strcmp(query, "search_command")) { - debug << "sending search command to backend" << endl; + debug("adapter") << "sending search command to backend" << endl; } else { - debug << "sending explore command to backend" << endl; + debug("adapter") << "sending explore command to backend" << endl; } geometry::Polygon polygon; ostringstream search; @@ -389,7 +393,7 @@ void GalaxyRobots::cancel_task(const Gal_Frame& inframe) { - debug << "sending cancel task to backend" << endl; + debug("adapter") << "sending cancel task to backend" << endl; const char* s = Gal_GetString(inframe, ":taskid"); if(!s) { error << "no taskid for cancel command" << endl; @@ -413,13 +417,13 @@ return; } - debug << "query is " << query << endl; + debug("adapter") << "query is " << query << endl; if(!robot) { error << "there is no robot" << endl; return; } - debug << "robot is " << robot << endl; + debug("adapter") << "robot is " << robot << endl; Agent* agent = find(robot); if(!agent) { error << "cannot find client for robot: " << robot << endl; @@ -445,6 +449,10 @@ agent->set_pose_command(inframe); else if(!strcmp(query, "cancel_task")) cancel_task(inframe); + else if(!strcmp(query, "pause_command")) + agent->pause_command(); + else if(!strcmp(query, "continue_command")) + agent->continue_command(); else error << "unhandled query: " << query << endl; } Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm =================================================================== --- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm 2007-10-21 17:24:26 UTC (rev 855) @@ -12,14 +12,6 @@ ;; ------------------------------------------------- ;; ------------------------------------------------- -;; The tty-sphinx server handles keyboard input -;; ------------------------------------------------- - -;;SERVER: tty-sphinx at localhost:11001 -;;OPERATIONS: speak process_parse -;;INIT: :greeting "Welcome to the %%DialogManager%%!" - -;; ------------------------------------------------- ;; The sphinx server handles decoding speech ;; ------------------------------------------------- @@ -178,10 +170,6 @@ OUT: :parse :input_features LOG_OUT: :parse :input_features -;;RULE: :parse --> tty-sphinx.process_parse -;;IN: :parse :input_features -;;OUT: - RULE: :parse --> PenDecoder.process_parse IN: :parse :input_features OUT: @@ -198,13 +186,6 @@ OUT: ;; Handle any :speaktext keywords by sending to -;; tty-sphinx also -;;RULE: :speaktext --> tty-sphinx.speak -;;LOG_IN: :tty-phrase -;;IN: (:tty-phrase :speaktext) :interruptable :id -;;OUT: - -;; Handle any :speaktext keywords by sending to ;; PenDecoder also RULE: :speaktext --> PenDecoder.speak LOG_IN: :tty-phrase @@ -226,12 +207,8 @@ PROGRAM: robot_message -;;RULE: :goal | --> PenDecoder.speak -;;IN: :robot_name :speaktext -;;OUT: - RULE: :type = "location" --> PenDecoder.set_bot -IN: :robot_name :x :y :r +IN: :robot_name :x :y :r :error OUT: RULE: :type = "goal" --> PenDecoder.set_goal Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp 2007-10-21 17:24:26 UTC (rev 855) @@ -30,7 +30,7 @@ bool RobotClient::connect() { - debug << "opening " << robot_.loc << ':' << robot_.port << endl; + debug("client") << "opening " << robot_.loc << ':' << robot_.port << endl; return open(robot_.loc.c_str(), robot_.port) != 0; } @@ -54,10 +54,10 @@ #endif { RobotClient* me = (RobotClient*)thisp; - debug << "starting trackbots thread" << endl; + debug("client") << "starting trackbots thread" << endl; for(int t=0; true; t++) { Sleep(1000); - debug << "sending location request" << endl; + debug("client") << "sending location request" << endl; if(!me->sendReqLocation()) { //maybe we're not connected anymore, try to connect warn << "we appear to be disconnected...trying to reconnect" << endl; Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-21 17:24:26 UTC (rev 855) @@ -359,6 +359,7 @@ // MsgCmdPause ******************************************************** //normal instantiation +MsgCmdPause::MsgCmdPause() : MsgCmd() {} MsgCmdPause::MsgCmdPause(int priority, string sender) : MsgCmd(priority, sender) {} //instantiation from a Boeing packet @@ -370,13 +371,14 @@ // MsgCmdResume ******************************************************* //normal instantiation +MsgCmdResume::MsgCmdResume() : MsgCmd() {} MsgCmdResume::MsgCmdResume(int priority, string sender) : MsgCmd(priority, sender) {} //instantiation from a Boeing packet MsgCmdResume::MsgCmdResume(string sender, double tstamp, int priority, int taskID, string action) : MsgCmd(sender, tstamp, priority, taskID) {} -string MsgCmdResume::renderBoeingPlayAction() const {return "resum,e";} +string MsgCmdResume::renderBoeingPlayAction() const {return "resume";} // MsgCmdFollow ******************************************************* @@ -573,7 +575,7 @@ float MsgRobLocation::getY() const {return loc_.y;} float MsgRobLocation::getAngle() const {return angle_;} bool MsgRobLocation::isMoving() const {return moving_;} -short MsgRobLocation::getErrorState() const {return error_state_;} +int MsgRobLocation::getErrorState() const {return error_state_;} bool MsgRobLocation::operator==(const MsgRobLocation& x) const { return (loc_-x.loc_).length() <= tolerance && Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-21 17:24:26 UTC (rev 855) @@ -177,6 +177,7 @@ class MsgCmdPause : public MsgCmd { public: //normal instantiation + MsgCmdPause(); MsgCmdPause(int priority, string sender=string()); //instantiation from a Boeing packet MsgCmdPause(string sender, double tstamp, int priority, int taskID, string action); @@ -186,6 +187,7 @@ class MsgCmdResume : public MsgCmd { public: //normal instantiation + MsgCmdResume(); MsgCmdResume(int priority, string sender=string()); //instantiation from a Boeing packet MsgCmdResume(string sender, double tstamp, int priority, int taskID, string action); @@ -289,7 +291,7 @@ float getY() const; float getAngle() const; bool isMoving() const; - short getErrorState() const; + int getErrorState() const; bool operator==(const MsgRobLocation& x) const; bool operator!=(const MsgRobLocation& x) const; string render() const; Modified: trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra =================================================================== --- trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-19 17:53:19 UTC (rev 854) +++ trunk/TeamTalk/Resources/Grammar/GRAMMAR/TeamTalkTask.gra 2007-10-21 17:24:26 UTC (rev 855) @@ -92,7 +92,7 @@ [HumanHaltCommand] (*[RobotName] all stop) - (*[RobotName] stop immediately) + (*[RobotName] stop *immediately) ; [Number-180-by5] From tk at edam.speech.cs.cmu.edu Sun Oct 21 23:45:43 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Sun, 21 Oct 2007 23:45:43 -0400 Subject: [TeamTalk 320]: [856] trunk/TeamTalk: 1) Bot uncertainty on the PenDecoder is now controlled through API calls rather than computed internally . Message-ID: <200710220345.l9M3jhFQ015292@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071021/8d695725/attachment-0001.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotShape.java 2007-10-22 03:45:42 UTC (rev 856) @@ -24,7 +24,8 @@ /** * this is the iconification of the uncertainty ring, placed on the map */ - protected java.awt.Shape placedUncertaintyRing; + protected java.awt.Shape placedUncertaintyRing = new java.awt.geom.Ellipse2D.Float(); + protected java.awt.Shape uncertaintyRing = new java.awt.geom.Ellipse2D.Float(); /** * the current transparency value for the bot @@ -59,9 +60,11 @@ protected TaskStatus goal_status; /** - * certainly boolean + * certainly range is the radius of a circle that we are certain the bot is inside + * (in centimeters) */ - protected boolean certainty = true; + protected int certainty_range = 0; + protected static final int certainty_threshold = 50; /** * last known good position and orientation of robot (in centimeters and radians) @@ -70,16 +73,6 @@ */ protected float lkgx, lkgy, lkgr; - /** - * amount of turning since last placement (in radians) - */ - protected float odometry_turns; - - /** - * distance traveled since last placement (in centimeters) - */ - protected float odometry_distance; - protected static Color unselected_color = Color.RED; protected static Color selected_color = Color.YELLOW; protected static Color failed_color = Color.WHITE; @@ -142,10 +135,8 @@ placedDot = move.createTransformedShape(dot); //reset the placed uncertainty ring - odometry_distance = 0F; - odometry_turns = 0F; alpha = 1F; - java.awt.Shape uncertaintyRing = new java.awt.geom.Ellipse2D.Float(); + uncertaintyRing = new java.awt.geom.Ellipse2D.Float(); placedUncertaintyRing = move.createTransformedShape(uncertaintyRing); //reset goal @@ -156,13 +147,19 @@ } /** - * set certainty + * set certainty (in centimeters) */ - public boolean setCertainty(boolean certainty) { - if(!certainty) System.err.println("uncertain robot location"); - boolean what_was = certainty; - certainty = this.certainty; - return what_was; + public void setCertainty(int certainty) { + if(certainty > certainty_threshold) + System.err.println("uncertain robot location"); + certainty_range = certainty; + java.awt.Shape uncertaintyRing = + new java.awt.geom.Ellipse2D.Float(-certainty_range,-certainty_range, + certainty_range, certainty_range); + + //set transparency of the bot and label based on the placement confidence + alpha = certainty_range > 1000? 0: 1F-certainty_range/1000F; + composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha); } /** @@ -198,7 +195,10 @@ } //draw uncertainty ring - //g.draw(placedUncertaintyRing); + if(certainty_range > certainty_threshold) { + System.err.println("drawing uncertainty ring, size: " + certainty_range); + g.draw(placedUncertaintyRing); + } //set composite Composite originalComposite = g.getComposite(); @@ -220,7 +220,8 @@ } else { g.setColor(unselected_color); } - if(!certainty) g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F)); + if(certainty_range > certainty_threshold) + g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F)); g.fill(arrow); } @@ -245,7 +246,7 @@ myG.scale(at.getScaleX(), at.getScaleY()); //recover screen's scale, i.e. don't zoom text //draw the label background - if(!certainty) myG.setFont(uncertainFont); + if(certainty_range > certainty_threshold) myG.setFont(uncertainFont); Rectangle2D labelBackground = myG.getFontMetrics().getStringBounds(name, myG); myG.setColor(labelBackgroundColor); myG.fill(labelBackground); @@ -292,37 +293,18 @@ */ public void setLocation(float x, float y, float rad) { if(this.x != x || this.y != y || this.rad != rad) { - odometry_distance += Math.sqrt((x-this.x)*(x-this.x)+(y-this.y)*(y-this.y)); - odometry_turns += Math.abs(arcDiff(this.rad, rad)); //set new x and y and place icon this.x = x; this.y = y; this.rad = rad; - if(alpha > 0.01) { + AffineTransform move = new AffineTransform(placement); + if(certainty_range <= certainty_threshold) { lkgx = x; lkgy = y; lkgr = rad; } - AffineTransform move = new AffineTransform(placement); move.translate(lkgx,lkgy); move.rotate(lkgr); placedIcon = move.createTransformedShape(icon); placedDot = move.createTransformedShape(dot); - - //model placement confidence at a ring around the bot - float turn_uncertainty = odometry_turns/5000; - float distance_uncertainty; - if(turn_uncertainty >= (float)Math.PI) { - distance_uncertainty = Float.MAX_VALUE; - } else { - distance_uncertainty = 2*odometry_distance*(float)Math.tan(turn_uncertainty/2); - } - java.awt.Shape uncertaintyRing = - new java.awt.geom.Ellipse2D.Float( - -(int)distance_uncertainty,-(int)distance_uncertainty, - (int)(distance_uncertainty*2), (int)(distance_uncertainty*2)); placedUncertaintyRing = move.createTransformedShape(uncertaintyRing); - - //set transparency of the bot and label based on the placement confidence - alpha = distance_uncertainty > 1000? 0: 1F-distance_uncertainty/1000F; - composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha); } } Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/BotTracker.java 2007-10-22 03:45:42 UTC (rev 856) @@ -6,6 +6,7 @@ public class BotTracker { protected MapCanvas canvas; protected final static int size = 3; + protected static int treasureNum = 0; protected HashMap bots = new HashMap(); protected HashMap names = new HashMap(); @@ -17,13 +18,16 @@ public boolean setObject(String name, float x, float y) { name.toUpperCase(); //names are always case insensitive boolean obj_created = false; + //name is a class, assume for now that each update is a new instance of that + //class + name += treasureNum++; ObjShape obj = getObj(name); obj.setLocation(x, y); canvas.repaint(); return obj_created; } - public boolean setBot(String name, float x, float y, float r, boolean certainty) { + public boolean setBot(String name, float x, float y, float r, int certainty) { name.toUpperCase(); //names are always case insensitive boolean bot_created = false; BotShape bot = getBot(name); Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderDisplay.java 2007-10-22 03:45:42 UTC (rev 856) @@ -347,30 +347,28 @@ */ protected ToolKit createToolkit() { ToolKit t = new ToolKit(); + + //stopping control + t.addTool(new ButtonTool(mapCanvas, "E-STOP", "Emergency Stop")); + t.addTool(new ButtonTool(mapCanvas, "Cancel Task", "Cancel the last task.")); t.addTool(new ToggleButtonTool(mapCanvas, - "Start Session", - "Click to start speaking", - "Stop Session", - "Click to mute")); - t.addTool(new ToggleButtonTool(mapCanvas, "Pause", "Pause a robot", "Continue", "Unpause a robot")); - t.addTool(new ButtonTool(mapCanvas, "E-STOP", "Emergency Stop")); + + //select t.addTool(new PointTool(mapCanvas, "Select", "Click on a robot to select it.", PointTool.POINT)); + + //reposition t.addTool(new PlacementTool(mapCanvas, "Re-position", "Click to reposition the selected robot. Drag to orient it at the new position.")); - t.addTool(new PointTool(mapCanvas, - "Zoom In", - "Click to zoom into a point on the map.", - PointTool.ZOOMIN)); - t.addTool(new ButtonTool(mapCanvas, "Zoom Out", "Zoom out to see the entire map.")); - t.addTool(new ButtonTool(mapCanvas, "Cancel Task", "Cancel the last task.")); + + //issue commands t.addTool(new NPointTool(mapCanvas, "Search", "Select waypoints along which to search.", @@ -379,6 +377,18 @@ "Explore", "Select waypoints along which to explore.", NPointTool.POLYLINE_EXPLORE)); + + //manage session and gui + t.addTool(new ToggleButtonTool(mapCanvas, + "Start Session", + "Click to start speaking", + "Stop Session", + "Click to mute")); + t.addTool(new PointTool(mapCanvas, + "Zoom In", + "Click to zoom into a point on the map.", + PointTool.ZOOMIN)); + t.addTool(new ButtonTool(mapCanvas, "Zoom Out", "Zoom out to see the entire map.")); t.addTool(new ButtonTool(mapCanvas, "Undock", "Click to undock application components.")); return t; } Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/PenDecoderServer.java 2007-10-22 03:45:42 UTC (rev 856) @@ -42,7 +42,7 @@ public void serverOpReinitialize(GFrame f) { String botName = (String)f.getProperty(":user_id"); if(!botName.equals("TeamTalk")) { - botTracker.setBot(botName, 0, 0, 0, true); + botTracker.setBot(botName, 0, 0, 0, 0); } } @@ -53,8 +53,8 @@ float y = 100*((Float)f.getProperty(":y")).floatValue(); float r = ((Float)f.getProperty(":r")).floatValue(); short error = f.getInt(":error").shortValue(); - - botTracker.setBot(name, x, y, r, (error==0)); + if(error == 0) botTracker.setBot(name, x, y, r, 0); + else botTracker.setBot(name, x, y, r, 100); return (GFrame) null; } Modified: trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/TeamTalkBackend/agent.cpp 2007-10-22 03:45:42 UTC (rev 856) @@ -49,7 +49,7 @@ string cfilename = writeSpecializedConfig("helios", "cfg", subs, uppername); ostringstream cmd, title; - cmd << HELIOS << " -port " << iHeliosPort << " -config " << cfilename; + cmd << HELIOS << " -maxconns 6 -port " << iHeliosPort << " -config " << cfilename; title << uppername << " Helios"; debug("agent") << "sending to pythia: " << cmd.str() << endl; Pythia::Message(cmd.str(), title.str()).send("localhost"); @@ -256,6 +256,8 @@ const MsgRobLocation *rloc = dynamic_cast(m); if(rloc != NULL) { if(location_ == *rloc) return; + if(location_.getErrorState() != rloc->getErrorState()) + SendErrorStatusToDM(rloc->getErrorState()); location_ = *rloc; } const MsgCmdGoTo *move = dynamic_cast(m); @@ -264,7 +266,7 @@ if(done != NULL) { vector::iterator i = findMsgById(done->getTaskID()); if(i == commitments_.end()) { - error << "Can't fine msg with taskid: " << done->getTaskID() << endl; + error("agent") << "Can't fine msg with taskid: " << done->getTaskID() << endl; return; } else { (*i)->setStatus(done); @@ -383,6 +385,12 @@ free(pgoNets); } +void Agent::SendErrorStatusToDM(int error) const { + string error_report = (error? "I am experiencing an error condition. Please help.": + "All systems are OK."); + SendMessageToDM("ERROR", error_report); +} + void Agent::SendMoveStatusToDM(const MsgCmdGoTo* move) const { ostringstream move_report; if(move->useAngle()) { @@ -463,7 +471,7 @@ string s_units(Gal_GetString(inframe, ":units")); string s_direction(Gal_GetString(inframe, ":direction")); if(!(s_distance.empty() && s_direction.empty())) { - error << "distance or direction missing" << endl; + error("agent") << "distance or direction missing" << endl; } else { Point vec(static_cast(GetNumber999(s_distance)), 0); if(!s_distance.empty()) { @@ -501,7 +509,7 @@ #endif delete go; } else - error << "unknown direction " << s_direction << endl; + error("agent") << "unknown direction " << s_direction << endl; } } } @@ -519,7 +527,7 @@ if (Gal_GetString(inframe, ":units")) s_units = Gal_GetString(inframe, ":units"); if(s_distance.empty() || s_direction.empty()) { - error << "distance or direction missing" << endl; + error("agent") << "distance or direction missing" << endl; } else { if(!s_distance.empty()) { Point vec(static_cast(GetNumber999(s_distance)), 0); @@ -555,7 +563,7 @@ #endif delete go; } else - error << "unknown direction " << s_direction << endl; + error("agent") << "unknown direction " << s_direction << endl; } } } @@ -575,7 +583,7 @@ debug << "sending follow command to backend" << endl; string followee = Gal_GetString(inframe, ":followee"); if(followee.empty()) { - error << "no followee" << endl; + error("agent") << "no followee" << endl; } else { MsgCmdFollow follow; #ifdef USE_TXT_COMMANDS @@ -597,22 +605,22 @@ robotClient_->sendHome(home.getPriority(), home.getTaskID()); //p_client->sendPacket(robot, MsgCmdHome()); } else if(sRelDist == "2") { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } else if(sRelDist == "3") { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } else if(sRelDist == "4") { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } else if(sRelDist == "5") { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } else if(sRelDist == "6") { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } else { - error << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; + error("agent") << "relative to goal '" << sRelDist << '\'' << " not understood" << endl; return; } } else { @@ -700,7 +708,7 @@ bRel = true; fRad = PI; } else { - error << "unknown direction " << sDirection << endl; + error("agent") << "unknown direction " << sDirection << endl; return; } MsgCmdGoTo turn((float)fRad); @@ -720,15 +728,15 @@ const char* y = Gal_GetString(inframe, ":y"); const char* a = Gal_GetString(inframe, ":angle"); if(!x) { - error << "x is null" << endl; + error("agent") << "x is null" << endl; return; } if(!y) { - error << "y is null" << endl; + error("agent") << "y is null" << endl; return; } if(!a) { - error << "angle is null" << endl; + error("agent") << "angle is null" << endl; return; } MsgCmdSetPos set_pos((float)atof(x), (float)atof(y), (float)atof(a)); Modified: trunk/TeamTalk/Agents/TeamTalkBackend/agent.h =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/agent.h 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/TeamTalkBackend/agent.h 2007-10-22 03:45:42 UTC (rev 856) @@ -71,6 +71,7 @@ const map& sMessages) const; void SendMoveStatusToDM(const MsgCmdGoTo* move) const; + void SendErrorStatusToDM(int error) const; //processing incoming TeamTalk messages void processMessage(const Msg* m); Modified: trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/TeamTalkBackend/gal_be.cpp 2007-10-22 03:45:42 UTC (rev 856) @@ -94,7 +94,7 @@ Gal_Frame reinitialize(Gal_Frame f, void *server_data) { const char *user_id = Gal_GetString(f, ":user_id"); - if(!user_id) error << "no user_id" << endl; + if(!user_id) error("gal_be") << "no user_id" << endl; else if(!strcmp(user_id, "TeamTalk")) { debug("gal_be") << "reinit: setting skeleton comm" << endl; galaxyRobots->setSkeletonComm(GalSS_EnvComm((GalSS_Environment*)server_data)); @@ -114,14 +114,14 @@ aStr = Gal_GetObject(f, ":inframe"); if (!aStr) { - error << "couldn't get string value of :inframe" << endl; + error("gal_be") << "couldn't get string value of :inframe" << endl; return f; } debug("gal_be") << "frame: " << f << endl; char* s_inframe = Gal_StringValue(aStr); if(!s_inframe) { - error << "couldn't get string value for inframe" << endl; + error("gal_be") << "couldn't get string value for inframe" << endl; return f; } @@ -143,7 +143,7 @@ debug("gal_be") << "working with fixed version: " << fixed.str() << endl; Gal_Frame inframe = Gal_ReadFrameFromString(fixed.str().c_str()); if(!inframe) { - error << "couldn't find :inframe" << endl; + error("gal_be") << "couldn't find :inframe" << endl; return f; } Modified: trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/TeamTalkBackend/robot-galaxy_adapter.cpp 2007-10-22 03:45:42 UTC (rev 856) @@ -42,14 +42,14 @@ ignoreToEndOfLine(Frobotips); info << "adding robot@" << rip << ':' << port << ' ' << voice << ' ' << safeness << endl; if(!r_client->addRobot(rname, rip, voice, safeness, port, this)) { - error << "couldn't add " << rname << endl; + error("adapter") << "couldn't add " << rname << endl; } else { names.push_back(rname); } } } catch(TeamTalk::RobotClientException e) { - error << "unable to add robot " << rname << '(' << rip << ')' << endl; - error << e.what() << endl; + error("adapter") << "unable to add robot " << rname << '(' << rip << ')' << endl; + error("adapter") << e.what() << endl; } } return names; @@ -96,7 +96,7 @@ ip = token; input >> token; if(token != "object") { - error << "was expecting 'object'" << endl; + error("adapter") << "was expecting 'object'" << endl; continue; } } @@ -105,13 +105,13 @@ input >> token; debug("adapter") << "got info token " << token << endl; if(token != "at") { - error << "was expecting 'at'" << endl; + error("adapter") << "was expecting 'at'" << endl; continue; } input >> token; debug("adapter") << "got info token " << token << endl; if(token.empty() || token.at(0) != '(') { - error << "was expecting (..." << endl; + error("adapter") << "was expecting (..." << endl; continue; } if(token == "(") { @@ -129,7 +129,7 @@ input >> token; debug("adapter") << "got info token " << token << endl; if(token.empty()) { - error << "was expecting ...)" << endl; + error("adapter") << "was expecting ...)" << endl; continue; } else if(token.at(token.length()-1) != ')') { token.resize(token.length()-1); @@ -177,7 +177,7 @@ Gal_SetProp(f, ":type", Gal_StringObject("diff")); break; default: - error << "unknown message type '" << msg->hdr.type << "' in maplistener" << endl; + error("adapter") << "unknown message type '" << msg->hdr.type << "' in maplistener" << endl; Gal_FreeFrame(f); continue; } @@ -189,7 +189,7 @@ Gal_SetProp(f, ":order", Gal_StringObject("X_MAJOR")); break; default: - error << "unhandled order: " << msg->map.encoding << endl; + error("adapter") << "unhandled order: " << msg->map.encoding << endl; Gal_FreeFrame(f); continue; } @@ -239,7 +239,7 @@ GalIO_CommWriteFrame(skeleton_comm_, f, GAL_FALSE); return; } - error << "skeleton unavailable" << endl; + error("adapter") << "skeleton unavailable" << endl; Sleep(1000); } }; @@ -326,7 +326,7 @@ void GalaxyRobots::addRobot(const string& name, GalIO_CommStruct* comm) { TeamTalk::RobotClient *robotClient = r_client->find(name); - if(!robotClient) error << "Couldn't find robotclient for: " << name << endl; + if(!robotClient) error("adapter") << "Couldn't find robotclient for: " << name << endl; else agents_.insert(Agent(robotClient, comm)); } @@ -334,11 +334,10 @@ { Agent* agent = find(m->getSender()); if(agent == NULL) { - error << "agent not found for: " << m->getSender() << endl; - error << "agents are: "; + error("adapter") << "agent not found for: " << m->getSender() << endl; + error("adapter") << "agents are: "; for(set::const_iterator i = agents_.begin(); i != agents_.end(); i++) - error << '"' << i->getName() << "\" "; - error << endl; + error("adapter") << '"' << i->getName() << "\" " << endl; return; } agent->processMessage(m); @@ -396,13 +395,13 @@ debug("adapter") << "sending cancel task to backend" << endl; const char* s = Gal_GetString(inframe, ":taskid"); if(!s) { - error << "no taskid for cancel command" << endl; + error("adapter") << "no taskid for cancel command" << endl; return; } istringstream in(s); int taskid; if((in >> taskid).fail()) { - error << "couldn't parse taskid: " << s << endl; + error("adapter") << "couldn't parse taskid: " << s << endl; return; } t_client->sendCancel(taskid); @@ -413,20 +412,20 @@ char* query = Gal_GetString(inframe, ":query"); char* robot = Gal_GetString(inframe, ":robot_name"); if(!query) { - error << "there is no query" << endl; + error("adapter") << "there is no query" << endl; return; } debug("adapter") << "query is " << query << endl; if(!robot) { - error << "there is no robot" << endl; + error("adapter") << "there is no robot" << endl; return; } debug("adapter") << "robot is " << robot << endl; Agent* agent = find(robot); if(!agent) { - error << "cannot find client for robot: " << robot << endl; + error("adapter") << "cannot find client for robot: " << robot << endl; return; } if(!strcmp(query, "location_query")) @@ -453,7 +452,7 @@ agent->pause_command(); else if(!strcmp(query, "continue_command")) agent->continue_command(); - else error << "unhandled query: " << query << endl; + else error("adapter") << "unhandled query: " << query << endl; } Agent* GalaxyRobots::find(const string& name) { Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp =================================================================== --- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-22 03:45:42 UTC (rev 856) @@ -308,6 +308,7 @@ BOOL_USER_CONCEPT(report_location_command_issued, "") STRING_SYSTEM_CONCEPT(location_report) STRING_SYSTEM_CONCEPT(move_report) + STRING_SYSTEM_CONCEPT(error_report) BOOL_USER_CONCEPT(move_cardinal_command_issued, "") BOOL_USER_CONCEPT(move_relative_command_issued, "") BOOL_USER_CONCEPT(move_to_goal_command_issued, "") @@ -333,6 +334,7 @@ SUBAGENT(Explore, CExplore, "") SUBAGENT(CommandMoveRelative, CCommandMoveRelative, "") SUBAGENT(ReportMove, CReportMove, "") + SUBAGENT(ReportError, CReportError, "") SUBAGENT(Halt, CHalt, "") SUBAGENT(Follow, CFollow, "") SUBAGENT(Pause, CPause, "") @@ -340,6 +342,7 @@ SUBAGENT(Turn, CTurn, "") SUBAGENT(SetPose, CSetPose, "") SUBAGENT(CancelTask, CCancelTask, "") + //SUBAGENT(RetrieveTreasure, CRetrieveTreasure, "") SUBAGENT(ExpectCancel, CExpectCancel, "") SUBAGENT(AllDoneDummy, CAllDoneDummy, "") ) @@ -606,6 +609,37 @@ ) //----------------------------------------------------------------------------- +// /TeamTalk/Task/ReportError +//----------------------------------------------------------------------------- +DEFINE_AGENCY(CReportError, + PRECONDITION(UPDATED(error_report) && + (*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") || + *C("current_addressee").CreateMergedHistoryConcept() == C("everyone"))) + DEFINE_SUBAGENTS( + SUBAGENT(ExpectReportError, CExpectReportError, "") + SUBAGENT(InformError, CInformError, "") + ) +) + +//----------------------------------------------------------------------------- +// /TeamTalk/Task/ReportError/ExpectReportError +//----------------------------------------------------------------------------- +DEFINE_EXPECT_AGENT(CExpectReportError, + EXPECT_CONCEPT(error_report) + EXPECT_WHEN( + (*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") || + *C("current_addressee").CreateMergedHistoryConcept() == C("everyone"))) + GRAMMAR_MAPPING("[RobotMessage.Error]") +) + +//----------------------------------------------------------------------------- +// /TeamTalk/Task/ReportError/InformError +//----------------------------------------------------------------------------- +DEFINE_INFORM_AGENT(CInformError, + PROMPT("inform report_error_status ["This is . ", " here. "], + # error report + "report_error_status" => ["This is . ", + " here. "], + # verbal reaction to search command "report_search" => "I am organizing a search party for the specified area.", Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp =================================================================== --- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-21 17:24:26 UTC (rev 855) +++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-22 03:45:42 UTC (rev 856) @@ -579,12 +579,14 @@ bool MsgRobLocation::operator==(const MsgRobLocation& x) const { return (loc_-x.loc_).length() <= tolerance && - abs(angle_ - x.angle_) <= angularTolerance; + abs(angle_ - x.angle_) <= angularTolerance && + error_state_ == x.error_state_; } bool MsgRobLocation::operator!=(const MsgRobLocation& x) const { return (loc_-x.loc_).length() > tolerance || - abs(angle_ - x.angle_) <= angularTolerance; + abs(angle_ - x.angle_) <= angularTolerance || + error_state_ != x.error_state_; } string MsgRobLocation::render() const { From tk at edam.speech.cs.cmu.edu Mon Oct 22 21:11:26 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 22 Oct 2007 21:11:26 -0400 Subject: [TeamTalk 321]: [857] trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/ Imager.java: Fixed camera image repaint in PenDecoder. Message-ID: <200710230111.l9N1BQxK018979@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071022/684e279f/attachment.html -------------- next part -------------- Modified: trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/Imager.java =================================================================== --- trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/Imager.java 2007-10-22 03:45:42 UTC (rev 856) +++ trunk/TeamTalk/Agents/PenDecoder/src/edu/cmu/ravenclaw/pendecoder/Imager.java 2007-10-23 01:11:25 UTC (rev 857) @@ -8,7 +8,6 @@ package edu.cmu.ravenclaw.pendecoder; import java.awt.*; -import java.awt.image.BufferedImage; /** * This class manages the display of the robot camera images. @@ -21,7 +20,7 @@ /** * The image to display. */ - protected BufferedImage image; + protected Image image; /** * Creates a new instance of Imager @@ -33,21 +32,22 @@ * @param i The new image. * @return true if the image dimensions have changed. */ - public boolean setImage(BufferedImage i) { + public boolean setImage(Image i) { //keep native aspect ratio with a height of 200 pixels final int fixedHeight = 200; Dimension newDimensions = - new Dimension(i.getWidth()*fixedHeight/i.getHeight(), + new Dimension(i.getWidth(this)*fixedHeight/i.getHeight(this), fixedHeight); image = i; if(newDimensions != getPreferredSize()) { setPreferredSize(newDimensions); + repaint(); return true; } repaint(); return false; } - + /** * Paint the image. */ From matt at edam.speech.cs.cmu.edu Wed Oct 24 17:08:38 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Wed, 24 Oct 2007 17:08:38 -0400 Subject: [TeamTalk 322]: [858] branches/mrmarge/PocketTeamTalkBeta/: Created folder remotely Message-ID: <200710242108.l9OL8c91024961@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071024/7c797689/attachment.html -------------- next part -------------- From matt at edam.speech.cs.cmu.edu Wed Oct 24 17:13:38 2007 From: matt at edam.speech.cs.cmu.edu (matt@edam.speech.cs.cmu.edu) Date: Wed, 24 Oct 2007 17:13:38 -0400 Subject: [TeamTalk 323]: [859] branches/mrmarge/PocketTeamTalkBeta/trunk/: made a copy Message-ID: <200710242113.l9OLDcf4024990@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071024/a9db9319/attachment.html -------------- next part -------------- Copied: branches/mrmarge/PocketTeamTalkBeta/trunk (from rev 858, trunk/TeamTalk) From tk at edam.speech.cs.cmu.edu Fri Oct 26 00:16:11 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 26 Oct 2007 00:16:11 -0400 Subject: [TeamTalk 324]: [860] trunk/TeamTalk/Agents: Removed a couple Agent solution files. Message-ID: <200710260416.l9Q4GBck028147@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071026/b6a9c9f5/attachment.html -------------- next part -------------- Deleted: trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.sln =================================================================== --- trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.sln 2007-10-24 21:13:38 UTC (rev 859) +++ trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.sln 2007-10-26 04:16:10 UTC (rev 860) @@ -1,47 +0,0 @@ -? -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zap2Backend", "zap2Backend.vcproj", "{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}" - ProjectSection(ProjectDependencies) = postProject - {4051C912-8C55-442F-9AF8-3F3AE9859776} = {4051C912-8C55-442F-9AF8-3F3AE9859776} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrimitiveComm", "..\PrimitiveComm\PrimitiveComm.vcproj", "{4051C912-8C55-442F-9AF8-3F3AE9859776}" -EndProject -Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 2 - SccProjectUniqueName0 = zap2Backend.vcproj - SccProjectName0 = \u0022$/zap2/Agents/zap2Backend\u0022,\u0020ZGJBAAAA - SccLocalPath0 = . - SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe - CanCheckoutShared = false - SccProjectUniqueName1 = ..\\PrimitiveComm\\PrimitiveComm.vcproj - SccProjectName1 = \u0022$/zap2/Agents/PrimitiveComm\u0022,\u0020OGVBAAAA - SccLocalPath1 = ..\\PrimitiveComm - SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe - CanCheckoutShared = false - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - ClydeDebug|Win32 = ClydeDebug|Win32 - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ClydeDebug|Win32.ActiveCfg = ClydeDebug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.ClydeDebug|Win32.Build.0 = ClydeDebug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Debug|Win32.Build.0 = Debug|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.ActiveCfg = Release|Win32 - {098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}.Release|Win32.Build.0 = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ClydeDebug|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.ClydeDebug|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.ActiveCfg = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Debug|Win32.Build.0 = Debug|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.ActiveCfg = Release|Win32 - {4051C912-8C55-442F-9AF8-3F3AE9859776}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Deleted: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.sln =================================================================== --- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.sln 2007-10-24 21:13:38 UTC (rev 859) +++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.sln 2007-10-26 04:16:10 UTC (rev 860) @@ -1,99 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zap2DM", "zap2DM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" - ProjectSection(ProjectDependencies) = postProject - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} = {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "..\RavenClaw\RavenClaw.vcproj", "{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" -EndProject -Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 3 - SccProjectName0 = \u0022$/zap2/Agents\u0022,\u0020BJGBAAAA - SccLocalPath0 = .. - SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe - CanCheckoutShared = false - SccProjectFilePathRelativizedFromConnection0 = zap2DM\\ - SccProjectUniqueName1 = zap2DM.vcproj - SccLocalPath1 = .. - CanCheckoutShared = false - SccProjectFilePathRelativizedFromConnection1 = zap2DM\\ - SccProjectUniqueName2 = ..\\RavenClaw\\RavenClaw.vcproj - SccProjectName2 = \u0022$/CommonAgents-2005/RavenClaw\u0022,\u0020PRACAAAA - SccLocalPath2 = ..\\RavenClaw - CanCheckoutShared = false - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - BashfulDebug|Win32 = BashfulDebug|Win32 - BashfulRelease|Win32 = BashfulRelease|Win32 - ClydeDebug|Win32 = ClydeDebug|Win32 - ClydeRelease|Win32 = ClydeRelease|Win32 - Debug|Win32 = Debug|Win32 - DebugGalaxy|Win32 = DebugGalaxy|Win32 - DebugOAA|Win32 = DebugOAA|Win32 - FestivalDebug|Win32 = FestivalDebug|Win32 - FestivalRelease|Win32 = FestivalRelease|Win32 - Release|Win32 = Release|Win32 - ReleaseGalaxy|Win32 = ReleaseGalaxy|Win32 - ReleaseOAA|Win32 = ReleaseOAA|Win32 - SwiftDebug|Win32 = SwiftDebug|Win32 - SwiftRelease|Win32 = SwiftRelease|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.BashfulDebug|Win32.ActiveCfg = BashfulDebug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.BashfulDebug|Win32.Build.0 = BashfulDebug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.BashfulRelease|Win32.ActiveCfg = BashfulRelease|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ClydeDebug|Win32.ActiveCfg = BashfulDebug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ClydeRelease|Win32.ActiveCfg = ClydeRelease|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.Build.0 = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.Build.0 = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugOAA|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalDebug|Win32.Build.0 = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalRelease|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalRelease|Win32.Build.0 = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.Build.0 = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftDebug|Win32.Build.0 = Debug|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftRelease|Win32.ActiveCfg = Release|Win32 - {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftRelease|Win32.Build.0 = Release|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.BashfulDebug|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.BashfulDebug|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.BashfulRelease|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.BashfulRelease|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ClydeDebug|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ClydeDebug|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ClydeRelease|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ClydeRelease|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.ActiveCfg = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.Build.0 = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.ActiveCfg = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.Build.0 = DebugGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.ActiveCfg = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.Build.0 = DebugOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalDebug|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalDebug|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalRelease|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalRelease|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.ActiveCfg = ReleaseGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.Build.0 = ReleaseGalaxy|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftDebug|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftDebug|Win32.Build.0 = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftRelease|Win32.ActiveCfg = ReleaseOAA|Win32 - {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftRelease|Win32.Build.0 = ReleaseOAA|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal From tk at edam.speech.cs.cmu.edu Mon Oct 29 14:21:45 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Mon, 29 Oct 2007 14:21:45 -0400 Subject: [TeamTalk 325]: [861] trunk/usarsim: Import from USARSim. Message-ID: <200710291821.l9TILj3b004878@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071029/6ef222c7/attachment-0001.html -------------- next part -------------- Modified: trunk/usarsim/System/USARBot.ini =================================================================== --- trunk/usarsim/System/USARBot.ini 2007-10-26 04:16:10 UTC (rev 860) +++ trunk/usarsim/System/USARBot.ini 2007-10-29 18:21:44 UTC (rev 861) @@ -186,7 +186,7 @@ JointParts=(PartName="LeftRWheel",PartClass=class'USARModels.P2ATTire',DrawScale3D=(X=1.0,Y=0.55,Z=1.0),bSteeringLocked=True,bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=-0.20399979,X=-0.13199987,Z=0.13104749),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.0,X=0.12799986,Z=-0.21599978),PkgClass=Class'USARMisPkg.CameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F1",Position=(X=0.14499985,Y=-0.12999986,Z=-0.0),Direction=(Y=0.0,Z=-1.5707964,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F2",Position=(X=0.1849998,Y=-0.114999875,Z=-0.0),Direction=(Y=0.0,Z=-0.87264335,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F3",Position=(X=0.21999978,Y=-0.079999916,Z=-0.0),Direction=(Y=0.0,Z=-0.52356684,X=0.0)) @@ -226,7 +226,7 @@ MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.0,X=0.12799986,Z=-0.21599978),PkgClass=Class'USARMisPkg.CameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=-0.04,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) ; Left Eye Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.04,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) ; Right Eye -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F1",Position=(X=0.14499985,Y=-0.12999986,Z=-0.0),Direction=(Y=0.0,Z=-1.5707964,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F2",Position=(X=0.1849998,Y=-0.114999875,Z=-0.0),Direction=(Y=0.0,Z=-0.87264335,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F3",Position=(X=0.21999978,Y=-0.079999916,Z=-0.0),Direction=(Y=0.0,Z=-0.52356684,X=0.0)) @@ -263,7 +263,7 @@ JointParts=(PartName="RearWheel",PartClass=class'USARModels.P2DXSmallTire',DrawScale3D=(X=1.0,Y=0.5,Z=1.0),bSteeringLocked=False,bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=0.0,X=-0.1919998,Z=0.167857),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.0,X=0.039999958,Z=-0.21599978),PkgClass=Class'USARMisPkg.CameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="CameraTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="CameraTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F1",Position=(X=0.114999875,Y=-0.12999986,Z=-0.0),Direction=(Y=0.0,Z=-1.5707964,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F2",Position=(X=0.15499984,Y=-0.114999875,Z=-0.0),Direction=(Y=0.0,Z=-0.87264335,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="F3",Position=(X=0.1899998,Y=-0.079999916,Z=-0.0),Direction=(Y=0.0,Z=-0.52356684,X=0.0)) @@ -298,7 +298,7 @@ JointParts=(PartName="LeftRWheel",PartClass=class'USARModels.AtrvLTire',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),bSteeringLocked=True,bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=-0.2559997,X=-0.1939998,Z=0.1919998),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.0,X=0.124,Z=-0.14),PkgClass=Class'USARMisPkg.CameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight1",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight1",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.079999916,Z=0.06399993),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="S1",Position=(X=0.33495012,Y=-0.104390375,Z=-0.0),Direction=(Y=0.0,Z=-0.52356684,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="S2",Position=(X=0.34040916,Y=-0.049910426,Z=-0.0),Direction=(Y=0.0,Z=-0.26183134,X=0.0)) Sensors=(ItemClass=class'USARBot.SonarSensor',ItemName="S3",Position=(X=0.3470606,Y=0.0,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) @@ -430,6 +430,28 @@ Effecters=(ItemClass=class'USARBot.RFIDReleaser',ItemName="Gun",Position=(X=0.0,Y=0.0,Z=0.0095238),Direction=(x=0.0,y=0.0,z=0.0)) Sensors=(ItemClass=class'USARBot.GroundTruth',ItemName="GroundTruth",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) +[USARBot.UnitLoader] +bDebug=False +Weight=50 +Payload=25 +ChassisMass=100.000000 +MaxTorque=32000.0 +MotorTorque=2400.0 +bMountByUU=False +JointParts=(PartName="RightFWheel",PartClass=class'USARModels.UnitLoaderTireRight',DrawScale3D=(X=1,Y=1,Z=1),bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=0.30,X=0.30,Z=0.2),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) +JointParts=(PartName="LeftFWheel",PartClass=class'USARModels.UnitLoaderTireLeft',DrawScale3D=(X=1,Y=1,Z=1),bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=-0.30,X=0.30,Z=0.2),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) +JointParts=(PartName="RightRWheel",PartClass=class'USARModels.UnitLoaderTireRight',DrawScale3D=(X=1,Y=1,Z=1),bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=0.30,X=-0.30,Z=0.2),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) +JointParts=(PartName="LeftRWheel",PartClass=class'USARModels.UnitLoaderTireLeft',DrawScale3D=(X=1,Y=1,Z=1),bSuspensionLocked=true,Parent="",JointClass=class'KCarWheelJoint',ParentPos=(Y=-0.30,X=-0.30,Z=0.2),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) +JointParts=(PartName="Light",PartClass=class'USARModels.SpinLight',DrawScale3D=(X=1,Y=1,Z=1),Parent="",JointClass=class'USARBot.KSpinHinge',ParentPos=(Y=0.0,X=0.45,Z=-1.33),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) +MisPkgs=(PkgName="UnitLoaderTop",Location=(Y=0,X=-0.17,Z=-0.32),PkgClass=Class'USARMisPkg.UnitLoaderTop') +MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0,X=0.6,Z=-.55),PkgClass=Class'USARMisPkg.CameraPanTilt') +Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) +Sensors=(ItemClass=class'USARBot.GroundTruth',ItemName="GroundTruth",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) +Sensors=(ItemClass=class'USARBot.INSSensor',ItemName="INS",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(x=0.0,y=0.0,z=0.0)) +Sensors=(ItemClass=class'USARModels.SICKLMS',ItemName="Scanner1",Position=(X=0.875,Y=0.0,Z=0.1),Direction=(Y=0.0,Z=0.0,X=0.0)) +Sensors=(ItemClass=class'USARModels.SICKLMS',ItemName="Scanner2",Position=(X=-0.75,Y=0.0,Z=-0.3),Direction=(Y=0.0,Z=3.145,X=0.0)) +Effecters=(ItemClass=class'USARBot.Roller',ItemName="Roller",Parent="UnitLoaderTop_Link1",Position=(Y=0.0,X=0.0,Z=-0.1),Direction=(Y=0.0,Z=0.0,X=0.0)) + [USARBot.Hummer] bDebug=False Weight=50 @@ -445,7 +467,7 @@ MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.00857142,X=0.7857136,Z=-1.047237),PkgClass=Class'USARMisPkg.CameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARModels.SICKLMS',ItemName="Scanner1",Position=(X=1.8133314,Y=0.00857142,Z=-0.5523804),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.00857142,X=1.7238077,Z=-0.7485706),Direction=(Y=-0.479369,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.00857142,X=1.7238077,Z=-0.7485706),Direction=(Y=-0.479369,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.GroundTruth',ItemName="GroundTruth",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) [USARBot.SnowStorm] @@ -466,7 +488,7 @@ Sensors=(ItemClass=class'USARBot.GPSSensor',ItemName="GPS",Position=(X=0.0,Y=0.0,Z=-1.0),Direction=(x=0.0,y=0.0,z=0.0)) Sensors=(ItemClass=class'USARBot.INSSensor',ItemName="Compass",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(X=0.0,Z=1.5664821,Y=0.0)) Sensors=(ItemClass=class'USARModels.SICKLMS',ItemName="Scanner1",Position=(X=1.8133314,Y=0.00857142,Z=-0.5523804),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.00857142,X=1.7238077,Z=-0.7485706),Direction=(Y=-0.479369,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.00857142,X=1.7238077,Z=-0.7485706),Direction=(Y=-0.479369,Z=0.0,X=0.0)) [USARBot.Sedan] bDebug=False @@ -510,7 +532,7 @@ MisPkgs=(PkgName="CameraPanTilt",Location=(Y=0.0,X=0.83809435,Z=-0.420571),PkgClass=Class'USARMisPkg.UnderwaterCameraPanTilt') Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="CameraPanTilt_Link2",Position=(Y=0.0,X=0.06,Z=-0.0088),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARModels.Pinger',ItemName="Scanner1",Position=(X=-0.9904752,Y=0.0,Z=0.42476144),Direction=(Y=-1.5707964,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.0,X=2.0857122,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="HeadLight",Parent="",Position=(Y=0.0,X=2.0857122,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=class'USARBot.GroundTruth',ItemName="GroundTruth",Position=(X=0.0,Y=0.0,Z=-0.0),Direction=(Y=0.0,Z=0.0,X=0.0)) [USARBot.AirRobot] @@ -573,7 +595,7 @@ Sensors=(ItemClass=Class'USARBot.AccelerationSensor',Parent=,ItemName="ACC",Position=(X=0.0,Y=0.0,Z=-0.0),direction=(Y=0.0,Z=0.0,X=0.0)) Sensors=(ItemClass=Class'USARBot.BallHSensor',Parent="HC",ItemName="BHS",Position=(X=0.076000005,Y=0.0,Z=0.016),direction=(Y=0.0,Z=0.0,X=0.0)) Cameras=(ItemClass=Class'USARBot.AIBOCamera',Parent="HC",ItemName="Camera",Position=(X=0.076000005,Y=0.0,Z=0.016),direction=(Y=0.0,Z=0.0,X=0.0)) -Headlights=(ItemClass=None,Parent=,ItemName=,Position=(X=0.0,Y=0.0,Z=-0.0),direction=(Y=0.0,Z=0.0,X=0.0),LightGlow=True) +Headlights=(ItemClass=None,Parent=,ItemName=,Position=(X=0.0,Y=0.0,Z=-0.0),direction=(Y=0.0,Z=0.0,X=0.0)) [USARBot.QRIO] msgTimer=0.2 @@ -629,7 +651,7 @@ JointParts=(PartName="RRTrack",PartClass=class'USARModels.SoryuTrack',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),bSteeringLocked=True,bSuspensionLocked=true,Parent="RearCarPitch",JointClass=class'KCarWheelJoint',ParentPos=(Y=0.054287,X=0.12143,Z=0.0),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) JointParts=(PartName="LRTrack",PartClass=class'USARModels.SoryuTrack',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),bSteeringLocked=True,bSuspensionLocked=true,Parent="RearCarPitch",JointClass=class'KCarWheelJoint',ParentPos=(Y=-0.054287,X=0.12143,Z=0.0),ParentAxis=(Z=1.0),ParentAxis2=(Y=1.0),SelfPos=(Z=-0.0),SelfAxis=(Z=1.0),SelfAxis2=(Y=1.0)) Cameras=(ItemClass=class'USARBot.RobotCamera',ItemName="Camera",Parent="FrontCarPitch",Position=(Y=0.0,X=0.15715,Z=0),Direction=(Y=0.0,Z=0.0,X=0.0)) -HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="FrontCarPitch",Position=(Y=0.0,X=0.15715,Z=0.0),Direction=(Y=-0.5,Z=0.0,X=0.0),LightGlow=True) +HeadLights=(ItemClass=class'USARBot.USARHeadLight',ItemName="Headlight",Parent="FrontCarPitch",Position=(Y=0.0,X=0.15715,Z=0.0),Direction=(Y=-0.5,Z=0.0,X=0.0)) [USARBot.Kurt2D] bDebug=False Modified: trunk/usarsim/System/USARMisPkg.ini =================================================================== --- trunk/usarsim/System/USARMisPkg.ini 2007-10-26 04:16:10 UTC (rev 860) +++ trunk/usarsim/System/USARMisPkg.ini 2007-10-29 18:21:44 UTC (rev 861) @@ -60,6 +60,12 @@ Links=(LinkNumber=3,LinkClass=Class'USARMisPkg.TeleMaxAuxWheel',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),ParentLinkNumber=1,ParentMount="C",SelfMount="A") Links=(LinkNumber=4,LinkClass=Class'USARMisPkg.TeleMaxAuxWheel',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),ParentLinkNumber=1,ParentMount="D",SelfMount="A") +;-------------------------------------------------------------------------------------------------------------- +; Table Mission Package for the UnitLoader +;-------------------------------------------------------------------------------------------------------------- +[USARMisPkg.UnitLoaderTop] +Links=(LinkNumber=1,LinkClass=Class'USARMisPkg.UnitLoaderTable',DrawScale3D=(X=1.0,Y=1.0,Z=1.0),ParentLinkNumber=-1,ParentMount="B",SelfMount="A") + ;-------------------------------------------------------------------------------------------------------------- ; Camera Pan/Tilt mission package used for the AirRobot ;-------------------------------------------------------------------------------------------------------------- @@ -284,6 +290,20 @@ MaxRange=0 ;-------------------------------------------------------------------------------------------------------------- +; UnitLoader Links used for the USARMisPkg.UnitLoader mission package +;-------------------------------------------------------------------------------------------------------------- +[USARMisPkg.UnitLoaderTable] +MountPoints=(Name="A",JointType="Scissor",Location=(X=0,Y=0,Z=-0.15),Orientation=(X=0.0,Y=-1.5707963267948966192313216916398,Z=0.0)) +MountPoints=(Name="B",JointType="Scissor",Location=(X=0,Y=0,Z=-1.15),Orientation=(X=0.0,Y=-1.5707963267948966192313216916398,Z=0.0)) +; max translation speed in m/s +MaxSpeed=0.5 +MaxTorque=300 +; MinRange should always be zero - for prismatic joints +; MaxRange defines how far along the Z-Axis the part can move - for prismatic joints +MinRange=0 +MaxRange=0.8 + +;-------------------------------------------------------------------------------------------------------------- ; Camera Links used for the USARMisPkg.AirRobotCameraPanTilt mission package ;-------------------------------------------------------------------------------------------------------------- [USARMisPkg.AirRobotCameraBase] Modified: trunk/usarsim/USARBot/Classes/Effecter.uc =================================================================== --- trunk/usarsim/USARBot/Classes/Effecter.uc 2007-10-26 04:16:10 UTC (rev 860) +++ trunk/usarsim/USARBot/Classes/Effecter.uc 2007-10-29 18:21:44 UTC (rev 861) @@ -1,43 +1,50 @@ -class Effecter extends Item abstract; - -function String GetConfHead() -{ - local string outstring; - - outstring="CONF {Type "$ItemType$"}"; - - return outstring; -} - -function String GetConfData() -{ - return "{Name "$ItemName$"}"; -} - -function string GetGeoHead() -{ - local string outstring; - - outstring="GEO {Type "$ItemType$"}"; - - return outstring; -} - -function string GetGeoData() -{ - local string outstring; - - if (converter==None) - outstring="{Name "$ItemName$" Location "$(Location-Base.Location)$" Orientation "$(Rotation-Base.Rotation)$" Mount "$ItemMount$"}"; - else - outstring="{Name "$ItemName$" Location "$(converter.Str_LengthVectorFromUU(Location-Base.Location)) - $" Orientation "$(converter.Str_RotatorFromUU(Rotation-Base.Rotation)) - $" Mount "$ItemMount$"}"; - return outstring; -} - -defaultproperties -{ - ItemType="Effecter" - bHidden=true +class Effecter extends Item abstract; + +var String confType; +var float minVal; +var float maxVal; + +function String GetConfHead() +{ + local string outstring; + + outstring="CONF {Type "$ItemType$"}"; + + return outstring; +} + +function String GetConfData() +{ + if(confType=="") + return "{Name "$ItemName$"}"; + else + return "{Name "$ItemName$"} {Cmd \""$confType$"\"} {MaxVal "$maxVal$"} {MinVal "$minVal$"}"; +} + +function string GetGeoHead() +{ + local string outstring; + + outstring="GEO {Type "$ItemType$"}"; + + return outstring; +} + +function string GetGeoData() +{ + local string outstring; + + if (converter==None) + outstring="{Name "$ItemName$" Location "$(Location-Base.Location)$" Orientation "$(Rotation-Base.Rotation)$" Mount "$ItemMount$"}"; + else + outstring="{Name "$ItemName$" Location "$(converter.Str_LengthVectorFromUU(Location-Base.Location)) + $" Orientation "$(converter.Str_RotatorFromUU(Rotation-Base.Rotation)) + $" Mount "$ItemMount$"}"; + return outstring; +} + +defaultproperties +{ + ItemType="Effecter" + bHidden=true } \ No newline at end of file Modified: trunk/usarsim/USARBot/Classes/KRobot.uc =================================================================== --- trunk/usarsim/USARBot/Classes/KRobot.uc 2007-10-26 04:16:10 UTC (rev 860) +++ trunk/usarsim/USARBot/Classes/KRobot.uc 2007-10-29 18:21:44 UTC (rev 861) @@ -1,2707 +1,2707 @@ -class KRobot extends KVehicle config(USARBot) abstract; - -//////////////////////////////////////////////// -// PHYSICAL ROBOT -//////////////////////////////////////////////// - -// Part Definiens -struct JointPart { - // Part - var() name PartName; - var() class PartClass; - var() vector DrawScale3D; - - // Joint - var() class JointClass; - var() bool bSteeringLocked; - var() bool bSuspensionLocked; - var() float BrakeTorque; - var() name Parent; - var() vector ParentPos; - //var() rotator ParentRot; - var() vector ParentAxis; - var() vector ParentAxis2; - var() vector SelfPos; - var() vector SelfAxis; - var() vector SelfAxis2; -}; -var config array JointParts; - -// Mission Package Data Structure -struct MisPkg -{ - var() name PkgName; - var() vector Location; - var() class PkgClass; -}; -var config array MisPkgs; - -var array allMisPkgs; // Holds information about all the mission packages -var array allMisPkgsLinks; // Holds information about all the mission packages' links - -// Joint Control -struct JointControl { - var byte state; // Control state: - // 0: no commands; - // 1: new command; - // 2: finished; - var float steer; // Steer angle - var byte order; // Specify the followed value. - var float value; // Control value: - // order = 0 , value=absolute angle; - // order = 1 , value=absolute speed; - // order = 2 , value=absolute torque; - // order = 10 , value=relative angle; - // order = 11 , value=relative speed; - // order = 12 , value=relative torque; - - var byte lastCommandId; // There are new commands if lastCommandId != RS_JointsCommandId - - //Variables used only by order = 0 control: - var float angle; // the desired spining angle. used for order=0 control. - var int startAng; // the start angle. used for compare spined angle. -}; -var array JointsControl; - -struct RobotSkin -{ - var string Name; - var texture Skin; - var string Comment; -}; -var config array RobotSkins; - -//======================= -// Networking RobotState -//======================= -// -// Replication variables used to update Robot State on clients - -var KRBVec RS_ChassisPosition; -var Quat RS_ChassisQuaternion; -var KRBVec RS_ChassisLinVel; -var KRBVec RS_ChassisAngVel; - -// dynamic array canot be replicated. So we must use static array here. -// Here, to make the client and server have the same state, we directly -// replicate the RigidBodyState. In the KCar class, it replicates the -// RigidBodyState related to the chassis. I don't know why they use relative -// state. I had tried to use relative state. But it involves vector and -// quaternion calculation. We need to calculate the relative pos and relative -// quat. For relative pos, it's just subtract part's (wheel's) pos from chassis -// pos. For relative quat, we need to use the third axis, that's -// Joints[i].KPriAxis1 Cross Joints[i].KSecAxis1), to calculate the relative -// quat. However, I cannot figure out the correct calculating method for general -// case, such as connect the y axis of the part to the x axis of the chassis -// through a joint. ANYWAY, the simplest, most stable and straightforward method -// is replicating all the (absolute) RigidBodyState. If the server is correct, -// then the client should also be correct. The only weakness of this method is we -// need to replicate more data. - -var KRBVec RS_PartsPos[32]; -var Quat RS_PartsQuat[32]; -var vector RS_PartsLinVel[32]; -var vector RS_PartsAngVel[32]; - -var float RS_JointsSteer[32]; -var byte RS_JointsOrder[32]; -var float RS_JointsValue[32]; -var byte RS_JointsCommandId[32]; - -// It denotes new replicated robot state. VehicleStateReceived will -// load on client side these new params and set bNewRobotState to true. -// Should be a boolean but it's a byte that increments at each replication, -// otherwise replication mechanism would not work becasue bool var would be -// always true on server (read the code for further details). -// (using struct wuold be a possible solution to replication, but it's not necessary) -var byte RS_RobotUpdateId; - -//Used to change the robot skin -var string RS_skinName; -var byte RS_skinUpdateId; - -// -- End Replication variables - -// if CacheRobotUpdateId on client is different from RS_RobotUpdateId received from server -// then ther's a new robot state to be loaded. At this point CacheRobotUpdateId is set -// equal to RS_RobotUpdateId and bNewRobotState is set to true. -var byte CacheRobotUpdateId; - -var byte CacheSkinUpdateId; - -// New RB params were loaded from replication and we must notify -// Karma to update RB state on client side -var bool bNewRobotState; - -var bool bNewCommand; //only used on server in ProcessCarInput() -var float NextNetUpdateTime; // Next time we should force an update of vehicles state. -var float MaxNetUpdateInterval; - -// Parts that build a robot (every part has a part a parent and a joint) -var array Parts; -var array Parents; -var array Joints; - -//======================== -// KCarWheelJoint settings -//======================== - -// Steering -var float SteerPropGap; -var float SteerTorque; -var float SteerSpeed; - -// KCarWheelSuspension setting -var float SuspStiffness; -var float SuspDamping; -var float SuspHighLimit; -var float SuspLowLimit; -var float SuspRef; - -// The Max torque for all the joints -var config float MaxTorque; -var config float SafeForce; -var config float ProtectTime; - -// KDHinge Joint settings -var config float HingePropGap; - -// KCarWheelJoint defalut working torque -var config float MotorTorque; -var config float MotorSpeed; -var float uuMotorSpeed; -var config float maxSpinSpeed; - -//======================== -// KTire settings -//======================== - -var float TireRollFriction; -var float TireLateralFriction; -var float TireRollSlip; -var float TireLateralSlip; -var float TireMinSlip; -var float TireSlipRate; -var float TireSoftness; -var float TireAdhesion; -var float TireRestitution; -//======================== - -// Robot parameters -var config float Payload; -var config float Weight; -var KRigidBodyState ChassisState; -var KRigidBodyState TeleportLocation; //!< Used to move the robot with MoveRobot() function. -var config float ChassisMass; -var config InterpCurve TorqueCurve; // Engine RPM in, Torque out. -var float HitSoundThreshold; -var float WheelRadius; -var vector Dimensions; - -// Flip -var config float FlipTorque; -var config float FlipTime; -var float FlipTimeLeft; - -//=============================== -// Items mounted on the robot -//=============================== - -// Item mount structure -struct sItem { - var class ItemClass; - var name Parent; - var string ItemName; - var vector Position; - var vector Direction; - var rotator uuDirection; -}; - -struct lightItem extends sItem -{ - var bool LightGlow; -}; - -// Sensors -var config array Sensors; -var config float msgTimer; // Timer used for sending out sensor data -var array SensorList; -var array ProcessedSensors; -// Effecters -var config array Effecters; -var array EffecterList; - -// Battery -var config int batteryLife; -var int startTime; -var int myLife; - -// Headlight -var config array HeadLights; -var array HeadlightList; -var bool bHeadlightOn; -var byte HeadlightItensity; - -// Camera -var config array Cameras; -var array CamList; -var RobotCamera myCamera; -var float PanSpeed, TiltSpeed; - -// DrawHud Variables (to determine how many screens, which camera, etc...) -var int viewportMode; // 0 is single view, 1 is dualviewhorizontal, 2 is dualviewvertical, and 3 is quad view -var int CamsToView[4]; // Store the camera indexes of the camera view to be displayed on the viewport -var bool bDrawHud; - -//========================= -// Others -//========================= - -// Variables used for programming -var string RobotName; -var config bool bDebug; -var int CurrentPart; -var config bool bDisplayTeamBeacon; -var float lastTime, previousTime; -var vector lastLocation, previousLocation; -var bool bRobotBuilt; -var name fpsLogger; -var config string ConverterClass; -var USARConverter converter; -var USARUtils utils; -var USARDraw Draw; -var config bool bMountByUU; -var config float logging_period; -var config bool bBarCode; -var float old_time; -var FileLog PosLog; -var FileLog CollLog; -var KSimParams oldKSP, newKSP; -var name tmpName; // Used to convert string to name - -//var bool bstats; //used for bump/touch events. -//var int bump_touch_cnt; - -// MultiView Addon -var int ViewNum; //Viewport number (assigned by Register()) used by DrawHUD to render the scene -var MultiView ViewManager; //the actual ViewManager actor (a bot) - -//############################################################################# -// KROBOT CODE -//############################################################################# - -replication -{ - // We replicate the robot state. - - reliable if(Role == ROLE_Authority) - RS_ChassisPosition, RS_ChassisQuaternion, RS_ChassisLinVel, RS_ChassisAngVel, - RS_PartsPos, RS_PartsQuat, RS_PartsLinVel, RS_PartsAngVel,RS_RobotUpdateId; - - reliable if(Role == ROLE_Authority) - RS_JointsSteer, RS_JointsOrder, RS_JointsValue, RS_JointsCommandId; - - reliable if(Role == ROLE_Authority) - FlipTimeLeft, bHeadlightOn, RobotName; - - reliable if(Role == ROLE_Authority) - RS_skinName, RS_skinUpdateId, ViewManager, ViewNum; -} - -simulated event PreBeginPlay() -{ - local class cClass; - local int i,j; - - Super.PreBeginPlay(); - utils = New class'USARUtils'; - draw = New class'USARDraw'; - bNoTeamBeacon=!bDisplayTeamBeacon; - cClass = class(DynamicLoadObject(ConverterClass, class'Class')); - converter = new cClass; - ConvertParam(converter); - if (MotorTorque>MaxTorque) - MotorTorque = MaxTorque; - - // Set up the mission package information (allocate space) - for(i=0; i>"); - - log("Receive<<"@RS_ChassisPosition.X at RS_ChassisPosition.Y@RS_ChassisPosition.Z); - log(" "@RS_ChassisQuaternion.X at RS_ChassisQuaternion.Y@RS_ChassisQuaternion.Z); - log(" "@RS_ChassisLinVel.X at RS_ChassisLinVel.Y@RS_ChassisLinVel.Z); - log(" "@RS_ChassisAngVel.X at RS_ChassisAngVel.Y@RS_ChassisAngVel.Z@">>"); - */ - - // Don't do anything if vehicle isn't started up. - if(!bRobotBuilt) { - if(Parts.length == 0) - return; - for (i=0; i NextNetUpdateTime) - { - /////////////////////////// - // Pack Chassis state - /////////////////////////// - KGetRigidBodyState(RBState); - RS_ChassisPosition = RBState.Position; - RS_ChassisQuaternion = RBState.Quaternion; - RS_ChassisLinVel = RBState.LinVel; - RS_ChassisAngVel = RBState.AngVel; - UpdateParts = true; - RS_RobotUpdateId += 1; - NextNetUpdateTime = Level.TimeSeconds + MaxNetUpdateInterval; - } - - // Get each part's state. - for (i=0;i= 0) - { - SetPropertyText("tmpName", PkgName $ "_Link" $ string(LinkNumber)); - } - - return tmpName; -} - -simulated function name getMisPkgPartName(Name PkgName, int LinkNumber) -{ - tmpName = ''; - - if(LinkNumber >= 0) - { - SetPropertyText("tmpName", string(PkgName) $ "_Link" $ string(LinkNumber)); - } - - return tmpName; -} - -simulated function int getLinkNumber(string strLink) -{ - return int(Right(strLink, Len(strLink) - (InStr(strLink, "Link") + 4))); -} - -simulated function string getMisPkgName(string strLink) -{ - return Left(strLink, InStr(strLink, "_Link")); -} - -simulated function PostNetBeginPlay() -{ - local int i, j; - local Actor Parent; - local vector RotX, RotY, RotZ, offset; - local sItem headlight; - - Super.PostNetBeginPlay(); - - // Turn the information about the mission packages into joint parts - for(i=0; i> converter.RotatorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointOrientation(allMisPkgs[i].Links[j].SelfMount))) * Vect(-1,-1,-1); - JointParts[JointParts.length - 1].SelfAxis = JointParts[JointParts.length - 1].ParentAxis; - JointParts[JointParts.length - 1].ParentAxis2 = (Vect(0,1,0) >> converter.RotatorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointOrientation(allMisPkgs[i].Links[j].SelfMount))) * Vect(-1,-1,-1); - JointParts[JointParts.length - 1].SelfAxis2 = JointParts[JointParts.length - 1].ParentAxis2; - - JointParts[JointParts.length - 1].SelfPos = converter.LengthVectorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointLocation(allMisPkgs[i].Links[j].SelfMount) * allMisPkgs[i].Links[j].DrawScale3D); - } - else if(Caps(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointJointType(allMisPkgs[i].Links[j].SelfMount)) == "PRISMATIC") - { - JointParts[JointParts.length - 1].JointClass = class'USARBot.KSlider'; - - if(j == 0) - JointParts[JointParts.length - 1].ParentPos = converter.LengthVectorToUU(MisPkgs[i].Location - (allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointLocation(allMisPkgs[i].Links[j].SelfMount) * allMisPkgs[i].Links[j].DrawScale3D)); - else - JointParts[JointParts.length - 1].ParentPos = converter.LengthVectorToUU((allMisPkgsLinks[i*allMisPkgs[i].Links.length+FindLinkParent(allMisPkgs[i], allMisPkgs[i].Links[j].ParentLinkNumber)].getMountPointLocation(allMisPkgs[i].Links[j].ParentMount) * allMisPkgs[i].Links[FindLinkParent(allMisPkgs[i], allMisPkgs[i].Links[j].ParentLinkNumber)].DrawScale3D) - (allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointLocation(allMisPkgs[i].Links[j].SelfMount) * allMisPkgs[i].Links[j].DrawScale3D)); - - JointParts[JointParts.length - 1].ParentAxis = (Vect(0,1,0) >> converter.RotatorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointOrientation(allMisPkgs[i].Links[j].SelfMount))) * Vect(-1,-1,-1); - JointParts[JointParts.length - 1].SelfAxis = JointParts[JointParts.length - 1].ParentAxis; - JointParts[JointParts.length - 1].ParentAxis2 = (Vect(1,0,0) >> converter.RotatorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointOrientation(allMisPkgs[i].Links[j].SelfMount))) * Vect(-1,-1,-1); - JointParts[JointParts.length - 1].SelfAxis2 = JointParts[JointParts.length - 1].ParentAxis2; - - JointParts[JointParts.length - 1].SelfPos = converter.LengthVectorToUU(-allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].MaxRange * (Vect(0,0,-1) >> converter.RotatorToUU(allMisPkgsLinks[i*allMisPkgs[i].Links.length+j].getMountPointOrientation(allMisPkgs[i].Links[j].SelfMount)))); - } - } - } - - //////////////////////////////// - // Create physical robot - //////////////////////////////// - for (CurrentPart=0;CurrentPart"); - GetAxes(Parent.Rotation,RotX,RotY,RotZ); - - //Spawn Joint (any KConstraint class) - Joints[CurrentPart] = spawn(JointParts[CurrentPart].JointClass,Parent); - - if (Joints[CurrentPart].IsA('KSlider')) { - KSlider(Joints[CurrentPart]).init1(Parent,JointParts[CurrentPart].ParentPos,JointParts[CurrentPart].ParentAxis,JointParts[CurrentPart].ParentAxis2, - JointParts[CurrentPart].SelfPos,JointParts[CurrentPart].SelfAxis,JointParts[CurrentPart].SelfAxis2); - offset = JointParts[CurrentPart].ParentPos - JointParts[CurrentPart].SelfPos; - Parts[CurrentPart] = spawn(JointParts[CurrentPart].PartClass, KSlider(Joints[CurrentPart]).Part2,, Parent.Location + offset.X*RotX + offset.Y*RotY + offset.Z*RotZ,Parent.Rotation); - Parts[CurrentPart].SetDrawScale3D(JointParts[CurrentPart].DrawScale3D); - log("Init"@Joints[CurrentPart]); - KSlider(Joints[CurrentPart]).init2(JointParts[CurrentPart].ParentPos,JointParts[CurrentPart].ParentAxis,JointParts[CurrentPart].ParentAxis2, - Parts[CurrentPart],JointParts[CurrentPart].SelfPos,JointParts[CurrentPart].SelfAxis,JointParts[CurrentPart].SelfAxis2); - } else { - //Spawn Part - offset = JointParts[CurrentPart].ParentPos - JointParts[CurrentPart].SelfPos; - Parts[CurrentPart] = spawn(JointParts[CurrentPart].PartClass, Parent,, Parent.Location + offset.X*RotX + offset.Y*RotY + offset.Z*RotZ,Parent.Rotation); - Parts[CurrentPart].SetDrawScale3D(JointParts[CurrentPart].DrawScale3D); - - //Set primary constraint params - Joints[CurrentPart].KConstraintActor1 = Parent; - Joints[CurrentPart].KPos1 = JointParts[CurrentPart].ParentPos/50; - Joints[CurrentPart].KPriAxis1 = JointParts[CurrentPart].ParentAxis; - if (VSize(JointParts[CurrentPart].ParentAxis2)>0) - Joints[CurrentPart].KSecAxis1 = JointParts[CurrentPart].ParentAxis2; - - //Set secondary constraint params - Joints[CurrentPart].KConstraintActor2 = Parts[CurrentPart]; - Joints[CurrentPart].KPos2 = JointParts[CurrentPart].SelfPos/50; - Joints[CurrentPart].KPriAxis2 = JointParts[CurrentPart].SelfAxis; - if (VSize(JointParts[CurrentPart].SelfAxis2)>0) - Joints[CurrentPart].KSecAxis2 = JointParts[CurrentPart].SelfAxis2; - - Joints[CurrentPart].SetPhysics(PHYS_Karma); - } - - if (ClassIsChildOf(JointParts[CurrentPart].PartClass,class'KTire') && - Joints[CurrentPart].IsA('KCarWheelJoint')) { - (KTire(Parts[CurrentPart])).WheelJoint = KCarWheelJoint(Joints[CurrentPart]); - (KTire(Parts[CurrentPart])).WheelJoint.KUpdateConstraintParams(); - if (Joints[CurrentPart].IsA('KSCarWheelJoint')) { - KSCarWheelJoint(Joints[CurrentPart]).KForceThreshold = SafeForce; - KSCarWheelJoint(Joints[CurrentPart]).StallTime = ProtectTime; - } - } else if (ClassIsChildOf(JointParts[CurrentPart].PartClass,class'USARBot.KDPart')) - (KDPart(Parts[CurrentPart])).setJoint(Joints[CurrentPart]); - - if(Role != ROLE_Authority) - KarmaParams(Parts[CurrentPart].KParams).bDestroyOnSimError = False; - } - if (bDebug) { - //DumpPackages(); - DumpJoints(); - } - - // Initially make sure parameters are sync'ed with Karma - KVehicleUpdateParams(); - - // For KImpact event - KSetImpactThreshold(HitSoundThreshold); - - // If this is not 'authority' version - don't destroy it if there is a problem. - // The network should sort things out. - if(Role != ROLE_Authority) - KarmaParams(KParams).bDestroyOnSimError = False; - - // init the array size - JointsControl.length = JointParts.length; - - ///////////////////////////////// - // Mount Items - ///////////////////////////////// - - // Mount headlights - for (i=0;i0) - { - if(CamList.Length == 1) - viewportMode = 0; - else - viewportMode = 1; - - myCamera = CamList[0]; - } - - // Mount sensors - for (i=0;i 0) && (i == RobotSkins.Length)) - skinTexture = RobotSkins[0].Skin; //i>0 assure [0] element existence - - if(skinTexture != none) - { - Skins[0] = skinTexture; - for (i = 0; i < Parts.Length; i++) - { - Parts[i].Skins[0] = skinTexture; - } - } - - if(Role == ROLE_Authority) - { - RS_skinName = skinName; - RS_skinUpdateId++; - } -} - -// dump joints -function DumpJoints() { - local int i; - - for (i=0;i> Rotation; - worldUp = vect(0, 0, 1) >> Rotation; - worldRight = vect(0, 1, 0) >> Rotation; - - torqueAxis = Normal(worldUp Cross vect(0, 0, 1)); - - // Torque scaled by how far over we are. - // This will be between 0 and PI - so convert to between 0 and 1. - torqueScale = Acos(worldUp Dot vect(0, 0, 1))/3.1416; - - Torque = FlipTorque * torqueScale * torqueAxis; -} - -function StartFlip(Pawn Pusher) -{ - //local vector toPusher, worldUp; - - // if we are already flipping the car - dont do it again! - if(FlipTimeLeft > 0) - return; - - FlipTimeLeft = FlipTime; // Start the flip on the server - USARRemoteBot(Controller).Flip = false; -} - -//given a name and return the correspond jointpart's id -function int FindJointPartId(string jname) -{ - local int i; - - for (i=0;i FindChildren(int idx) -{ - local array res; - local int i; - local name myName,pName; - - //invalid idx is treated as the robot platform (hard mount). - if (idx<0 || idx>=JointParts.length) - myName='None'; - //iterate JointParts to find all the children - myName = JointParts[idx].PartName; - for (i=0;i An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071029/6a4cd4a2/attachment-0001.html -------------- next part -------------- Modified: trunk/moast-bth/TeamTalkSimulator/TeamTalkSimulator.cc =================================================================== --- trunk/moast-bth/TeamTalkSimulator/TeamTalkSimulator.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/TeamTalkSimulator/TeamTalkSimulator.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -75,7 +75,7 @@ void sendFullMap(Boeing::MapServer *mserver) { readMapFile(); - Boeing::MsgMap::MsgMapFactory(Boeing::MAP_RLE, + Boeing::MsgMap::MsgMapFactory(Boeing::MAP_X_MAJOR, msgMap, currentMap, mapWidth*mapHeight, 0, 0, mapWidth, mapHeight); //debug << "raw: " << msgMap->map[0] @@ -86,7 +86,7 @@ void sendDiffMap(Boeing::MapServer *mserver) { readMapFile(); - Boeing::MsgMap::MsgMapFactory(Boeing::MAP_RLE, + Boeing::MsgMap::MsgMapFactory(Boeing::MAP_X_MAJOR, msgMap, diffMap, mapWidth*mapHeight, 0, 0, mapWidth, mapHeight); //debug << "raw: " << msgMap->map[0] Modified: trunk/moast-bth/moast/bin/Makefile.am =================================================================== --- trunk/moast-bth/moast/bin/Makefile.am 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/bin/Makefile.am 2007-10-29 20:24:46 UTC (rev 862) @@ -1,4 +1,4 @@ -bin_PROGRAMS = moastNmlSvr simWare servoShell primSPMain primMisMain primMobMain primShell segmentTest polyIntersect exampleUtmConvert gpsToSerial amSPMain amMisMain amMobMain amShell vehSPMain vehMobPLMain vehShell sectShell sectMobPL exampleDijkTabs exampleDijkHeap exampleDijkHeapN exampleAStarHeapA exampleAStarHeapB exampleAStarHeapNA exampleAStarHeapNB exampleScrollMap spPlay moastErrorLog nmlPrint inifind exampleVisGraph vehDrone nmlConvert spqrConvert slamStub trafficShell linkMon linkMonShell +bin_PROGRAMS = moastNmlSvr simWare servoShell primSPMain primMisMain primMobMain primShell segmentTest polyIntersect exampleUtmConvert gpsToSerial amSPMain amMisMain amMobMain amShell vehSPMain vehMobPLMain vehShell sectShell sectMobPL exampleDijkTabs exampleDijkHeap exampleDijkHeapN exampleAStarHeapA exampleAStarHeapB exampleAStarHeapNA exampleAStarHeapNB exampleScrollMap spPlay moastErrorLog nmlPrint inifind exampleVisGraph vehDrone nmlConvert spqrConvert slamStub trafficShell INCLUDES = -I$(RCSLIB_DIR)/include Modified: trunk/moast-bth/moast/bin/run =================================================================== --- trunk/moast-bth/moast/bin/run 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/bin/run 2007-10-29 20:24:46 UTC (rev 862) @@ -3,7 +3,7 @@ # USERS EDIT THIS AREA # # set up to use ackerman steering -#export USE_ACKERMAN=2 +export USE_ACKERMAN=1 # set up to use the submarine #export USE_NAUTIC=1.0 @@ -15,7 +15,7 @@ VEH=no # if VEH=no, set AM=yes to run AM, prim, and servo, else AM=no -AM=no +AM=yes # if AM=no, set PRIM=yes to run prim, and servo, else PRIM=no PRIM=yes Modified: trunk/moast-bth/moast/bin/runJoy =================================================================== --- trunk/moast-bth/moast/bin/runJoy 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/bin/runJoy 2007-10-29 20:24:46 UTC (rev 862) @@ -16,11 +16,13 @@ #Zerg #PLATFORM=7; JOYMODE=1 #Talon -PLATFORM=8; JOYMODE=1 +#PLATFORM=8; JOYMODE=1 #TeleMax #PLATFORM=9; JOYMODE=1 #AirRobot #PLATFORM=10; JOYMODE=4 +#Unit Loader +PLATFORM=12; JOYMODE=2 #done with user area if [ $# = 0 ]; then @@ -161,8 +163,8 @@ #./joySDL -d1 -x3 -y3 -z3 -w3 -m$JOYMODE& # Settings for the AirRobot -./robojoy -d1 -x1.5708 -y-5 -z5 -w-5 & - +#./robojoy -d1 -x1.5708 -y-5 -z5 -w-5 & +./robojoy & # Settings for other robots (robojoy will adjust scale factors automatically) #./robojoy -d1& pid11=$! Modified: trunk/moast-bth/moast/etc/moast.ini =================================================================== --- trunk/moast-bth/moast/etc/moast.ini 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/etc/moast.ini 2007-10-29 20:24:46 UTC (rev 862) @@ -75,13 +75,21 @@ ; V_CUTOFF_ANGLE = 10.0 ; W_CUTOFF_ANGLE = 45.0 +; unit loader +ACKERMAN_MAX_TRAN_VEL = 2.5 +ACKERMAN_MAX_TRAN_ACC = 1 +ACKERMAN_MAX_ROT_VEL = 60 +ACKERMAN_MAX_ROT_ACC = 145 +ACKERMAN_V_CUTOFF_ANGLE = 150 +ACKERMAN_W_CUTOFF_ANGLE = 10 + ; 60 mph = 26.9224 m/s -;MAX_TRAN_VEL = 100 -;MAX_TRAN_ACC = 2 -;MAX_ROT_VEL = 60 -;MAX_ROT_ACC = 145 -;V_CUTOFF_ANGLE = 150 -;W_CUTOFF_ANGLE = 10 +;ACKERMAN_MAX_TRAN_VEL = 100 +;ACKERMAN_MAX_TRAN_ACC = 2 +;ACKERMAN_MAX_ROT_VEL = 60 +;ACKERMAN_MAX_ROT_ACC = 145 +;ACKERMAN_V_CUTOFF_ANGLE = 150 +;ACKERMAN_W_CUTOFF_ANGLE = 10 ; USARSim robot driving MAX_TRAN_VEL = 2.5 @@ -138,7 +146,9 @@ PLATFORM_TYPE_8=Talon PLATFORM_TYPE_9=TeleMax PLATFORM_TYPE_10=AirRobot -PLATFORM_TYPE_11=SegwayRMP +PLATFORM_TYPE_11=Sedan +PLATFORM_TYPE_12=UnitLoader +PLATFORM_TYPE_13=SegwayRMP ; if < 0 then turn off trace function TRACE_FUNCTION=-0.1 @@ -251,6 +261,20 @@ UTM_START_POSE_2 = 239.9 129 -0.2 0 0 0 UTM_START_POSE_3 = 255.5 130 -0.2 0 0 0 +[DM-Factory] +UNREAL_UTM_OFFSET = 0 0 0 +RESOLUTION = 0.0196 +UTM_LETTER = N +UTM_ZONE = 18 +UTM_START_POSE_COUNT = 7 +UTM_START_POSE_1 = 12.34 6.3 1. 0 0 0 +UTM_START_POSE_2 = 12.61 -2.62 1. 0 0 0 +UTM_START_POSE_3 = 17.36 6.41 1. 0 0 0 +UTM_START_POSE_4 = 17.9 -2.71 1. 0 0 0 +UTM_START_POSE_5 = 23.17 6.28 1. 0 0 0 +UTM_START_POSE_6 = 23.1 2.10 1. 0 0 0 +UTM_START_POSE_7 = 23.22 -2.86 1. 0 0 0 + [DM-NISTBuild_V3] UNREAL_UTM_OFFSET = 0 0 0 RESOLUTION = 0.0196 @@ -434,6 +458,14 @@ UTM_START_POSE_COUNT = 1 UTM_START_POSE_1 = 79.38 48.45 -1.8 0 0 0 +[DM-Mobility_125] +UNREAL_UTM_OFFSET = 0. 0. 0 +RESOLUTION = 0.01905 +UTM_LETTER = N +UTM_ZONE = 18 +UTM_START_POSE_COUNT = 1 +UTM_START_POSE_1 = 157.9 85.5 1.5 0 0 0 + [DM-competitionWorld1] UNREAL_UTM_OFFSET = 0. 0. 0 RESOLUTION = 0.01905 Modified: trunk/moast-bth/moast/include/servoMisJA.hh =================================================================== --- trunk/moast-bth/moast/include/servoMisJA.hh 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/include/servoMisJA.hh 2007-10-29 20:24:46 UTC (rev 862) @@ -26,8 +26,8 @@ \code CVS Status: $Author: cj_scrapper $ - $Revision: 1.4 $ $ - $Date: 2007/03/12 17:32:07 $ + $Revision: 1.6 $ $ + $Date: 2007/10/18 17:53:45 $ \endcode \author Chris Scrapper @@ -75,7 +75,8 @@ { SERVO_MIS_JA_INVALID_JOINT_TYPE = -1, SERVO_MIS_JA_PRISMATIC_JOINT_TYPE, - SERVO_MIS_JA_REVOLUTE_JOINT_TYPE + SERVO_MIS_JA_REVOLUTE_JOINT_TYPE, + SERVO_MIS_JA_SCISSOR_JOINT_TYPE }ServoMisJAJointType; typedef enum SERVO_MIS_JA_LINK_CMD_TYPE @@ -250,6 +251,12 @@ Modification history: $Log: servoMisJA.hh,v $ + Revision 1.6 2007/10/18 17:53:45 cj_scrapper + Adding Scissor Joint + + Revision 1.5 2007/10/18 17:42:43 cj_scrapper + Adding Scissor joint + Revision 1.4 2007/03/12 17:32:07 cj_scrapper Added new servo Mission package commands Modified: trunk/moast-bth/moast/src/nml/servoMisJA.cc =================================================================== --- trunk/moast-bth/moast/src/nml/servoMisJA.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/nml/servoMisJA.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -22,7 +22,7 @@ /* * Initializer for ServoMisJALinkSet * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void initialize_ServoMisJALinkSet(ServoMisJALinkSet* x) { @@ -39,7 +39,7 @@ /* * Initializer for ServoMisJALinkCmd * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void initialize_ServoMisJALinkCmd(ServoMisJALinkCmd* x) { @@ -52,7 +52,7 @@ /* * Initializer for ServoMisJALinkStat * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void initialize_ServoMisJALinkStat(ServoMisJALinkStat* x) { @@ -110,6 +110,62 @@ // Enumerated Type Constants +// moastSteerType +#ifndef MAX_ENUM_MOASTSTEERTYPE_STRING_LENGTH +#define MAX_ENUM_MOASTSTEERTYPE_STRING_LENGTH 29 +#endif +#ifndef ENUM_MOASTSTEERTYPE_LENGTH +#define ENUM_MOASTSTEERTYPE_LENGTH 9 +#endif + +static const char enum_moastSteerType_string_list[ENUM_MOASTSTEERTYPE_LENGTH][MAX_ENUM_MOASTSTEERTYPE_STRING_LENGTH]= { + "MOAST_ACKERMAN_STEER_TYPE", /* 0,1 */ + "MOAST_FIXED_WING_STEER_TYPE", /* 1,5 */ + "MOAST_INVALID_STEER_TYPE", /* 2,-1 */ + "MOAST_OMNI_STEER_TYPE", /* 3,2 */ + "MOAST_ROTARY_WING_STEER_TYPE", /* 4,4 */ + "MOAST_SKID_STEER_TYPE", /* 5,0 */ + "MOAST_SUBMARINE_STEER_TYPE", /* 6,3 */ + "MOAST_UNKNOWN_STEER_TYPE", /* 7,6 */ + ""}; + +static const int enum_moastSteerType_int_list[ENUM_MOASTSTEERTYPE_LENGTH]= { + MOAST_ACKERMAN_STEER_TYPE, /* 0,1 */ + MOAST_FIXED_WING_STEER_TYPE, /* 1,5 */ + MOAST_INVALID_STEER_TYPE, /* 2,-1 */ + MOAST_OMNI_STEER_TYPE, /* 3,2 */ + MOAST_ROTARY_WING_STEER_TYPE, /* 4,4 */ + MOAST_SKID_STEER_TYPE, /* 5,0 */ + MOAST_SUBMARINE_STEER_TYPE, /* 6,3 */ + MOAST_UNKNOWN_STEER_TYPE, /* 7,6 */ + }; + +const char *servoMisJA_enum_moastSteerType_symbol_lookup(long v) +{ + switch(v) + { + case MOAST_ACKERMAN_STEER_TYPE: return("MOAST_ACKERMAN_STEER_TYPE"); /* 1 */ + case MOAST_FIXED_WING_STEER_TYPE: return("MOAST_FIXED_WING_STEER_TYPE"); /* 5 */ + case MOAST_INVALID_STEER_TYPE: return("MOAST_INVALID_STEER_TYPE"); /* -1 */ + case MOAST_OMNI_STEER_TYPE: return("MOAST_OMNI_STEER_TYPE"); /* 2 */ + case MOAST_ROTARY_WING_STEER_TYPE: return("MOAST_ROTARY_WING_STEER_TYPE"); /* 4 */ + case MOAST_SKID_STEER_TYPE: return("MOAST_SKID_STEER_TYPE"); /* 0 */ + case MOAST_SUBMARINE_STEER_TYPE: return("MOAST_SUBMARINE_STEER_TYPE"); /* 3 */ + case MOAST_UNKNOWN_STEER_TYPE: return("MOAST_UNKNOWN_STEER_TYPE"); /* 6 */ + default:break; + } + return(NULL); +} + +static const struct cms_enum_info enum_moastSteerType_info_struct={ + "moastSteerType", + (const char **)enum_moastSteerType_string_list, + enum_moastSteerType_int_list, + MAX_ENUM_MOASTSTEERTYPE_STRING_LENGTH, + ENUM_MOASTSTEERTYPE_LENGTH, + (cms_symbol_lookup_function_t)servoMisJA_enum_moastSteerType_symbol_lookup + }; + // RCS_ADMIN_STATE #ifndef MAX_ENUM_RCS_ADMIN_STATE_STRING_LENGTH #define MAX_ENUM_RCS_ADMIN_STATE_STRING_LENGTH 20 @@ -244,19 +300,21 @@ #define MAX_ENUM_SERVOMISJAJOINTTYPE_STRING_LENGTH 34 #endif #ifndef ENUM_SERVOMISJAJOINTTYPE_LENGTH -#define ENUM_SERVOMISJAJOINTTYPE_LENGTH 4 +#define ENUM_SERVOMISJAJOINTTYPE_LENGTH 5 #endif static const char enum_ServoMisJAJointType_string_list[ENUM_SERVOMISJAJOINTTYPE_LENGTH][MAX_ENUM_SERVOMISJAJOINTTYPE_STRING_LENGTH]= { "SERVO_MIS_JA_INVALID_JOINT_TYPE", /* 0,-1 */ "SERVO_MIS_JA_PRISMATIC_JOINT_TYPE", /* 1,0 */ "SERVO_MIS_JA_REVOLUTE_JOINT_TYPE", /* 2,1 */ + "SERVO_MIS_JA_SCISSOR_JOINT_TYPE", /* 3,2 */ ""}; static const int enum_ServoMisJAJointType_int_list[ENUM_SERVOMISJAJOINTTYPE_LENGTH]= { SERVO_MIS_JA_INVALID_JOINT_TYPE, /* 0,-1 */ SERVO_MIS_JA_PRISMATIC_JOINT_TYPE, /* 1,0 */ SERVO_MIS_JA_REVOLUTE_JOINT_TYPE, /* 2,1 */ + SERVO_MIS_JA_SCISSOR_JOINT_TYPE, /* 3,2 */ }; const char *servoMisJA_enum_ServoMisJAJointType_symbol_lookup(long v) @@ -266,6 +324,7 @@ case SERVO_MIS_JA_INVALID_JOINT_TYPE: return("SERVO_MIS_JA_INVALID_JOINT_TYPE"); /* -1 */ case SERVO_MIS_JA_PRISMATIC_JOINT_TYPE: return("SERVO_MIS_JA_PRISMATIC_JOINT_TYPE"); /* 0 */ case SERVO_MIS_JA_REVOLUTE_JOINT_TYPE: return("SERVO_MIS_JA_REVOLUTE_JOINT_TYPE"); /* 1 */ + case SERVO_MIS_JA_SCISSOR_JOINT_TYPE: return("SERVO_MIS_JA_SCISSOR_JOINT_TYPE"); /* 2 */ default:break; } return(NULL); @@ -280,6 +339,138 @@ (cms_symbol_lookup_function_t)servoMisJA_enum_ServoMisJAJointType_symbol_lookup }; +// moastFlipperType +#ifndef MAX_ENUM_MOASTFLIPPERTYPE_STRING_LENGTH +#define MAX_ENUM_MOASTFLIPPERTYPE_STRING_LENGTH 22 +#endif +#ifndef ENUM_MOASTFLIPPERTYPE_LENGTH +#define ENUM_MOASTFLIPPERTYPE_LENGTH 5 +#endif + +static const char enum_moastFlipperType_string_list[ENUM_MOASTFLIPPERTYPE_LENGTH][MAX_ENUM_MOASTFLIPPERTYPE_STRING_LENGTH]= { + "MOAST_FL_FLIPPER_TYPE", /* 0,1 */ + "MOAST_FR_FLIPPER_TYPE", /* 1,0 */ + "MOAST_RL_FLIPPER_TYPE", /* 2,3 */ + "MOAST_RR_FLIPPER_TYPE", /* 3,2 */ + ""}; + +static const int enum_moastFlipperType_int_list[ENUM_MOASTFLIPPERTYPE_LENGTH]= { + MOAST_FL_FLIPPER_TYPE, /* 0,1 */ + MOAST_FR_FLIPPER_TYPE, /* 1,0 */ + MOAST_RL_FLIPPER_TYPE, /* 2,3 */ + MOAST_RR_FLIPPER_TYPE, /* 3,2 */ + }; + +const char *servoMisJA_enum_moastFlipperType_symbol_lookup(long v) +{ + switch(v) + { + case MOAST_FL_FLIPPER_TYPE: return("MOAST_FL_FLIPPER_TYPE"); /* 1 */ + case MOAST_FR_FLIPPER_TYPE: return("MOAST_FR_FLIPPER_TYPE"); /* 0 */ + case MOAST_RL_FLIPPER_TYPE: return("MOAST_RL_FLIPPER_TYPE"); /* 3 */ + case MOAST_RR_FLIPPER_TYPE: return("MOAST_RR_FLIPPER_TYPE"); /* 2 */ + default:break; + } + return(NULL); +} + +static const struct cms_enum_info enum_moastFlipperType_info_struct={ + "moastFlipperType", + (const char **)enum_moastFlipperType_string_list, + enum_moastFlipperType_int_list, + MAX_ENUM_MOASTFLIPPERTYPE_STRING_LENGTH, + ENUM_MOASTFLIPPERTYPE_LENGTH, + (cms_symbol_lookup_function_t)servoMisJA_enum_moastFlipperType_symbol_lookup + }; + +// moastRobotType +#ifndef MAX_ENUM_MOASTROBOTTYPE_STRING_LENGTH +#define MAX_ENUM_MOASTROBOTTYPE_STRING_LENGTH 26 +#endif +#ifndef ENUM_MOASTROBOTTYPE_LENGTH +#define ENUM_MOASTROBOTTYPE_LENGTH 7 +#endif + +static const char enum_moastRobotType_string_list[ENUM_MOASTROBOTTYPE_LENGTH][MAX_ENUM_MOASTROBOTTYPE_STRING_LENGTH]= { + "MOAST_AERIAL_ROBOT_TYPE", /* 0,2 */ + "MOAST_GROUND_VEHICLE_TYPE", /* 1,0 */ + "MOAST_INVALID_ROBOT_TYPE", /* 2,-1 */ + "MOAST_LEGGED_ROBOT_TYPE", /* 3,3 */ + "MOAST_NAUTIC_ROBOT_TYPE", /* 4,1 */ + "MOAST_UNKNOWN_ROBOT_TYPE", /* 5,4 */ + ""}; + +static const int enum_moastRobotType_int_list[ENUM_MOASTROBOTTYPE_LENGTH]= { + MOAST_AERIAL_ROBOT_TYPE, /* 0,2 */ + MOAST_GROUND_VEHICLE_TYPE, /* 1,0 */ + MOAST_INVALID_ROBOT_TYPE, /* 2,-1 */ + MOAST_LEGGED_ROBOT_TYPE, /* 3,3 */ + MOAST_NAUTIC_ROBOT_TYPE, /* 4,1 */ + MOAST_UNKNOWN_ROBOT_TYPE, /* 5,4 */ + }; + +const char *servoMisJA_enum_moastRobotType_symbol_lookup(long v) +{ + switch(v) + { + case MOAST_AERIAL_ROBOT_TYPE: return("MOAST_AERIAL_ROBOT_TYPE"); /* 2 */ + case MOAST_GROUND_VEHICLE_TYPE: return("MOAST_GROUND_VEHICLE_TYPE"); /* 0 */ + case MOAST_INVALID_ROBOT_TYPE: return("MOAST_INVALID_ROBOT_TYPE"); /* -1 */ + case MOAST_LEGGED_ROBOT_TYPE: return("MOAST_LEGGED_ROBOT_TYPE"); /* 3 */ + case MOAST_NAUTIC_ROBOT_TYPE: return("MOAST_NAUTIC_ROBOT_TYPE"); /* 1 */ + case MOAST_UNKNOWN_ROBOT_TYPE: return("MOAST_UNKNOWN_ROBOT_TYPE"); /* 4 */ + default:break; + } + return(NULL); +} + +static const struct cms_enum_info enum_moastRobotType_info_struct={ + "moastRobotType", + (const char **)enum_moastRobotType_string_list, + enum_moastRobotType_int_list, + MAX_ENUM_MOASTROBOTTYPE_STRING_LENGTH, + ENUM_MOASTROBOTTYPE_LENGTH, + (cms_symbol_lookup_function_t)servoMisJA_enum_moastRobotType_symbol_lookup + }; + +// anonymous_enum_______include_moastTypes_hh_210 +#ifndef MAX_ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_STRING_LENGTH +#define MAX_ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_STRING_LENGTH 17 +#endif +#ifndef ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_LENGTH +#define ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_LENGTH 3 +#endif + +static const char enum_anonymous_enum_______include_moastTypes_hh_210_string_list[ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_LENGTH][MAX_ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_STRING_LENGTH]= { + "MOAST_ROTATE_CCW", /* 0,1 */ + "MOAST_ROTATE_CW", /* 1,0 */ + ""}; + +static const int enum_anonymous_enum_______include_moastTypes_hh_210_int_list[ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_LENGTH]= { + MOAST_ROTATE_CCW, /* 0,1 */ + MOAST_ROTATE_CW, /* 1,0 */ + }; + +const char *servoMisJA_enum_anonymous_enum_______include_moastTypes_hh_210_symbol_lookup(long v) +{ + switch(v) + { + case MOAST_ROTATE_CCW: return("MOAST_ROTATE_CCW"); /* 1 */ + case MOAST_ROTATE_CW: return("MOAST_ROTATE_CW"); /* 0 */ + default:break; + } + return(NULL); +} + +static const struct cms_enum_info enum_anonymous_enum_______include_moastTypes_hh_210_info_struct={ + "anonymous_enum_______include_moastTypes_hh_210", + (const char **)enum_anonymous_enum_______include_moastTypes_hh_210_string_list, + enum_anonymous_enum_______include_moastTypes_hh_210_int_list, + MAX_ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_STRING_LENGTH, + ENUM_ANONYMOUS_ENUM_______INCLUDE_MOASTTYPES_HH_210_LENGTH, + (cms_symbol_lookup_function_t)servoMisJA_enum_anonymous_enum_______include_moastTypes_hh_210_symbol_lookup + }; + /* Estimated_size ServoMisJACfgCycleTime 32 Estimated_size ServoMisJACfgDebug 32 @@ -298,7 +489,7 @@ /* * NML/CMS Format function : servoMisJA_format * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ int servoMisJA_format(NMLTYPE type, void *buffer, CMS *cms) { @@ -380,7 +571,7 @@ /* * NML/CMS Update function for ServoMisJACmdMove * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACmdMove::update(CMS *cms) { @@ -405,7 +596,7 @@ /* * NML/CMS Update function for ServoMisJALinkSet * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void nmlupdate(CMS *cms,ServoMisJALinkSet *x) { @@ -429,7 +620,7 @@ /* * NML/CMS Update function for ServoMisJACfgDebug * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACfgDebug::update(CMS *cms) { @@ -446,7 +637,7 @@ /* * NML/CMS Update function for ServoMisJASet * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJASet::update(CMS *cms) { @@ -475,7 +666,7 @@ /* * NML/CMS Update function for ServoMisJACmdShutdown * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACmdShutdown::update(CMS *cms) { @@ -491,7 +682,7 @@ /* * NML/CMS Update function for ServoMisJACfgCycleTime * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACfgCycleTime::update(CMS *cms) { @@ -508,7 +699,7 @@ /* * NML/CMS Update function for ServoMisJACmdInit * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACmdInit::update(CMS *cms) { @@ -524,7 +715,7 @@ /* * NML/CMS Update function for ServoMisJALinkCmd * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void nmlupdate(CMS *cms,ServoMisJALinkCmd *x) { @@ -542,7 +733,7 @@ /* * NML/CMS Update function for ServoMisJACmdAbort * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACmdAbort::update(CMS *cms) { @@ -558,7 +749,7 @@ /* * NML/CMS Update function for ServoMisJAStat * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJAStat::update(CMS *cms) { @@ -590,7 +781,7 @@ /* * NML/CMS Update function for ServoMisJACmdHalt * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void ServoMisJACmdHalt::update(CMS *cms) { @@ -606,7 +797,7 @@ /* * NML/CMS Update function for ServoMisJALinkStat * Automatically generated by NML CodeGen Java Applet. -* on Mon Mar 12 16:18:53 EDT 2007 +* on Thu Oct 18 13:45:07 EDT 2007 */ void nmlupdate(CMS *cms,ServoMisJALinkStat *x) { Modified: trunk/moast-bth/moast/src/prim/primMobMain.cc =================================================================== --- trunk/moast-bth/moast/src/prim/primMobMain.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/prim/primMobMain.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -16,8 +16,8 @@ \code CVS Status: $Author: dr_steveb $ - $Revision: 1.30 $ - $Date: 2007/05/10 13:18:29 $ + $Revision: 1.32 $ + $Date: 2007/10/17 21:35:55 $ \endcode \author Fred Proctor @@ -286,7 +286,7 @@ ackerMsg.velocity, ackerMsg.steerAngle, trash); - ackerMsg.crabAngle = 0; + ackerMsg.crabAngle = -ackerMsg.steerAngle; SET_AND_RECORD(ackerMsg); sub_cmd_buf->write(&ackerMsg); } else if (engine->isNautic()) { @@ -329,7 +329,7 @@ ackerMsg.velocity, ackerMsg.steerAngle, trash); - ackerMsg.crabAngle = 0; + ackerMsg.crabAngle = -ackerMsg.steerAngle; SET_AND_RECORD(ackerMsg); sub_cmd_buf->write(&ackerMsg); } else if (engine->isNautic()) { @@ -455,7 +455,7 @@ stat->status = engine->doCmdVel(S0, cmd->v, cmd->w, stat->state, ackerMsg.velocity, ackerMsg.steerAngle, trash ); - ackerMsg.crabAngle = 0; + ackerMsg.crabAngle = -ackerMsg.steerAngle; SET_AND_RECORD(ackerMsg); sub_cmd_buf->write(&ackerMsg); } else if (engine->isNautic()) { @@ -765,15 +765,16 @@ #define INI_INVALID 2 #endif -static int iniLoad(const char * prog, const char * filename, PrimMobJASet * set) +static int iniLoad(const char * prog, const char * filename, PrimMobJASet * set, PrimMobEngine *engine) { INIFILE inifile; - const char * key; const char * section; const char * inistring; + const char * extra; double d; int i; int retval = INI_OK; + char key[80]; if (0 != inifile.open(filename)) { rcs_print_error("%s: can't open INI file %s, using defaults for PrimMobJASet\n", prog, filename); @@ -789,7 +790,14 @@ section = "PRIM_MOB_JA"; - key = "CYCLE_TIME"; + if( engine->isAckerman() ) + extra = "ACKERMAN_"; + else if( engine->isNautic() ) + extra = "NAUTIC_"; + else + extra = ""; + + sprintf( key, "%s", "CYCLE_TIME" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -812,7 +820,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "MAX_TRAN_VEL"; + sprintf(key, "%s%s", extra,"MAX_TRAN_VEL" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -834,7 +842,8 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "MAX_TRAN_ACC"; + + sprintf( key, "%s%s", extra, "MAX_TRAN_ACC" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -856,7 +865,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "MAX_ROT_VEL"; + sprintf( key, "%s%s", extra, "MAX_ROT_VEL" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -878,7 +887,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "MAX_ROT_ACC"; + sprintf(key, "%s%s", extra, "MAX_ROT_ACC"); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -900,7 +909,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "V_CUTOFF_ANGLE"; + sprintf( key, "%s%s", extra, "V_CUTOFF_ANGLE" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -922,7 +931,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "W_CUTOFF_ANGLE"; + sprintf( key, "%s%s", extra, "W_CUTOFF_ANGLE" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%lf", &d) && d > 0.0) { @@ -944,7 +953,7 @@ retval = (retval == INI_OK ? INI_DEFAULT : retval); } - key = "DEBUG"; + sprintf( key, "%s", "DEBUG" ); if (NULL != (inistring = inifile.find(key, section))) { if (1 == sscanf(inistring, "%i", &i)) { // found, and valid @@ -1086,7 +1095,7 @@ // others will come from .ini file shortly... // read in the INI file params - if (INI_INVALID == iniLoad(argv[0], INI_FILE, &primMobJASet)) { + if (INI_INVALID == iniLoad(argv[0], INI_FILE, &primMobJASet, engine)) { rcs_print_error("%s: error loading INI file '%s'\n", argv[0], INI_FILE); return 1; } @@ -1408,6 +1417,12 @@ Modification history: $Log: primMobMain.cc,v $ + Revision 1.32 2007/10/17 21:35:55 dr_steveb + Added reading of ackerman and nautic specific parameters from .ini file + + Revision 1.31 2007/10/17 19:15:20 dr_steveb + Added ability to drive rear-wheel steer vehicles + Revision 1.30 2007/05/10 13:18:29 dr_steveb Separated the prim mobility planning engine from the interface wrappers. This will allow a controller to be created (the traffic controller) that controls a large number of vehicles without the overhead of individual NML channels for each vehicle. No changes in the algorithms were made. Modified: trunk/moast-bth/moast/src/section/rcsSectMobPlEngine.cc =================================================================== --- trunk/moast-bth/moast/src/section/rcsSectMobPlEngine.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/section/rcsSectMobPlEngine.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -2092,7 +2092,7 @@ dataPt[count++] = cell; } } - Boeing::MsgMap::MsgMapFactory(Boeing::MAP_RLE, + Boeing::MsgMap::MsgMapFactory(Boeing::MAP_X_MAJOR, boeingMapMsg, dataPt, count, 0, 0, Modified: trunk/moast-bth/moast/src/sim/simWare/swKBTypes.hh =================================================================== --- trunk/moast-bth/moast/src/sim/simWare/swKBTypes.hh 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/sim/simWare/swKBTypes.hh 2007-10-29 20:24:46 UTC (rev 862) @@ -34,6 +34,7 @@ typedef enum SIMWARE_JOINT_TYPE { SW_KB_PRISMATIC_JOINT_TYPE, + SW_KB_SCISSOR_JOINT_TYPE, SW_KB_REVOLUTE_JOINT_TYPE, SW_KB_UNKNOWN_JOINT_TYPE }SIMwareJointType; Modified: trunk/moast-bth/moast/src/sim/simWare/swServoMis.cc =================================================================== --- trunk/moast-bth/moast/src/sim/simWare/swServoMis.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/sim/simWare/swServoMis.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -164,6 +164,10 @@ case SW_KB_REVOLUTE_JOINT_TYPE: ((ServoMisJASet *)setMsg)->linkSet[count].jType=SERVO_MIS_JA_REVOLUTE_JOINT_TYPE; break; + + case SW_KB_SCISSOR_JOINT_TYPE: + ((ServoMisJASet *)setMsg)->linkSet[count].jType=SERVO_MIS_JA_SCISSOR_JOINT_TYPE; + break; default: ((ServoMisJASet *)setMsg)->linkSet[count].jType=SERVO_MIS_JA_INVALID_JOINT_TYPE; Modified: trunk/moast-bth/moast/src/sim/simWare/usarInfSkin.cc =================================================================== --- trunk/moast-bth/moast/src/sim/simWare/usarInfSkin.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/sim/simWare/usarInfSkin.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -1518,6 +1518,8 @@ linkPtr->setJointType(SW_KB_REVOLUTE_JOINT_TYPE); else if( !nocase_cmp (toks[i], "Prismatic")) linkPtr->setJointType(SW_KB_PRISMATIC_JOINT_TYPE); + else if( !nocase_cmp (toks[i], "Scissor")) + linkPtr->setJointType(SW_KB_SCISSOR_JOINT_TYPE); else linkPtr->setJointType(SW_KB_UNKNOWN_JOINT_TYPE); } Modified: trunk/moast-bth/moast/src/skel/Makefile =================================================================== --- trunk/moast-bth/moast/src/skel/Makefile 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/skel/Makefile 2007-10-29 20:24:46 UTC (rev 862) @@ -5,11 +5,11 @@ include Makefile.rcs NML_HEADERS = skel.hh -NML_SOURCES = $(NML_HEADERS:%.hh=%_n.cc) +NML_SOURCES = $(NML_HEADERS:%.hh=%_n.cc) skel.nml NML_OBJS = $(NML_SOURCES:%.cc=%.o) OTHER_HEADERS = skelCommon.hh -OTHER_SOURCES = skelSvr.cc skelApp.cc skelShell.cc +OTHER_SOURCES = skelSvr.cc skelApp.cc skelShell.cc nmlRead.cc nmlWrite.cc OTHER_OBJS = $(OTHER_SOURCES:%.cc=%.o) HEADERS = $(NML_HEADERS) $(OTHER_HEADERS) @@ -20,7 +20,7 @@ LIBS = libskel_nml.a -BINS = skelSvr skelApp skelShell +BINS = skelSvr skelApp skelShell nmlRead nmlWrite all : $(NML_SOURCES) $(OBJS) $(LIBS) $(BINS) @@ -30,6 +30,7 @@ %_n.cc : %.hh echo load $< > $(TEMP_CODEGEN) echo clear >> $(TEMP_CODEGEN) + echo _generate_symbol_lookups=true >> $(TEMP_CODEGEN) echo 'select_from_file $<' >> $(TEMP_CODEGEN) echo 'set_format_function $(@:%_n.cc=%)_format' >> $(TEMP_CODEGEN) echo 'generate C++ format >$@' >> $(TEMP_CODEGEN) @@ -40,7 +41,16 @@ rm $(TEMP_CODEGEN) indent $@ +# +# build the nml configuration file # +NMLCFG = $(RCSDIR)/bin/nmlcfg + +%.nml : %.cfg + @ echo building $@ from $< + $(NMLCFG) $< -o $@ + +# # Explicit rule for the skeleton NML library # libskel_nml.a : $(NML_OBJS) Added: trunk/moast-bth/moast/src/skel/nmlRead.cc =================================================================== --- trunk/moast-bth/moast/src/skel/nmlRead.cc (rev 0) +++ trunk/moast-bth/moast/src/skel/nmlRead.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -0,0 +1,133 @@ +/***************************************************************************** + DISCLAIMER: + This software was produced by the National Institute of Standards + and Technology (NIST), an agency of the U.S. government, and by statute is + not subject to copyright in the United States. Recipients of this software + assume all responsibility associated with its operation, modification, + maintenance, and subsequent redistribution. + + See NIST Administration Manual 4.09.07 b and Appendix I. +*****************************************************************************/ +/*! + \file nmlRead.cc + \brief example of reading an NML buffer + + \code CVS Status: + $Author: dr_steveb $ + $Revision: 1.3 $ + $Date: 2007/10/16 17:13:08 $ + \endcode + + \author Stephen Balakisky + \date 10/15/2007 +*/ + +#include // NULL +#include // getenv() +#include "rcs.hh" // RCS_CMD,STAT_CHANNEL, rcs_print() +#include "skelCommon.hh" +#include "skel.hh" + +static RCS_CMD_CHANNEL * skel_cmd_buf= NULL; + +#define DEFAULT_NML_FILE "./skel.nml" +#define SKEL_CMD_NAME "skelCmd" // NML cmd buffer name +#define THIS_PROCESS "nmlRead" // NML process name for the server + +static int init_nml_buffers(char * config_file) +{ + if (NULL != skel_cmd_buf) delete skel_cmd_buf; + skel_cmd_buf = new RCS_CMD_CHANNEL(skel_format, SKEL_CMD_NAME, THIS_PROCESS, config_file); + if (! skel_cmd_buf->valid()) { + delete skel_cmd_buf; + skel_cmd_buf = 0; + return 1; + } + skel_cmd_buf->clear(); + return 0; +} + +#define max(a,b) ((a) > (b) ? (a) : (b)) + +int main(int argc, char *argv[]) +{ + char config_file_default[] = DEFAULT_NML_FILE; + char * config_file_env; + char * NML_FILE = config_file_default; + int retval; + NMLTYPE cmdType; + RCS_TIMER timer(.1); + + // get the config file name from arg, if provided, next environment, + // if there, else default + if (argc > 1) { + NML_FILE = argv[1]; + rcs_print("%s: using specified config file %s\n", argv[0], NML_FILE); + } else { + config_file_env = getenv("CONFIG_NML"); + if (NULL != config_file_env) { + NML_FILE = config_file_env; + rcs_print("%s: using environment config file %s\n", argv[0], NML_FILE); + } else { + rcs_print("%s: using default config file %s\n", argv[0], NML_FILE); + } + } + + // initial allocate all the buffers + retval = init_nml_buffers(NML_FILE); + + if (retval) { + rcs_print_error("%s: can't allocate NML buffers\n", argv[0]); + return 1; + } + + // read a value from the buffer + /****************************************************************** + * READ COMMAND - Command information is received, and the system + * is prepared to execute the command. When a new + * command is received, the old command is immediately + * replaced by this command. If the command is not + * able to be interrupted, error flags are set and + * will be reported during the writng of status + */ + + // read command + for(;;) + { + cmdType = skel_cmd_buf->read(); + switch (cmdType) { + case 0: + // no new command + break; + case -1: + // comm error + rcs_print_error("%s: NML command read error\n", argv[0]); + break; + case SKEL_CMD_GO_TYPE: + rcs_print( "new Go command received with value: %f\n", ((SkelCmdGo *) skel_cmd_buf->get_address())->where ); + break; + case SKEL_CMD_SHUTDOWN_TYPE: + nml_cleanup(); + rcs_print( "Exiting...\n" ); + return 0; + } + timer.wait(); + } + // will never get here + return 0; +} + +/* + Modification history: + + $Log: nmlRead.cc,v $ + Revision 1.3 2007/10/16 17:13:08 dr_steveb + Added timer to loop + + Revision 1.2 2007/10/16 12:53:48 dr_steveb + Added the ability to have programs exit and some comments. + + Revision 1.1 2007/10/15 21:09:55 dr_steveb + Changes made for IEEE workshop presentation + +*/ Added: trunk/moast-bth/moast/src/skel/nmlWrite.cc =================================================================== --- trunk/moast-bth/moast/src/skel/nmlWrite.cc (rev 0) +++ trunk/moast-bth/moast/src/skel/nmlWrite.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -0,0 +1,115 @@ +/***************************************************************************** + DISCLAIMER: + This software was produced by the National Institute of Standards + and Technology (NIST), an agency of the U.S. government, and by statute is + not subject to copyright in the United States. Recipients of this software + assume all responsibility associated with its operation, modification, + maintenance, and subsequent redistribution. + + See NIST Administration Manual 4.09.07 b and Appendix I. +*****************************************************************************/ +/*! + \file nmlWrite.cc + \brief example of writing an NML buffer + + \code CVS Status: + $Author: dr_steveb $ + $Revision: 1.2 $ + $Date: 2007/10/16 12:53:48 $ + \endcode + + \author Stephen Balakisky + \date 10/15/2007 +*/ + +#include // NULL +#include // getenv() +#include +#include "rcs.hh" // RCS_CMD,STAT_CHANNEL, rcs_print() +#include "skelCommon.hh" +#include "skel.hh" + +static RCS_CMD_CHANNEL * skel_cmd_buf= NULL; + +#define DEFAULT_NML_FILE "./skel.nml" +#define SKEL_CMD_NAME "skelCmd" // NML cmd buffer name +#define THIS_PROCESS "nmlWrite" // NML process name for the server + +static int init_nml_buffers(char * config_file) +{ + if (NULL != skel_cmd_buf) delete skel_cmd_buf; + skel_cmd_buf = new RCS_CMD_CHANNEL(skel_format, SKEL_CMD_NAME, THIS_PROCESS, config_file); + if (! skel_cmd_buf->valid()) { + delete skel_cmd_buf; + skel_cmd_buf = 0; + return 1; + } + return 0; +} + +#define max(a,b) ((a) > (b) ? (a) : (b)) + +int main(int argc, char *argv[]) +{ + char config_file_default[] = DEFAULT_NML_FILE; + char * config_file_env; + char * NML_FILE = config_file_default; + int retval; + SkelCmdGo goCmd; + SkelCmdShutdown shutdownCmd; + + printf("usage: please run skelSvr before running this program.\n"); + printf("Next, run this program (nmlWrite) and nmlRead.\n"); + printf("Type a value and the value should appear at the nmlRead application.\n"); + printf("Type a negative value to exit.\n"); + // get the config file name from arg, if provided, next environment, + // if there, else default + if (argc > 1) { + NML_FILE = argv[1]; + rcs_print("%s: using specified config file %s\n", argv[0], NML_FILE); + } else { + config_file_env = getenv("CONFIG_NML"); + if (NULL != config_file_env) { + NML_FILE = config_file_env; + rcs_print("%s: using environment config file %s\n", argv[0], NML_FILE); + } else { + rcs_print("%s: using default config file %s\n", argv[0], NML_FILE); + } + } + + // initial allocate all the buffers + retval = init_nml_buffers(NML_FILE); + + if (retval) { + rcs_print_error("%s: can't allocate NML buffers\n", argv[0]); + return 1; + } + for(;;) + { + fscanf(stdin, "%lf", &goCmd.where); + if( goCmd.where < 0 ) + { + skel_cmd_buf->write(shutdownCmd); + nml_cleanup(); + printf( "Exiting...\n" ); + return 0; + } + else + skel_cmd_buf->write(goCmd); + } + + // will never get here + return 0; +} + +/* + Modification history: + + $Log: nmlWrite.cc,v $ + Revision 1.2 2007/10/16 12:53:48 dr_steveb + Added the ability to have programs exit and some comments. + + Revision 1.1 2007/10/15 21:09:56 dr_steveb + Changes made for IEEE workshop presentation + +*/ Added: trunk/moast-bth/moast/src/skel/skel.cfg =================================================================== --- trunk/moast-bth/moast/src/skel/skel.cfg (rev 0) +++ trunk/moast-bth/moast/src/skel/skel.cfg 2007-10-29 20:24:46 UTC (rev 862) @@ -0,0 +1,22 @@ +b bufname=skelCmd size=1024 +b bufname=skelStat size=1024 +b bufname=skelCfg size=1024 +b bufname=skelSet size=1024 + +p bufname=skelCmd name=skelSvr master=1 server=1 proctype=local +p bufname=skelStat name=skelSvr master=1 server=1 proctype=local +p bufname=skelCfg name=skelSvr master=1 server=1 proctype=local +p bufname=skelSet name=skelSvr master=1 server=1 proctype=local + +p bufname=skelCmd name=skelApp master=0 server=0 proctype=local +p bufname=skelStat name=skelApp master=0 server=0 proctype=local +p bufname=skelCfg name=skelApp master=0 server=0 proctype=local +p bufname=skelSet name=skelApp master=0 server=0 proctype=local + +p bufname=skelCmd name=skelShell master=0 server=0 proctype=local +p bufname=skelStat name=skelShell master=0 server=0 proctype=local +p bufname=skelCfg name=skelShell master=0 server=0 proctype=local +p bufname=skelSet name=skelShell master=0 server=0 proctype=local + +p bufname=skelCmd name=nmlWrite master=0 server=0 proctype=local +p bufname=skelCmd name=nmlRead master=0 server=0 proctype=local Modified: trunk/moast-bth/moast/src/skel/skel.nml =================================================================== --- trunk/moast-bth/moast/src/skel/skel.nml 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/skel/skel.nml 2007-10-29 20:24:46 UTC (rev 862) @@ -1,30 +1,30 @@ # skel.nml + +# Buffers: +# name type host size neut 0 buf# max_proc . . . +B skelCmd SHMEM localhost 1088 0 * 1 * 30701 TCP=25700 xdr +B skelStat SHMEM localhost 1088 0 * 2 * 30702 TCP=25701 xdr +B skelCfg SHMEM localhost 1088 0 * 3 * 30703 TCP=25702 xdr +B skelSet SHMEM localhost 1088 0 * 4 * 30704 TCP=25703 xdr -# Buffers -# name type host size neut (old) buf# max_proc shmem_key, ... +# Processes: +# Name Buffer type host ops server timeout master c_num . . . +P skelSvr skelCmd LOCAL localhost RW 1 INF 1 0 +P skelSvr skelStat LOCAL localhost RW 1 INF 1 0 +P skelSvr skelCfg LOCAL localhost RW 1 INF 1 0 +P skelSvr skelSet LOCAL localhost RW 1 INF 1 0 + +P skelApp skelCmd LOCAL localhost RW 0 INF 0 1 +P skelApp skelStat LOCAL localhost RW 0 INF 0 1 +P skelApp skelCfg LOCAL localhost RW 0 INF 0 1 +P skelApp skelSet LOCAL localhost RW 0 INF 0 1 + +P skelShell skelCmd LOCAL localhost RW 0 INF 0 2 +P skelShell skelStat LOCAL localhost RW 0 INF 0 2 +P skelShell skelCfg LOCAL localhost RW 0 INF 0 2 +P skelShell skelSet LOCAL localhost RW 0 INF 0 2 + +P nmlWrite skelCmd LOCAL localhost RW 0 INF 0 3 +P nmlRead skelCmd LOCAL localhost RW 0 INF 0 4 -B skelCmd SHMEM localhost 1024 0 * 1 * 101 TCP=25101 xdr -B skelStat SHMEM localhost 1024 0 * 2 * 102 TCP=25102 xdr -B skelCfg SHMEM localhost 1024 0 * 3 * 103 TCP=25103 xdr -B skelSet SHMEM localhost 1024 0 * 4 * 104 TCP=25104 xdr - -# Processes -# name buffer type host ops server timeout master c_num waitformaster, ... - -P skelSvr skelCmd LOCAL localhost RW 1 INF 1 0 -P skelSvr skelStat LOCAL localhost RW 1 INF 1 0 -P skelSvr skelCfg LOCAL localhost RW 1 INF 1 0 -P skelSvr skelSet LOCAL localhost RW 1 INF 1 0 - -P skelApp skelCmd LOCAL localhost RW 0 INF 0 1 waitformaster -P skelApp skelStat LOCAL localhost RW 0 INF 0 1 waitformaster -P skelApp skelCfg LOCAL localhost RW 0 INF 0 1 waitformaster -P skelApp skelSet LOCAL localhost RW 0 INF 0 1 waitformaster - -P skelShell skelCmd LOCAL localhost RW 0 INF 0 2 waitformaster -P skelShell skelStat LOCAL localhost RW 0 INF 0 2 waitformaster -P skelShell skelCfg LOCAL localhost RW 0 INF 0 2 waitformaster -P skelShell skelSet LOCAL localhost RW 0 INF 0 2 waitformaster - -P default default AUTO localhost RW 0 INF 0 10 waitformaster Modified: trunk/moast-bth/moast/src/skel/skel_n.cc =================================================================== --- trunk/moast-bth/moast/src/skel/skel_n.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/skel/skel_n.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -110,7 +110,7 @@ default: break; } - return (NULL); + return ("!!UNDEFINED_SYMBOL!!"); } static const struct cms_enum_info enum_RCS_STATUS_info_struct = { @@ -123,9 +123,23 @@ }; /* +Estimated_size SkelCfgCycleTime 32 +Estimated_size SkelCfgDebug 32 +Estimated_size SkelCfgLength 32 +Estimated_size SkelCfgWidth 32 +Estimated_size SkelCmdAbort 24 +Estimated_size SkelCmdGo 32 +Estimated_size SkelCmdHalt 24 +Estimated_size SkelCmdInit 24 +Estimated_size SkelCmdShutdown 24 +Estimated_size SkelSet 176 +Estimated_size SkelStat 144 +Estimated_size MAXIMUM 176 +*/ +/* * NML/CMS Format function : skel_format * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ int skel_format (NMLTYPE type, void *buffer, CMS * cms) @@ -217,62 +231,81 @@ } /* -* NML/CMS Update function for SkelCfgWidth +* NML/CMS Update function for SkelCfgCycleTime * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void -SkelCfgWidth::update (CMS * cms) +SkelCfgCycleTime::update (CMS * cms) { - cms->beginClass ("SkelCfgWidth", "RCS_CMD_MSG"); + cms->beginClass ("SkelCfgCycleTime", "RCS_CMD_MSG"); RCS_CMD_MSG::update_cmd_msg_base (cms); - cms->update_with_name ("width", width); + cms->update_with_name ("cycleTime", cycleTime); - cms->endClass ("SkelCfgWidth", "RCS_CMD_MSG"); + cms->endClass ("SkelCfgCycleTime", "RCS_CMD_MSG"); } /* -* NML/CMS Update function for SkelCmdShutdown +* NML/CMS Update function for SkelCfgDebug * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void -SkelCmdShutdown::update (CMS * cms) +SkelCfgDebug::update (CMS * cms) { - cms->beginClass ("SkelCmdShutdown", "RCS_CMD_MSG"); + cms->beginClass ("SkelCfgDebug", "RCS_CMD_MSG"); RCS_CMD_MSG::update_cmd_msg_base (cms); + cms->update_with_name ("debug", debug); - cms->endClass ("SkelCmdShutdown", "RCS_CMD_MSG"); + cms->endClass ("SkelCfgDebug", "RCS_CMD_MSG"); } /* -* NML/CMS Update function for SkelCfgCycleTime +* NML/CMS Update function for SkelCfgLength * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void -SkelCfgCycleTime::update (CMS * cms) +SkelCfgLength::update (CMS * cms) { - cms->beginClass ("SkelCfgCycleTime", "RCS_CMD_MSG"); + cms->beginClass ("SkelCfgLength", "RCS_CMD_MSG"); RCS_CMD_MSG::update_cmd_msg_base (cms); - cms->update_with_name ("cycleTime", cycleTime); + cms->update_with_name ("length", length); - cms->endClass ("SkelCfgCycleTime", "RCS_CMD_MSG"); + cms->endClass ("SkelCfgLength", "RCS_CMD_MSG"); } /* +* NML/CMS Update function for SkelCfgWidth +* Automatically generated by NML CodeGen Java Applet. +* on Mon Oct 15 16:53:22 EDT 2007 +*/ +void +SkelCfgWidth::update (CMS * cms) +{ + + cms->beginClass ("SkelCfgWidth", "RCS_CMD_MSG"); + RCS_CMD_MSG::update_cmd_msg_base (cms); + cms->update_with_name ("width", width); + + cms->endClass ("SkelCfgWidth", "RCS_CMD_MSG"); + +} + + +/* * NML/CMS Update function for SkelCmdAbort * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void SkelCmdAbort::update (CMS * cms) @@ -289,7 +322,7 @@ /* * NML/CMS Update function for SkelCmdGo * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void SkelCmdGo::update (CMS * cms) @@ -307,7 +340,7 @@ /* * NML/CMS Update function for SkelCmdHalt * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void SkelCmdHalt::update (CMS * cms) @@ -322,47 +355,9 @@ /* -* NML/CMS Update function for SkelCfgLength -* Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 -*/ -void -SkelCfgLength::update (CMS * cms) -{ - - cms->beginClass ("SkelCfgLength", "RCS_CMD_MSG"); - RCS_CMD_MSG::update_cmd_msg_base (cms); - cms->update_with_name ("length", length); - - cms->endClass ("SkelCfgLength", "RCS_CMD_MSG"); - -} - - -/* -* NML/CMS Update function for SkelStat -* Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 -*/ -void -SkelStat::update (CMS * cms) -{ - - cms->beginClass ("SkelStat", "RCS_STAT_MSG"); - - RCS_STAT_MSG::update_stat_msg_base (cms); - cms->update_with_name ("where", where); - cms->update_with_name ("here", here); - - cms->endClass ("SkelStat", "RCS_STAT_MSG"); - -} - - -/* * NML/CMS Update function for SkelCmdInit * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void SkelCmdInit::update (CMS * cms) @@ -377,19 +372,18 @@ /* -* NML/CMS Update function for SkelCfgDebug +* NML/CMS Update function for SkelCmdShutdown * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void -SkelCfgDebug::update (CMS * cms) +SkelCmdShutdown::update (CMS * cms) { - cms->beginClass ("SkelCfgDebug", "RCS_CMD_MSG"); + cms->beginClass ("SkelCmdShutdown", "RCS_CMD_MSG"); RCS_CMD_MSG::update_cmd_msg_base (cms); - cms->update_with_name ("debug", debug); - cms->endClass ("SkelCfgDebug", "RCS_CMD_MSG"); + cms->endClass ("SkelCmdShutdown", "RCS_CMD_MSG"); } @@ -397,7 +391,7 @@ /* * NML/CMS Update function for SkelSet * Automatically generated by NML CodeGen Java Applet. -* on Tue Oct 18 17:39:25 EDT 2005 +* on Mon Oct 15 16:53:22 EDT 2007 */ void SkelSet::update (CMS * cms) @@ -416,3 +410,23 @@ cms->endClass ("SkelSet", "RCS_STAT_MSG"); } + + +/* +* NML/CMS Update function for SkelStat +* Automatically generated by NML CodeGen Java Applet. +* on Mon Oct 15 16:53:22 EDT 2007 +*/ +void +SkelStat::update (CMS * cms) +{ + + cms->beginClass ("SkelStat", "RCS_STAT_MSG"); + + RCS_STAT_MSG::update_stat_msg_base (cms); + cms->update_with_name ("where", where); + cms->update_with_name ("here", here); + + cms->endClass ("SkelStat", "RCS_STAT_MSG"); + +} Modified: trunk/moast-bth/moast/src/tools/linkMonitor/linkMon.cc =================================================================== --- trunk/moast-bth/moast/src/tools/linkMonitor/linkMon.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/tools/linkMonitor/linkMon.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -26,8 +26,8 @@ \code CVS Status: $Author: dr_steveb $ - $Revision: 1.3 $ - $Date: 2007/09/18 20:03:49 $ + $Revision: 1.5 $ + $Date: 2007/09/20 20:14:57 $ \endcode \author Stephen Balakirsky @@ -56,6 +56,9 @@ static LinkMonStat linkMonStat; static int done = 0; static int server_fd = -1; // connection to unreal +static int *server_listen = NULL; // connection to message sent over comm server +static int *server_listenCon = NULL; // connection to message sent over comm server + static float radioCutOff = 60; #define DEFAULT_NML_FILE "../etc/moast.nml" @@ -65,6 +68,7 @@ static char *USARSimHostName; static int USARSimPort = 5874; +static int USARSimListenPortBase = 7795; // global variables and defines for searcher #define DIJK_MAP_SIZE MAX_TRAFFIC_VEHICLES * MAX_TRAFFIC_VEHICLES @@ -142,6 +146,94 @@ return sockfd; } +/* + * Accept a new TCP connection and write a message about who was + * accepted to the system log. + */ + +static int tcp_accept(int listen) +{ + struct sockaddr_storage ss; + socklen_t ss_len = sizeof(ss); + char host[NI_MAXHOST]; + char serv[NI_MAXSERV]; + int n, fd; + + fd = accept(listen, (struct sockaddr *) &ss, &ss_len); + if (fd == -1) + { + printf("accept failed: %s\n", strerror(errno)); + return -1; + } + + n = getnameinfo((struct sockaddr *) &ss, ss_len, + host, sizeof(host), serv, sizeof(serv), + NI_NUMERICHOST); + if (n) + { + printf("getnameinfo failed: %s\n", gai_strerror(n)); + } + else + { + printf("connection from %s:%s\n", host, serv); + } + return fd; +} + +static int tcp_listen(char *port) +{ + struct addrinfo hints, *ai_list, *ai; + int n, fd = 0, on = 1; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_PASSIVE; + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + n = getaddrinfo(NULL, port, &hints, &ai_list); + if (n) + { + fprintf(stderr, "%s: getaddrinfo failed: %s\n", + THIS_PROCESS, gai_strerror(n)); + return -1; + } + + for (ai = ai_list; ai; ai = ai->ai_next) + { + fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (fd < 0) + { + continue; + } + + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (bind(fd, ai->ai_addr, ai->ai_addrlen) == 0) + { + break; + } + close(fd); + } + + freeaddrinfo(ai_list); + + if (ai == NULL) + { + fprintf(stderr, "%s: bind failed for port %s\n", + THIS_PROCESS, port); + return -1; + } + + if (listen(fd, 42) < 0) + { + fprintf(stderr, "%s: listen failed: %s\n", + THIS_PROCESS, strerror(errno)); + close(fd); + return -1; + } + + return fd; +} + ///////////////////////////////////////////////////////////////////////////////////////// //// graph search routines from Tom Kramer and me ///////////////////////////////////////////////////////////////////////////////////////// @@ -269,12 +361,40 @@ ///////////////////////////////////////////////////////////////////////////////////////// bool wssWrite( char *robotName, char *msg ) { + int nn; + char mess[128]; + printf( "Need to send message %s to robot %s\n", msg, robotName ); + sprintf( mess, "SEND %d %s;", strlen(msg)+2, msg ); + printf( "Sending message: %s\n", mess ); + nn = write(server_listenCon[atoi(robotName)], mess, strlen(mess+1)); + // nn = write(server_listenCon[0], mess, strlen(mess+1)); + if( nn == -1 ) + { + printf("Error form write\n"); + return false; + } + // close the connection ? + return true; } char *wssRead() { + int nn; + char msg[128]; + int trash = 0; + + if( trash == 0 ) + nn = recv(server_listenCon[1], msg, sizeof(msg)-1, MSG_DONTWAIT); + else + nn = read(server_listenCon[1], msg, sizeof(msg)-1); + if( nn == -1 ) + { + return NULL; + } + msg[nn] = '\0'; + printf( "Message received: %s\n", msg ); return NULL; } @@ -318,6 +438,8 @@ state_next(stat, S10); return; } + server_listen = new int[set->robotInfo_length]; + server_listenCon = new int[set->robotInfo_length]; status_next(stat, RCS_EXEC); state_next(stat, S1); } @@ -326,8 +448,7 @@ //Register with the Server for( i=0; irobotInfo_length; i++ ) { - stat->admin_state = ADMIN_INITIALIZED; - sprintf( msg, "register %s %s;", set->robotInfo[i].robotName, "129.6.33.142" ); + sprintf( msg, "REGISTER %s %s;", set->robotInfo[i].robotName, "129.6.33.142" ); printf("%s: sending %d length message: %s\n", THIS_PROCESS, strlen(msg), msg); nn = send( server_fd, msg, strlen(msg)+1, 0); // send( server_fd, "\r\n", 2, 0); @@ -356,11 +477,113 @@ } else { + state_next(stat, S2); + + } + } + } + if(state_match(stat, S2)) + { + //set robots to listen REMEMBER that robot 0 is the comm station + for( i=0; irobotInfo_length; i++ ) + //for( i=0; i<2; i++ ) + { + sprintf( msg, "listen %s %d;", set->robotInfo[i].robotName, USARSimListenPortBase + 3*i); + printf("%s: sending %d length message: %s\n", THIS_PROCESS, strlen(msg), msg); + nn = send( server_fd, msg, strlen(msg)+1, 0); + // send( server_fd, "\r\n", 2, 0); + if (nn != (int)strlen(msg)+1) + { + fprintf(stderr, "Write Failed\n"); + status_next(stat, RCS_ERROR); state_next(stat, S10); + return; + } + //Wait for OK response + nn = recv(server_fd, msg, sizeof(msg)-1, 0); + if( nn == -1 ) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + msg[nn] = '\0'; + printf("%s: message received:%s\n", THIS_PROCESS, msg); + if(msg[0]!='O' || msg[1]!='K') + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + else + { + state_next(stat, S3); + stat->admin_state = ADMIN_INITIALIZED; + } + } + } + if(state_match(stat, S3)) + { + //open connections between robot 0 and the other robots + for( i=1; irobotInfo_length; i++ ) + // for( i=1; i<2; i++ ) + { + sprintf( msg, "OPEN %s %d %s %d;", set->robotInfo[0].robotName, USARSimListenPortBase, + set->robotInfo[i].robotName, USARSimListenPortBase+3*i); + printf("%s: sending %d length message: %s\n", THIS_PROCESS, strlen(msg), msg); + nn = send( server_fd, msg, strlen(msg)+1, 0); + // send( server_fd, "\r\n", 2, 0); + if (nn != (int)strlen(msg)+1) + { + fprintf(stderr, "Write Failed\n"); + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; } + //Wait for OK response + nn = recv(server_fd, msg, sizeof(msg)-1, 0); + if( nn == -1 ) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + msg[nn] = '\0'; + printf("%s: message received:%s\n", THIS_PROCESS, msg); + if(msg[0]!='O' || msg[1]!='K') + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + else + { + state_next(stat, S4); + } } } + if(state_match(stat, S4)) + { + for( i=0; irobotInfo_length; i++ ) + { + printf( "Listening to listen port %d\n", USARSimListenPortBase+i*3 ); + sprintf(msg, "%d", USARSimListenPortBase+i*3 ); + if( -1 == (server_listen[i] = tcp_listen(msg))) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + } + else if (-1 == (server_listenCon[i] = tcp_accept(server_listen[i]))) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + } + state_next(stat, S5); + } + stat->admin_state = ADMIN_INITIALIZED; + printf( "Done with listening\n" ); + } // else wait here else state_default(stat); @@ -410,6 +633,10 @@ void doCmdWrite( LinkMonStat * stat, LinkMonCmdWrite *cmdIn ) { + int nn; + char msg[128]; + TrafficCtrlSet * set = (TrafficCtrlSet *) trafficCtrlSetNml->get_address(); + if(state_match(stat, NEW_COMMAND)) { state_new(stat); @@ -420,14 +647,54 @@ } else { - state_next(stat, S0); + state_next(stat, S1); status_next(stat, RCS_EXEC); } } + // state NOT USED at this time if(state_match(stat, S0)) { + //open connections between robot 0 and the other robots + sprintf( msg, "open %s %d %s %d;", + set->robotInfo[atoi(cmdIn->robotToWrite)].robotName, + USARSimListenPortBase+3*atoi(cmdIn->robotToWrite), + set->robotInfo[0].robotName, USARSimListenPortBase); + printf("%s: sending %d length message: %s\n", THIS_PROCESS, strlen(msg), msg); + nn = send( server_fd, msg, strlen(msg)+1, 0); + // send( server_fd, "\r\n", 2, 0); + if (nn != (int)strlen(msg)+1) + { + fprintf(stderr, "Write Failed\n"); + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + //Wait for OK response + nn = recv(server_fd, msg, sizeof(msg)-1, 0); + if( nn == -1 ) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + msg[nn] = '\0'; + printf("%s: message received:%s\n", THIS_PROCESS, msg); + if(msg[0]!='O' || msg[1]!='K') + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + else + { + state_next(stat, S1); + } + } + if(state_match(stat, S1)) + { + if( !wssWrite(cmdIn->robotToWrite, cmdIn->msg ) ) { status_next(stat, RCS_ERROR); @@ -439,6 +706,42 @@ state_next(stat, S2); } } + if(state_match(stat, S2)) + { + //open connections between robot 0 and the other robots + sprintf( msg, "CLOSE;"); + printf("%s: sending %d length message: %s\n", THIS_PROCESS, strlen(msg), msg); + nn = send( server_fd, msg, strlen(msg)+1, 0); + // send( server_fd, "\r\n", 2, 0); + if (nn != (int)strlen(msg)+1) + { + fprintf(stderr, "Write Failed\n"); + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + //Wait for OK response + nn = recv(server_fd, msg, sizeof(msg)-1, 0); + if( nn == -1 ) + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + msg[nn] = '\0'; + printf("%s: message received:%s\n", THIS_PROCESS, msg); + if(msg[0]!='O' || msg[1]!='K') + { + status_next(stat, RCS_ERROR); + state_next(stat, S10); + return; + } + else + { + state_next(stat, S4); + } + } + } void doCmdMonitor( LinkMonStat * stat ) @@ -722,8 +1025,11 @@ // read buffers cmd_type = linkMonCmdNml->read(); trafficCtrlSetNml->read(); - if( (msgIn=wssRead()) != NULL ) - printf( "Message received: %s\n", msgIn ); + if( linkMonStat.admin_state == ADMIN_INITIALIZED ) + { + if( (msgIn=wssRead()) != NULL ) + printf( "Message received: %s\n", msgIn ); + } // listen to all robots over USARSim commServer @@ -803,6 +1109,12 @@ Modification history: $Log: linkMon.cc,v $ + Revision 1.5 2007/09/20 20:14:57 dr_steveb + Better, but still not working + + Revision 1.4 2007/09/20 19:26:37 dr_steveb + Added additional link connection code for USARSim. Not working yet! + Revision 1.3 2007/09/18 20:03:49 dr_steveb Added write command Modified: trunk/moast-bth/moast/src/tools/robojoy.cc =================================================================== --- trunk/moast-bth/moast/src/tools/robojoy.cc 2007-10-29 18:21:44 UTC (rev 861) +++ trunk/moast-bth/moast/src/tools/robojoy.cc 2007-10-29 20:24:46 UTC (rev 862) @@ -16,8 +16,8 @@ \code CVS Status: $Author: dr_steveb $ - $Revision: 1.27 $ - $Date: 2007/08/29 18:28:34 $ + $Revision: 1.28 $ + $Date: 2007/10/17 17:18:43 $ \endcode \author Fred Proctor @@ -52,7 +52,7 @@ /* define INHIBIT_PRISMATIC to inhibit the motion of prismatic joints during Cartesian motion - */ +*/ #define INHIBIT_PRISMATIC /* @@ -133,9 +133,103 @@ static double flipperIncr[SERVO_MOB_JA_FLIPPER_TYPE_MAX]; static ServoMobJAFlipperSet flipperSet[SERVO_MOB_JA_FLIPPER_TYPE_MAX]; bool needToWrite; +bool userScale; +bool button8Down; #define MY_NAME_BASE "joystick" + +bool openMission( int vehID ) +{ + bool retval = true; + char *configNml = getenv("CONFIG_NML"); + char chanName[MOAST_NML_BUFFER_NAME_LEN]; + char myName[MOAST_NML_BUFFER_NAME_LEN]; + ServoMisJACmdInit servoMisInit; + int gotIt; + double end; + + sprintf(myName, "%s", MY_NAME_BASE); + + if (NULL == configNml) { + configNml = "../etc/moast.nml"; + } + + if( servoMisJACmdNml != NULL ) + { + delete servoMisJACmdNml; + servoMisJACmdNml = NULL; + } + if (NULL == servoMisJACmdNml) { + sprintf(chanName, "%s%d_%d", SERVO_MIS_JA_CMD_NAME, vehID, compID); + servoMisJACmdNml = new RCS_CMD_CHANNEL(servoMisJA_format, chanName, myName, configNml); + if (! servoMisJACmdNml->valid()) { + delete servoMisJACmdNml; + servoMisJACmdNml = NULL; + printf("can't open %s\n", chanName); + retval = false; + } + } + + if( servoMisJAStatNml != NULL ) + { + delete servoMisJAStatNml; + servoMisJAStatNml = NULL; + } + if (NULL == servoMisJAStatNml) { + sprintf(chanName, "%s%d_%d", SERVO_MIS_JA_STAT_NAME, vehID, compID); @@ Diff output truncated at 60000 characters. @@