From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:02:35 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:02:35 +0900 Subject: [Julius-cvs 795] CVS update: julius4/julius Message-ID: <1371027755.818175.27418.nullmailer@users.sourceforge.jp> Index: julius4/julius/output_file.c diff -u julius4/julius/output_file.c:1.4 julius4/julius/output_file.c:1.5 --- julius4/julius/output_file.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/julius/output_file.c Wed Jun 12 18:02:34 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Wed Dec 12 11:07:46 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* @@ -104,6 +104,9 @@ case J_RESULT_STATUS_REJECT_SHORT: fprintf(fp, "\n"); break; + case J_RESULT_STATUS_REJECT_LONG: + fprintf(fp, "\n"); + break; case J_RESULT_STATUS_FAIL: fprintf(fp, "\n"); break; Index: julius4/julius/output_module.c diff -u julius4/julius/output_module.c:1.8 julius4/julius/output_module.c:1.9 --- julius4/julius/output_module.c:1.8 Fri Jul 27 17:44:49 2012 +++ julius4/julius/output_module.c Wed Jun 12 18:02:34 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Tue Sep 06 14:46:49 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -413,6 +413,9 @@ case J_RESULT_STATUS_REJECT_SHORT: module_send(module_sd, "\n"); break; + case J_RESULT_STATUS_REJECT_LONG: + printf("\n"); + break; case J_RESULT_STATUS_FAIL: printf("\n"); break; From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:02:36 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:02:36 +0900 Subject: [Julius-cvs 796] CVS update: julius4/julius-simple Message-ID: <1371027756.200815.27442.nullmailer@users.sourceforge.jp> Index: julius4/julius-simple/julius-simple.c diff -u julius4/julius-simple/julius-simple.c:1.3 julius4/julius-simple/julius-simple.c:1.4 --- julius4/julius-simple/julius-simple.c:1.3 Sat Apr 11 20:51:20 2009 +++ julius4/julius-simple/julius-simple.c Wed Jun 12 18:02:36 2013 @@ -23,7 +23,7 @@ * @author Akinobu Lee * @date Tue Dec 11 14:40:04 2007 * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * */ @@ -124,6 +124,9 @@ case J_RESULT_STATUS_REJECT_SHORT: printf("\n"); break; + case J_RESULT_STATUS_REJECT_LONG: + printf("\n"); + break; case J_RESULT_STATUS_FAIL: printf("\n"); break; From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:02:36 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:02:36 +0900 Subject: [Julius-cvs 797] CVS update: julius4/libjulius/include/julius Message-ID: <1371027756.505630.27466.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/include/julius/define.h diff -u julius4/libjulius/include/julius/define.h:1.8 julius4/libjulius/include/julius/define.h:1.9 --- julius4/libjulius/include/julius/define.h:1.8 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/define.h Wed Jun 12 18:02:36 2013 @@ -27,7 +27,7 @@ * @author Akinobu LEE * @date Mon Mar 7 15:17:26 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -57,6 +57,7 @@ #define LM_NGRAM_USER 3 ///< User-defined statistical LM /* recognition status */ +#define J_RESULT_STATUS_REJECT_LONG -8 ///< Input rejected by long input #define J_RESULT_STATUS_BUFFER_OVERFLOW -7 ///< Input buffer overflow #define J_RESULT_STATUS_REJECT_POWER -6 ///< Input rejected by power #define J_RESULT_STATUS_TERMINATE -5 ///< Input was terminated by app. request Index: julius4/libjulius/include/julius/jconf.h diff -u julius4/libjulius/include/julius/jconf.h:1.15 julius4/libjulius/include/julius/jconf.h:1.16 --- julius4/libjulius/include/julius/jconf.h:1.15 Wed Oct 10 11:47:10 2012 +++ julius4/libjulius/include/julius/jconf.h Wed Jun 12 18:02:36 2013 @@ -23,7 +23,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * */ /* @@ -983,6 +983,10 @@ * Length threshold to reject input (-rejectshort) */ int rejectshortlen; + /** + * Length threshold to reject input (-rejectlong) + */ + int rejectlonglen; #ifdef POWER_REJECT /** * Rejection power threshold Index: julius4/libjulius/include/julius/recog.h diff -u julius4/libjulius/include/julius/recog.h:1.17 julius4/libjulius/include/julius/recog.h:1.18 --- julius4/libjulius/include/julius/recog.h:1.17 Wed Oct 10 11:47:10 2012 +++ julius4/libjulius/include/julius/recog.h Wed Jun 12 18:02:36 2013 @@ -70,7 +70,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * */ /* @@ -386,6 +386,7 @@ pthread_mutex_t mutex; ///< Lock primitive SP16 *speech; ///< Unprocessed samples recorded by A/D-in thread int speechlen; ///< Current length of @a speech + int freezelen; ///< Number of samples to abondon processing /* * Semaphore to start/stop recognition. * From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:02:36 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:02:36 +0900 Subject: [Julius-cvs 798] CVS update: julius4/libjulius/src Message-ID: <1371027756.925708.27529.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/adin-cut.c diff -u julius4/libjulius/src/adin-cut.c:1.20 julius4/libjulius/src/adin-cut.c:1.21 --- julius4/libjulius/src/adin-cut.c:1.20 Wed Oct 10 11:47:11 2012 +++ julius4/libjulius/src/adin-cut.c Wed Jun 12 18:02:36 2013 @@ -95,7 +95,7 @@ * @author Akinobu LEE * @date Sat Feb 12 13:20:53 2005 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* @@ -180,6 +180,11 @@ #ifdef HAVE_PTHREAD adin->transfer_online = FALSE; adin->speech = NULL; + if (jconf->reject.rejectlonglen >= 0) { + adin->freezelen = (jconf->reject.rejectlonglen + 500.0) * jconf->input.sfreq / 1000.0; + } else { + adin->freezelen = MAXSPEECHLEN; + } #endif /**********************/ @@ -1174,7 +1179,7 @@ } } } - if (prev_len < nowlen) { + if (prev_len < nowlen && nowlen <= a->freezelen) { #ifdef THREAD_DEBUG jlog("DEBUG: process: proceed [%d-%d]\n",prev_len, nowlen); #endif Index: julius4/libjulius/src/default.c diff -u julius4/libjulius/src/default.c:1.16 julius4/libjulius/src/default.c:1.17 --- julius4/libjulius/src/default.c:1.16 Wed Oct 10 11:47:11 2012 +++ julius4/libjulius/src/default.c Wed Jun 12 18:02:36 2013 @@ -17,7 +17,7 @@ * @author Akinobu Lee * @date Fri Feb 16 15:05:43 2007 * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * */ /* @@ -92,6 +92,7 @@ j->reject.gmm_gprune_num = 10; j->reject.gmm_reject_cmn_string = NULL; j->reject.rejectshortlen = 0; + j->reject.rejectlonglen = -1; #ifdef POWER_REJECT j->reject.powerthres = POWER_REJECT_DEFAULT_THRES; #endif Index: julius4/libjulius/src/m_fusion.c diff -u julius4/libjulius/src/m_fusion.c:1.23 julius4/libjulius/src/m_fusion.c:1.24 --- julius4/libjulius/src/m_fusion.c:1.23 Tue Oct 9 20:25:21 2012 +++ julius4/libjulius/src/m_fusion.c Wed Jun 12 18:02:36 2013 @@ -20,7 +20,7 @@ * @author Akinobu Lee * @date Thu May 12 13:31:47 2005 * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * */ /* @@ -1431,33 +1431,9 @@ jlog("ERROR: m_fusion: failed to map words in additional dictionary to N-gram\n"); return FALSE; } -#if 0 - /* post-fix EOS / BOS uni prob for SRILM */ - fix_uniprob_srilm(ngram, winfo); -#endif } } -#if 0 - /* grammar case: not tested */ - if (lm->lmtype == LM_DFA) { - if (lm->config->dfa_filename != NULL && lm->config->dictfilename != NULL) { - /* here add grammar specified by "-dfa" and "-v" to grammar list */ - multigram_add_gramlist(lm->config->dfa_filename, lm->config->dictfilename, lm->config, LM_DFA_GRAMMAR); - } - /* load all the specified grammars */ - if (multigram_load_all_gramlist(lm) == FALSE) { - jlog("ERROR: m_fusion: some error occured in reading grammars\n"); - return FALSE; - } - /* setup for later wchmm building */ - multigram_update(lm); - /* the whole lexicon will be forced to built in the boot sequence, - so reset the global modification flag here */ - lm->global_modified = FALSE; - } -#endif - /* re-create all recognition process instance */ for(sh=recog->jconf->search_root;sh;sh=sh->next) { if (j_launch_recognition_instance(recog, sh) == FALSE) { Index: julius4/libjulius/src/m_info.c diff -u julius4/libjulius/src/m_info.c:1.16 julius4/libjulius/src/m_info.c:1.17 --- julius4/libjulius/src/m_info.c:1.16 Wed Oct 10 11:47:11 2012 +++ julius4/libjulius/src/m_info.c Wed Jun 12 18:02:36 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Thu May 12 14:14:01 2005 * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * */ /* @@ -906,6 +906,12 @@ } else { jlog("off\n"); } + jlog("\t reject long input = "); + if (jconf->reject.rejectlonglen >= 0) { + jlog("longer than %d msec\n", jconf->reject.rejectlonglen); + } else { + jlog("off\n"); + } #ifdef POWER_REJECT jlog("\t power rejection thres = %f", jconf->reject.powerthres); #endif Index: julius4/libjulius/src/m_options.c diff -u julius4/libjulius/src/m_options.c:1.27 julius4/libjulius/src/m_options.c:1.28 --- julius4/libjulius/src/m_options.c:1.27 Wed Oct 10 11:47:11 2012 +++ julius4/libjulius/src/m_options.c Wed Jun 12 18:02:36 2013 @@ -18,7 +18,7 @@ * @author Akinobu Lee * @date Thu May 12 18:52:07 2005 * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * */ /* @@ -423,6 +423,11 @@ GET_TMPARG; jconf->reject.rejectshortlen = atoi(tmparg); continue; + } else if (strmatch(argv[i],"-rejectlong")) { /* long input rejection */ + if (!check_section(jconf, argv[i], JCONF_OPT_GLOBAL)) return FALSE; + GET_TMPARG; + jconf->reject.rejectlonglen = atoi(tmparg); + continue; #ifdef POWER_REJECT } else if (strmatch(argv[i],"-powerthres")) { /* short input rejection */ if (!check_section(jconf, argv[i], JCONF_OPT_GLOBAL)) return FALSE; Index: julius4/libjulius/src/m_usage.c diff -u julius4/libjulius/src/m_usage.c:1.19 julius4/libjulius/src/m_usage.c:1.20 --- julius4/libjulius/src/m_usage.c:1.19 Wed Oct 10 11:47:11 2012 +++ julius4/libjulius/src/m_usage.c Wed Jun 12 18:02:36 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Fri May 13 15:04:34 2005 * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * */ /* @@ -115,6 +115,7 @@ fprintf(fp, " [-nostrip] disable stripping off zero samples\n"); fprintf(fp, " [-record dir] record triggered speech data to dir\n"); fprintf(fp, " [-rejectshort msec] reject an input shorter than specified\n"); + fprintf(fp, " [-rejectlong msec] reject an input longer than specified\n"); #ifdef POWER_REJECT fprintf(fp, " [-powerthres value] rejection threshold of average power (%.1f)\n", jconf->reject.powerthres); #endif Index: julius4/libjulius/src/pass1.c diff -u julius4/libjulius/src/pass1.c:1.9 julius4/libjulius/src/pass1.c:1.10 --- julius4/libjulius/src/pass1.c:1.9 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/src/pass1.c Wed Jun 12 18:02:36 2013 @@ -36,7 +36,7 @@ * @author Akinobu Lee * @date Fri Oct 12 23:14:13 2007 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -386,6 +386,13 @@ ok_p = FALSE; } } + if (recog->jconf->reject.rejectlonglen >= 0) { + mseclen = (float)recog->mfcclist->last_time * (float)recog->jconf->input.period * (float)recog->jconf->input.frameshift / 10000.0; + if (mseclen >= recog->jconf->reject.rejectlonglen) { + last_status = J_RESULT_STATUS_REJECT_LONG; + ok_p = FALSE; + } + } #ifdef POWER_REJECT if (ok_p) { @@ -524,6 +531,13 @@ ok_p = FALSE; } } + if (recog->jconf->reject.rejectlonglen >= 0) { + mseclen = (float)mfcc->param->samplenum * (float)recog->jconf->input.period * (float)recog->jconf->input.frameshift / 10000.0; + if (mseclen >= recog->jconf->reject.rejectlonglen) { + last_status = J_RESULT_STATUS_REJECT_LONG; + ok_p = FALSE; + } + } } #ifdef POWER_REJECT Index: julius4/libjulius/src/recogmain.c diff -u julius4/libjulius/src/recogmain.c:1.20 julius4/libjulius/src/recogmain.c:1.21 --- julius4/libjulius/src/recogmain.c:1.20 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/src/recogmain.c Wed Jun 12 18:02:36 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Wed Aug 8 14:53:53 2007 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ @@ -1087,6 +1087,14 @@ goto end_recog; } } + /* when using "-rejectlong", and input was longer than specified, + terminate the input here */ + if (recog->jconf->reject.rejectlonglen >= 0) { + if (seclen * 1000.0 >= recog->jconf->reject.rejectlonglen) { + result_error(recog, J_RESULT_STATUS_REJECT_LONG); + goto end_recog; + } + } /**********************************************/ /* acoustic analysis and encoding of speech[] */ @@ -1179,6 +1187,13 @@ goto end_recog; } } + if (jconf->reject.rejectlonglen >= 0) { + mseclen = (float)recog->mfcclist->param->samplenum * (float)jconf->input.period * (float)jconf->input.frameshift / 10000.0; + if (mseclen >= jconf->reject.rejectlonglen) { + result_error(recog, J_RESULT_STATUS_REJECT_LONG); + goto end_recog; + } + } #ifdef POWER_REJECT if (power_reject(recog)) { result_error(recog, J_RESULT_STATUS_REJECT_POWER); From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 799] CVS update: julius4/julius Message-ID: <1371030506.157363.21109.nullmailer@users.sourceforge.jp> Index: julius4/julius/output_file.c diff -u julius4/julius/output_file.c:1.5 julius4/julius/output_file.c:1.6 --- julius4/julius/output_file.c:1.5 Wed Jun 12 18:02:34 2013 +++ julius4/julius/output_file.c Wed Jun 12 18:48:25 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Wed Dec 12 11:07:46 2007 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* @@ -151,6 +151,29 @@ } fprintf(fp, "\n"); #endif +#ifdef USE_MBR + /** + * + * Update 2 September 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + if(r->config->mbr.use_mbr == TRUE){ + + fprintf(fp, "MBRscore%d: %f\n", n+1, s->score_mbr); + } + + /** + * + * MBR Expansion End + * + **/ + +#endif + fprintf(fp, "score%d: %f", n+1, s->score); if (r->lmtype == LM_PROB) { fprintf(fp, " (AM: %f LM: %f)", s->score_am, s->score_lm); Index: julius4/julius/output_module.c diff -u julius4/julius/output_module.c:1.9 julius4/julius/output_module.c:1.10 --- julius4/julius/output_module.c:1.9 Wed Jun 12 18:02:34 2013 +++ julius4/julius/output_module.c Wed Jun 12 18:48:25 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Tue Sep 06 14:46:49 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -444,6 +444,29 @@ module_send(module_sd, " config->mbr.use_mbr == TRUE){ + + module_send(module_sd, " MBRSCORE=\"%f\"", s->score_mbr); + } + + /** + * + * MBR Expansion End + * + **/ + +#endif module_send(module_sd, " SCORE=\"%f\"", s->score); if (r->lmtype == LM_PROB) { if (separate_score_flag) { Index: julius4/julius/output_stdout.c diff -u julius4/julius/output_stdout.c:1.11 julius4/julius/output_stdout.c:1.12 --- julius4/julius/output_stdout.c:1.11 Wed Jun 12 18:02:34 2013 +++ julius4/julius/output_stdout.c Wed Jun 12 18:48:25 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Tue Sep 06 17:18:46 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* @@ -907,6 +907,29 @@ printf("%s\n",ec); /* bold off & newline */ } if (verbose_flag) { +#ifdef USE_MBR + + /** + * + * Update 7 September 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + if(r->config->mbr.use_mbr == TRUE){ + + printf("MBRscore%d: %f\n", n+1, s->score_mbr); + } + + /** + * + * MBR Expansion End + * + **/ + +#endif printf("score%d: %f", n+1, s->score); if (r->lmtype == LM_PROB) { if (separate_score_flag) { From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 800] CVS update: julius4/libjulius/include/julius Message-ID: <1371030506.338088.21132.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/include/julius/extern.h diff -u julius4/libjulius/include/julius/extern.h:1.20 julius4/libjulius/include/julius/extern.h:1.21 --- julius4/libjulius/include/julius/extern.h:1.20 Tue Oct 9 20:25:21 2012 +++ julius4/libjulius/include/julius/extern.h Wed Jun 12 18:48:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Mon Mar 7 23:19:14 2005 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* @@ -327,7 +327,27 @@ boolean mfc_module_end(MFCCCalc *mfcc); int mfc_module_read(MFCCCalc *mfcc, int *new_t); char *mfc_module_input_name(MFCCCalc *mfcc); +#ifdef USE_MBR + +/** + * + * Update 21 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + +/* mbr.c */ +void candidate_mbr(NODE **r_start, NODE **r_bottom, int r_stacknum, RecogProcess *r); + +/** + * + * MBR Expansion End + * + **/ +#endif #ifdef __cplusplus } #endif Index: julius4/libjulius/include/julius/jconf.h diff -u julius4/libjulius/include/julius/jconf.h:1.16 julius4/libjulius/include/julius/jconf.h:1.17 --- julius4/libjulius/include/julius/jconf.h:1.16 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/include/julius/jconf.h Wed Jun 12 18:48:26 2013 @@ -23,7 +23,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * */ /* @@ -791,6 +791,41 @@ } sw; +#ifdef USE_MBR + + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + struct { + + /* Rescoring sentence on MBR (-mbr) */ + boolean use_mbr; + + /* Use word weight on MBR (-mbr_wwer) */ + boolean use_word_weight; + + /* Likelihood weight */ + float score_weight; + + /* Loss function weight */ + float loss_weight; + + } mbr; + + /** + * + * MBR Expansion End + * + **/ + +#endif + /* pointer to next instance */ struct __jconf_search__ *next; Index: julius4/libjulius/include/julius/recog.h diff -u julius4/libjulius/include/julius/recog.h:1.18 julius4/libjulius/include/julius/recog.h:1.19 --- julius4/libjulius/include/julius/recog.h:1.18 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/include/julius/recog.h Wed Jun 12 18:48:26 2013 @@ -70,7 +70,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * */ /* @@ -333,6 +333,27 @@ int gram_id; ///< The grammar ID this sentence belongs to for DFA SentenceAlign *align; +#ifdef USE_MBR + + /** + * + * Update 19 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + LOGPROB score_mbr; ///< MBR score + + /** + * + * MBR Expansion End + * + **/ + +#endif + } Sentence; /** Index: julius4/libjulius/include/julius/search.h diff -u julius4/libjulius/include/julius/search.h:1.4 julius4/libjulius/include/julius/search.h:1.5 --- julius4/libjulius/include/julius/search.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/search.h Wed Jun 12 18:48:26 2013 @@ -29,7 +29,7 @@ * @author Akinobu Lee * @date Wed Sep 07 07:40:11 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* @@ -130,6 +130,26 @@ struct __recogprocess__ *region; ///> Where this node belongs to +#ifdef USE_MBR + + /** + * + * Update 19 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + float score_mbr; ///< MBR score + + /** + * + * MBR Expansion End + * + **/ + +#endif } NODE; /* @@ -164,4 +184,36 @@ =============================================================== */ +#ifdef USE_MBR + +/** + * + * Update 21 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + +/** + * + * DPマッチングで使うノード + * + */ +typedef struct { + + int d; // 最短距離 + int r; // 遷移元 1=Ins. 2=Del. 3=Sub. or Cor. + int c; // r=3とした場合の遷移コスト 1=Sub. 0=Cor. +} DP; + + +/** + * + * MBR Expansion End + * + **/ + +#endif + #endif /* __J_SEARCH_H__ */ From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 801] CVS update: julius4/libsent/src/util Message-ID: <1371030506.718857.21206.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/util/confout.c diff -u julius4/libsent/src/util/confout.c:1.9 julius4/libsent/src/util/confout.c:1.10 --- julius4/libsent/src/util/confout.c:1.9 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/confout.c Wed Jun 12 18:48:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Thu Feb 17 15:34:39 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -93,6 +93,9 @@ #else fprintf(strm, " word id unit : short (%d bytes)\n", sizeof(WORD_ID)); #endif +#ifdef USE_MBR + fprintf(strm, " MBR weight support : yes\n"); +#endif } /** From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 802] CVS update: julius4/libjulius/src Message-ID: <1371030506.438860.21152.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/default.c diff -u julius4/libjulius/src/default.c:1.17 julius4/libjulius/src/default.c:1.18 --- julius4/libjulius/src/default.c:1.17 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/src/default.c Wed Jun 12 18:48:26 2013 @@ -17,7 +17,7 @@ * @author Akinobu Lee * @date Fri Feb 16 15:05:43 2007 * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * */ /* @@ -316,6 +316,28 @@ j->sw.wchmm_check_flag = FALSE; j->sw.start_inactive = FALSE; j->sw.fallback_pass1_flag = FALSE; + +#ifdef USE_MBR + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + j->mbr.use_mbr = FALSE; + j->mbr.use_word_weight = FALSE; + j->mbr.score_weight = 0.1; + j->mbr.loss_weight = 1.0; + + /** + * + * MBR Expansion End + * + **/ +#endif } /* end of file */ Index: julius4/libjulius/src/m_info.c diff -u julius4/libjulius/src/m_info.c:1.17 julius4/libjulius/src/m_info.c:1.18 --- julius4/libjulius/src/m_info.c:1.17 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/src/m_info.c Wed Jun 12 18:48:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Thu May 12 14:14:01 2005 * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * */ /* @@ -740,7 +740,31 @@ } else { jlog("off, returns search failure\n"); } +#ifdef USE_MBR + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + if (r->config->mbr.use_mbr) { + jlog("\n"); + jlog("Minimum Bayes Risk Decoding:\n"); + jlog("\t(-mbr) sentence rescoring on MBR = %s\n", r->config->mbr.use_mbr ? "yes" : "no"); + jlog("\t(-mbr_wwer) use word weight on MBR = %s\n", r->config->mbr.use_word_weight ? "yes" : "no"); + jlog("\t(-mbr_weight) score weight = %2.1f loss func. weight = %2.1f\n", r->config->mbr.score_weight, r->config->mbr.loss_weight); + } + + /** + * + * MBR Expansion End + * + **/ + +#endif jlog("\n"); } Index: julius4/libjulius/src/m_options.c diff -u julius4/libjulius/src/m_options.c:1.28 julius4/libjulius/src/m_options.c:1.29 --- julius4/libjulius/src/m_options.c:1.28 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/src/m_options.c Wed Jun 12 18:48:26 2013 @@ -18,7 +18,7 @@ * @author Akinobu Lee * @date Thu May 12 18:52:07 2005 * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * */ /* @@ -1372,6 +1372,57 @@ //return FALSE; unknown_opt = TRUE; } + +#ifdef USE_MBR + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + } else if (strmatch(argv[i],"-mbr")) { + + if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE; + jconf->searchnow->mbr.use_mbr = TRUE; + jconf->searchnow->mbr.use_word_weight = FALSE; + + continue; + + } else if (strmatch(argv[i],"-mbr_wwer")) { + + if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE; + jconf->searchnow->mbr.use_mbr = TRUE; + jconf->searchnow->mbr.use_word_weight = TRUE; + + continue; + + } else if (strmatch(argv[i],"-nombr")) { + + if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE; + jconf->searchnow->mbr.use_mbr = FALSE; + jconf->searchnow->mbr.use_word_weight = FALSE; + + continue; + + } else if (strmatch(argv[i],"-mbr_weight")) { + + if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE; + GET_TMPARG; + jconf->searchnow->mbr.score_weight = (LOGPROB)atof(tmparg); + GET_TMPARG; + jconf->searchnow->mbr.loss_weight = (LOGPROB)atof(tmparg); + + continue; + /** + * + * MBR Expansion End + * + **/ +#endif + } else { /* error */ //jlog("ERROR: m_options: wrong argument: %s\n", argv[0], argv[i]); //return FALSE; Index: julius4/libjulius/src/m_usage.c diff -u julius4/libjulius/src/m_usage.c:1.20 julius4/libjulius/src/m_usage.c:1.21 --- julius4/libjulius/src/m_usage.c:1.20 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/src/m_usage.c Wed Jun 12 18:48:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Fri May 13 15:04:34 2005 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* @@ -361,6 +361,30 @@ fprintf(fp, " [-walign] optionally output word alignments\n"); fprintf(fp, " [-palign] optionally output phoneme alignments\n"); fprintf(fp, " [-salign] optionally output state alignments\n"); + +#ifdef USE_MBR + /** + * + * Update 7 September 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + fprintf(fp, "\n Minimum Bayes Risk Decoding:\n"); + fprintf(fp, " [-mbr] enable rescoring sentence on MBR(WER)\n"); + fprintf(fp, " [-mbr_wwer] enable rescoring sentence on MBR(WWER)\n"); + fprintf(fp, " [-nombr] disable rescoring sentence on MBR\n"); + fprintf(fp, " [-mbr_weight float float] score and loss func. weight on MBR (%.1f %.1f)\n", jconf->search_root->mbr.score_weight, jconf->search_root->mbr.loss_weight); + + /** + * + * MBR Expansion End + * + **/ +#endif + #ifdef CONFIDENCE_MEASURE fprintf(fp, "\n Confidence Score:\n"); #ifdef CM_MULTIPLE_ALPHA Index: julius4/libjulius/src/search_bestfirst_main.c diff -u julius4/libjulius/src/search_bestfirst_main.c:1.12 julius4/libjulius/src/search_bestfirst_main.c:1.13 --- julius4/libjulius/src/search_bestfirst_main.c:1.12 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/src/search_bestfirst_main.c Wed Jun 12 18:48:26 2013 @@ -35,7 +35,7 @@ * @author Akinobu Lee * @date Thu Sep 08 11:51:12 2005 * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * */ /* @@ -1023,6 +1023,26 @@ s->score = hypo->score; s->score_lm = hypo->totallscore; s->score_am = hypo->score - hypo->totallscore; + +#ifdef USE_MBR + /** + * + * Update 19 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + s->score_mbr = hypo->score_mbr; + + /** + * + * MBR Expansion End + * + **/ +#endif + if (r->lmtype == LM_DFA) { /* output which grammar the hypothesis belongs to on multiple grammar */ /* determine only by the last word */ @@ -2149,6 +2169,30 @@ if (debug2_flag) { jlog("STAT: %02d %s: got %d candidates\n", r->config->id, r->config->name, dwrk->finishnum); } + +#ifdef USE_MBR + + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + if(r->config->mbr.use_mbr){ + candidate_mbr(&r_start, &r_bottom, r_stacknum, r); + } + + /** + * + * MBR Expansion End + * + **/ + +#endif + /* 結果はまだ出力されていないので，文候補用スタック内をソートして ここで出力する */ /* As all of the found candidate are in result stack, we sort them Index: julius4/libjulius/src/search_bestfirst_v1.c diff -u julius4/libjulius/src/search_bestfirst_v1.c:1.7 julius4/libjulius/src/search_bestfirst_v1.c:1.8 --- julius4/libjulius/src/search_bestfirst_v1.c:1.7 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/src/search_bestfirst_v1.c Wed Jun 12 18:48:26 2013 @@ -92,7 +92,7 @@ * @author Akinobu Lee * @date Sun Sep 11 23:54:53 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* @@ -398,6 +398,27 @@ tmp->region = r; +#ifdef USE_MBR + + /** + * + * Update 19 October 2010 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + tmp->score_mbr = 0.0; + + /** + * + * MBR Expansion End + * + **/ + +#endif + return(tmp); } Index: julius4/libjulius/src/version.c.in diff -u julius4/libjulius/src/version.c.in:1.8 julius4/libjulius/src/version.c.in:1.9 --- julius4/libjulius/src/version.c.in:1.8 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/src/version.c.in Wed Jun 12 18:48:26 2013 @@ -14,7 +14,7 @@ * @author Akinobu Lee * @date Mon Sep 12 01:34:15 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -92,7 +92,7 @@ fprintf(strm," - Supported LM : DFA, N-gram, Word\n"); fprintf(strm," - Extension :"); #ifndef UNIGRAM_FACTORING - fprintf(strm, ", 2gramFactoring"); + fprintf(strm, " 2gramFactoring"); #endif # ifdef GRAPHOUT_DYNAMIC @@ -231,6 +231,28 @@ fprintf(strm, " PowerReject"); #endif +#ifdef USE_MBR + + /** + * + * Update 21 February 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + fprintf(strm," MBR"); + + /** + * + * MBR Expansion End + * + **/ + +#endif + + fprintf(strm, "\n"); fprintf(strm," - Compiled by : %s %s\n", CC, CFLAGS); } From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 803] CVS update: julius4/libsent/include/sent Message-ID: <1371030506.645380.21198.nullmailer@users.sourceforge.jp> Index: julius4/libsent/include/sent/config.h.in diff -u julius4/libsent/include/sent/config.h.in:1.8 julius4/libsent/include/sent/config.h.in:1.9 --- julius4/libsent/include/sent/config.h.in:1.8 Fri Mar 4 12:01:48 2011 +++ julius4/libsent/include/sent/config.h.in Wed Jun 12 18:48:26 2013 @@ -33,7 +33,7 @@ * @author Akinobu LEE * @date Thu Feb 10 17:48:32 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ @@ -156,3 +156,6 @@ /* Define if MSD-HMM support is enabled */ #undef ENABLE_MSD + +/* Define if MBR support is enabled */ +#undef USE_MBR Index: julius4/libsent/include/sent/vocabulary.h diff -u julius4/libsent/include/sent/vocabulary.h:1.9 julius4/libsent/include/sent/vocabulary.h:1.10 --- julius4/libsent/include/sent/vocabulary.h:1.9 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/vocabulary.h Wed Jun 12 18:48:26 2013 @@ -30,7 +30,7 @@ * @author Akinobu LEE * @date Sat Feb 12 12:38:13 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -76,6 +76,24 @@ int totalmodelnum; ///< Total number of models (phonemes) int totaltransnum; ///< Total number of state transitions boolean *is_transparent; ///< TRUE if the word can be treated as transparent [wid] +#ifdef USE_MBR + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + float *weight; ///< Word weight (use minimization WWER on MBR) + + /** + * + * MBR Expansion End + * + **/ +#endif APATNODE *errph_root; ///< Root node of index tree for gathering error %HMM name appeared when reading the dictionary BMALLOC_BASE *mroot; ///< Pointer for block memory allocation void *work; ///< Work buffer for dictionary reading From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 804] CVS update: julius4/libsent/src/voca Message-ID: <1371030506.794925.21230.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/voca/voca_load_htkdict.c diff -u julius4/libsent/src/voca/voca_load_htkdict.c:1.12 julius4/libsent/src/voca/voca_load_htkdict.c:1.13 --- julius4/libsent/src/voca/voca_load_htkdict.c:1.12 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/voca_load_htkdict.c Wed Jun 12 18:48:26 2013 @@ -19,7 +19,7 @@ * @author Akinobu LEE * @date Fri Feb 18 19:43:06 2005 * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * */ /* @@ -489,6 +489,59 @@ return TRUE; } winfo->woutput[vnum] = strcpy((char *)mybmalloc2(strlen(ptmp)+1, &(winfo->mroot)), ptmp); + +#ifdef USE_MBR + + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + /* just move pointer to next token */ + if ((ptmp = mystrtok_movetonext(NULL, " \t\n")) == NULL) { + jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + + if (ptmp[0] == ':') { /* Word weight (use minimization WWER on MBR) */ + + /* Word weight (use minimization WWER on MBR) */ + /* format: (classname @classprob) wordname [output] :weight phoneseq */ + /* format: :%f (linear scale) */ + /* if ":" not found, it means weight == 1.0 (same minimization WER) */ + + if ((ptmp = mystrtok(NULL, " \t\n")) == NULL) { + jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + if (ptmp[1] == '\0') { /* space between ':' and figures */ + jlog("Error: voca_load_htkdict: line %d: value after ':' missing, maybe wrong space?\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + winfo->weight[vnum] = atof(&(ptmp[1])); + } + else{ + winfo->weight[vnum] = 1.0; /* default, same minimization WER */ + } + + /** + * + * MBR Expansion End + * + **/ + +#endif + /* phoneme sequence */ if (hmminfo == NULL) { Index: julius4/libsent/src/voca/voca_load_wordlist.c diff -u julius4/libsent/src/voca/voca_load_wordlist.c:1.8 julius4/libsent/src/voca/voca_load_wordlist.c:1.9 --- julius4/libsent/src/voca/voca_load_wordlist.c:1.8 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/voca_load_wordlist.c Wed Jun 12 18:48:26 2013 @@ -13,7 +13,7 @@ * @author Akinobu LEE * @date Sun Jul 22 13:29:32 2007 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -306,6 +306,59 @@ return TRUE; } winfo->woutput[vnum] = strcpy((char *)mybmalloc2(strlen(ptmp)+1, &(winfo->mroot)), ptmp); + +#ifdef USE_MBR + + /** + * + * Update 7 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + /* just move pointer to next token */ + if ((ptmp = mystrtok_movetonext(NULL, " \t\n")) == NULL) { + jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + + if (ptmp[0] == ':') { /* Word weight (use minimization WWER on MBR) */ + + /* Word weight (use minimization WWER on MBR) */ + /* format: (classname @classprob) wordname [output] :weight phoneseq */ + /* format: :%f (linear scale) */ + /* if ":" not found, it means weight == 1.0 (same minimization WER) */ + + if ((ptmp = mystrtok(NULL, " \t\n")) == NULL) { + jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + if (ptmp[1] == '\0') { /* space between ':' and figures */ + jlog("Error: voca_load_htkdict: line %d: value after ':' missing, maybe wrong space?\n> %s\n", linenum, bufbak); + winfo->errnum++; + *ok_flag = FALSE; + return TRUE; + } + winfo->weight[vnum] = atof(&(ptmp[1])); + } + else{ + winfo->weight[vnum] = 1.0; /* default, same minimization WER */ + } + + /** + * + * MBR Expansion End + * + **/ + +#endif + /* phoneme sequence */ if (hmminfo == NULL) { Index: julius4/libsent/src/voca/voca_malloc.c diff -u julius4/libsent/src/voca/voca_malloc.c:1.7 julius4/libsent/src/voca/voca_malloc.c:1.8 --- julius4/libsent/src/voca/voca_malloc.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/voca_malloc.c Wed Jun 12 18:48:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Fri Feb 18 21:33:29 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* @@ -48,6 +48,9 @@ new->cprob = NULL; #endif new->is_transparent = NULL; +#ifdef USE_MBR + new->weight = NULL; +#endif return(new); } @@ -72,6 +75,26 @@ #endif if (winfo->is_transparent != NULL) free(winfo->is_transparent); /* free whole */ +#ifdef USE_MBR + + /** + * + * Update 4 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + if (winfo->weight != NULL) free(winfo->weight); + + /** + * + * MBR Expansion End + * + **/ + +#endif free(winfo); } @@ -103,6 +126,28 @@ winfo->maxwlen = 0; winfo->errnum = 0; winfo->errph_root = NULL; + +#ifdef USE_MBR + + /** + * + * Update 4 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + winfo->weight = (LOGPROB *)mymalloc(sizeof(LOGPROB)*n); + + /** + * + * MBR Expansion End + * + **/ + +#endif + } /** @@ -132,6 +177,26 @@ winfo->cprob = (LOGPROB *)myrealloc(winfo->cprob, sizeof(LOGPROB)*n); #endif winfo->is_transparent = (boolean *)myrealloc(winfo->is_transparent, sizeof(boolean)*n); + +#ifdef USE_MBR + /** + * + * Update 4 March 2011 + * + * MBR Expansion Hiroaki NANJO + * Ryo FURUTANI + * + **/ + + winfo->weight = (LOGPROB *)myrealloc(winfo->weight, sizeof(LOGPROB)*n); + + /** + * + * MBR Expansion End + * + **/ +#endif + winfo->maxnum = n; return TRUE; From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:26 +0900 Subject: [Julius-cvs 805] CVS update: julius4/libjulius Message-ID: <1371030506.240034.21118.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/Makefile.in diff -u julius4/libjulius/Makefile.in:1.8 julius4/libjulius/Makefile.in:1.9 --- julius4/libjulius/Makefile.in:1.8 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/Makefile.in Wed Jun 12 18:48:26 2013 @@ -5,7 +5,7 @@ # All rights reserved # -# $Id: Makefile.in,v 1.8 2012/07/27 08:44:49 sumomo Exp $ +# $Id: Makefile.in,v 1.9 2013/06/12 09:48:26 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: @@ -72,6 +72,7 @@ src/dfa_decode.o \ src/graphout.o \ src/confnet.o \ +src/mbr.o \ src/gmm.o \ src/word_align.o \ src/plugin.o \ From sumomo ＠ users.sourceforge.jp Wed Jun 12 18:48:58 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Wed, 12 Jun 2013 18:48:58 +0900 Subject: [Julius-cvs 806] CVS update: julius4/libjulius/src Message-ID: <1371030538.642558.22541.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/mbr.c diff -u /dev/null julius4/libjulius/src/mbr.c:1.1 --- /dev/null Wed Jun 12 18:48:58 2013 +++ julius4/libjulius/src/mbr.c Wed Jun 12 18:48:58 2013 @@ -0,0 +1,465 @@ +/** + * @file mbr.c + * + * + * @brief 認識された文をMBRの枠組みでリスコア + * + * 認識された文をMBRの枠組みでリスコアする． + * + * + * @author Hiroaki NANJO, Ryo FURUTANI + * @date 28 March 2011 + * + * $Revision: 1.1 $ + * + */ +/* + * Copyright (c) 2010-2011 NANJO lab. Ryukoku University + * All rights reserved + */ + +#include + +#ifdef USE_MBR + +/** + * + * MBRスコアでソートするための qsort コールバック関数. + * + * @param a [in] 要素1 + * @param b [in] 要素2 + * + * @return 演算の結果の符合を返す. + * + */ + +static int +mbr_cmp(NODE **a, NODE **b) +{ + if ((*a)->score_mbr > (*b)->score_mbr) return 1; + if ((*a)->score_mbr < (*b)->score_mbr) return -1; + return 0; +} + + +/** + * + * DPマッチングの結果を出力するデバッグ関数． + * + * @param d [in] DPマッチングの結果 + * @param len1 [in] 要素1の要素数 + * @param len2 [in] 要素2の要素数 + * + * @return 最短距離 + * + */ + +static int +dp_print(DP *d, int len1, int len2) +{ + int i, j; + + jlog("Distance\n"); + for(i = 0; i < len1; i++){ + for(j = 0; j < len2; j++){ + jlog("%d ", d[j * len1 + i].d); + } + jlog("\n"); + } + + jlog("\nTransition from\n"); + for(i = 0; i < len1; i++){ + for(j = 0; j < len2; j++){ + jlog("%d ", d[j * len1 + i].r); + } + jlog("\n"); + } + + jlog("\nCost\n"); + for(i = 0; i < len1; i++){ + for(j = 0; j < len2; j++){ + jlog("%d ", d[j * len1 + i].c); + } + jlog("\n"); + } + + return d[len1 * len2 - 1].d; +} + + +/** + * + * + * 最もコストが小さいパスを返す． + * + * @param a [in] 値1 + * @param b [in] 値2 + * @param c [in] 値3 + * @param cost [in] 遷移コスト + * + * @return コストと遷移元． + * + */ + +static DP +dppath(int a, int b, int c, int cost) +{ + DP min; + + if (a < b){ + min.d = a; + min.r = 1; + } + else{ + min.d = b; + min.r = 2; + } + + if (c < min.d){ + min.d = c; + min.r = 3; + } + + min.c = cost; + + return min; +} + + +/** + * + * + * DPマッチングを行う． + * + * @param a [in] 要素1 + * @param b [in] 要素2 + * @param w [in] 言語モデル + * + * @return DPマッチングの結果． + * + */ + +static DP* +dpmatch(NODE *a, NODE *b, WORD_INFO *winfo) +{ + int len1, len2; + DP *d; + int i, j; + int cost; + + char *c1, *c2; + + len1 = a->seqnum + 1; + len2 = b->seqnum + 1; + + d = (DP *)mymalloc(sizeof(DP) * len1 * len2); + + d[0].d = 0; + d[0].r = 0; + d[0].c = 0; + + for(i = 1; i < len1; i++){ + + d[i].d = i; + d[i].r = 1; + d[i].c = 0; + } + + for(i = 1; i < len2; i++){ + + d[i * len1].d = i; + d[i * len1].r = 2; + d[i * len1].c = 0; + } + + for(i = 1; i < len1; i++){ + + c1 = winfo->woutput[a->seq[i - 1]]; + + for(j = 1; j < len2; j++){ + + c2 = winfo->woutput[b->seq[j - 1]]; + + if (strmatch(c1, c2)) { + + cost = 0; + } + else { + + cost = 1; + } + + d[j * len1 + i] = dppath(d[j * len1 + (i - 1)].d + 1, + d[(j - 1) * len1 + i].d + 1, + d[(j - 1) * len1 + (i - 1)].d + cost, + cost); + } + } + + if(debug2_flag){ + dp_print(d, len1, len2); + } + + return d; +} + + +/** + * + * Weighed Levenstein distanceを計算する． + * + * @param a [in] 要素1 + * @param b [in] 要素2 + * @param w [in] 言語モデル + * + * @return Weighed Levenstein distanceの値を返す． + * + */ + +static float +calc_wld(NODE *a, NODE *b, WORD_INFO *winfo) +{ + float weight, error1, error2; + DP *d; + int i, j, now; + + /* DPマッチングのパスを求める */ + d = dpmatch(a, b, winfo); + + weight = 0.0; + i = a->seqnum; + j = b->seqnum; + + /* バックトレースしつつ重みを確定 */ + if(d[i * j - 1].d > 0){ + + error1 = 0.0; + error2 = 0.0; + + while(i > 0 || j > 0){ + + now = j * (a->seqnum + 1) + i; + + if(d[now].r == 1){ + /* Deletion error */ + error1 += winfo->weight[a->seq[i - 1]]; + i--; + } + else if(d[now].r == 2){ + /* Insertion error */ + error2 += winfo->weight[b->seq[j - 1]]; + j--; + } + else if(d[now].r == 3){ + if(d[now].c == 1){ + /* Substitution error */ + error1 += winfo->weight[a->seq[i - 1]]; + error2 += winfo->weight[b->seq[j - 1]]; + } + else if(d[now].c == 0){ + /* Correct word */ + weight += error1 > error2 ? error1 : error2; + error1 = 0.0; + error2 = 0.0; + } + else{ + jlog("Error: calc_wld: cannot calculation Weighted Levenstein distance: cost error\n"); + return -1.0; + } + + i--; + j--; + } + else{ + jlog("Error: calc_wld: cannot calculation Weighted Levenstein distance: table error: i = %d, j = %d\n", i, j); + return -1.0; + } + } + + weight += error1 > error2 ? error1 : error2; + } + + free(d); + + return weight; +} + + +/** + * + * Levenstein distanceを計算する． + * + * @param a [in] 要素1 + * @param b [in] 要素2 + * @param w [in] 言語モデル + * + * @return Levenstein distanceの値を返す． + * + */ + +static int +calc_ld(NODE *a, NODE *b, WORD_INFO *winfo) +{ + int distance; + DP *d; + + /* DPマッチングのパスを求める */ + d = dpmatch(a, b, winfo); + + distance = d[(a->seqnum + 1) * (b->seqnum + 1) - 1].d; + + free(d); + + return distance; +} + + +/** + * + * 音声認識スコアを正規化する． + * MBRスコアの初期化も同時に行う． + * + * @param table [in] スタックテーブル + * @param r_stacknum [in] スタックのデータ数 + * @param r [in] 認識インスタンス + * + * @return 正規化されたスコアの配列を返す． + * + */ + +static float * +normalization_score(NODE **table, int r_stacknum, RecogProcess *r) +{ + float *n_score; + int i; + float max; + + n_score = (float *)mymalloc(sizeof(float) * r_stacknum); + + /* 最も高いスコアで正規化する */ + max = table[0]->score; + n_score[0] = 1.0; + table[0]->score_mbr = 0.0; + + if(debug2_flag){ + jlog("n_score[0] = %f\n", n_score[0]); + } + + for(i = 1; i < r_stacknum; i++){ + + n_score[i] = pow(10, (table[i]->score - max) * r->config->mbr.score_weight); + table[i]->score_mbr = 0.0; + + if(debug2_flag){ + jlog("n_score[%d] = %f\n", i, n_score[i]); + } + } + + return n_score; +} + + +/** + * + * @brief MBR処理のメイン関数 + * + * 認識した文をMBRの枠組みでリスコアする． + * + * @param r_start [i/o] 結果格納用スタックの先頭ノードへのポインタ + * @param r_bottom [i/o] 結果格納用スタックの底ノードへのポインタ + * @param r_stacknum [in] スタックに格納されているノード数へのポインタ + * @param r [in] 認識処理インスタンス + * + * + * @callgraph + * @callergraph + * + */ + + +void +candidate_mbr(NODE **r_start, NODE **r_bottom, int r_stacknum, RecogProcess *r) +{ + JCONF_SEARCH *jconf = r->config; + NODE **table; + NODE *now; + + int i, j; + int dist; + + float *n_score; + float error; + + /* リストのままでは扱いにくいので配列に変換 */ + table = (NODE **)mymalloc(sizeof(NODE *) * r_stacknum); + i = 0; + for(now = *r_start; now; now = now->next){ + table[i] = now; + i++; + } + + /* 認識スコア（ゆう度）を正規化 */ + n_score = normalization_score(table, r_stacknum, r); + + /* MBRスコアを計算 */ + for(i = 0; i < r_stacknum - 1; i++){ + for(j = i + 1; j < r_stacknum; j++){ + + if(jconf->mbr.use_word_weight){ + /* 損失関数はWeighted Levenstein distance */ + if((error = calc_wld(table[i], table[j], r->lm->winfo)) < 0.0){ + jlog("Error: candidate_mbr: cannot calculation Weighted Levenstein distance\n"); + free(n_score); + free(table); + return; + } + + error = pow(error, jconf->mbr.loss_weight); + } + else{ + /* 損失関数はLevenstein distance */ + if((dist = calc_ld(table[i], table[j], r->lm->winfo)) < 0){ + jlog("Error: candidate_mbr: cannot calculation Levenstein distance\n"); + free(n_score); + free(table); + return; + } + + error = pow(dist, jconf->mbr.loss_weight); + } + + table[i]->score_mbr += n_score[j] * error; + table[j]->score_mbr += n_score[i] * error; + + if(debug2_flag){ + jlog("i = %d, j = %d\n", i, j); + jlog("error = %f\n", error); + jlog("n_score[%d] * error = %f\n", j, n_score[j] * error); + jlog("table[%d]->score_mbr = %f\n", i, table[i]->score_mbr); + jlog("n_score[%d] * error = %f\n", i, n_score[i] * error); + jlog("table[%d]->score_mbr = %f\n", j, table[j]->score_mbr); + } + } + } + + /* 結果をリスコア */ + qsort(table, r_stacknum, sizeof(NODE *), + (int (*)(const void *, const void *))mbr_cmp); + + /* 配列をリストに変換 */ + *r_start = table[0]; + (*r_start)->prev = NULL; + for(i = 1; i < r_stacknum; i++){ + table[i]->prev = table[i - 1]; + table[i - 1]->next = table[i]; + } + *r_bottom = table[r_stacknum - 1]; + (*r_bottom)->next = NULL; + + free(n_score); + free(table); + + return; +} + +#endif /* USE_MBR */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:28 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:28 +0900 Subject: [Julius-cvs 807] CVS update: julius4 Message-ID: <1371747748.731879.12081.nullmailer@users.sourceforge.jp> Index: julius4/00readme-ja.txt diff -u julius4/00readme-ja.txt:1.17 julius4/00readme-ja.txt:1.18 --- julius4/00readme-ja.txt:1.17 Fri Jul 27 17:44:47 2012 +++ julius4/00readme-ja.txt Fri Jun 21 02:02:27 2013 @@ -4,6 +4,7 @@ Julius + (Rev 4.2.3 2013/06/30) (Rev 4.2.2 2012/08/01) (Rev 4.2.1 2011/12/25) (Rev 4.2 2011/05/01) @@ -16,10 +17,10 @@ (Rev 2.0 1999/02/20) (Rev 1.0 1998/02/20) - Copyright (c) 1991-2012 ???? ????ｺ + Copyright (c) 1991-2013 ???? ????ｺ Copyright (c) 1997-2000 ????U?????(IPA) Copyright (c) 2000-2005 ?????????w??? ｭ???ｺ - Copyright (c) 2005-2012 ??????? Julius????? + Copyright (c) 2005-2013 ??????? Julius????? All rights reserved ====================================================================== @@ -36,14 +37,13 @@ http://julius.sourceforge.jp/ -Julius-4.2.2 +Julius-4.2.3 ============= -????? 4.2.2 ??????????[???? -????????????????B -?????????? (mkfa) ? flex ??????????????? -??????????????flex ????????????????? -????????????????? +????? 4.2.3 ???ｫ???????A?????????????? +??? mkbingram ??????N-gram????????????????? +????????????????????B + ??????????Release-ja.txt ???????? @@ -104,6 +104,14 @@ ??p???p????????????????????? ???????????????"LICENSE.txt" ???????? +?????????????????? Copyright ???????B + + libjulius/src/mbr.c + libsent/src/adin/pa/ + msvc/portaudio/ + msvc/zlib/ + + ??? =========== Index: julius4/00readme.txt diff -u julius4/00readme.txt:1.15 julius4/00readme.txt:1.16 --- julius4/00readme.txt:1.15 Fri Jul 27 17:44:47 2012 +++ julius4/00readme.txt Fri Jun 21 02:02:27 2013 @@ -4,6 +4,7 @@ Julius + (Rev 4.2.3 2013/06/30) (Rev 4.2.2 2012/08/01) (Rev 4.2.1 2011/12/25) (Rev 4.2 2011/05/01) @@ -16,10 +17,10 @@ (Rev 2.0 1999/02/20) (Rev 1.0 1998/02/20) - Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + Copyright (c) 1991-2013 Kawahara Lab., Kyoto University Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology All rights reserved ====================================================================== @@ -48,17 +49,16 @@ together with source codes. -What's new in Julius-4.2.2 +What's new in Julius-4.2.3 =========================== -Version 4.2.2 is a bug fix release. Several bugs has been fixed. The -grammar compiler (mkfa) now does not link flex library, so you can -compile without flex. +Version 4.2.3 includes several new features: dictionary reloading, audio +scaling, and binary N-gram charset conversion. Bugs has been also fixed. See the "Release.txt" file for the full list of updates. -Contents of Julius-4.2.2 +Contents of Julius-4.2.3 ========================= (Documents with suffix "ja" are written in Japanese) @@ -103,6 +103,15 @@ information about the license, please refer to the "LICENSE.txt" file included in this archive. +Also see the copyrights in the files: + + libjulius/src/mbr.c + gqramtools/gram2sapixml/gram2sapixml.pl.in + libsent/src/wav2mfcc/wav2mfcc-*.c + libsent/src/adin/pa/ + msvc/portaudio/ + msvc/zlib/ + Contact Us =========== Index: julius4/LICENSE.txt diff -u julius4/LICENSE.txt:1.9 julius4/LICENSE.txt:1.10 --- julius4/LICENSE.txt:1.9 Fri Jul 27 17:44:47 2012 +++ julius4/LICENSE.txt Fri Jun 21 02:02:27 2013 @@ -3,10 +3,10 @@ ?????????ｯ???? Julius? ????? - Copyright (c) 1991-2012 ???? ????ｺ + Copyright (c) 1991-2013 ???? ????ｺ Copyright (c) 1997-2000 ????U?????(IPA) Copyright (c) 2000-2005 ?????????w??? ｭ???ｺ - Copyright (c) 2005-2012 ??????? Julius????? + Copyright (c) 2005-2013 ??????? Julius????? ---------------------------------------------------------------------------- @@ -40,10 +40,10 @@ ???????ｦ?????????????? ? - Copyright (c) 1991-2012 ???? ????ｺ + Copyright (c) 1991-2013 ???? ????ｺ Copyright (c) 1997-2000 ????U?????(IPA) Copyright (c) 2000-2005 ?????????w??? ｭ???ｺ - Copyright (c) 2005-2012 ??????? Julius????? + Copyright (c) 2005-2013 ??????? Julius????? 3. ???????????????????????????????? ?????????ｯ???? Julius????????????????? @@ -79,10 +79,10 @@ Large Vocabulary Continuous Speech Recognition Engine Julius - Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + Copyright (c) 1991-2013 Kawahara Lab., Kyoto University Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology "Large Vocabulary Continuous Speech Recognition Engine Julius", including Julian, is being developed at Kawahara Lab., Kyoto @@ -129,10 +129,10 @@ Form of copyright notice: - Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + Copyright (c) 1991-2013 Kawahara Lab., Kyoto University Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology 3. When you publish or present any results by using the Software, you must explicitly mention your use of "Large Vocabulary Continuous Index: julius4/Release-ja.txt diff -u julius4/Release-ja.txt:1.17 julius4/Release-ja.txt:1.18 --- julius4/Release-ja.txt:1.17 Thu Jul 19 10:48:48 2012 +++ julius4/Release-ja.txt Fri Jun 21 02:02:27 2013 @@ -1,3 +1,26 @@ +4.2.3 (2013.06.30) +================== + +???? +- ｫ????[?: j_reload_adddict() +- ???????????????"-lvscale factor" ??? + "j_adin_change_input_scaling_factor()" +- ????????"-rejectlong msec" +- ????N-gram?????????????: "mkbingram" +- ?????????MBR)???ﾀ? + MBR Extension by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) + +??????o? +- ?????????????adinnet????????????????? + ??????????????? +- j_close_stream() ????????????????ｸ??? +- 64bit???????????????????????HMM????????? +- N-gram ????????ｸ????????? +- ?????????????????? +- ????????????????????? +- ???MacOSX???????ｸ??? + + 4.2.2 (2012.08.01) ================== Index: julius4/Release.txt diff -u julius4/Release.txt:1.16 julius4/Release.txt:1.17 --- julius4/Release.txt:1.16 Thu Jul 19 10:48:48 2012 +++ julius4/Release.txt Fri Jun 21 02:02:27 2013 @@ -1,3 +1,26 @@ +4.2.3 (2013.06.30) +================== + +New features: +- Add function "j_reload_adddict()" to reload dictionaries. +- Add option "-lvscale factor" and func "j_adin_change_input_scaling_factor()" + to scale the amplitude of captured audio by the factor. +- Add option "-rejectlong msec" to reject too long input. +- Add minimum bayes risk decoding (by Nanjo and ...) + MBR Extension contributed by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) +- Support binary N-gram symbol charset conversion by "mkbingram". + +Fixes: +- Fix sending audio stream via network with incorrect byte order at + big-endian machines. +- Fix occasional failure of closing audio device at j_close_stream(). +- Fix segfault when reading binary hmm created at 64bit env. with embedded parameters. +- Fix memory leak when failed to read an N-gram file. +- Fix memory leak when input length overflow is detected. +- Fix unable to load feature vector plugin. +- Update microphone input code for recent MacOSX. + + 4.2.2 (2012.08.01) ================== Index: julius4/Sample.jconf diff -u julius4/Sample.jconf:1.8 julius4/Sample.jconf:1.9 --- julius4/Sample.jconf:1.8 Fri Apr 29 10:24:14 2011 +++ julius4/Sample.jconf Fri Jun 21 02:02:27 2013 @@ -65,6 +65,11 @@ #-nozmean # disable "-zmean" specified before #### +#### Audio Input Scaling +#### +#-lvscale 1.0 # input level scaling factor (1.0 = disable) + +#### #### Speech segment detection by level and zero-cross #### #### default: on for microphone, off for other sources @@ -76,6 +81,7 @@ #-headmargin 300 # head silence margin (msec) #-tailmargin 400 # tail silence margin (msec) #-rejectshort 0 # reject shorter input (msec) +#-rejectlong -1 # reject longer input (msec) -1 to disable #### #### Input rejection by average power (EXPERIMENTAL) From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 808] CVS update: julius4/libjulius/src Message-ID: <1371747749.396842.12200.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/default.c diff -u julius4/libjulius/src/default.c:1.18 julius4/libjulius/src/default.c:1.19 --- julius4/libjulius/src/default.c:1.18 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/default.c Fri Jun 21 02:02:29 2013 @@ -17,7 +17,7 @@ * @author Akinobu Lee * @date Fri Feb 16 15:05:43 2007 * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * */ /* @@ -318,25 +318,10 @@ j->sw.fallback_pass1_flag = FALSE; #ifdef USE_MBR - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - j->mbr.use_mbr = FALSE; j->mbr.use_word_weight = FALSE; j->mbr.score_weight = 0.1; j->mbr.loss_weight = 1.0; - - /** - * - * MBR Expansion End - * - **/ #endif } Index: julius4/libjulius/src/m_fusion.c diff -u julius4/libjulius/src/m_fusion.c:1.24 julius4/libjulius/src/m_fusion.c:1.25 --- julius4/libjulius/src/m_fusion.c:1.24 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/src/m_fusion.c Fri Jun 21 02:02:29 2013 @@ -20,7 +20,7 @@ * @author Akinobu Lee * @date Thu May 12 13:31:47 2005 * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * */ /* @@ -1384,10 +1384,8 @@ * * @brief Reload dictionaries. * - * This function reload dictionaries from file. - * - * This function works only for N-gram LM. - * It also re-create all the recognition process, even if it is grammar-based. + * This function reload dictionaries and re-create all the recognition + * process. * * @param recog [i/o] engine instance * @param lm [i/o] LM instance to reload @@ -1433,6 +1431,23 @@ } } } + if (lm->lmtype == LM_DFA) { + /* DFA */ + if (lm->config->dfa_filename != NULL && lm->config->dictfilename != NULL) { + /* here add grammar specified by "-dfa" and "-v" to grammar list */ + multigram_add_gramlist(lm->config->dfa_filename, lm->config->dictfilename, lm->config, LM_DFA_GRAMMAR); + } + /* load all the specified grammars */ + if (multigram_load_all_gramlist(lm) == FALSE) { + jlog("ERROR: m_fusion: some error occured in reading grammars\n"); + return FALSE; + } + /* setup for later wchmm building */ + multigram_update(lm); + /* the whole lexicon will be forced to built in the boot sequence, + so reset the global modification flag here */ + lm->global_modified = FALSE; + } /* re-create all recognition process instance */ for(sh=recog->jconf->search_root;sh;sh=sh->next) { Index: julius4/libjulius/src/m_info.c diff -u julius4/libjulius/src/m_info.c:1.18 julius4/libjulius/src/m_info.c:1.19 --- julius4/libjulius/src/m_info.c:1.18 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/m_info.c Fri Jun 21 02:02:29 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Thu May 12 14:14:01 2005 * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * */ /* @@ -741,15 +741,6 @@ jlog("off, returns search failure\n"); } #ifdef USE_MBR - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - if (r->config->mbr.use_mbr) { jlog("\n"); jlog("Minimum Bayes Risk Decoding:\n"); @@ -757,13 +748,6 @@ jlog("\t(-mbr_wwer) use word weight on MBR = %s\n", r->config->mbr.use_word_weight ? "yes" : "no"); jlog("\t(-mbr_weight) score weight = %2.1f loss func. weight = %2.1f\n", r->config->mbr.score_weight, r->config->mbr.loss_weight); } - - /** - * - * MBR Expansion End - * - **/ - #endif jlog("\n"); } Index: julius4/libjulius/src/m_options.c diff -u julius4/libjulius/src/m_options.c:1.29 julius4/libjulius/src/m_options.c:1.30 --- julius4/libjulius/src/m_options.c:1.29 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/m_options.c Fri Jun 21 02:02:29 2013 @@ -18,7 +18,7 @@ * @author Akinobu Lee * @date Thu May 12 18:52:07 2005 * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * */ /* @@ -1374,15 +1374,6 @@ } #ifdef USE_MBR - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - } else if (strmatch(argv[i],"-mbr")) { if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE; @@ -1416,11 +1407,6 @@ jconf->searchnow->mbr.loss_weight = (LOGPROB)atof(tmparg); continue; - /** - * - * MBR Expansion End - * - **/ #endif } else { /* error */ Index: julius4/libjulius/src/m_usage.c diff -u julius4/libjulius/src/m_usage.c:1.21 julius4/libjulius/src/m_usage.c:1.22 --- julius4/libjulius/src/m_usage.c:1.21 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/m_usage.c Fri Jun 21 02:02:29 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Fri May 13 15:04:34 2005 * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * */ /* @@ -363,26 +363,11 @@ fprintf(fp, " [-salign] optionally output state alignments\n"); #ifdef USE_MBR - /** - * - * Update 7 September 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - fprintf(fp, "\n Minimum Bayes Risk Decoding:\n"); fprintf(fp, " [-mbr] enable rescoring sentence on MBR(WER)\n"); fprintf(fp, " [-mbr_wwer] enable rescoring sentence on MBR(WWER)\n"); fprintf(fp, " [-nombr] disable rescoring sentence on MBR\n"); fprintf(fp, " [-mbr_weight float float] score and loss func. weight on MBR (%.1f %.1f)\n", jconf->search_root->mbr.score_weight, jconf->search_root->mbr.loss_weight); - - /** - * - * MBR Expansion End - * - **/ #endif #ifdef CONFIDENCE_MEASURE Index: julius4/libjulius/src/mbr.c diff -u julius4/libjulius/src/mbr.c:1.1 julius4/libjulius/src/mbr.c:1.2 --- julius4/libjulius/src/mbr.c:1.1 Wed Jun 12 18:48:58 2013 +++ julius4/libjulius/src/mbr.c Fri Jun 21 02:02:29 2013 @@ -6,15 +6,19 @@ * * 認識された文をMBRの枠組みでリスコアする． * + * + * + * @brief Rescoring N-best sentences using MBR framework + * * * @author Hiroaki NANJO, Ryo FURUTANI * @date 28 March 2011 * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * */ /* - * Copyright (c) 2010-2011 NANJO lab. Ryukoku University + * Copyright (c) 2010-2013 NANJO lab. Ryukoku University * All rights reserved */ Index: julius4/libjulius/src/search_bestfirst_main.c diff -u julius4/libjulius/src/search_bestfirst_main.c:1.13 julius4/libjulius/src/search_bestfirst_main.c:1.14 --- julius4/libjulius/src/search_bestfirst_main.c:1.13 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/search_bestfirst_main.c Fri Jun 21 02:02:29 2013 @@ -35,7 +35,7 @@ * @author Akinobu Lee * @date Thu Sep 08 11:51:12 2005 * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * */ /* @@ -1025,22 +1025,7 @@ s->score_am = hypo->score - hypo->totallscore; #ifdef USE_MBR - /** - * - * Update 19 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - s->score_mbr = hypo->score_mbr; - - /** - * - * MBR Expansion End - * - **/ #endif if (r->lmtype == LM_DFA) { @@ -2171,26 +2156,9 @@ } #ifdef USE_MBR - - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - if(r->config->mbr.use_mbr){ candidate_mbr(&r_start, &r_bottom, r_stacknum, r); } - - /** - * - * MBR Expansion End - * - **/ - #endif /* 結果はまだ出力されていないので，文候補用スタック内をソートして Index: julius4/libjulius/src/search_bestfirst_v1.c diff -u julius4/libjulius/src/search_bestfirst_v1.c:1.8 julius4/libjulius/src/search_bestfirst_v1.c:1.9 --- julius4/libjulius/src/search_bestfirst_v1.c:1.8 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/search_bestfirst_v1.c Fri Jun 21 02:02:29 2013 @@ -92,7 +92,7 @@ * @author Akinobu Lee * @date Sun Sep 11 23:54:53 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -399,24 +399,7 @@ tmp->region = r; #ifdef USE_MBR - - /** - * - * Update 19 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - tmp->score_mbr = 0.0; - - /** - * - * MBR Expansion End - * - **/ - #endif return(tmp); Index: julius4/libjulius/src/version.c.in diff -u julius4/libjulius/src/version.c.in:1.9 julius4/libjulius/src/version.c.in:1.10 --- julius4/libjulius/src/version.c.in:1.9 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/src/version.c.in Fri Jun 21 02:02:29 2013 @@ -14,7 +14,7 @@ * @author Akinobu Lee * @date Mon Sep 12 01:34:15 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -232,27 +232,9 @@ #endif #ifdef USE_MBR - - /** - * - * Update 21 February 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - fprintf(strm," MBR"); - - /** - * - * MBR Expansion End - * - **/ - #endif - fprintf(strm, "\n"); fprintf(strm," - Compiled by : %s %s\n", CC, CFLAGS); } From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:28 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:28 +0900 Subject: [Julius-cvs 809] CVS update: julius4/julius Message-ID: <1371747748.925028.12134.nullmailer@users.sourceforge.jp> Index: julius4/julius/output_file.c diff -u julius4/julius/output_file.c:1.6 julius4/julius/output_file.c:1.7 --- julius4/julius/output_file.c:1.6 Wed Jun 12 18:48:25 2013 +++ julius4/julius/output_file.c Fri Jun 21 02:02:28 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Wed Dec 12 11:07:46 2007 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* @@ -152,26 +152,10 @@ fprintf(fp, "\n"); #endif #ifdef USE_MBR - /** - * - * Update 2 September 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - if(r->config->mbr.use_mbr == TRUE){ fprintf(fp, "MBRscore%d: %f\n", n+1, s->score_mbr); } - - /** - * - * MBR Expansion End - * - **/ - #endif fprintf(fp, "score%d: %f", n+1, s->score); Index: julius4/julius/output_module.c diff -u julius4/julius/output_module.c:1.10 julius4/julius/output_module.c:1.11 --- julius4/julius/output_module.c:1.10 Wed Jun 12 18:48:25 2013 +++ julius4/julius/output_module.c Fri Jun 21 02:02:28 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Tue Sep 06 14:46:49 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* @@ -445,27 +445,10 @@ module_send(module_sd, " config->mbr.use_mbr == TRUE){ module_send(module_sd, " MBRSCORE=\"%f\"", s->score_mbr); } - - /** - * - * MBR Expansion End - * - **/ - #endif module_send(module_sd, " SCORE=\"%f\"", s->score); if (r->lmtype == LM_PROB) { Index: julius4/julius/output_stdout.c diff -u julius4/julius/output_stdout.c:1.12 julius4/julius/output_stdout.c:1.13 --- julius4/julius/output_stdout.c:1.12 Wed Jun 12 18:48:25 2013 +++ julius4/julius/output_stdout.c Fri Jun 21 02:02:28 2013 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Tue Sep 06 17:18:46 2005 * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * */ /* @@ -908,27 +908,9 @@ } if (verbose_flag) { #ifdef USE_MBR - - /** - * - * Update 7 September 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - if(r->config->mbr.use_mbr == TRUE){ - printf("MBRscore%d: %f\n", n+1, s->score_mbr); } - - /** - * - * MBR Expansion End - * - **/ - #endif printf("score%d: %f", n+1, s->score); if (r->lmtype == LM_PROB) { From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 810] CVS update: julius4/libjulius/include/julius Message-ID: <1371747749.090300.12169.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/include/julius/extern.h diff -u julius4/libjulius/include/julius/extern.h:1.21 julius4/libjulius/include/julius/extern.h:1.22 --- julius4/libjulius/include/julius/extern.h:1.21 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/include/julius/extern.h Fri Jun 21 02:02:29 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Mon Mar 7 23:19:14 2005 * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * */ /* @@ -328,25 +328,8 @@ int mfc_module_read(MFCCCalc *mfcc, int *new_t); char *mfc_module_input_name(MFCCCalc *mfcc); #ifdef USE_MBR - -/** - * - * Update 21 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - /* mbr.c */ void candidate_mbr(NODE **r_start, NODE **r_bottom, int r_stacknum, RecogProcess *r); - -/** - * - * MBR Expansion End - * - **/ - #endif #ifdef __cplusplus } Index: julius4/libjulius/include/julius/jconf.h diff -u julius4/libjulius/include/julius/jconf.h:1.17 julius4/libjulius/include/julius/jconf.h:1.18 --- julius4/libjulius/include/julius/jconf.h:1.17 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/include/julius/jconf.h Fri Jun 21 02:02:29 2013 @@ -23,7 +23,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * */ /* @@ -792,16 +792,6 @@ } sw; #ifdef USE_MBR - - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - struct { /* Rescoring sentence on MBR (-mbr) */ @@ -817,13 +807,6 @@ float loss_weight; } mbr; - - /** - * - * MBR Expansion End - * - **/ - #endif /* pointer to next instance */ Index: julius4/libjulius/include/julius/recog.h diff -u julius4/libjulius/include/julius/recog.h:1.19 julius4/libjulius/include/julius/recog.h:1.20 --- julius4/libjulius/include/julius/recog.h:1.19 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/include/julius/recog.h Fri Jun 21 02:02:29 2013 @@ -70,7 +70,7 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * */ /* @@ -334,24 +334,7 @@ SentenceAlign *align; #ifdef USE_MBR - - /** - * - * Update 19 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - LOGPROB score_mbr; ///< MBR score - - /** - * - * MBR Expansion End - * - **/ - #endif } Sentence; Index: julius4/libjulius/include/julius/search.h diff -u julius4/libjulius/include/julius/search.h:1.5 julius4/libjulius/include/julius/search.h:1.6 --- julius4/libjulius/include/julius/search.h:1.5 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/include/julius/search.h Fri Jun 21 02:02:29 2013 @@ -29,7 +29,7 @@ * @author Akinobu Lee * @date Wed Sep 07 07:40:11 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* @@ -131,24 +131,7 @@ struct __recogprocess__ *region; ///> Where this node belongs to #ifdef USE_MBR - - /** - * - * Update 19 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - float score_mbr; ///< MBR score - - /** - * - * MBR Expansion End - * - **/ - #endif } NODE; @@ -185,20 +168,13 @@ */ #ifdef USE_MBR - -/** - * - * Update 21 October 2010 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - /** * * DPマッチングで使うノード * + * + * Nodes for DP matching + * */ typedef struct { @@ -206,14 +182,6 @@ int r; // 遷移元 1=Ins. 2=Del. 3=Sub. or Cor. int c; // r=3とした場合の遷移コスト 1=Sub. 0=Cor. } DP; - - -/** - * - * MBR Expansion End - * - **/ - #endif #endif /* __J_SEARCH_H__ */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:30 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:30 +0900 Subject: [Julius-cvs 811] CVS update: julius4/support Message-ID: <1371747750.178742.12292.nullmailer@users.sourceforge.jp> Index: julius4/support/build-all.sh diff -u julius4/support/build-all.sh:1.13 julius4/support/build-all.sh:1.14 --- julius4/support/build-all.sh:1.13 Fri Jul 27 19:02:04 2012 +++ julius4/support/build-all.sh Fri Jun 21 02:02:30 2013 @@ -6,7 +6,7 @@ # # argument: any configure options except "--enable-setup=..." is allowed. # -JULIUS_VERSION=4.2.2 +JULIUS_VERSION=4.2.3 ###################################################################### From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 812] CVS update: julius4/libsent Message-ID: <1371747749.743057.12220.nullmailer@users.sourceforge.jp> Index: julius4/libsent/configure diff -u julius4/libsent/configure:1.31 julius4/libsent/configure:1.32 --- julius4/libsent/configure:1.31 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/configure Fri Jun 21 02:02:29 2013 @@ -565,7 +565,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -LIBSENT_VERSION=4.2.2 +LIBSENT_VERSION=4.2.3 # specify mic type # Check whether --with-mictype or --without-mictype was given. Index: julius4/libsent/configure.in diff -u julius4/libsent/configure.in:1.31 julius4/libsent/configure.in:1.32 --- julius4/libsent/configure.in:1.31 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/configure.in Fri Jun 21 02:02:29 2013 @@ -3,7 +3,7 @@ dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.31 2013/06/12 09:48:26 sumomo Exp $ +dnl $Id: configure.in,v 1.32 2013/06/20 17:02:29 sumomo Exp $ dnl dnl Process this file with autoconf to produce a configure script. @@ -11,7 +11,7 @@ AC_CONFIG_HEADER(include/sent/config.h) AC_CONFIG_AUX_DIR(../support) -LIBSENT_VERSION=4.2.2 +LIBSENT_VERSION=4.2.3 dnl Checks for options # specify mic type From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:30 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:30 +0900 Subject: [Julius-cvs 813] CVS update: julius4/msvc/config Message-ID: <1371747750.086981.12284.nullmailer@users.sourceforge.jp> Index: julius4/msvc/config/config-msvc-libjulius.h diff -u julius4/msvc/config/config-msvc-libjulius.h:1.2 julius4/msvc/config/config-msvc-libjulius.h:1.3 --- julius4/msvc/config/config-msvc-libjulius.h:1.2 Fri Dec 24 13:33:42 2010 +++ julius4/msvc/config/config-msvc-libjulius.h Fri Jun 21 02:02:29 2013 @@ -29,7 +29,7 @@ * @author Akinobu LEE * @date Sat Feb 19 12:53:54 2005 * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * */ @@ -37,7 +37,7 @@ #define JULIUS_PRODUCTNAME "JuliusLib" /// Version string -#define JULIUS_VERSION "4.1.5" +#define JULIUS_VERSION "4.2.3" /// Engine setting (value of "--enable-setup=..."). #define JULIUS_SETUP "fast" Index: julius4/msvc/config/config-msvc-libsent.h diff -u julius4/msvc/config/config-msvc-libsent.h:1.3 julius4/msvc/config/config-msvc-libsent.h:1.4 --- julius4/msvc/config/config-msvc-libsent.h:1.3 Thu Feb 24 19:07:03 2011 +++ julius4/msvc/config/config-msvc-libsent.h Fri Jun 21 02:02:30 2013 @@ -1,5 +1,5 @@ /* Version string */ -#define LIBSENT_VERSION "4.1.5" +#define LIBSENT_VERSION "4.2.3" /* Audio API name */ #define AUDIO_API_NAME "pa-dsound" @@ -103,5 +103,20 @@ /* Define if exist */ #undef HAVE_PULSE_SIMPLE_H +/* Define if enable alsa */ +#undef HAS_ALSA + +/* Define if enable oss */ +#undef HAS_OSS + +/* Define if enable pulseaudio */ +#undef HAS_PULSEAUDIO + +/* Define if enable esd */ +#undef HAS_ESD + /* Define if MSD-HMM support is enabled */ #undef ENABLE_MSD + +/* Define if MBR support is enabled */ +#undef USE_MBR From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 814] CVS update: julius4/libsent/src/voca Message-ID: <1371747749.965196.12273.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/voca/voca_load_htkdict.c diff -u julius4/libsent/src/voca/voca_load_htkdict.c:1.13 julius4/libsent/src/voca/voca_load_htkdict.c:1.14 --- julius4/libsent/src/voca/voca_load_htkdict.c:1.13 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/src/voca/voca_load_htkdict.c Fri Jun 21 02:02:29 2013 @@ -19,7 +19,7 @@ * @author Akinobu LEE * @date Fri Feb 18 19:43:06 2005 * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * */ /* @@ -491,16 +491,6 @@ winfo->woutput[vnum] = strcpy((char *)mybmalloc2(strlen(ptmp)+1, &(winfo->mroot)), ptmp); #ifdef USE_MBR - - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - /* just move pointer to next token */ if ((ptmp = mystrtok_movetonext(NULL, " \t\n")) == NULL) { jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); @@ -533,13 +523,6 @@ else{ winfo->weight[vnum] = 1.0; /* default, same minimization WER */ } - - /** - * - * MBR Expansion End - * - **/ - #endif Index: julius4/libsent/src/voca/voca_load_wordlist.c diff -u julius4/libsent/src/voca/voca_load_wordlist.c:1.9 julius4/libsent/src/voca/voca_load_wordlist.c:1.10 --- julius4/libsent/src/voca/voca_load_wordlist.c:1.9 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/src/voca/voca_load_wordlist.c Fri Jun 21 02:02:29 2013 @@ -13,7 +13,7 @@ * @author Akinobu LEE * @date Sun Jul 22 13:29:32 2007 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* @@ -308,16 +308,6 @@ winfo->woutput[vnum] = strcpy((char *)mybmalloc2(strlen(ptmp)+1, &(winfo->mroot)), ptmp); #ifdef USE_MBR - - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - /* just move pointer to next token */ if ((ptmp = mystrtok_movetonext(NULL, " \t\n")) == NULL) { jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); @@ -350,13 +340,6 @@ else{ winfo->weight[vnum] = 1.0; /* default, same minimization WER */ } - - /** - * - * MBR Expansion End - * - **/ - #endif Index: julius4/libsent/src/voca/voca_malloc.c diff -u julius4/libsent/src/voca/voca_malloc.c:1.8 julius4/libsent/src/voca/voca_malloc.c:1.9 --- julius4/libsent/src/voca/voca_malloc.c:1.8 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/src/voca/voca_malloc.c Fri Jun 21 02:02:29 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Fri Feb 18 21:33:29 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* @@ -76,24 +76,7 @@ if (winfo->is_transparent != NULL) free(winfo->is_transparent); /* free whole */ #ifdef USE_MBR - - /** - * - * Update 4 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - if (winfo->weight != NULL) free(winfo->weight); - - /** - * - * MBR Expansion End - * - **/ - #endif free(winfo); } @@ -128,24 +111,7 @@ winfo->errph_root = NULL; #ifdef USE_MBR - - /** - * - * Update 4 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - winfo->weight = (LOGPROB *)mymalloc(sizeof(LOGPROB)*n); - - /** - * - * MBR Expansion End - * - **/ - #endif } @@ -179,22 +145,7 @@ winfo->is_transparent = (boolean *)myrealloc(winfo->is_transparent, sizeof(boolean)*n); #ifdef USE_MBR - /** - * - * Update 4 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - winfo->weight = (LOGPROB *)myrealloc(winfo->weight, sizeof(LOGPROB)*n); - - /** - * - * MBR Expansion End - * - **/ #endif winfo->maxnum = n; From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 815] CVS update: julius4/libsent/include/sent Message-ID: <1371747749.816336.12232.nullmailer@users.sourceforge.jp> Index: julius4/libsent/include/sent/config.h.in diff -u julius4/libsent/include/sent/config.h.in:1.9 julius4/libsent/include/sent/config.h.in:1.10 --- julius4/libsent/include/sent/config.h.in:1.9 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/include/sent/config.h.in Fri Jun 21 02:02:29 2013 @@ -33,7 +33,7 @@ * @author Akinobu LEE * @date Thu Feb 10 17:48:32 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ @@ -158,4 +158,5 @@ #undef ENABLE_MSD /* Define if MBR support is enabled */ +/* MBR Extension by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) */ #undef USE_MBR Index: julius4/libsent/include/sent/vocabulary.h diff -u julius4/libsent/include/sent/vocabulary.h:1.10 julius4/libsent/include/sent/vocabulary.h:1.11 --- julius4/libsent/include/sent/vocabulary.h:1.10 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/include/sent/vocabulary.h Fri Jun 21 02:02:29 2013 @@ -30,7 +30,7 @@ * @author Akinobu LEE * @date Sat Feb 12 12:38:13 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* @@ -77,22 +77,7 @@ int totaltransnum; ///< Total number of state transitions boolean *is_transparent; ///< TRUE if the word can be treated as transparent [wid] #ifdef USE_MBR - /** - * - * Update 7 March 2011 - * - * MBR Expansion Hiroaki NANJO - * Ryo FURUTANI - * - **/ - float *weight; ///< Word weight (use minimization WWER on MBR) - - /** - * - * MBR Expansion End - * - **/ #endif APATNODE *errph_root; ///< Root node of index tree for gathering error %HMM name appeared when reading the dictionary BMALLOC_BASE *mroot; ///< Pointer for block memory allocation From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:02:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:02:29 +0900 Subject: [Julius-cvs 816] CVS update: julius4/libjulius Message-ID: <1371747749.001421.12144.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/configure diff -u julius4/libjulius/configure:1.16 julius4/libjulius/configure:1.17 --- julius4/libjulius/configure:1.16 Fri Jul 27 19:02:04 2012 +++ julius4/libjulius/configure Fri Jun 21 02:02:28 2013 @@ -592,7 +592,7 @@ JULIUS_PRODUCTNAME=JuliusLib -JULIUS_VERSION=4.2.2 +JULIUS_VERSION=4.2.3 # Check whether --enable-pthread or --disable-pthread was given. Index: julius4/libjulius/configure.in diff -u julius4/libjulius/configure.in:1.17 julius4/libjulius/configure.in:1.18 --- julius4/libjulius/configure.in:1.17 Fri Jul 27 19:02:04 2012 +++ julius4/libjulius/configure.in Fri Jun 21 02:02:28 2013 @@ -4,7 +4,7 @@ dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.17 2012/07/27 10:02:04 sumomo Exp $ +dnl $Id: configure.in,v 1.18 2013/06/20 17:02:28 sumomo Exp $ dnl AC_INIT(src/search_bestfirst_main.c) @@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(../support) JULIUS_PRODUCTNAME=JuliusLib -JULIUS_VERSION=4.2.2 +JULIUS_VERSION=4.2.3 dnl Checks for options From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:16 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:16 +0900 Subject: [Julius-cvs 817] CVS update: julius4 Message-ID: <1371748456.865057.26403.nullmailer@users.sourceforge.jp> Index: julius4/Makefile.in diff -u julius4/Makefile.in:1.5 julius4/Makefile.in:1.6 --- julius4/Makefile.in:1.5 Fri Jul 27 17:44:47 2012 +++ julius4/Makefile.in Fri Jun 21 02:14:16 2013 @@ -1,11 +1,11 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # # Makefile.in --- Makefile Template for configure # -# $Id: Makefile.in,v 1.5 2012/07/27 08:44:47 sumomo Exp $ +# $Id: Makefile.in,v 1.6 2013/06/20 17:14:16 sumomo Exp $ # SHELL=/bin/sh Index: julius4/configure.in diff -u julius4/configure.in:1.6 julius4/configure.in:1.7 --- julius4/configure.in:1.6 Fri Jul 27 17:44:47 2012 +++ julius4/configure.in Fri Jun 21 02:14:16 2013 @@ -1,9 +1,9 @@ -dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 1991-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.6 2012/07/27 08:44:47 sumomo Exp $ +dnl $Id: configure.in,v 1.7 2013/06/20 17:14:16 sumomo Exp $ dnl AC_INIT(Sample.jconf) AC_CONFIG_AUX_DIR(support) From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:27 +0900 Subject: [Julius-cvs 818] CVS update: julius4/libsent/src/wav2mfcc Message-ID: <1371748467.607928.27771.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/wav2mfcc/mfcc-core.c diff -u julius4/libsent/src/wav2mfcc/mfcc-core.c:1.7 julius4/libsent/src/wav2mfcc/mfcc-core.c:1.8 --- julius4/libsent/src/wav2mfcc/mfcc-core.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/wav2mfcc/mfcc-core.c Fri Jun 21 02:14:27 2013 @@ -17,13 +17,13 @@ * @author Akinobu Lee * @date Mon Aug 7 11:55:45 2006 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/wav2mfcc/para.c diff -u julius4/libsent/src/wav2mfcc/para.c:1.11 julius4/libsent/src/wav2mfcc/para.c:1.12 --- julius4/libsent/src/wav2mfcc/para.c:1.11 Sun Aug 5 10:26:54 2012 +++ julius4/libsent/src/wav2mfcc/para.c Fri Jun 21 02:14:27 2013 @@ -16,13 +16,13 @@ * @author Akinobu Lee * @date Fri Oct 27 14:55:00 2006 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/wav2mfcc/ss.c diff -u julius4/libsent/src/wav2mfcc/ss.c:1.5 julius4/libsent/src/wav2mfcc/ss.c:1.6 --- julius4/libsent/src/wav2mfcc/ss.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/wav2mfcc/ss.c Fri Jun 21 02:14:27 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Thu Feb 17 17:19:54 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c diff -u julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.8 julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.9 --- julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.8 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c Fri Jun 21 02:14:27 2013 @@ -20,13 +20,13 @@ * @author Akinobu LEE * @date Thu Feb 17 18:12:30 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:16 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:16 +0900 Subject: [Julius-cvs 819] CVS update: julius4/adinrec Message-ID: <1371748456.985355.26420.nullmailer@users.sourceforge.jp> Index: julius4/adinrec/Makefile.in diff -u julius4/adinrec/Makefile.in:1.7 julius4/adinrec/Makefile.in:1.8 --- julius4/adinrec/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/adinrec/Makefile.in Fri Jun 21 02:14:16 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.7 2012/07/27 08:44:48 sumomo Exp $ +# $Id: Makefile.in,v 1.8 2013/06/20 17:14:16 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/adinrec/adinrec.c diff -u julius4/adinrec/adinrec.c:1.11 julius4/adinrec/adinrec.c:1.12 --- julius4/adinrec/adinrec.c:1.11 Sun Aug 5 10:26:53 2012 +++ julius4/adinrec/adinrec.c Fri Jun 21 02:14:16 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Mar 23 20:33:01 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 820] CVS update: julius4/gramtools/dfa_determinize Message-ID: <1371748457.422333.26502.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/dfa_determinize/Makefile.in diff -u julius4/gramtools/dfa_determinize/Makefile.in:1.7 julius4/gramtools/dfa_determinize/Makefile.in:1.8 --- julius4/gramtools/dfa_determinize/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/dfa_determinize/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/dfa_determinize/dfa_determinize.c diff -u julius4/gramtools/dfa_determinize/dfa_determinize.c:1.4 julius4/gramtools/dfa_determinize/dfa_determinize.c:1.5 --- julius4/gramtools/dfa_determinize/dfa_determinize.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/dfa_determinize/dfa_determinize.c Fri Jun 21 02:14:17 2013 @@ -6,12 +6,12 @@ * @author Akinobu Lee * @date Wed Oct 4 17:42:16 2006 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 2006-2012 Kawahara Lab., Kyoto University - * Copyright (c) 2006-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2006-2013 Kawahara Lab., Kyoto University + * Copyright (c) 2006-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:18 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:18 +0900 Subject: [Julius-cvs 821] CVS update: julius4/gramtools/yomi2voca Message-ID: <1371748458.793733.26734.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/yomi2voca/Makefile.in diff -u julius4/gramtools/yomi2voca/Makefile.in:1.4 julius4/gramtools/yomi2voca/Makefile.in:1.5 --- julius4/gramtools/yomi2voca/Makefile.in:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/yomi2voca/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/yomi2voca/yomi2voca.pl.in diff -u julius4/gramtools/yomi2voca/yomi2voca.pl.in:1.5 julius4/gramtools/yomi2voca/yomi2voca.pl.in:1.6 --- julius4/gramtools/yomi2voca/yomi2voca.pl.in:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/yomi2voca/yomi2voca.pl.in Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ #!@PERL@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # # @configure_input@ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:20 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:20 +0900 Subject: [Julius-cvs 822] CVS update: julius4/libsent/include/sent Message-ID: <1371748460.566296.27069.nullmailer@users.sourceforge.jp> Index: julius4/libsent/include/sent/adin.h diff -u julius4/libsent/include/sent/adin.h:1.12 julius4/libsent/include/sent/adin.h:1.13 --- julius4/libsent/include/sent/adin.h:1.12 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/adin.h Fri Jun 21 02:14:20 2013 @@ -19,12 +19,12 @@ * @author Akinobu LEE * @date Thu Feb 10 17:22:36 2005 * - * $Revision: 1.12 $ + * $Revision: 1.13 $ */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/dfa.h diff -u julius4/libsent/include/sent/dfa.h:1.7 julius4/libsent/include/sent/dfa.h:1.8 --- julius4/libsent/include/sent/dfa.h:1.7 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/dfa.h Fri Jun 21 02:14:20 2013 @@ -29,13 +29,13 @@ * @author Akinobu LEE * @date Thu Feb 10 18:21:27 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/hmm.h diff -u julius4/libsent/include/sent/hmm.h:1.5 julius4/libsent/include/sent/hmm.h:1.6 --- julius4/libsent/include/sent/hmm.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/hmm.h Fri Jun 21 02:14:20 2013 @@ -21,13 +21,13 @@ * @author Akinobu LEE * @date Thu Feb 10 14:54:06 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/hmm_calc.h diff -u julius4/libsent/include/sent/hmm_calc.h:1.9 julius4/libsent/include/sent/hmm_calc.h:1.10 --- julius4/libsent/include/sent/hmm_calc.h:1.9 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/hmm_calc.h Fri Jun 21 02:14:20 2013 @@ -13,13 +13,13 @@ * @author Akinobu LEE * @date Thu Feb 10 14:54:06 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/htk_defs.h diff -u julius4/libsent/include/sent/htk_defs.h:1.5 julius4/libsent/include/sent/htk_defs.h:1.6 --- julius4/libsent/include/sent/htk_defs.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/htk_defs.h Fri Jun 21 02:14:20 2013 @@ -24,13 +24,13 @@ * @author Akinobu LEE * @date Thu Feb 10 19:36:47 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/htk_hmm.h diff -u julius4/libsent/include/sent/htk_hmm.h:1.10 julius4/libsent/include/sent/htk_hmm.h:1.11 --- julius4/libsent/include/sent/htk_hmm.h:1.10 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/htk_hmm.h Fri Jun 21 02:14:20 2013 @@ -16,13 +16,13 @@ * @author Akinobu LEE * @date Thu Feb 10 19:36:47 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/htk_param.h diff -u julius4/libsent/include/sent/htk_param.h:1.5 julius4/libsent/include/sent/htk_param.h:1.6 --- julius4/libsent/include/sent/htk_param.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/htk_param.h Fri Jun 21 02:14:20 2013 @@ -48,13 +48,13 @@ * @author Akinobu LEE * @date Fri Feb 11 02:52:52 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/machines.h diff -u julius4/libsent/include/sent/machines.h:1.5 julius4/libsent/include/sent/machines.h:1.6 --- julius4/libsent/include/sent/machines.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/machines.h Fri Jun 21 02:14:20 2013 @@ -21,13 +21,13 @@ * @author Akinobu LEE * @date Fri Feb 11 03:38:31 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/ngram2.h diff -u julius4/libsent/include/sent/ngram2.h:1.12 julius4/libsent/include/sent/ngram2.h:1.13 --- julius4/libsent/include/sent/ngram2.h:1.12 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/ngram2.h Fri Jun 21 02:14:20 2013 @@ -95,13 +95,13 @@ * @author Akinobu LEE * @date Fri Feb 11 15:04:02 2005 * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/ptree.h diff -u julius4/libsent/include/sent/ptree.h:1.8 julius4/libsent/include/sent/ptree.h:1.9 --- julius4/libsent/include/sent/ptree.h:1.8 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/ptree.h Fri Jun 21 02:14:20 2013 @@ -17,13 +17,13 @@ * @author Akinobu LEE * @date Fri Feb 11 17:27:24 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/speech.h diff -u julius4/libsent/include/sent/speech.h:1.5 julius4/libsent/include/sent/speech.h:1.6 --- julius4/libsent/include/sent/speech.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/speech.h Fri Jun 21 02:14:20 2013 @@ -23,13 +23,13 @@ * @author Akinobu LEE * @date Sat Feb 12 11:16:41 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/stddefs.h diff -u julius4/libsent/include/sent/stddefs.h:1.8 julius4/libsent/include/sent/stddefs.h:1.9 --- julius4/libsent/include/sent/stddefs.h:1.8 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/stddefs.h Fri Jun 21 02:14:20 2013 @@ -29,13 +29,13 @@ * @author Akinobu LEE * @date Sat Feb 12 11:49:37 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/tcpip.h diff -u julius4/libsent/include/sent/tcpip.h:1.5 julius4/libsent/include/sent/tcpip.h:1.6 --- julius4/libsent/include/sent/tcpip.h:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/tcpip.h Fri Jun 21 02:14:20 2013 @@ -11,13 +11,13 @@ * @author Akinobu LEE * @date Sat Feb 12 12:26:15 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/util.h diff -u julius4/libsent/include/sent/util.h:1.9 julius4/libsent/include/sent/util.h:1.10 --- julius4/libsent/include/sent/util.h:1.9 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/include/sent/util.h Fri Jun 21 02:14:20 2013 @@ -21,13 +21,13 @@ * @author Akinobu LEE * @date Sat Feb 12 12:30:40 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/include/sent/vocabulary.h diff -u julius4/libsent/include/sent/vocabulary.h:1.11 julius4/libsent/include/sent/vocabulary.h:1.12 --- julius4/libsent/include/sent/vocabulary.h:1.11 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/include/sent/vocabulary.h Fri Jun 21 02:14:20 2013 @@ -30,13 +30,13 @@ * @author Akinobu LEE * @date Sat Feb 12 12:38:13 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:18 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:18 +0900 Subject: [Julius-cvs 823] CVS update: julius4/gramtools/mkdfa/mkfa-1.44-flex Message-ID: <1371748458.511985.26653.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in:1.5 julius4/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in:1.6 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in:1.5 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved ## Makefile for mkfa, DFA compiler Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.c:1.5 julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.c:1.6 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.c:1.5 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.h diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.h:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.h:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/dfa.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/gram.y diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/gram.y:1.3 julius4/gramtools/mkdfa/mkfa-1.44-flex/gram.y:1.4 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/gram.y:1.3 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/gram.y Fri Jun 21 02:14:18 2013 @@ -1,8 +1,8 @@ %{ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c:1.6 julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c:1.7 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c:1.6 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c Fri Jun 21 02:14:18 2013 @@ -1,14 +1,14 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /cvsroot/julius/julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c,v 1.6 2012/07/27 08:44:48 sumomo Exp $ + * $Header: /cvsroot/julius/julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c,v 1.7 2013/06/20 17:14:18 sumomo Exp $ */ #define FLEX_SCANNER Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/main.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/main.c:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/main.c:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/main.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/main.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/mkfa.h diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/mkfa.h:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/mkfa.h:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/mkfa.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/mkfa.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.c:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.c:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.h diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.h:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.h:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/nfa.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ void makeNFA( void ); Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.c:1.5 julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.c:1.6 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.c:1.5 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.h diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.h:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.h:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/triplet.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ void makeTriplet( void ); Index: julius4/gramtools/mkdfa/mkfa-1.44-flex/voca.c diff -u julius4/gramtools/mkdfa/mkfa-1.44-flex/voca.c:1.4 julius4/gramtools/mkdfa/mkfa-1.44-flex/voca.c:1.5 --- julius4/gramtools/mkdfa/mkfa-1.44-flex/voca.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkfa-1.44-flex/voca.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "mkfa.h" From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:24 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:24 +0900 Subject: [Julius-cvs 824] CVS update: julius4/libsent/src/net Message-ID: <1371748464.442971.27453.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/net/rdwt.c diff -u julius4/libsent/src/net/rdwt.c:1.6 julius4/libsent/src/net/rdwt.c:1.7 --- julius4/libsent/src/net/rdwt.c:1.6 Wed Oct 10 11:36:03 2012 +++ julius4/libsent/src/net/rdwt.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 07:09:25 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/net/server-client.c diff -u julius4/libsent/src/net/server-client.c:1.5 julius4/libsent/src/net/server-client.c:1.6 --- julius4/libsent/src/net/server-client.c:1.5 Fri Jul 27 17:44:56 2012 +++ julius4/libsent/src/net/server-client.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 07:18:13 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 825] CVS update: julius4/adintool Message-ID: <1371748457.074801.26441.nullmailer@users.sourceforge.jp> Index: julius4/adintool/Makefile.in diff -u julius4/adintool/Makefile.in:1.7 julius4/adintool/Makefile.in:1.8 --- julius4/adintool/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/adintool/Makefile.in Fri Jun 21 02:14:16 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.7 2012/07/27 08:44:48 sumomo Exp $ +# $Id: Makefile.in,v 1.8 2013/06/20 17:14:16 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/adintool/adintool.c diff -u julius4/adintool/adintool.c:1.16 julius4/adintool/adintool.c:1.17 --- julius4/adintool/adintool.c:1.16 Sun Aug 5 10:26:54 2012 +++ julius4/adintool/adintool.c Fri Jun 21 02:14:17 2013 @@ -35,13 +35,13 @@ * @author Akinobu LEE * @date Wed Mar 23 20:43:32 2005 * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:27 +0900 Subject: [Julius-cvs 826] CVS update: julius4/man Message-ID: <1371748467.719287.27793.nullmailer@users.sourceforge.jp> Index: julius4/man/Makefile.in diff -u julius4/man/Makefile.in:1.5 julius4/man/Makefile.in:1.6 --- julius4/man/Makefile.in:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/man/Makefile.in Fri Jun 21 02:14:27 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.5 2012/07/27 08:44:57 sumomo Exp $ +# $Id: Makefile.in,v 1.6 2013/06/20 17:14:27 sumomo Exp $ # SHELL=/bin/sh RM=@RM@ -f From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 827] CVS update: julius4/gramtools/generate Message-ID: <1371748457.608599.26536.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/generate/Makefile.in diff -u julius4/gramtools/generate/Makefile.in:1.7 julius4/gramtools/generate/Makefile.in:1.8 --- julius4/gramtools/generate/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/generate/common.h diff -u julius4/gramtools/generate/common.h:1.4 julius4/gramtools/generate/common.h:1.5 --- julius4/gramtools/generate/common.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/common.h Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/generate/gen_next.c diff -u julius4/gramtools/generate/gen_next.c:1.4 julius4/gramtools/generate/gen_next.c:1.5 --- julius4/gramtools/generate/gen_next.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/gen_next.c Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/generate/gen_next.h diff -u julius4/gramtools/generate/gen_next.h:1.4 julius4/gramtools/generate/gen_next.h:1.5 --- julius4/gramtools/generate/gen_next.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/gen_next.h Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/generate/generate.c diff -u julius4/gramtools/generate/generate.c:1.5 julius4/gramtools/generate/generate.c:1.6 --- julius4/gramtools/generate/generate.c:1.5 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/generate.c Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/generate/rdterm.c diff -u julius4/gramtools/generate/rdterm.c:1.4 julius4/gramtools/generate/rdterm.c:1.5 --- julius4/gramtools/generate/rdterm.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/generate/rdterm.c Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:27 +0900 Subject: [Julius-cvs 828] CVS update: julius4/mkbingram Message-ID: <1371748467.796960.27820.nullmailer@users.sourceforge.jp> Index: julius4/mkbingram/Makefile.in diff -u julius4/mkbingram/Makefile.in:1.8 julius4/mkbingram/Makefile.in:1.9 --- julius4/mkbingram/Makefile.in:1.8 Sat Aug 11 19:44:02 2012 +++ julius4/mkbingram/Makefile.in Fri Jun 21 02:14:27 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.8 2012/08/11 10:44:02 sumomo Exp $ +# $Id: Makefile.in,v 1.9 2013/06/20 17:14:27 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/mkbingram/charconv.c diff -u julius4/mkbingram/charconv.c:1.1 julius4/mkbingram/charconv.c:1.2 --- julius4/mkbingram/charconv.c:1.1 Sat Aug 11 19:44:02 2012 +++ julius4/mkbingram/charconv.c Fri Jun 21 02:14:27 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/mkbingram/mkbingram.c diff -u julius4/mkbingram/mkbingram.c:1.6 julius4/mkbingram/mkbingram.c:1.7 --- julius4/mkbingram/mkbingram.c:1.6 Sat Aug 11 19:44:02 2012 +++ julius4/mkbingram/mkbingram.c Fri Jun 21 02:14:27 2013 @@ -18,19 +18,19 @@ * @author Akinobu LEE * @date Thu Mar 24 12:22:27 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* mkbingram --- make binary n-gram for JULIUS from ARPA standard format */ -/* $Id: mkbingram.c,v 1.6 2012/08/11 10:44:02 sumomo Exp $ */ +/* $Id: mkbingram.c,v 1.7 2013/06/20 17:14:27 sumomo Exp $ */ #include #include From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 829] CVS update: julius4/gramtools/dfa_minimize Message-ID: <1371748457.523014.26518.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/dfa_minimize/Makefile.in diff -u julius4/gramtools/dfa_minimize/Makefile.in:1.7 julius4/gramtools/dfa_minimize/Makefile.in:1.8 --- julius4/gramtools/dfa_minimize/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/dfa_minimize/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/dfa_minimize/dfa_minimize.c diff -u julius4/gramtools/dfa_minimize/dfa_minimize.c:1.4 julius4/gramtools/dfa_minimize/dfa_minimize.c:1.5 --- julius4/gramtools/dfa_minimize/dfa_minimize.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/dfa_minimize/dfa_minimize.c Fri Jun 21 02:14:17 2013 @@ -6,12 +6,12 @@ * @author Akinobu Lee * @date Wed Oct 4 17:42:16 2006 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 2006-2012 Kawahara Lab., Kyoto University - * Copyright (c) 2006-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2006-2013 Kawahara Lab., Kyoto University + * Copyright (c) 2006-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 830] CVS update: julius4/gramtools/accept_check Message-ID: <1371748457.353090.26486.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/accept_check/Makefile.in diff -u julius4/gramtools/accept_check/Makefile.in:1.7 julius4/gramtools/accept_check/Makefile.in:1.8 --- julius4/gramtools/accept_check/Makefile.in:1.7 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/accept_check/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/accept_check/accept_check.c diff -u julius4/gramtools/accept_check/accept_check.c:1.4 julius4/gramtools/accept_check/accept_check.c:1.5 --- julius4/gramtools/accept_check/accept_check.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/accept_check/accept_check.c Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/accept_check/common.h diff -u julius4/gramtools/accept_check/common.h:1.4 julius4/gramtools/accept_check/common.h:1.5 --- julius4/gramtools/accept_check/common.h:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/accept_check/common.h Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/accept_check/rdterm.c diff -u julius4/gramtools/accept_check/rdterm.c:1.4 julius4/gramtools/accept_check/rdterm.c:1.5 --- julius4/gramtools/accept_check/rdterm.c:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/accept_check/rdterm.c Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:21 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:21 +0900 Subject: [Julius-cvs 831] CVS update: julius4/libsent/src/anlz Message-ID: <1371748461.026378.27151.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/anlz/param_malloc.c diff -u julius4/libsent/src/anlz/param_malloc.c:1.4 julius4/libsent/src/anlz/param_malloc.c:1.5 --- julius4/libsent/src/anlz/param_malloc.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/param_malloc.c Fri Jun 21 02:14:20 2013 @@ -12,14 +12,14 @@ * @author Akinobu Lee * @date Fri Aug 3 14:09:39 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/paramselect.c diff -u julius4/libsent/src/anlz/paramselect.c:1.4 julius4/libsent/src/anlz/paramselect.c:1.5 --- julius4/libsent/src/anlz/paramselect.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/paramselect.c Fri Jun 21 02:14:20 2013 @@ -36,13 +36,13 @@ * @author Akinobu LEE * @date Sun Feb 13 20:46:39 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/paramtypes.c diff -u julius4/libsent/src/anlz/paramtypes.c:1.4 julius4/libsent/src/anlz/paramtypes.c:1.5 --- julius4/libsent/src/anlz/paramtypes.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/paramtypes.c Fri Jun 21 02:14:20 2013 @@ -17,13 +17,13 @@ * @author Akinobu LEE * @date Tue Feb 15 00:06:26 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/rdparam.c diff -u julius4/libsent/src/anlz/rdparam.c:1.5 julius4/libsent/src/anlz/rdparam.c:1.6 --- julius4/libsent/src/anlz/rdparam.c:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/rdparam.c Fri Jun 21 02:14:20 2013 @@ -25,13 +25,13 @@ * @author Akinobu LEE * @date Tue Feb 15 00:16:44 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/strip.c diff -u julius4/libsent/src/anlz/strip.c:1.5 julius4/libsent/src/anlz/strip.c:1.6 --- julius4/libsent/src/anlz/strip.c:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/strip.c Fri Jun 21 02:14:20 2013 @@ -11,13 +11,13 @@ * @author Akinobu LEE * @date Tue Feb 15 00:30:38 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/strip_mfcc.c diff -u julius4/libsent/src/anlz/strip_mfcc.c:1.5 julius4/libsent/src/anlz/strip_mfcc.c:1.6 --- julius4/libsent/src/anlz/strip_mfcc.c:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/strip_mfcc.c Fri Jun 21 02:14:20 2013 @@ -42,13 +42,13 @@ * @author Akinobu LEE * @date Tue Feb 15 00:38:57 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/wrsamp.c diff -u julius4/libsent/src/anlz/wrsamp.c:1.4 julius4/libsent/src/anlz/wrsamp.c:1.5 --- julius4/libsent/src/anlz/wrsamp.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/wrsamp.c Fri Jun 21 02:14:20 2013 @@ -11,13 +11,13 @@ * @author Akinobu LEE * @date Tue Feb 15 00:58:47 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/anlz/wrwav.c diff -u julius4/libsent/src/anlz/wrwav.c:1.4 julius4/libsent/src/anlz/wrwav.c:1.5 --- julius4/libsent/src/anlz/wrwav.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/anlz/wrwav.c Fri Jun 21 02:14:20 2013 @@ -11,13 +11,13 @@ * @author Akinobu LEE * @date Tue Feb 15 01:02:18 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:24 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:24 +0900 Subject: [Julius-cvs 832] CVS update: julius4/libsent/src/ngram Message-ID: <1371748464.628893.27509.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/ngram/init_ngram.c diff -u julius4/libsent/src/ngram/init_ngram.c:1.9 julius4/libsent/src/ngram/init_ngram.c:1.10 --- julius4/libsent/src/ngram/init_ngram.c:1.9 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/init_ngram.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 07:40:53 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_access.c diff -u julius4/libsent/src/ngram/ngram_access.c:1.7 julius4/libsent/src/ngram/ngram_access.c:1.8 --- julius4/libsent/src/ngram/ngram_access.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/ngram_access.c Fri Jun 21 02:14:24 2013 @@ -13,13 +13,13 @@ * @author Akinobu LEE * @date Wed Feb 16 07:46:18 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_compact_context.c diff -u julius4/libsent/src/ngram/ngram_compact_context.c:1.9 julius4/libsent/src/ngram/ngram_compact_context.c:1.10 --- julius4/libsent/src/ngram/ngram_compact_context.c:1.9 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/ngram_compact_context.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Sat Aug 11 11:50:58 2007 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_lookup.c diff -u julius4/libsent/src/ngram/ngram_lookup.c:1.6 julius4/libsent/src/ngram/ngram_lookup.c:1.7 --- julius4/libsent/src/ngram/ngram_lookup.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/ngram_lookup.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 16:42:38 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_malloc.c diff -u julius4/libsent/src/ngram/ngram_malloc.c:1.8 julius4/libsent/src/ngram/ngram_malloc.c:1.9 --- julius4/libsent/src/ngram/ngram_malloc.c:1.8 Fri Aug 31 14:17:28 2012 +++ julius4/libsent/src/ngram/ngram_malloc.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 16:48:56 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_read_arpa.c diff -u julius4/libsent/src/ngram/ngram_read_arpa.c:1.20 julius4/libsent/src/ngram/ngram_read_arpa.c:1.21 --- julius4/libsent/src/ngram/ngram_read_arpa.c:1.20 Fri Aug 31 14:17:28 2012 +++ julius4/libsent/src/ngram/ngram_read_arpa.c Fri Jun 21 02:14:24 2013 @@ -20,17 +20,17 @@ * @author Akinobu LEE * @date Wed Feb 16 16:52:24 2005 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ -/* $Id: ngram_read_arpa.c,v 1.20 2012/08/31 05:17:28 sumomo Exp $ */ +/* $Id: ngram_read_arpa.c,v 1.21 2013/06/20 17:14:24 sumomo Exp $ */ /* words should be alphabetically sorted */ Index: julius4/libsent/src/ngram/ngram_read_bin.c diff -u julius4/libsent/src/ngram/ngram_read_bin.c:1.11 julius4/libsent/src/ngram/ngram_read_bin.c:1.12 --- julius4/libsent/src/ngram/ngram_read_bin.c:1.11 Fri Aug 31 14:17:28 2012 +++ julius4/libsent/src/ngram/ngram_read_bin.c Fri Jun 21 02:14:24 2013 @@ -48,13 +48,13 @@ * @author Akinobu LEE * @date Wed Feb 16 17:12:08 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_util.c diff -u julius4/libsent/src/ngram/ngram_util.c:1.9 julius4/libsent/src/ngram/ngram_util.c:1.10 --- julius4/libsent/src/ngram/ngram_util.c:1.9 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/ngram_util.c Fri Jun 21 02:14:24 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Wed Feb 16 17:18:55 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/ngram/ngram_write_bin.c diff -u julius4/libsent/src/ngram/ngram_write_bin.c:1.6 julius4/libsent/src/ngram/ngram_write_bin.c:1.7 --- julius4/libsent/src/ngram/ngram_write_bin.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/ngram/ngram_write_bin.c Fri Jun 21 02:14:24 2013 @@ -40,13 +40,13 @@ * @author Akinobu LEE * @date Wed Feb 16 17:23:16 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:19 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:19 +0900 Subject: [Julius-cvs 833] CVS update: julius4/libjulius Message-ID: <1371748459.193651.26822.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/Makefile.in diff -u julius4/libjulius/Makefile.in:1.9 julius4/libjulius/Makefile.in:1.10 --- julius4/libjulius/Makefile.in:1.9 Wed Jun 12 18:48:26 2013 +++ julius4/libjulius/Makefile.in Fri Jun 21 02:14:19 2013 @@ -1,11 +1,11 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.9 2013/06/12 09:48:26 sumomo Exp $ +# $Id: Makefile.in,v 1.10 2013/06/20 17:14:19 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/libjulius/configure.in diff -u julius4/libjulius/configure.in:1.18 julius4/libjulius/configure.in:1.19 --- julius4/libjulius/configure.in:1.18 Fri Jun 21 02:02:28 2013 +++ julius4/libjulius/configure.in Fri Jun 21 02:14:19 2013 @@ -1,10 +1,10 @@ -dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 1991-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.18 2013/06/20 17:02:28 sumomo Exp $ +dnl $Id: configure.in,v 1.19 2013/06/20 17:14:19 sumomo Exp $ dnl AC_INIT(src/search_bestfirst_main.c) From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 834] CVS update: julius4/generate-ngram Message-ID: <1371748457.195679.26456.nullmailer@users.sourceforge.jp> Index: julius4/generate-ngram/Makefile.in diff -u julius4/generate-ngram/Makefile.in:1.10 julius4/generate-ngram/Makefile.in:1.11 --- julius4/generate-ngram/Makefile.in:1.10 Fri Jul 27 17:44:48 2012 +++ julius4/generate-ngram/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.10 2012/07/27 08:44:48 sumomo Exp $ +# $Id: Makefile.in,v 1.11 2013/06/20 17:14:17 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:18 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:18 +0900 Subject: [Julius-cvs 835] CVS update: julius4/jcontrol Message-ID: <1371748458.986876.26773.nullmailer@users.sourceforge.jp> Index: julius4/jcontrol/Makefile.in diff -u julius4/jcontrol/Makefile.in:1.6 julius4/jcontrol/Makefile.in:1.7 --- julius4/jcontrol/Makefile.in:1.6 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 2002-2012 Kawahara Lab., Kyoto University +# Copyright (c) 2002-2013 Kawahara Lab., Kyoto University # Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.6 2012/07/27 08:44:49 sumomo Exp $ +# $Id: Makefile.in,v 1.7 2013/06/20 17:14:18 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/jcontrol/configure.in diff -u julius4/jcontrol/configure.in:1.7 julius4/jcontrol/configure.in:1.8 --- julius4/jcontrol/configure.in:1.7 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/configure.in Fri Jun 21 02:14:18 2013 @@ -1,6 +1,6 @@ -dnl Copyright (c) 2002-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 2002-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved AC_INIT(jcontrol.c) AC_CANONICAL_HOST Index: julius4/jcontrol/japi.h diff -u julius4/jcontrol/japi.h:1.5 julius4/jcontrol/japi.h:1.6 --- julius4/jcontrol/japi.h:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/japi.h Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 07:12:32 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/jcontrol/japi_grammar.c diff -u julius4/jcontrol/japi_grammar.c:1.6 julius4/jcontrol/japi_grammar.c:1.7 --- julius4/jcontrol/japi_grammar.c:1.6 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/japi_grammar.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 07:13:41 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/jcontrol/japi_misc.c diff -u julius4/jcontrol/japi_misc.c:1.4 julius4/jcontrol/japi_misc.c:1.5 --- julius4/jcontrol/japi_misc.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/japi_misc.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 11:24:18 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/jcontrol/japi_process.c diff -u julius4/jcontrol/japi_process.c:1.3 julius4/jcontrol/japi_process.c:1.4 --- julius4/jcontrol/japi_process.c:1.3 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/japi_process.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 11:24:18 2005 * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/jcontrol/jcontrol.c diff -u julius4/jcontrol/jcontrol.c:1.6 julius4/jcontrol/jcontrol.c:1.7 --- julius4/jcontrol/jcontrol.c:1.6 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/jcontrol.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 11:49:27 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ #include "japi.h" Index: julius4/jcontrol/server.c diff -u julius4/jcontrol/server.c:1.4 julius4/jcontrol/server.c:1.5 --- julius4/jcontrol/server.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/jcontrol/server.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 24 12:07:24 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:19 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:19 +0900 Subject: [Julius-cvs 836] CVS update: julius4/julius Message-ID: <1371748459.121458.26812.nullmailer@users.sourceforge.jp> Index: julius4/julius/Makefile.in diff -u julius4/julius/Makefile.in:1.10 julius4/julius/Makefile.in:1.11 --- julius4/julius/Makefile.in:1.10 Fri Jul 27 17:44:49 2012 +++ julius4/julius/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,11 +1,11 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.10 2012/07/27 08:44:49 sumomo Exp $ +# $Id: Makefile.in,v 1.11 2013/06/20 17:14:18 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/julius/charconv.c diff -u julius4/julius/charconv.c:1.4 julius4/julius/charconv.c:1.5 --- julius4/julius/charconv.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/julius/charconv.c Fri Jun 21 02:14:18 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:02:41 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/charconv_iconv.c diff -u julius4/julius/charconv_iconv.c:1.5 julius4/julius/charconv_iconv.c:1.6 --- julius4/julius/charconv_iconv.c:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/julius/charconv_iconv.c Fri Jun 21 02:14:18 2013 @@ -14,13 +14,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:02:41 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/charconv_libjcode.c diff -u julius4/julius/charconv_libjcode.c:1.4 julius4/julius/charconv_libjcode.c:1.5 --- julius4/julius/charconv_libjcode.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/julius/charconv_libjcode.c Fri Jun 21 02:14:18 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:02:41 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/charconv_win32.c diff -u julius4/julius/charconv_win32.c:1.5 julius4/julius/charconv_win32.c:1.6 --- julius4/julius/charconv_win32.c:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/julius/charconv_win32.c Fri Jun 21 02:14:18 2013 @@ -29,13 +29,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:02:41 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/configure.in diff -u julius4/julius/configure.in:1.7 julius4/julius/configure.in:1.8 --- julius4/julius/configure.in:1.7 Fri Jul 27 17:44:49 2012 +++ julius4/julius/configure.in Fri Jun 21 02:14:18 2013 @@ -1,10 +1,10 @@ -dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 1991-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.7 2012/07/27 08:44:49 sumomo Exp $ +dnl $Id: configure.in,v 1.8 2013/06/20 17:14:18 sumomo Exp $ dnl AC_INIT(main.c) Index: julius4/julius/main.c diff -u julius4/julius/main.c:1.5 julius4/julius/main.c:1.6 --- julius4/julius/main.c:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/julius/main.c Fri Jun 21 02:14:18 2013 @@ -12,14 +12,14 @@ * @author Akinobu Lee * @date Wed May 18 15:02:55 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/output_file.c diff -u julius4/julius/output_file.c:1.7 julius4/julius/output_file.c:1.8 --- julius4/julius/output_file.c:1.7 Fri Jun 21 02:02:28 2013 +++ julius4/julius/output_file.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Wed Dec 12 11:07:46 2007 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/output_module.c diff -u julius4/julius/output_module.c:1.11 julius4/julius/output_module.c:1.12 --- julius4/julius/output_module.c:1.11 Fri Jun 21 02:02:28 2013 +++ julius4/julius/output_module.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Tue Sep 06 14:46:49 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/output_stdout.c diff -u julius4/julius/output_stdout.c:1.13 julius4/julius/output_stdout.c:1.14 --- julius4/julius/output_stdout.c:1.13 Fri Jun 21 02:02:28 2013 +++ julius4/julius/output_stdout.c Fri Jun 21 02:14:18 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Tue Sep 06 17:18:46 2005 * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/recogloop.c diff -u julius4/julius/recogloop.c:1.5 julius4/julius/recogloop.c:1.6 --- julius4/julius/recogloop.c:1.5 Fri Jul 27 17:44:49 2012 +++ julius4/julius/recogloop.c Fri Jun 21 02:14:18 2013 @@ -12,14 +12,14 @@ * @author Akinobu Lee * @date Sun Sep 02 21:12:52 2007 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/record.c diff -u julius4/julius/record.c:1.6 julius4/julius/record.c:1.7 --- julius4/julius/record.c:1.6 Fri Jul 27 17:44:49 2012 +++ julius4/julius/record.c Fri Jun 21 02:14:19 2013 @@ -29,13 +29,13 @@ * @author Akinobu Lee * @date Tue Sep 06 14:13:54 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/julius/visual.c diff -u julius4/julius/visual.c:1.4 julius4/julius/visual.c:1.5 --- julius4/julius/visual.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/julius/visual.c Fri Jun 21 02:14:19 2013 @@ -21,12 +21,12 @@ * @author Akinobu Lee * @date Mon Sep 12 01:49:44 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* * Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 837] CVS update: julius4/gramtools Message-ID: <1371748457.264873.26472.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/Makefile.in diff -u julius4/gramtools/Makefile.in:1.5 julius4/gramtools/Makefile.in:1.6 --- julius4/gramtools/Makefile.in:1.5 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,10 +1,10 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.5 2012/07/27 08:44:48 sumomo Exp $ +# $Id: Makefile.in,v 1.6 2013/06/20 17:14:17 sumomo Exp $ # SHELL=/bin/sh RM=@RM@ -f Index: julius4/gramtools/configure.in diff -u julius4/gramtools/configure.in:1.6 julius4/gramtools/configure.in:1.7 --- julius4/gramtools/configure.in:1.6 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/configure.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 1991-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved AC_INIT(00readme.txt) From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:27 +0900 Subject: [Julius-cvs 838] CVS update: julius4/mkbinhmm Message-ID: <1371748467.873923.27851.nullmailer@users.sourceforge.jp> Index: julius4/mkbinhmm/Makefile.in diff -u julius4/mkbinhmm/Makefile.in:1.8 julius4/mkbinhmm/Makefile.in:1.9 --- julius4/mkbinhmm/Makefile.in:1.8 Fri Jul 27 17:44:57 2012 +++ julius4/mkbinhmm/Makefile.in Fri Jun 21 02:14:27 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 2003-2012 Kawahara Lab., Kyoto University +# Copyright (c) 2003-2013 Kawahara Lab., Kyoto University # Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.8 2012/07/27 08:44:57 sumomo Exp $ +# $Id: Makefile.in,v 1.9 2013/06/20 17:14:27 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/mkbinhmm/mkbinhmm.c diff -u julius4/mkbinhmm/mkbinhmm.c:1.6 julius4/mkbinhmm/mkbinhmm.c:1.7 --- julius4/mkbinhmm/mkbinhmm.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/mkbinhmm/mkbinhmm.c Fri Jun 21 02:14:27 2013 @@ -1,13 +1,13 @@ /* - * Copyright (c) 2003-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2003-2013 Kawahara Lab., Kyoto University * Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* mkbinhmm --- read in ascii hmmdefs file and write in binary format */ -/* $Id: mkbinhmm.c,v 1.6 2012/07/27 08:44:57 sumomo Exp $ */ +/* $Id: mkbinhmm.c,v 1.7 2013/06/20 17:14:27 sumomo Exp $ */ #include #include Index: julius4/mkbinhmm/mkbinhmmlist.c diff -u julius4/mkbinhmm/mkbinhmmlist.c:1.4 julius4/mkbinhmm/mkbinhmmlist.c:1.5 --- julius4/mkbinhmm/mkbinhmmlist.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/mkbinhmm/mkbinhmmlist.c Fri Jun 21 02:14:27 2013 @@ -1,13 +1,13 @@ /* - * Copyright (c) 2003-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2003-2013 Kawahara Lab., Kyoto University * Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* mkbinhmmlist --- read in ascii hmmlist file and write in binary format */ -/* $Id: mkbinhmmlist.c,v 1.4 2012/07/27 08:44:57 sumomo Exp $ */ +/* $Id: mkbinhmmlist.c,v 1.5 2013/06/20 17:14:27 sumomo Exp $ */ #include #include From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 839] CVS update: julius4/gramtools/mkdfa Message-ID: <1371748457.741878.26560.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/mkdfa/Makefile.in diff -u julius4/gramtools/mkdfa/Makefile.in:1.4 julius4/gramtools/mkdfa/Makefile.in:1.5 --- julius4/gramtools/mkdfa/Makefile.in:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/mkdfa/mkdfa.pl.in diff -u julius4/gramtools/mkdfa/mkdfa.pl.in:1.4 julius4/gramtools/mkdfa/mkdfa.pl.in:1.5 --- julius4/gramtools/mkdfa/mkdfa.pl.in:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/mkdfa/mkdfa.pl.in Fri Jun 21 02:14:17 2013 @@ -1,7 +1,7 @@ #!@PERL@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # # @configure_input@ # From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:26 +0900 Subject: [Julius-cvs 840] CVS update: julius4/libsent/src/voca Message-ID: <1371748466.574894.27680.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/voca/init_voca.c diff -u julius4/libsent/src/voca/init_voca.c:1.4 julius4/libsent/src/voca/init_voca.c:1.5 --- julius4/libsent/src/voca/init_voca.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/init_voca.c Fri Jun 21 02:14:26 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Fri Feb 18 19:41:12 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/voca/voca_load_htkdict.c diff -u julius4/libsent/src/voca/voca_load_htkdict.c:1.14 julius4/libsent/src/voca/voca_load_htkdict.c:1.15 --- julius4/libsent/src/voca/voca_load_htkdict.c:1.14 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/src/voca/voca_load_htkdict.c Fri Jun 21 02:14:26 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Fri Feb 18 19:43:06 2005 * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/voca/voca_load_wordlist.c diff -u julius4/libsent/src/voca/voca_load_wordlist.c:1.10 julius4/libsent/src/voca/voca_load_wordlist.c:1.11 --- julius4/libsent/src/voca/voca_load_wordlist.c:1.10 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/src/voca/voca_load_wordlist.c Fri Jun 21 02:14:26 2013 @@ -13,13 +13,13 @@ * @author Akinobu LEE * @date Sun Jul 22 13:29:32 2007 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/voca/voca_lookup.c diff -u julius4/libsent/src/voca/voca_lookup.c:1.4 julius4/libsent/src/voca/voca_lookup.c:1.5 --- julius4/libsent/src/voca/voca_lookup.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/voca_lookup.c Fri Jun 21 02:14:26 2013 @@ -18,13 +18,13 @@ * @author Akinobu LEE * @date Fri Feb 18 21:24:01 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/voca/voca_malloc.c diff -u julius4/libsent/src/voca/voca_malloc.c:1.9 julius4/libsent/src/voca/voca_malloc.c:1.10 --- julius4/libsent/src/voca/voca_malloc.c:1.9 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/src/voca/voca_malloc.c Fri Jun 21 02:14:26 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Fri Feb 18 21:33:29 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/voca/voca_util.c diff -u julius4/libsent/src/voca/voca_util.c:1.4 julius4/libsent/src/voca/voca_util.c:1.5 --- julius4/libsent/src/voca/voca_util.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/voca/voca_util.c Fri Jun 21 02:14:26 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Fri Feb 18 21:41:41 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:17 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:17 +0900 Subject: [Julius-cvs 841] CVS update: julius4/gramtools/gram2sapixml Message-ID: <1371748457.672461.26544.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/gram2sapixml/Makefile.in diff -u julius4/gramtools/gram2sapixml/Makefile.in:1.4 julius4/gramtools/gram2sapixml/Makefile.in:1.5 --- julius4/gramtools/gram2sapixml/Makefile.in:1.4 Fri Jul 27 17:44:48 2012 +++ julius4/gramtools/gram2sapixml/Makefile.in Fri Jun 21 02:14:17 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:25 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:25 +0900 Subject: [Julius-cvs 842] CVS update: julius4/libsent/src/phmm Message-ID: <1371748465.142000.27568.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/phmm/addlog.c diff -u julius4/libsent/src/phmm/addlog.c:1.4 julius4/libsent/src/phmm/addlog.c:1.5 --- julius4/libsent/src/phmm/addlog.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/addlog.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 13:23:50 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/calc_mix.c diff -u julius4/libsent/src/phmm/calc_mix.c:1.6 julius4/libsent/src/phmm/calc_mix.c:1.7 --- julius4/libsent/src/phmm/calc_mix.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/calc_mix.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 14:18:52 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/calc_tied_mix.c diff -u julius4/libsent/src/phmm/calc_tied_mix.c:1.7 julius4/libsent/src/phmm/calc_tied_mix.c:1.8 --- julius4/libsent/src/phmm/calc_tied_mix.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/calc_tied_mix.c Fri Jun 21 02:14:25 2013 @@ -22,13 +22,13 @@ * @author Akinobu LEE * @date Thu Feb 17 14:22:44 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gms.c diff -u julius4/libsent/src/phmm/gms.c:1.4 julius4/libsent/src/phmm/gms.c:1.5 --- julius4/libsent/src/phmm/gms.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gms.c Fri Jun 21 02:14:25 2013 @@ -16,13 +16,13 @@ * @author Akinobu LEE * @date Thu Feb 17 14:52:18 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gms_gprune.c diff -u julius4/libsent/src/phmm/gms_gprune.c:1.6 julius4/libsent/src/phmm/gms_gprune.c:1.7 --- julius4/libsent/src/phmm/gms_gprune.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gms_gprune.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:05:08 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gprune_beam.c diff -u julius4/libsent/src/phmm/gprune_beam.c:1.6 julius4/libsent/src/phmm/gprune_beam.c:1.7 --- julius4/libsent/src/phmm/gprune_beam.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gprune_beam.c Fri Jun 21 02:14:25 2013 @@ -40,13 +40,13 @@ * @author Akinobu LEE * @date Thu Feb 17 03:27:53 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gprune_common.c diff -u julius4/libsent/src/phmm/gprune_common.c:1.4 julius4/libsent/src/phmm/gprune_common.c:1.5 --- julius4/libsent/src/phmm/gprune_common.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gprune_common.c Fri Jun 21 02:14:25 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Fri Feb 18 18:10:58 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gprune_heu.c diff -u julius4/libsent/src/phmm/gprune_heu.c:1.6 julius4/libsent/src/phmm/gprune_heu.c:1.7 --- julius4/libsent/src/phmm/gprune_heu.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gprune_heu.c Fri Jun 21 02:14:25 2013 @@ -38,13 +38,13 @@ * @author Akinobu LEE * @date Thu Feb 17 05:44:52 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gprune_none.c diff -u julius4/libsent/src/phmm/gprune_none.c:1.6 julius4/libsent/src/phmm/gprune_none.c:1.7 --- julius4/libsent/src/phmm/gprune_none.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gprune_none.c Fri Jun 21 02:14:25 2013 @@ -30,13 +30,13 @@ * @author Akinobu LEE * @date Thu Feb 17 05:09:46 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/gprune_safe.c diff -u julius4/libsent/src/phmm/gprune_safe.c:1.6 julius4/libsent/src/phmm/gprune_safe.c:1.7 --- julius4/libsent/src/phmm/gprune_safe.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/gprune_safe.c Fri Jun 21 02:14:25 2013 @@ -39,20 +39,20 @@ * @author Akinobu LEE * @date Thu Feb 17 05:28:12 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* gprune_safe.c --- calculate probability of Gaussian densities */ /* with Gaussian pruning (safe) */ -/* $Id: gprune_safe.c,v 1.6 2012/07/27 08:44:57 sumomo Exp $ */ +/* $Id: gprune_safe.c,v 1.7 2013/06/20 17:14:25 sumomo Exp $ */ #include #include Index: julius4/libsent/src/phmm/mkwhmm.c diff -u julius4/libsent/src/phmm/mkwhmm.c:1.5 julius4/libsent/src/phmm/mkwhmm.c:1.6 --- julius4/libsent/src/phmm/mkwhmm.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/mkwhmm.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Fri Feb 18 18:31:40 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/outprob.c diff -u julius4/libsent/src/phmm/outprob.c:1.5 julius4/libsent/src/phmm/outprob.c:1.6 --- julius4/libsent/src/phmm/outprob.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/outprob.c Fri Jun 21 02:14:25 2013 @@ -46,13 +46,13 @@ * @author Akinobu LEE * @date Fri Feb 18 18:45:21 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/outprob_init.c diff -u julius4/libsent/src/phmm/outprob_init.c:1.6 julius4/libsent/src/phmm/outprob_init.c:1.7 --- julius4/libsent/src/phmm/outprob_init.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/outprob_init.c Fri Jun 21 02:14:25 2013 @@ -34,13 +34,13 @@ * @author Akinobu LEE * @date Thu Feb 17 13:35:37 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/phmm/vsegment.c diff -u julius4/libsent/src/phmm/vsegment.c:1.4 julius4/libsent/src/phmm/vsegment.c:1.5 --- julius4/libsent/src/phmm/vsegment.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/phmm/vsegment.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Fri Feb 18 19:29:22 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:20 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:20 +0900 Subject: [Julius-cvs 843] CVS update: julius4/libsent Message-ID: <1371748460.436808.27021.nullmailer@users.sourceforge.jp> Index: julius4/libsent/Makefile.in diff -u julius4/libsent/Makefile.in:1.12 julius4/libsent/Makefile.in:1.13 --- julius4/libsent/Makefile.in:1.12 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/Makefile.in Fri Jun 21 02:14:20 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.12 2012/07/27 08:44:50 sumomo Exp $ +# $Id: Makefile.in,v 1.13 2013/06/20 17:14:20 sumomo Exp $ # SHELL=/bin/sh Index: julius4/libsent/configure.in diff -u julius4/libsent/configure.in:1.32 julius4/libsent/configure.in:1.33 --- julius4/libsent/configure.in:1.32 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/configure.in Fri Jun 21 02:14:20 2013 @@ -1,9 +1,9 @@ -dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 1991-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.32 2013/06/20 17:02:29 sumomo Exp $ +dnl $Id: configure.in,v 1.33 2013/06/20 17:14:20 sumomo Exp $ dnl dnl Process this file with autoconf to produce a configure script. From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:25 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:25 +0900 Subject: [Julius-cvs 844] CVS update: julius4/libsent/src/util Message-ID: <1371748465.854220.27630.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/util/aptree.c diff -u julius4/libsent/src/util/aptree.c:1.5 julius4/libsent/src/util/aptree.c:1.6 --- julius4/libsent/src/util/aptree.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/aptree.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:21:53 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/confout.c diff -u julius4/libsent/src/util/confout.c:1.10 julius4/libsent/src/util/confout.c:1.11 --- julius4/libsent/src/util/confout.c:1.10 Wed Jun 12 18:48:26 2013 +++ julius4/libsent/src/util/confout.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:34:39 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/endian.c diff -u julius4/libsent/src/util/endian.c:1.5 julius4/libsent/src/util/endian.c:1.6 --- julius4/libsent/src/util/endian.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/endian.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:43:46 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/gzfile.c diff -u julius4/libsent/src/util/gzfile.c:1.4 julius4/libsent/src/util/gzfile.c:1.5 --- julius4/libsent/src/util/gzfile.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/gzfile.c Fri Jun 21 02:14:25 2013 @@ -25,13 +25,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:46:00 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/jlog.c diff -u julius4/libsent/src/util/jlog.c:1.4 julius4/libsent/src/util/jlog.c:1.5 --- julius4/libsent/src/util/jlog.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/jlog.c Fri Jun 21 02:14:25 2013 @@ -22,13 +22,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:02:41 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/mybmalloc.c diff -u julius4/libsent/src/util/mybmalloc.c:1.5 julius4/libsent/src/util/mybmalloc.c:1.6 --- julius4/libsent/src/util/mybmalloc.c:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/mybmalloc.c Fri Jun 21 02:14:25 2013 @@ -25,13 +25,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:14:59 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/mymalloc.c diff -u julius4/libsent/src/util/mymalloc.c:1.7 julius4/libsent/src/util/mymalloc.c:1.8 --- julius4/libsent/src/util/mymalloc.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/mymalloc.c Fri Jun 21 02:14:25 2013 @@ -17,13 +17,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:27:03 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/mystrtok.c diff -u julius4/libsent/src/util/mystrtok.c:1.4 julius4/libsent/src/util/mystrtok.c:1.5 --- julius4/libsent/src/util/mystrtok.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/mystrtok.c Fri Jun 21 02:14:25 2013 @@ -18,13 +18,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:31:39 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/ptree.c diff -u julius4/libsent/src/util/ptree.c:1.7 julius4/libsent/src/util/ptree.c:1.8 --- julius4/libsent/src/util/ptree.c:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/ptree.c Fri Jun 21 02:14:25 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Feb 17 15:34:39 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/readfile.c diff -u julius4/libsent/src/util/readfile.c:1.6 julius4/libsent/src/util/readfile.c:1.7 --- julius4/libsent/src/util/readfile.c:1.6 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/readfile.c Fri Jun 21 02:14:25 2013 @@ -21,13 +21,13 @@ * @author Akinobu LEE * @date Thu Feb 17 16:41:58 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/util/strcasecmp.c diff -u julius4/libsent/src/util/strcasecmp.c:1.4 julius4/libsent/src/util/strcasecmp.c:1.5 --- julius4/libsent/src/util/strcasecmp.c:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/libsent/src/util/strcasecmp.c Fri Jun 21 02:14:25 2013 @@ -18,13 +18,13 @@ * @author Akinobu LEE * @date Thu Feb 17 17:02:09 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:18 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:18 +0900 Subject: [Julius-cvs 845] CVS update: julius4/jclient-perl Message-ID: <1371748458.857363.26751.nullmailer@users.sourceforge.jp> Index: julius4/jclient-perl/Makefile.in diff -u julius4/jclient-perl/Makefile.in:1.3 julius4/jclient-perl/Makefile.in:1.4 --- julius4/jclient-perl/Makefile.in:1.3 Fri Jul 27 17:44:49 2012 +++ julius4/jclient-perl/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:21 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:21 +0900 Subject: [Julius-cvs 846] CVS update: julius4/libsent/src/dfa Message-ID: <1371748461.144151.27188.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/dfa/cpair.c diff -u julius4/libsent/src/dfa/cpair.c:1.6 julius4/libsent/src/dfa/cpair.c:1.7 --- julius4/libsent/src/dfa/cpair.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/cpair.c Fri Jun 21 02:14:21 2013 @@ -18,13 +18,13 @@ * @author Akinobu LEE * @date Tue Feb 15 13:54:44 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/dfa_lookup.c diff -u julius4/libsent/src/dfa/dfa_lookup.c:1.4 julius4/libsent/src/dfa/dfa_lookup.c:1.5 --- julius4/libsent/src/dfa/dfa_lookup.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/dfa_lookup.c Fri Jun 21 02:14:21 2013 @@ -18,13 +18,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:11:41 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/dfa_malloc.c diff -u julius4/libsent/src/dfa/dfa_malloc.c:1.4 julius4/libsent/src/dfa/dfa_malloc.c:1.5 --- julius4/libsent/src/dfa/dfa_malloc.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/dfa_malloc.c Fri Jun 21 02:14:21 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:16:03 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/dfa_util.c diff -u julius4/libsent/src/dfa/dfa_util.c:1.6 julius4/libsent/src/dfa/dfa_util.c:1.7 --- julius4/libsent/src/dfa/dfa_util.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/dfa_util.c Fri Jun 21 02:14:21 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:18:36 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/init_dfa.c diff -u julius4/libsent/src/dfa/init_dfa.c:1.5 julius4/libsent/src/dfa/init_dfa.c:1.6 --- julius4/libsent/src/dfa/init_dfa.c:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/init_dfa.c Fri Jun 21 02:14:21 2013 @@ -20,13 +20,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:20:43 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/mkcpair.c diff -u julius4/libsent/src/dfa/mkcpair.c:1.6 julius4/libsent/src/dfa/mkcpair.c:1.7 --- julius4/libsent/src/dfa/mkcpair.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/mkcpair.c Fri Jun 21 02:14:21 2013 @@ -38,13 +38,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:35:33 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/mkterminfo.c diff -u julius4/libsent/src/dfa/mkterminfo.c:1.4 julius4/libsent/src/dfa/mkterminfo.c:1.5 --- julius4/libsent/src/dfa/mkterminfo.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/mkterminfo.c Fri Jun 21 02:14:21 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:47:27 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/dfa/rddfa.c diff -u julius4/libsent/src/dfa/rddfa.c:1.5 julius4/libsent/src/dfa/rddfa.c:1.6 --- julius4/libsent/src/dfa/rddfa.c:1.5 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/dfa/rddfa.c Fri Jun 21 02:14:21 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Tue Feb 15 14:54:40 2005 * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:19 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:19 +0900 Subject: [Julius-cvs 847] CVS update: julius4/libjulius/include/julius Message-ID: <1371748459.996930.26891.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/include/julius/beam.h diff -u julius4/libjulius/include/julius/beam.h:1.4 julius4/libjulius/include/julius/beam.h:1.5 --- julius4/libjulius/include/julius/beam.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/beam.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Mon Mar 7 15:12:29 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/callback.h diff -u julius4/libjulius/include/julius/callback.h:1.4 julius4/libjulius/include/julius/callback.h:1.5 --- julius4/libjulius/include/julius/callback.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/callback.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Mon Nov 5 18:30:04 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/define.h diff -u julius4/libjulius/include/julius/define.h:1.9 julius4/libjulius/include/julius/define.h:1.10 --- julius4/libjulius/include/julius/define.h:1.9 Wed Jun 12 18:02:36 2013 +++ julius4/libjulius/include/julius/define.h Fri Jun 21 02:14:19 2013 @@ -27,13 +27,13 @@ * @author Akinobu LEE * @date Mon Mar 7 15:17:26 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/extern.h diff -u julius4/libjulius/include/julius/extern.h:1.22 julius4/libjulius/include/julius/extern.h:1.23 --- julius4/libjulius/include/julius/extern.h:1.22 Fri Jun 21 02:02:29 2013 +++ julius4/libjulius/include/julius/extern.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Mon Mar 7 23:19:14 2005 * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/global.h diff -u julius4/libjulius/include/julius/global.h:1.6 julius4/libjulius/include/julius/global.h:1.7 --- julius4/libjulius/include/julius/global.h:1.6 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/global.h Fri Jun 21 02:14:19 2013 @@ -14,13 +14,13 @@ * @author Akinobu Lee * @date Sun Sep 18 23:53:17 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/graph.h diff -u julius4/libjulius/include/julius/graph.h:1.4 julius4/libjulius/include/julius/graph.h:1.5 --- julius4/libjulius/include/julius/graph.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/graph.h Fri Jun 21 02:14:19 2013 @@ -17,13 +17,13 @@ * @author Akinobu Lee * @date Thu Aug 16 00:30:54 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/jconf.h diff -u julius4/libjulius/include/julius/jconf.h:1.18 julius4/libjulius/include/julius/jconf.h:1.19 --- julius4/libjulius/include/julius/jconf.h:1.18 Fri Jun 21 02:02:29 2013 +++ julius4/libjulius/include/julius/jconf.h Fri Jun 21 02:14:19 2013 @@ -23,13 +23,13 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/jfunc.h diff -u julius4/libjulius/include/julius/jfunc.h:1.11 julius4/libjulius/include/julius/jfunc.h:1.12 --- julius4/libjulius/include/julius/jfunc.h:1.11 Wed Oct 10 11:47:10 2012 +++ julius4/libjulius/include/julius/jfunc.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Tue Nov 6 22:41:00 2007 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/julius.h diff -u julius4/libjulius/include/julius/julius.h:1.8 julius4/libjulius/include/julius/julius.h:1.9 --- julius4/libjulius/include/julius/julius.h:1.8 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/julius.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu LEE * @date Thu Mar 17 21:08:21 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/juliuslib.h diff -u julius4/libjulius/include/julius/juliuslib.h:1.4 julius4/libjulius/include/julius/juliuslib.h:1.5 --- julius4/libjulius/include/julius/juliuslib.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/juliuslib.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Tue Nov 6 22:42:12 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/misc.h diff -u julius4/libjulius/include/julius/misc.h:1.4 julius4/libjulius/include/julius/misc.h:1.5 --- julius4/libjulius/include/julius/misc.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/misc.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Mon May 30 15:58:16 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/multi-gram.h diff -u julius4/libjulius/include/julius/multi-gram.h:1.4 julius4/libjulius/include/julius/multi-gram.h:1.5 --- julius4/libjulius/include/julius/multi-gram.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/multi-gram.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Fri Jul 8 14:47:05 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/plugin.h diff -u julius4/libjulius/include/julius/plugin.h:1.4 julius4/libjulius/include/julius/plugin.h:1.5 --- julius4/libjulius/include/julius/plugin.h:1.4 Fri Aug 31 14:25:48 2012 +++ julius4/libjulius/include/julius/plugin.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Sat Aug 2 13:04:15 2008 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/recog.h diff -u julius4/libjulius/include/julius/recog.h:1.20 julius4/libjulius/include/julius/recog.h:1.21 --- julius4/libjulius/include/julius/recog.h:1.20 Fri Jun 21 02:02:29 2013 +++ julius4/libjulius/include/julius/recog.h Fri Jun 21 02:14:19 2013 @@ -70,13 +70,13 @@ * @author Akinobu Lee * @date Fri Feb 16 13:42:28 2007 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/search.h diff -u julius4/libjulius/include/julius/search.h:1.6 julius4/libjulius/include/julius/search.h:1.7 --- julius4/libjulius/include/julius/search.h:1.6 Fri Jun 21 02:02:29 2013 +++ julius4/libjulius/include/julius/search.h Fri Jun 21 02:14:19 2013 @@ -29,13 +29,13 @@ * @author Akinobu Lee * @date Wed Sep 07 07:40:11 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/useropt.h diff -u julius4/libjulius/include/julius/useropt.h:1.4 julius4/libjulius/include/julius/useropt.h:1.5 --- julius4/libjulius/include/julius/useropt.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/useropt.h Fri Jun 21 02:14:19 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Sun Sep 02 03:09:12 2007 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libjulius/include/julius/wchmm.h diff -u julius4/libjulius/include/julius/wchmm.h:1.7 julius4/libjulius/include/julius/wchmm.h:1.8 --- julius4/libjulius/include/julius/wchmm.h:1.7 Fri Jul 27 17:44:49 2012 +++ julius4/libjulius/include/julius/wchmm.h Fri Jun 21 02:14:19 2013 @@ -28,13 +28,13 @@ * @author Akinobu Lee * @date Sun Sep 18 21:31:32 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:18 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:18 +0900 Subject: [Julius-cvs 848] CVS update: julius4/gramtools/nextword Message-ID: <1371748458.720177.26710.nullmailer@users.sourceforge.jp> Index: julius4/gramtools/nextword/Makefile.in diff -u julius4/gramtools/nextword/Makefile.in:1.7 julius4/gramtools/nextword/Makefile.in:1.8 --- julius4/gramtools/nextword/Makefile.in:1.7 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/Makefile.in Fri Jun 21 02:14:18 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/gramtools/nextword/common.h diff -u julius4/gramtools/nextword/common.h:1.4 julius4/gramtools/nextword/common.h:1.5 --- julius4/gramtools/nextword/common.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/common.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/get_next.c diff -u julius4/gramtools/nextword/get_next.c:1.4 julius4/gramtools/nextword/get_next.c:1.5 --- julius4/gramtools/nextword/get_next.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/get_next.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/nextword.c diff -u julius4/gramtools/nextword/nextword.c:1.4 julius4/gramtools/nextword/nextword.c:1.5 --- julius4/gramtools/nextword/nextword.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/nextword.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/nextword.h diff -u julius4/gramtools/nextword/nextword.h:1.4 julius4/gramtools/nextword/nextword.h:1.5 --- julius4/gramtools/nextword/nextword.h:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/nextword.h Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/rdterm.c diff -u julius4/gramtools/nextword/rdterm.c:1.4 julius4/gramtools/nextword/rdterm.c:1.5 --- julius4/gramtools/nextword/rdterm.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/rdterm.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/readline.c diff -u julius4/gramtools/nextword/readline.c:1.4 julius4/gramtools/nextword/readline.c:1.5 --- julius4/gramtools/nextword/readline.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/readline.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/gramtools/nextword/wtoken.c diff -u julius4/gramtools/nextword/wtoken.c:1.4 julius4/gramtools/nextword/wtoken.c:1.5 --- julius4/gramtools/nextword/wtoken.c:1.4 Fri Jul 27 17:44:49 2012 +++ julius4/gramtools/nextword/wtoken.c Fri Jun 21 02:14:18 2013 @@ -1,7 +1,7 @@ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:20 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:20 +0900 Subject: [Julius-cvs 849] CVS update: julius4/libsent/src/adin Message-ID: <1371748460.725089.27122.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/adin/adin_esd.c diff -u julius4/libsent/src/adin/adin_esd.c:1.7 julius4/libsent/src/adin/adin_esd.c:1.8 --- julius4/libsent/src/adin/adin_esd.c:1.7 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_esd.c Fri Jun 21 02:14:20 2013 @@ -21,12 +21,12 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* * Copyright (c) 2004-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_file.c diff -u julius4/libsent/src/adin/adin_file.c:1.10 julius4/libsent/src/adin/adin_file.c:1.11 --- julius4/libsent/src/adin/adin_file.c:1.10 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_file.c Fri Jun 21 02:14:20 2013 @@ -56,13 +56,13 @@ * @author Akinobu LEE * @date Sun Feb 13 13:31:20 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_freebsd.c diff -u julius4/libsent/src/adin/adin_mic_freebsd.c:1.8 julius4/libsent/src/adin/adin_mic_freebsd.c:1.9 --- julius4/libsent/src/adin/adin_mic_freebsd.c:1.8 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_freebsd.c Fri Jun 21 02:14:20 2013 @@ -39,13 +39,13 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_linux.c diff -u julius4/libsent/src/adin/adin_mic_linux.c:1.8 julius4/libsent/src/adin/adin_mic_linux.c:1.9 --- julius4/libsent/src/adin/adin_mic_linux.c:1.8 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_linux.c Fri Jun 21 02:14:20 2013 @@ -23,13 +23,13 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_linux_alsa.c diff -u julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.13 julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.14 --- julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.13 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_linux_alsa.c Fri Jun 21 02:14:20 2013 @@ -44,13 +44,13 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_linux_oss.c diff -u julius4/libsent/src/adin/adin_mic_linux_oss.c:1.9 julius4/libsent/src/adin/adin_mic_linux_oss.c:1.10 --- julius4/libsent/src/adin/adin_mic_linux_oss.c:1.9 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_linux_oss.c Fri Jun 21 02:14:20 2013 @@ -51,13 +51,13 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_o2.c diff -u julius4/libsent/src/adin/adin_mic_o2.c:1.6 julius4/libsent/src/adin/adin_mic_o2.c:1.7 --- julius4/libsent/src/adin/adin_mic_o2.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_o2.c Fri Jun 21 02:14:20 2013 @@ -29,13 +29,13 @@ * @author Akinobu LEE * @date Sun Feb 13 18:42:22 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_sol2.c diff -u julius4/libsent/src/adin/adin_mic_sol2.c:1.7 julius4/libsent/src/adin/adin_mic_sol2.c:1.8 --- julius4/libsent/src/adin/adin_mic_sol2.c:1.7 Wed Oct 10 11:36:03 2012 +++ julius4/libsent/src/adin/adin_mic_sol2.c Fri Jun 21 02:14:20 2013 @@ -38,13 +38,13 @@ * @author Akinobu LEE * @date Sun Feb 13 19:06:46 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_mic_sun4.c diff -u julius4/libsent/src/adin/adin_mic_sun4.c:1.6 julius4/libsent/src/adin/adin_mic_sun4.c:1.7 --- julius4/libsent/src/adin/adin_mic_sun4.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_mic_sun4.c Fri Jun 21 02:14:20 2013 @@ -34,13 +34,13 @@ * @author Akinobu LEE * @date Sun Feb 13 18:56:13 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_na.c diff -u julius4/libsent/src/adin/adin_na.c:1.4 julius4/libsent/src/adin/adin_na.c:1.5 --- julius4/libsent/src/adin/adin_na.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_na.c Fri Jun 21 02:14:20 2013 @@ -23,13 +23,13 @@ * @author Akinobu LEE * @date Sun Feb 13 19:40:56 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_netaudio.c diff -u julius4/libsent/src/adin/adin_netaudio.c:1.6 julius4/libsent/src/adin/adin_netaudio.c:1.7 --- julius4/libsent/src/adin/adin_netaudio.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_netaudio.c Fri Jun 21 02:14:20 2013 @@ -26,13 +26,13 @@ * @author Akinobu LEE * @date Sun Feb 13 19:50:55 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_portaudio.c diff -u julius4/libsent/src/adin/adin_portaudio.c:1.19 julius4/libsent/src/adin/adin_portaudio.c:1.20 --- julius4/libsent/src/adin/adin_portaudio.c:1.19 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_portaudio.c Fri Jun 21 02:14:20 2013 @@ -56,12 +56,12 @@ * @author Akinobu LEE * @date Mon Feb 14 12:03:48 2005 * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * */ /* * Copyright (c) 2004-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_pulseaudio.c diff -u julius4/libsent/src/adin/adin_pulseaudio.c:1.2 julius4/libsent/src/adin/adin_pulseaudio.c:1.3 --- julius4/libsent/src/adin/adin_pulseaudio.c:1.2 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_pulseaudio.c Fri Jun 21 02:14:20 2013 @@ -21,11 +21,11 @@ * @author Akinobu LEE * @date Thu Feb 24 00:18:22 2011 * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * */ /* - * Copyright (c) 2010-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2010-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_sndfile.c diff -u julius4/libsent/src/adin/adin_sndfile.c:1.6 julius4/libsent/src/adin/adin_sndfile.c:1.7 --- julius4/libsent/src/adin/adin_sndfile.c:1.6 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_sndfile.c Fri Jun 21 02:14:20 2013 @@ -61,13 +61,13 @@ * @author Akinobu LEE * @date Mon Feb 14 12:13:27 2005 * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/adin_tcpip.c diff -u julius4/libsent/src/adin/adin_tcpip.c:1.7 julius4/libsent/src/adin/adin_tcpip.c:1.8 --- julius4/libsent/src/adin/adin_tcpip.c:1.7 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/adin_tcpip.c Fri Jun 21 02:14:20 2013 @@ -45,13 +45,13 @@ * @author Akinobu LEE * @date Mon Feb 14 14:55:03 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/ds48to16.c diff -u julius4/libsent/src/adin/ds48to16.c:1.4 julius4/libsent/src/adin/ds48to16.c:1.5 --- julius4/libsent/src/adin/ds48to16.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/ds48to16.c Fri Jun 21 02:14:20 2013 @@ -13,13 +13,13 @@ * @author Akinobu LEE * @date Sun Feb 13 16:18:26 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/zc-e.c diff -u julius4/libsent/src/adin/zc-e.c:1.4 julius4/libsent/src/adin/zc-e.c:1.5 --- julius4/libsent/src/adin/zc-e.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/zc-e.c Fri Jun 21 02:14:20 2013 @@ -19,13 +19,13 @@ * @author Akinobu LEE * @date Mon Feb 14 19:11:34 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ Index: julius4/libsent/src/adin/zmean.c diff -u julius4/libsent/src/adin/zmean.c:1.4 julius4/libsent/src/adin/zmean.c:1.5 --- julius4/libsent/src/adin/zmean.c:1.4 Fri Jul 27 17:44:50 2012 +++ julius4/libsent/src/adin/zmean.c Fri Jun 21 02:14:20 2013 @@ -28,13 +28,13 @@ * @author Akinobu LEE * @date Sun Feb 13 20:31:23 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:29 +0900 Subject: [Julius-cvs 850] CVS update: julius4/plugin Message-ID: <1371748469.325357.28018.nullmailer@users.sourceforge.jp> Index: julius4/plugin/plugin_defs.h diff -u julius4/plugin/plugin_defs.h:1.3 julius4/plugin/plugin_defs.h:1.4 --- julius4/plugin/plugin_defs.h:1.3 Fri Jul 27 17:44:58 2012 +++ julius4/plugin/plugin_defs.h Fri Jun 21 02:14:29 2013 @@ -12,13 +12,13 @@ * @author Akinobu Lee * @date Sat Aug 9 23:46:32 2008 * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology * All rights reserved */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:28 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:28 +0900 Subject: [Julius-cvs 851] CVS update: julius4/mkss Message-ID: <1371748469.000010.27953.nullmailer@users.sourceforge.jp> Index: julius4/mkss/Makefile.in diff -u julius4/mkss/Makefile.in:1.7 julius4/mkss/Makefile.in:1.8 --- julius4/mkss/Makefile.in:1.7 Fri Jul 27 17:44:57 2012 +++ julius4/mkss/Makefile.in Fri Jun 21 02:14:28 2013 @@ -1,9 +1,9 @@ -# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University +# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # -# $Id: Makefile.in,v 1.7 2012/07/27 08:44:57 sumomo Exp $ +# $Id: Makefile.in,v 1.8 2013/06/20 17:14:28 sumomo Exp $ # SHELL=/bin/sh .SUFFIXES: Index: julius4/mkss/mkss.c diff -u julius4/mkss/mkss.c:1.7 julius4/mkss/mkss.c:1.8 --- julius4/mkss/mkss.c:1.7 Sun Aug 5 10:26:54 2012 +++ julius4/mkss/mkss.c Fri Jun 21 02:14:28 2013 @@ -1,14 +1,14 @@ /* - * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University + * Copyright (c) 2002-2013 Kawahara Lab., Kyoto University * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ /* * mkss --- compute average spectrum of mic input for SS in Julius * - * $Id: mkss.c,v 1.7 2012/08/05 01:26:54 sumomo Exp $ + * $Id: mkss.c,v 1.8 2013/06/20 17:14:28 sumomo Exp $ * */ From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:28 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:28 +0900 Subject: [Julius-cvs 852] CVS update: julius4/mkgshmm Message-ID: <1371748468.625105.27926.nullmailer@users.sourceforge.jp> Index: julius4/mkgshmm/Makefile.in diff -u julius4/mkgshmm/Makefile.in:1.5 julius4/mkgshmm/Makefile.in:1.6 --- julius4/mkgshmm/Makefile.in:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/mkgshmm/Makefile.in Fri Jun 21 02:14:28 2013 @@ -1,6 +1,6 @@ -# Copyright (c) 2001-2012 Kawahara Lab., Kyoto University +# Copyright (c) 2001-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved SHELL=/bin/sh Index: julius4/mkgshmm/configure.in diff -u julius4/mkgshmm/configure.in:1.5 julius4/mkgshmm/configure.in:1.6 --- julius4/mkgshmm/configure.in:1.5 Fri Jul 27 17:44:57 2012 +++ julius4/mkgshmm/configure.in Fri Jun 21 02:14:28 2013 @@ -1,6 +1,6 @@ -dnl Copyright (c) 2001-2012 Kawahara Lab., Kyoto University +dnl Copyright (c) 2001-2013 Kawahara Lab., Kyoto University dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology -dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved AC_INIT(mkgshmm.in) Index: julius4/mkgshmm/mkgshmm.in diff -u julius4/mkgshmm/mkgshmm.in:1.4 julius4/mkgshmm/mkgshmm.in:1.5 --- julius4/mkgshmm/mkgshmm.in:1.4 Fri Jul 27 17:44:57 2012 +++ julius4/mkgshmm/mkgshmm.in Fri Jun 21 02:14:28 2013 @@ -1,7 +1,7 @@ #!@PERL@ -# Copyright (c) 2001-2012 Kawahara Lab., Kyoto University +# Copyright (c) 2001-2013 Kawahara Lab., Kyoto University # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology -# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology +# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology # All rights reserved # # mkgshmm.pl --- output Gaussian Mixture Selection model for Julius-3.2 From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:29 +0900 Subject: [Julius-cvs 853] CVS update: julius4/msvc/SampleApp Message-ID: <1371748469.171589.27983.nullmailer@users.sourceforge.jp> Index: julius4/msvc/SampleApp/Julius.cpp diff -u julius4/msvc/SampleApp/Julius.cpp:1.9 julius4/msvc/SampleApp/Julius.cpp:1.10 --- julius4/msvc/SampleApp/Julius.cpp:1.9 Fri Jul 27 17:44:57 2012 +++ julius4/msvc/SampleApp/Julius.cpp Fri Jun 21 02:14:29 2013 @@ -2,7 +2,7 @@ * * cJulius: JuliusLib wrapper class for C++ * - * Copyright (c) 2011-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2011-2013 Julius project team, Nagoya Institute of Technology * All rights reserved * * This is a part of the Julius software. Index: julius4/msvc/SampleApp/Julius.h diff -u julius4/msvc/SampleApp/Julius.h:1.7 julius4/msvc/SampleApp/Julius.h:1.8 --- julius4/msvc/SampleApp/Julius.h:1.7 Fri Jul 27 17:44:58 2012 +++ julius4/msvc/SampleApp/Julius.h Fri Jun 21 02:14:29 2013 @@ -2,7 +2,7 @@ * * cJulius: JuliusLib wrapper class for C++ * - * Copyright (c) 2009-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2009-2013 Julius project team, Nagoya Institute of Technology * All rights reserved * * This is a part of the Julius software. From sumomo ＠ users.sourceforge.jp Fri Jun 21 02:14:29 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 02:14:29 +0900 Subject: [Julius-cvs 854] CVS update: julius4/msvc/config Message-ID: <1371748469.239106.27999.nullmailer@users.sourceforge.jp> Index: julius4/msvc/config/version.c diff -u julius4/msvc/config/version.c:1.4 julius4/msvc/config/version.c:1.5 --- julius4/msvc/config/version.c:1.4 Fri Jul 27 17:44:58 2012 +++ julius4/msvc/config/version.c Fri Jun 21 02:14:29 2013 @@ -14,13 +14,13 @@ * @author Akinobu Lee * @date Mon Sep 12 01:34:15 2005 * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * */ /* - * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University + * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology - * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology + * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ @@ -66,10 +66,10 @@ if (strm == NULL) return; fprintf(strm,"\n%s rev.%s (%s) built for %s\n\n", JULIUS_PRODUCTNAME, JULIUS_VERSION, JULIUS_SETUP, JULIUS_HOSTINFO); - fprintf(strm,"Copyright (c) 1991-2012 Kawahara Lab., Kyoto University\n"); + fprintf(strm,"Copyright (c) 1991-2013 Kawahara Lab., Kyoto University\n"); fprintf(strm,"Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan\n"); fprintf(strm,"Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology\n"); - fprintf(strm,"Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology\n\n"); + fprintf(strm,"Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology\n\n"); } /** From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:26 +0900 Subject: [Julius-cvs 855] CVS update: julius4 Message-ID: <1371792266.615479.1786.nullmailer@users.sourceforge.jp> Index: julius4/00readme-ja.txt diff -u julius4/00readme-ja.txt:1.18 julius4/00readme-ja.txt:1.19 --- julius4/00readme-ja.txt:1.18 Fri Jun 21 02:02:27 2013 +++ julius4/00readme-ja.txt Fri Jun 21 14:24:26 2013 @@ -40,12 +40,18 @@ Julius-4.2.3 ============= -????? 4.2.3 ???ｫ???????A?????????????? -??? mkbingram ??????N-gram????????????????? -????????????????????B - +????? 4.2.3 ???????????ｫ???????A??????? +?????????????????????????T????????? +?????????????N-gram????????????? +??????????????????B + +??????? + -lvscale + -rejectlong + -mbr, -nombr, -mbr_wwer, -mbr_weight ??????????Release-ja.txt ???????? +?? "-help" ????ﾀ???????????????????????B ??????? @@ -106,13 +112,13 @@ ?????????????????? Copyright ???????B - libjulius/src/mbr.c + gramtools/gram2sapixml/gram2sapixml.pl.in + libsent/src/wav2mfcc/wav2mfcc-*.c libsent/src/adin/pa/ msvc/portaudio/ msvc/zlib/ - ??? =========== Index: julius4/00readme.txt diff -u julius4/00readme.txt:1.16 julius4/00readme.txt:1.17 --- julius4/00readme.txt:1.16 Fri Jun 21 02:02:27 2013 +++ julius4/00readme.txt Fri Jun 21 14:24:26 2013 @@ -52,10 +52,18 @@ What's new in Julius-4.2.3 =========================== -Version 4.2.3 includes several new features: dictionary reloading, audio -scaling, and binary N-gram charset conversion. Bugs has been also fixed. +Version 4.2.3 includes new features: dictionary reloading, audio input +scaling, long input rejection, minimum bayes risk decoding, and +character set conversion of binary N-gram. Several bugs has also been +fixed. + +New options: + -lvscale + -rejectlong + -mbr, -nombr, -mbr_wwer, -mbr_weight See the "Release.txt" file for the full list of updates. +Run with "-help" to see full list of options. Contents of Julius-4.2.3 @@ -105,8 +113,7 @@ Also see the copyrights in the files: - libjulius/src/mbr.c - gqramtools/gram2sapixml/gram2sapixml.pl.in + gramtools/gram2sapixml/gram2sapixml.pl.in libsent/src/wav2mfcc/wav2mfcc-*.c libsent/src/adin/pa/ msvc/portaudio/ Index: julius4/Release-ja.txt diff -u julius4/Release-ja.txt:1.18 julius4/Release-ja.txt:1.19 --- julius4/Release-ja.txt:1.18 Fri Jun 21 02:02:27 2013 +++ julius4/Release-ja.txt Fri Jun 21 14:24:26 2013 @@ -7,8 +7,8 @@ "j_adin_change_input_scaling_factor()" - ????????"-rejectlong msec" - ????N-gram?????????????: "mkbingram" -- ?????????MBR)???ﾀ? - MBR Extension by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) +- ?????????MBR)???ﾀ?????????????ﾀ? + MBR Extension contributed by Hiroaki Nanjo and Ryo Furutani. ??????o? - ?????????????adinnet????????????????? Index: julius4/Release.txt diff -u julius4/Release.txt:1.17 julius4/Release.txt:1.18 --- julius4/Release.txt:1.17 Fri Jun 21 02:02:27 2013 +++ julius4/Release.txt Fri Jun 21 14:24:26 2013 @@ -6,8 +6,7 @@ - Add option "-lvscale factor" and func "j_adin_change_input_scaling_factor()" to scale the amplitude of captured audio by the factor. - Add option "-rejectlong msec" to reject too long input. -- Add minimum bayes risk decoding (by Nanjo and ...) - MBR Extension contributed by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) +- Add minimum bayes risk decoding, contributed by H. Nanjo and R. Furutani - Support binary N-gram symbol charset conversion by "mkbingram". Fixes: From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:27 +0900 Subject: [Julius-cvs 856] CVS update: julius4/libsent/src/voca Message-ID: <1371792267.508980.1893.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/voca/voca_load_htkdict.c diff -u julius4/libsent/src/voca/voca_load_htkdict.c:1.15 julius4/libsent/src/voca/voca_load_htkdict.c:1.16 --- julius4/libsent/src/voca/voca_load_htkdict.c:1.15 Fri Jun 21 02:14:26 2013 +++ julius4/libsent/src/voca/voca_load_htkdict.c Fri Jun 21 14:24:27 2013 @@ -19,7 +19,7 @@ * @author Akinobu LEE * @date Fri Feb 18 19:43:06 2005 * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * */ /* @@ -376,7 +376,7 @@ char *ptmp, *lp = NULL, *p; static char cbuf[MAX_HMMNAME_LEN]; HMM_Logical **tmpwseq; - int len; + int i, len; HMM_Logical *tmplg; boolean pok; int vnum; @@ -512,19 +512,27 @@ *ok_flag = FALSE; return TRUE; } - if (ptmp[1] == '\0') { /* space between ':' and figures */ + if ((ptmp[1] < '0' || ptmp[1] > '9') && ptmp[1] != '.') { /* not figure after ':' */ jlog("Error: voca_load_htkdict: line %d: value after ':' missing, maybe wrong space?\n> %s\n", linenum, bufbak); winfo->errnum++; *ok_flag = FALSE; return TRUE; } + + /* allocate if not yet */ + if (winfo->weight == NULL) { + winfo->weight = (LOGPROB *)mymalloc(sizeof(LOGPROB) * winfo->maxnum); + for (i = 0; i < vnum; i++) { + winfo->weight[i] = 1.0; + } + } winfo->weight[vnum] = atof(&(ptmp[1])); } else{ - winfo->weight[vnum] = 1.0; /* default, same minimization WER */ + if (winfo->weight) + winfo->weight[vnum] = 1.0; /* default, same minimization WER */ } #endif - /* phoneme sequence */ if (hmminfo == NULL) { Index: julius4/libsent/src/voca/voca_load_wordlist.c diff -u julius4/libsent/src/voca/voca_load_wordlist.c:1.11 julius4/libsent/src/voca/voca_load_wordlist.c:1.12 --- julius4/libsent/src/voca/voca_load_wordlist.c:1.11 Fri Jun 21 02:14:26 2013 +++ julius4/libsent/src/voca/voca_load_wordlist.c Fri Jun 21 14:24:27 2013 @@ -13,7 +13,7 @@ * @author Akinobu LEE * @date Sun Jul 22 13:29:32 2007 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* @@ -202,7 +202,7 @@ static char cbuf[MAX_HMMNAME_LEN]; static HMM_Logical **tmpwseq = NULL; static int tmpmaxlen; - int len; + int i, len; HMM_Logical *tmplg; boolean pok, first; int vnum; @@ -300,7 +300,7 @@ ptmp = winfo->wname[vnum]; } if (ptmp == NULL) { - jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + jlog("Error: voca_load_wordlist: line %d: corrupted data:\n> %s\n", linenum, bufbak); winfo->errnum++; *ok_flag = FALSE; return TRUE; @@ -310,7 +310,7 @@ #ifdef USE_MBR /* just move pointer to next token */ if ((ptmp = mystrtok_movetonext(NULL, " \t\n")) == NULL) { - jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + jlog("Error: voca_load_wordlist: line %d: corrupted data:\n> %s\n", linenum, bufbak); winfo->errnum++; *ok_flag = FALSE; return TRUE; @@ -324,21 +324,31 @@ /* if ":" not found, it means weight == 1.0 (same minimization WER) */ if ((ptmp = mystrtok(NULL, " \t\n")) == NULL) { - jlog("Error: voca_load_htkdict: line %d: corrupted data:\n> %s\n", linenum, bufbak); + jlog("Error: voca_load_wordlist: line %d: corrupted data:\n> %s\n", linenum, bufbak); winfo->errnum++; *ok_flag = FALSE; return TRUE; } - if (ptmp[1] == '\0') { /* space between ':' and figures */ - jlog("Error: voca_load_htkdict: line %d: value after ':' missing, maybe wrong space?\n> %s\n", linenum, bufbak); + if ((ptmp[1] < '0' || ptmp[1] > '9') && ptmp[1] != '.') { /* not figure after ':' */ + jlog("Error: voca_load_wordlist: line %d: value after ':' missing, maybe wrong space?\n> %s\n", linenum, bufbak); winfo->errnum++; *ok_flag = FALSE; return TRUE; } + + /* allocate if not yet */ + if (winfo->weight == NULL) { + winfo->weight = (LOGPROB *)mymalloc(sizeof(LOGPROB) * winfo->maxnum); + for (i = 0; i < vnum; i++) { + winfo->weight[i] = 1.0; + } + } + winfo->weight[vnum] = atof(&(ptmp[1])); } else{ - winfo->weight[vnum] = 1.0; /* default, same minimization WER */ + if (winfo->weight) + winfo->weight[vnum] = 1.0; /* default, same minimization WER */ } #endif @@ -362,7 +372,7 @@ /* insert head phone at beginning of word */ if (contextphone) { if (strlen(contextphone) >= MAX_HMMNAME_LEN) { - jlog("Error: voca_load_htkdict: line %d: too long phone name: %s\n", linenum, contextphone); + jlog("Error: voca_load_wordlist: line %d: too long phone name: %s\n", linenum, contextphone); winfo->errnum++; *ok_flag = FALSE; return TRUE; @@ -378,7 +388,7 @@ return TRUE; } if (strlen(lp) >= MAX_HMMNAME_LEN) { - jlog("Error: voca_load_htkdict: line %d: too long phone name: %s\n", linenum, lp); + jlog("Error: voca_load_wordlist: line %d: too long phone name: %s\n", linenum, lp); winfo->errnum++; *ok_flag = FALSE; return TRUE; @@ -391,7 +401,7 @@ if (lp != NULL) { /* token exist */ if (strlen(lp) >= MAX_HMMNAME_LEN) { - jlog("Error: voca_load_htkdict: line %d: too long phone name: %s\n", linenum, lp); + jlog("Error: voca_load_wordlist: line %d: too long phone name: %s\n", linenum, lp); winfo->errnum++; *ok_flag = FALSE; return TRUE; @@ -401,7 +411,7 @@ /* no more token, insert tail phone at end of word */ if (contextphone) { if (strlen(contextphone) >= MAX_HMMNAME_LEN) { - jlog("Error: voca_load_htkdict: line %d: too long phone name: %s\n", linenum, contextphone); + jlog("Error: voca_load_wordlist: line %d: too long phone name: %s\n", linenum, contextphone); winfo->errnum++; *ok_flag = FALSE; return TRUE; Index: julius4/libsent/src/voca/voca_malloc.c diff -u julius4/libsent/src/voca/voca_malloc.c:1.10 julius4/libsent/src/voca/voca_malloc.c:1.11 --- julius4/libsent/src/voca/voca_malloc.c:1.10 Fri Jun 21 02:14:26 2013 +++ julius4/libsent/src/voca/voca_malloc.c Fri Jun 21 14:24:27 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Fri Feb 18 21:33:29 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* @@ -109,11 +109,6 @@ winfo->maxwlen = 0; winfo->errnum = 0; winfo->errph_root = NULL; - -#ifdef USE_MBR - winfo->weight = (LOGPROB *)mymalloc(sizeof(LOGPROB)*n); -#endif - } /** @@ -145,7 +140,8 @@ winfo->is_transparent = (boolean *)myrealloc(winfo->is_transparent, sizeof(boolean)*n); #ifdef USE_MBR - winfo->weight = (LOGPROB *)myrealloc(winfo->weight, sizeof(LOGPROB)*n); + if (winfo->weight) + winfo->weight = (LOGPROB *)myrealloc(winfo->weight, sizeof(LOGPROB)*n); #endif winfo->maxnum = n; From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:26 +0900 Subject: [Julius-cvs 857] CVS update: julius4/libjulius/src Message-ID: <1371792266.739967.1817.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/mbr.c diff -u julius4/libjulius/src/mbr.c:1.2 julius4/libjulius/src/mbr.c:1.3 --- julius4/libjulius/src/mbr.c:1.2 Fri Jun 21 02:02:29 2013 +++ julius4/libjulius/src/mbr.c Fri Jun 21 14:24:26 2013 @@ -14,11 +14,11 @@ * @author Hiroaki NANJO, Ryo FURUTANI * @date 28 March 2011 * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * */ /* - * Copyright (c) 2010-2013 NANJO lab. Ryukoku University + * Copyright (c) 2011-2013 Julius project team, Nagoya Institute of Technology * All rights reserved */ @@ -207,6 +207,21 @@ return d; } +static float +get_weight(WORD_INFO *winfo, WORD_ID id) +{ + float val; + + if (winfo->weight) { + /* word-level weight exist, return the value */ + val = winfo->weight[id]; + } else { + /* no word-level weight, return default value */ + val = 1.0; + } + return val; +} + /** * @@ -246,19 +261,19 @@ if(d[now].r == 1){ /* Deletion error */ - error1 += winfo->weight[a->seq[i - 1]]; + error1 += get_weight(winfo, a->seq[i - 1]); i--; } else if(d[now].r == 2){ /* Insertion error */ - error2 += winfo->weight[b->seq[j - 1]]; + error2 += get_weight(winfo, b->seq[j - 1]); j--; } else if(d[now].r == 3){ if(d[now].c == 1){ /* Substitution error */ - error1 += winfo->weight[a->seq[i - 1]]; - error2 += winfo->weight[b->seq[j - 1]]; + error1 += get_weight(winfo, a->seq[i - 1]); + error2 += get_weight(winfo, b->seq[j - 1]); } else if(d[now].c == 0){ /* Correct word */ Index: julius4/libjulius/src/version.c.in diff -u julius4/libjulius/src/version.c.in:1.11 julius4/libjulius/src/version.c.in:1.12 --- julius4/libjulius/src/version.c.in:1.11 Fri Jun 21 02:14:20 2013 +++ julius4/libjulius/src/version.c.in Fri Jun 21 14:24:26 2013 @@ -14,7 +14,7 @@ * @author Akinobu Lee * @date Mon Sep 12 01:34:15 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* @@ -231,8 +231,8 @@ fprintf(strm, " PowerReject"); #endif -#ifdef USE_MBR - fprintf(strm," MBR"); +#ifndef USE_MBR + fprintf(strm," NoMBR"); #endif fprintf(strm, "\n"); From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:26 +0900 Subject: [Julius-cvs 858] CVS update: julius4/libsent/include/sent Message-ID: <1371792266.884147.1851.nullmailer@users.sourceforge.jp> Index: julius4/libsent/include/sent/config.h.in diff -u julius4/libsent/include/sent/config.h.in:1.10 julius4/libsent/include/sent/config.h.in:1.11 --- julius4/libsent/include/sent/config.h.in:1.10 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/include/sent/config.h.in Fri Jun 21 14:24:26 2013 @@ -33,7 +33,7 @@ * @author Akinobu LEE * @date Thu Feb 10 17:48:32 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ @@ -158,5 +158,5 @@ #undef ENABLE_MSD /* Define if MBR support is enabled */ -/* MBR Extension by Hiroaki Nanjo and Ryo Furutani (Ryukoku University) */ +/* MBR Extension by Hiroaki Nanjo and Ryo Furutani */ #undef USE_MBR From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:26 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:26 +0900 Subject: [Julius-cvs 859] CVS update: julius4/libsent Message-ID: <1371792266.817256.1838.nullmailer@users.sourceforge.jp> Index: julius4/libsent/configure diff -u julius4/libsent/configure:1.32 julius4/libsent/configure:1.33 --- julius4/libsent/configure:1.32 Fri Jun 21 02:02:29 2013 +++ julius4/libsent/configure Fri Jun 21 14:24:26 2013 @@ -29,7 +29,7 @@ ac_help="$ac_help --enable-msd enable MSD model support" ac_help="$ac_help - --enable-mbr enable MBR support" + --disable-mbr disable MBR support" ac_help="$ac_help --disable-zlib disable zlib library" ac_help="$ac_help @@ -653,7 +653,7 @@ want_mbr=$enableval else - want_mbr=no + want_mbr=yes fi Index: julius4/libsent/configure.in diff -u julius4/libsent/configure.in:1.33 julius4/libsent/configure.in:1.34 --- julius4/libsent/configure.in:1.33 Fri Jun 21 02:14:20 2013 +++ julius4/libsent/configure.in Fri Jun 21 14:24:26 2013 @@ -3,7 +3,7 @@ dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.33 2013/06/20 17:14:20 sumomo Exp $ +dnl $Id: configure.in,v 1.34 2013/06/21 05:24:26 sumomo Exp $ dnl dnl Process this file with autoconf to produce a configure script. @@ -61,9 +61,9 @@ dnl MBR support AC_ARG_ENABLE(mbr, -[ --enable-mbr enable MBR support], +[ --disable-mbr disable MBR support], want_mbr=$enableval -,want_mbr=no) +,want_mbr=yes) From sumomo ＠ users.sourceforge.jp Fri Jun 21 14:24:27 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Fri, 21 Jun 2013 14:24:27 +0900 Subject: [Julius-cvs 860] CVS update: julius4/libsent/src/util Message-ID: <1371792267.433840.1881.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/util/confout.c diff -u julius4/libsent/src/util/confout.c:1.11 julius4/libsent/src/util/confout.c:1.12 --- julius4/libsent/src/util/confout.c:1.11 Fri Jun 21 02:14:25 2013 +++ julius4/libsent/src/util/confout.c Fri Jun 21 14:24:26 2013 @@ -12,7 +12,7 @@ * @author Akinobu LEE * @date Thu Feb 17 15:34:39 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* @@ -88,14 +88,16 @@ #else fprintf(strm, " class N-gram support : no\n"); #endif +#ifdef USE_MBR + fprintf(strm, " MBR weight support : yes\n"); +#else + fprintf(strm, " MBR weight support : no\n"); +#endif #ifdef WORDS_INT fprintf(strm, " word id unit : integer (%d bytes)\n", sizeof(WORD_ID)); #else fprintf(strm, " word id unit : short (%d bytes)\n", sizeof(WORD_ID)); #endif -#ifdef USE_MBR - fprintf(strm, " MBR weight support : yes\n"); -#endif } /** From sumomo ＠ users.sourceforge.jp Tue Jun 25 14:59:56 2013 From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp) Date: Tue, 25 Jun 2013 14:59:56 +0900 Subject: [Julius-cvs 861] CVS update: julius4 Message-ID: <1372139996.481080.8477.nullmailer@users.sourceforge.jp> Index: julius4/00readme-ja.txt diff -u julius4/00readme-ja.txt:1.19 julius4/00readme-ja.txt:1.20 --- julius4/00readme-ja.txt:1.19 Fri Jun 21 14:24:26 2013 +++ julius4/00readme-ja.txt Tue Jun 25 14:59:55 2013 @@ -41,9 +41,9 @@ ============= ????? 4.2.3 ???????????ｫ???????A??????? -?????????????????????????T????????? -?????????????N-gram????????????? -??????????????????B +?????????????????????????T????????? +????????????????N-gram???????????????? +???????????????B ??????? -lvscale Index: julius4/00readme.txt diff -u julius4/00readme.txt:1.17 julius4/00readme.txt:1.18 --- julius4/00readme.txt:1.17 Fri Jun 21 14:24:26 2013 +++ julius4/00readme.txt Tue Jun 25 14:59:55 2013 @@ -53,9 +53,9 @@ =========================== Version 4.2.3 includes new features: dictionary reloading, audio input -scaling, long input rejection, minimum bayes risk decoding, and -character set conversion of binary N-gram. Several bugs has also been -fixed. +scaling, long input rejection, minimum bayes risk decoding +(contributed by Hiroaki Nanjo and Ryo Furutani), and character set +conversion of binary N-gram. Several bugs has also been fixed. New options: -lvscale Index: julius4/Release-ja.txt diff -u julius4/Release-ja.txt:1.19 julius4/Release-ja.txt:1.20 --- julius4/Release-ja.txt:1.19 Fri Jun 21 14:24:26 2013 +++ julius4/Release-ja.txt Tue Jun 25 14:59:55 2013 @@ -7,8 +7,7 @@ "j_adin_change_input_scaling_factor()" - ????????"-rejectlong msec" - ????N-gram?????????????: "mkbingram" -- ?????????MBR)???ﾀ?????????????ﾀ? - MBR Extension contributed by Hiroaki Nanjo and Ryo Furutani. +- ?????????MBR)???ﾀ????????????????? ??????o? - ?????????????adinnet?????????????????