CMU Sphinx

Revision: 8716
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8716&view=rev
Author:   dhdfu
Date:     2008-08-15 14:17:55 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Fix some compiler warnings

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2008-08-14 20:34:58 UTC (rev 8715)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2008-08-15 14:17:55 UTC (rev 8716)
@@ -432,7 +432,7 @@
             m->sseq[i] = m->sseq[0] + i * m->n_emit_state;
     }
     else {
-        m->sseq_len = (int8 *) (m->sseq[0] + *sseq_size);
+        m->sseq_len = (uint8 *) (m->sseq[0] + *sseq_size);
         for (i = 1; i < m->n_sseq; ++i)
             m->sseq[i] = m->sseq[i - 1] + m->sseq_len[i - 1];
     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-08-14 20:34:58 UTC (rev 8715)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-08-15 14:17:55 UTC (rev 8716)
@@ -86,7 +86,7 @@
     words = ckd_calloc(n_words, sizeof(*words));
     /* This will include alternates, again, that's okay since they aren't in the LM */
     for (i = 0; i < n_words; ++i)
-        words[i] = dict_word_str(ps_search_dict(ngs), i);
+        words[i] = (const char *)dict_word_str(ps_search_dict(ngs), i);
     ngram_model_set_map_words(ngs->lmset, words, n_words);
     ckd_free(words);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8725
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8725&view=rev
Author:   dhdfu
Date:     2008-08-21 21:02:01 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Tentative code for run-length-encoded senone dump files.  Microsoft
seems to have made this work very well, but it seems to be a bit
slower for us, at least in this implementation.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-08-20 14:40:12 UTC (rev 8724)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-08-21 21:02:01 UTC (rev 8725)
@@ -148,6 +148,8 @@
  * Optimization for various topn cases, PDF-size(#bits) cases of
  * SCVQComputeScores() and SCVQComputeScores_all().
  */
+static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores,
+                                int32 *out_bestidx);
 static int32 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
                             int32 *senone_active, int32 n_senone_active,
                             int32 *out_bestidx);
@@ -390,9 +392,21 @@
         mgau_norm(s, i);
     }
 
-    if (compallsen) {
+    if (s->rle) {
 	switch (s->topn) {
 	case 4:
+	    return get_scores4_8b_rle(s, senone_scores, out_bestidx);
+	case 2:
+	case 1:
+	default:
+            /* FAIL, for now */
+            E_FATAL("FAIL!\n");
+            return -1;
+	}
+    }
+    else if (compallsen) {
+	switch (s->topn) {
+	case 4:
 	    return get_scores4_8b_all(s, senone_scores, out_bestidx);
 	case 2:
 	    return get_scores2_8b_all(s, senone_scores, out_bestidx);
@@ -535,6 +549,7 @@
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (j = 0; j < s->n_feat; j++) {
         uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
+        int16 *senscr;
         int32 n;
 
         /* ptrs to senone prob ids */
@@ -542,28 +557,131 @@
         pid_cw1 = s->mixw[j][s->f[j][1].codeword];
         pid_cw2 = s->mixw[j][s->f[j][2].codeword];
         pid_cw3 = s->mixw[j][s->f[j][3].codeword];
+        /* ptr to senone scores */
+        senscr = senone_scores;
 
         for (n = 0; n < s->n_sen; n++) {
             int32 tmp1, tmp2;
-            tmp1 = pid_cw0[n] + s->f[j][0].score;
-            tmp2 = pid_cw1[n] + s->f[j][1].score;
+            tmp1 = *(pid_cw0++) + s->f[j][0].score;
+            tmp2 = *(pid_cw1++) + s->f[j][1].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = pid_cw2[n] + s->f[j][2].score;
+            tmp2 = *(pid_cw2++) + s->f[j][2].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = pid_cw3[n] + s->f[j][3].score;
+            tmp2 = *(pid_cw3++) + s->f[j][3].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
 
-            senone_scores[n] += tmp1;
-            if (j == s->n_feat - 1 && senone_scores[n] < best) {
-                best = senone_scores[n];
+            *senscr += tmp1;
+            if (j == s->n_feat - 1 && *senscr < best) {
+                best = *senscr;
                 *out_bestidx = n;
             }
+            ++senscr;
         }
     }
     return best;
 }
 
 static int32
+get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores,
+                   int32 *out_bestidx)
+{
+    int32 j;
+    int32 best = (int32)0x7fffffff;
+
+    memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
+    for (j = 0; j < s->n_feat; j++) {
+        uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
+        uint8 zero_cw0 = 0, zero_cw1 = 0, zero_cw2 = 0, zero_cw3 = 0;
+        int16 *senscr;
+        int32 n;
+
+        /* ptrs to senone prob id arrays */
+        pid_cw0 = s->mixw[j][s->f[j][0].codeword];
+        pid_cw1 = s->mixw[j][s->f[j][1].codeword];
+        pid_cw2 = s->mixw[j][s->f[j][2].codeword];
+        pid_cw3 = s->mixw[j][s->f[j][3].codeword];
+        /* ptr to senone scores */
+        senscr = senone_scores;
+
+        for (n = 0; n < s->n_sen; n++) {
+            int32 tmp1, tmp2;
+
+            /* 255 is only ever used as a flag value (zero runs are
+               limited to 254 entries), so this is a safe check even
+               if a particular codeword is inside a zero run. */
+            if (*pid_cw0 == 255)
+                zero_cw0 = *(++pid_cw0); /* Get the run length */
+            if (*pid_cw1 == 255)
+                zero_cw1 = *(++pid_cw1);
+            if (*pid_cw2 == 255)
+                zero_cw2 = *(++pid_cw2);
+            if (*pid_cw3 == 255)
+                zero_cw3 = *(++pid_cw3);
+#if 0
+            uint8 mw0, mw1, mw2, mw3;
+            mw0 = mw1 = mw2 = mw3 = 159;
+            if (zero_cw0 == 0)
+                mw0 = *(pid_cw0++);
+            else if (--zero_cw0 == 0)
+                ++pid_cw0; /* Skip past the run length */
+            if (zero_cw1 == 0)
+                mw1 = *(pid_cw1++);
+            else if (--zero_cw1 == 0)
+                ++pid_cw1;
+            if (zero_cw2 == 0)
+                mw2 = *(pid_cw2++);
+            else if (--zero_cw2 == 0)
+                ++pid_cw2;
+            if (zero_cw3 == 0)
+                mw3 = *(pid_cw3++);
+            else if (--zero_cw3 == 0)
+                ++pid_cw3;
+
+            tmp1 = mw0 + s->f[j][0].score;
+            tmp2 = mw1 + s->f[j][1].score;
+            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+            tmp2 = mw2 + s->f[j][1].score;
+            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+            tmp2 = mw3 + s->f[j][1].score;
+            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+#else
+            tmp1 = 159; /* default "zero" value. */
+            if (zero_cw0 == 0)
+                tmp1 = *(pid_cw0++) + s->f[j][0].score;
+            else if (--zero_cw0 == 0)
+                ++pid_cw0; /* Skip past the run length */
+            if (zero_cw1 == 0) {
+                tmp2 = *(pid_cw1++) + s->f[j][1].score;
+                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+            }
+            else if (--zero_cw1 == 0)
+                ++pid_cw1;
+            if (zero_cw2 == 0) {
+                tmp2 = *(pid_cw2++) + s->f[j][2].score;
+                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+            }
+            else if (--zero_cw2 == 0)
+                ++pid_cw2;
+            if (zero_cw3 == 0) {
+                tmp2 = *(pid_cw3++) + s->f[j][3].score;
+                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
+            }
+            else if (--zero_cw3 == 0)
+                ++pid_cw3;
+#endif
+
+            *senscr += tmp1;
+            if (j == s->n_feat - 1 && *senscr < best) {
+                best = *senscr;
+                *out_bestidx = n;
+            }
+            ++senscr;
+        }
+    }
+    return best;
+}
+
+static int32
 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
                int32 *senone_active, int32 n_senone_active,
                int32 *out_bestidx)
@@ -727,6 +845,61 @@
 }
 
 static int32
+read_sendump_rle(s2_semi_mgau_t *s, FILE *file,
+                 size_t offset, size_t filesize,
+                 int32 n_comp, int32 n_sen)
+{
+    uint8 *mwdata, *x, *e;
+    int32 f, c, i;
+
+    /* Read in the data. */
+    if (s->sendump_mmap) {
+        mwdata = (uint8 *)mmio_file_ptr(s->sendump_mmap) + offset;
+    }
+    else {
+        mwdata = ckd_malloc(filesize - offset);
+        if (fread(mwdata, 1, filesize - offset, file) != filesize - offset) {
+            E_ERROR("Failed to read %d bytes from sendump\n", filesize - offset);
+            return -1;
+        }
+    }
+
+    /* Now decode it to find the endpoints for each (feature,component) */
+    s->mixw = ckd_calloc_2d(s->n_feat, n_comp, sizeof(**s->mixw));
+    x = mwdata;
+    e = mwdata + filesize - offset;
+    for (f = 0; f < s->n_feat; ++f) {
+        for (c = 0; c < n_comp; ++c) {
+            s->mixw[f][c] = x;
+            i = 0;
+            while (i < n_sen) {
+                if (x >= e) {
+                    E_ERROR("Inconsistent RLE in sendump: final n_sen = %d\n", i);
+                    return -1;
+                }
+                /* Run of zeros (zero = 159) */
+                if (*x == 255) {
+                    /* Run length. */
+                    i += x[1];
+                    x += 2;
+                }
+                /* Ordinary thing. */
+                else {
+                    ++i;
+                    ++x;
+                }
+            }
+        }
+    }
+
+    /* Don't track active senones in RLE mode, since we are going to
+       knock a lot of them out anyway */
+    cmd_ln_set_boolean_r(s->config, "-compallsen", TRUE);
+    fclose(file);
+    return 0;
+}
+
+static int32
 read_sendump(s2_semi_mgau_t *s, bin_mdef_t *mdef, char const *file)
 {
     FILE *fp;
@@ -787,6 +960,9 @@
         if (!strncmp(line, "cluster_count ", strlen("cluster_count "))) {
             n_clust = atoi(line + strlen("cluster_count "));
         }
+        if (!strncmp(line, "rle_compressed 1", strlen("rle_compressed 1"))) {
+            s->rle = TRUE;
+        }
     }
 
     /* Read #codewords, #pdfs */
@@ -804,27 +980,20 @@
     if (do_mmap) {
             E_INFO("Using memory-mapped I/O for senones\n");
     }
-    /* Verify alignment constraints for using mmap() */
-    if ((c & 3) != 0) {
-        /* This will cause us to run very slowly, so don't do it. */
-        E_ERROR
-            ("Number of PDFs (%d) not padded to multiple of 4, will not use mmap()\n",
-             c);
-        do_mmap = 0;
-    }
     offset = ftell(fp);
     fseek(fp, 0, SEEK_END);
     filesize = ftell(fp);
     fseek(fp, offset, SEEK_SET);
-    if ((offset & 3) != 0) {
-        E_ERROR
-            ("PDFs are not aligned to 4-byte boundary in file, will not use mmap()\n");
-        do_mmap = 0;
-    }
 
     /* Allocate memory for pdfs (or memory map them) */
     if (do_mmap)
         s->sendump_mmap = mmio_file_read(file);
+
+    /* Handle RLE compressed weights separately. */
+    if (s->rle)
+        return read_sendump_rle(s, fp, offset, filesize, r, c);
+
+    /* Otherwise, set up all pointers, etc. */
     if (s->sendump_mmap) {
         s->mixw = ckd_calloc(s->n_feat, sizeof(*s->mixw));
         for (i = 0; i < s->n_feat; i++) {
@@ -844,8 +1013,10 @@
         /* Read pdf values and ids */
         for (n = 0; n < s->n_feat; n++) {
             for (i = 0; i < r; i++) {
-                if (fread(s->mixw[n][i], sizeof(***s->mixw), c, fp) != (size_t) c)
-                    E_FATAL("fread failed\n");
+                if (fread(s->mixw[n][i], sizeof(***s->mixw), c, fp) != (size_t) c) {
+                    E_ERROR("Failed to read %d bytes from sendump\n", c);
+                    return -1;
+                }
             }
         }
     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-08-20 14:40:12 UTC (rev 8724)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-08-21 21:02:01 UTC (rev 8725)
@@ -65,11 +65,12 @@
     uint8 ***mixw;     /* mixture weight distributions */
     mmio_file_t *sendump_mmap;/* memory map for mixw (or NULL if not mmap) */
 
-    int32 n_feat;	/* Number of feature streams */
     int32 *veclen;	/* Length of feature streams */
-    int32 n_density;	/* Number of mixtures per codebook */
+    int16 n_feat;	/* Number of feature streams */
+    int16 n_density;	/* Number of mixtures per codebook */
     int32 n_sen;	/* Number of senones */
-    int32 topn;		/* Number of top densities to compute (<S2_MAX_TOPN) */
+    int16 topn;		/* Number of top densities to compute (<S2_MAX_TOPN) */
+    int16 rle;          /* RLE compression applied to mixture weights */
 
     kd_tree_t **kdtrees;
     uint32 n_kdtrees;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8735
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8735&view=rev
Author:   dhdfu
Date:     2008-08-28 19:23:47 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
CDHMM scores can overflow 16 bits quite easily, so explicitly check
for this here.  Also the "component removal" code didn't really work.

This means that undertrained models like AN4 no longer fail quite so
catastrophically, but there's still something odd going on, since the
accuracy is very different from Sphinx3.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ms_gauden.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_gauden.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_gauden.c	2008-08-27 17:37:28 UTC (rev 8734)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_gauden.c	2008-08-28 19:23:47 UTC (rev 8735)
@@ -318,9 +318,9 @@
     mean_t *meanp;
     var_t *varp;
     var_t *detp;
-    int32 floored, removed;
+    int32 floored;
 
-    floored = removed = 0;
+    floored = 0;
     /* Allocate space for determinants */
     g->det = ckd_calloc_3d(g->n_mgau, g->n_feat, g->n_density, sizeof(***g->det));
 
@@ -331,21 +331,6 @@
             /* Determinants for all variance vectors in g->[m][f] */
             for (d = 0, detp = g->det[m][f]; d < g->n_density; d++, detp++) {
                 *detp = 0;
-                /*
-                 * In larger acoustic models it is likely that some components were
-                 * only observed once, or were never observed, and thus have zero
-                 * variance.  These will totally screw up the decoder, so we "remove"
-                 * them, actually by setting their determinant to an improbable value.
-                 */
-                for (i = 0; i < flen; ++i)
-                    if (g->var[m][f][d][i] != 0.0)
-                        break;
-                if (i == flen) {
-                    *detp = logmath_get_zero(lmath);
-                    ++removed;
-                    continue;
-                }
-
                 for (i = 0, varp = g->var[m][f][d], meanp = g->mean[m][f][d];
                      i < flen; i++, varp++, meanp++) {
                     float32 *fvarp = (float32 *)varp;
@@ -366,8 +351,7 @@
         }
     }
 
-    E_INFO("%d variance values floored, %d zero-variance components removed\n",
-           floored, removed);
+    E_INFO("%d variance values floored\n", floored);
 
     return 0;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-08-27 17:37:28 UTC (rev 8734)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-08-28 19:23:47 UTC (rev 8735)
@@ -205,7 +205,12 @@
     /* Normalize senone scores */
     for (i = 0; i < n_senone_active; i++) {
 	int32 s = senone_active[i];
-	senscr[s] -= best;
+	int32 bs = senscr[s] - best;
+	if (bs > 32767)
+	  bs = 32767;
+	if (bs < -32768)
+	  bs = -32768;
+	senscr[s] = bs;
     }
 
     return best;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2008-08-27 17:37:28 UTC (rev 8734)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2008-08-28 19:23:47 UTC (rev 8735)
@@ -389,6 +389,11 @@
         scr -= fscr;
     }
 
+    /* Avoid overflowing int16 */
+    if (scr > 32767)
+      scr = 32767;
+    if (scr < -32768)
+      scr = -32768;
     return scr;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8738
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8738&view=rev
Author:   dhdfu
Date:     2008-08-29 18:52:35 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Eliminate the search for the best senone score and ID from the "hot
path", since it is not really used for anything.  Makes things a tiny
bit faster, maybe...

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-08-29 18:52:35 UTC (rev 8738)
@@ -651,9 +651,7 @@
 
 int16 const *
 acmod_score(acmod_t *acmod,
-	    int *out_frame_idx,
-	    int16 *out_best_score,
-	    int32 *out_best_senid)
+	    int *out_frame_idx)
 {
     /* No frames available to score. */
     if (acmod->n_feat_frame == 0)
@@ -670,15 +668,13 @@
     if (acmod->feat_outidx == acmod->n_feat_alloc)
         acmod->feat_outidx = 0;
     /* Generate scores for the next available frame */
-    *out_best_score = 
-        (*acmod->frame_eval)(acmod->mgau,
-                             acmod->senone_scores,
-                             acmod->senone_active,
-                             acmod->n_senone_active,
-                             acmod->feat_buf[acmod->feat_outidx],
-                             acmod->output_frame,
-                             acmod->compallsen,
-                             out_best_senid);
+    (*acmod->frame_eval)(acmod->mgau,
+                         acmod->senone_scores,
+                         acmod->senone_active,
+                         acmod->n_senone_active,
+                         acmod->feat_buf[acmod->feat_outidx],
+                         acmod->output_frame,
+                         acmod->compallsen);
     /* Advance the output pointers. */
     ++acmod->feat_outidx;
     --acmod->n_feat_frame;

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-08-29 18:52:35 UTC (rev 8738)
@@ -80,8 +80,7 @@
                             int32 n_senone_active,
                             mfcc_t ** feat,
                             int32 frame,
-                            int32 compallsen,
-                            int32 *out_bestidx);
+                            int32 compallsen);
 
 /**
  * Acoustic model structure.
@@ -264,16 +263,12 @@
  *
  * @param out_frame_idx  Output: frame index corresponding to this set
  *                       of scores.
- * @param out_best_score Output: best un-normalized acoustic score.
- * @param out_best_senid Output: senone ID corresponding to best score.
  * @return Array of senone scores for this frame, or NULL if no frame
  *         is available for scoring.  The data pointed to persists only
  *         until the next call to acmod_score().
  */
 int16 const *acmod_score(acmod_t *acmod,
-                         int *out_frame_idx,
-                         int16 *out_best_score,
-                         int32 *out_best_senid);
+                         int *out_frame_idx);
 
 /**
  * Clear set of active senones.

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2008-08-29 18:52:35 UTC (rev 8738)
@@ -763,8 +763,7 @@
 {
     fsg_search_t *fsgs = (fsg_search_t *)search;
     int16 const *senscr;
-    int frame_idx, best_senid;
-    int16 best_senscr;
+    int frame_idx;
     acmod_t *acmod = search->acmod;
     gnode_t *gn;
     fsg_pnode_t *pnode;
@@ -778,7 +777,7 @@
     if (!acmod->compallsen)
         fsg_search_sen_active(fsgs);
     /* Compute GMM scores for the current frame. */
-    senscr = acmod_score(acmod, &frame_idx, &best_senscr, &best_senid);
+    senscr = acmod_score(acmod, &frame_idx);
     fsgs->n_sen_eval += acmod->n_senone_active;
     hmm_context_set_senscore(fsgs->hmmctx, senscr);
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-08-29 18:52:35 UTC (rev 8738)
@@ -706,8 +706,7 @@
 ngram_fwdflat_search(ngram_search_t *ngs)
 {
     int16 const *senscr;
-    int frame_idx, best_senid;
-    int16 best_senscr;
+    int frame_idx;
     int32 nf, i, j;
     int32 *nawl;
 
@@ -720,8 +719,7 @@
         compute_fwdflat_sen_active(ngs, acmod_frame_idx(ps_search_acmod(ngs)));
 
     /* Compute GMM scores for the current frame. */
-    senscr = acmod_score(ps_search_acmod(ngs), &frame_idx,
-                         &best_senscr, &best_senid);
+    senscr = acmod_score(ps_search_acmod(ngs), &frame_idx);
     ngs->st.n_senone_active_utt += ps_search_acmod(ngs)->n_senone_active;
 
     /* Mark backpointer table for current frame. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-08-29 18:52:35 UTC (rev 8738)
@@ -1378,8 +1378,7 @@
 ngram_fwdtree_search(ngram_search_t *ngs)
 {
     int16 const *senscr;
-    int frame_idx, best_senid;
-    int16 best_senscr;
+    int frame_idx;
 
     /* Determine if we actually have a frame to process. */
     if (ps_search_acmod(ngs)->n_feat_frame == 0)
@@ -1390,8 +1389,7 @@
         compute_sen_active(ngs, acmod_frame_idx(ps_search_acmod(ngs)));
 
     /* Compute GMM scores for the current frame. */
-    senscr = acmod_score(ps_search_acmod(ngs), &frame_idx,
-                         &best_senscr, &best_senid);
+    senscr = acmod_score(ps_search_acmod(ngs), &frame_idx);
     ngs->st.n_senone_active_utt += ps_search_acmod(ngs)->n_senone_active;
 
     /* Mark backpointer table for current frame. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-08-29 18:52:35 UTC (rev 8738)
@@ -148,28 +148,20 @@
  * Optimization for various topn cases, PDF-size(#bits) cases of
  * SCVQComputeScores() and SCVQComputeScores_all().
  */
-static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores,
-                                int32 *out_bestidx);
+static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active,
-                            int32 *out_bestidx);
+                            int32 *senone_active, int32 n_senone_active);
 static int32 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active,
-                            int32 *out_bestidx);
+                            int32 *senone_active, int32 n_senone_active);
 static int32 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active,
-                            int32 *out_bestidx);
+                            int32 *senone_active, int32 n_senone_active);
 static int32 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                           int32 *senone_active, int32 n_senone_active,
-                           int32 *out_bestidx);
-static int32 get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                                int32 *out_bestidx);
-static int32 get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                                int32 *out_bestidx);
-static int32 get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                                int32 *out_bestidx);
-static int32 get_scores_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                               int32 *out_bestidx);
+                           int32 *senone_active, int32 n_senone_active);
+static int32 get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
+static int32 get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
+static int32 get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
+static int32 get_scores_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
+static int32 get_scores_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 
 static void
 eval_topn(s2_semi_mgau_t *s, int32 feat, mfcc_t *z)
@@ -382,8 +374,7 @@
                         int32 *senone_active,
                         int32 n_senone_active,
 			mfcc_t ** featbuf, int32 frame,
-			int32 compallsen,
-                        int32 *out_bestidx)
+			int32 compallsen)
 {
     int i;
 
@@ -395,7 +386,7 @@
     if (s->rle) {
 	switch (s->topn) {
 	case 4:
-	    return get_scores4_8b_rle(s, senone_scores, out_bestidx);
+	    return get_scores4_8b_rle(s, senone_scores);
 	case 2:
 	case 1:
 	default:
@@ -407,44 +398,38 @@
     else if (compallsen) {
 	switch (s->topn) {
 	case 4:
-	    return get_scores4_8b_all(s, senone_scores, out_bestidx);
+	    return get_scores4_8b_all(s, senone_scores);
 	case 2:
-	    return get_scores2_8b_all(s, senone_scores, out_bestidx);
+	    return get_scores2_8b_all(s, senone_scores);
 	case 1:
-	    return get_scores1_8b_all(s, senone_scores, out_bestidx);
+	    return get_scores1_8b_all(s, senone_scores);
 	default:
-	    return get_scores_8b_all(s, senone_scores, out_bestidx);
+	    return get_scores_8b_all(s, senone_scores);
 	}
     }
     else {
 	switch (s->topn) {
 	case 4:
 	    return get_scores4_8b(s, senone_scores,
-                                  senone_active, n_senone_active,
-                                  out_bestidx);
+                                  senone_active, n_senone_active);
 	case 2:
 	    return get_scores2_8b(s, senone_scores,
-                                  senone_active, n_senone_active,
-                                  out_bestidx);
+                                  senone_active, n_senone_active);
 	case 1:
 	    return get_scores1_8b(s, senone_scores,
-                                  senone_active, n_senone_active,
-                                  out_bestidx);
+                                  senone_active, n_senone_active);
 	default:
 	    return get_scores_8b(s, senone_scores,
-                                  senone_active, n_senone_active,
-                                  out_bestidx);
+                                 senone_active, n_senone_active);
 	}
     }
 }
 
 static int32
 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-              int32 *senone_active, int32 n_senone_active,
-              int32 *out_bestidx)
+              int32 *senone_active, int32 n_senone_active)
 {
     int32 i, j, k;
-    int32 best = (int32)0x7fffffff;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (i = 0; i < s->n_feat; ++i) {
@@ -460,21 +445,15 @@
                                        pid_cw[sen] + s->f[i][k].score);
             }
             senone_scores[sen] += tmp;
-            if (i == s->n_feat - 1 && senone_scores[sen] < best) {
-                best = senone_scores[sen];
-                *out_bestidx = sen;
-            }
         }
     }
-    return best;
+    return 0;
 }
 
 static int32
-get_scores_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                  int32 *out_bestidx)
+get_scores_8b_all(s2_semi_mgau_t * s, int16 *senone_scores)
 {
     int32 i, j, k;
-    int32 best = (int32)0x7fffffff;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (i = 0; i < s->n_feat; ++i) {
@@ -489,22 +468,45 @@
                                        pid_cw[j] + s->f[i][k].score);
             }
             senone_scores[j] += tmp;
-            if (i == s->n_feat - 1 && senone_scores[j] < best) {
-                best = senone_scores[j];
-                *out_bestidx = j;
+        }
+    }
+    return 0;
+}
+
+static int32
+get_scores_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores)
+{
+    int32 i, j, k;
+    int32 best = (int32)0x7fffffff;
+
+#if 0
+    memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
+    for (i = 0; i < s->n_feat; ++i) {
+        for (k = 0; k < s->topn; ++k) {
+            uint8 *pid_cw, den_cw, wden_cw;
+            /* Get compressed mixture weight array. */
+            pid_cw = s->mixw[i][s->f[i][k].codeword];
+            /* Get Gaussian density for this codeword. */
+            den_cw = s->f[i][k].score;
+
+            for (j = 0; j < s->n_sen; j++) {
+                wden = *pid_cw + den_cw;
+                tmp = fast_logmath_add(s->lmath_8b, tmp,
+                                       pid_cw[j] + s->f[i][k].score);
+                senone_scores[j] += tmp;
             }
         }
     }
+#endif
     return best;
 }
 
+
 static int32
 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active,
-               int32 *out_bestidx)
+               int32 *senone_active, int32 n_senone_active)
 {
     int32 j;
-    int32 best = (int32)0x7fffffff;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (j = 0; j < s->n_feat; j++) {
@@ -530,21 +532,15 @@
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
 
             senone_scores[n] += tmp1;
-            if (j == s->n_feat - 1 && senone_scores[n] < best) {
-                best = senone_scores[n];
-                *out_bestidx = n;
-            }
         }
     }
-    return best;
+    return 0;
 }
 
 static int32
-get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                   int32 *out_bestidx)
+get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores)
 {
     int32 j;
-    int32 best = (int32)0x7fffffff;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (j = 0; j < s->n_feat; j++) {
@@ -571,22 +567,16 @@
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
 
             *senscr += tmp1;
-            if (j == s->n_feat - 1 && *senscr < best) {
-                best = *senscr;
-                *out_bestidx = n;
-            }
             ++senscr;
         }
     }
-    return best;
+    return 0;
 }
 
 static int32
-get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores,
-                   int32 *out_bestidx)
+get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores)
 {
     int32 j;
-    int32 best = (int32)0x7fffffff;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (j = 0; j < s->n_feat; j++) {
@@ -671,23 +661,17 @@
 #endif
 
             *senscr += tmp1;
-            if (j == s->n_feat - 1 && *senscr < best) {
-                best = *senscr;
-                *out_bestidx = n;
-            }
             ++senscr;
         }
     }
-    return best;
+    return 0;
 }
 
 static int32
 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active,
-               int32 *out_bestidx)
+               int32 *senone_active, int32 n_senone_active)
 {
     int32 k;
-    int32 best = (int32)0x7fffffff;
     uint8 *pid_cw00, *pid_cw10, *pid_cw01, *pid_cw11,
         *pid_cw02, *pid_cw12, *pid_cw03, *pid_cw13;
 
@@ -722,21 +706,15 @@
         tmp2 = pid_cw13[n] + s->f[3][1].score;
         tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
         senone_scores[n] += tmp1;
-        if (senone_scores[n] < best) {
-            best = senone_scores[n];
-            *out_bestidx = n;
-        }
     }
-    return best;
+    return 0;
 }
 
 static int32
-get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                   int32 *out_bestidx)
+get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores)
 {
     uint8 *pid_cw00, *pid_cw10, *pid_cw01, *pid_cw11,
         *pid_cw02, *pid_cw12, *pid_cw03, *pid_cw13;
-    int32 best = (int32)0x7fffffff;
     int32 n;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
@@ -769,21 +747,15 @@
         tmp2 = pid_cw13[n] + s->f[3][1].score;
         tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
         senone_scores[n] += tmp1;
-        if (senone_scores[n] < best) {
-            best = senone_scores[n];
-            *out_bestidx = n;
-        }
     }
-    return best;
+    return 0;
 }
 
 static int32
 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active,
-               int32 *out_bestidx)
+               int32 *senone_active, int32 n_senone_active)
 {
     int32 j, k;
-    int32 best = (int32)0x7fffffff;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
 
     /* Ptrs to senone prob values for the top codeword of all codebooks */
@@ -796,20 +768,14 @@
         j = senone_active[k];
         senone_scores[j] =
             (pid_cw0[j] + pid_cw1[j] + pid_cw2[j] + pid_cw3[j]);
-        if (senone_scores[j] < best) {
-            best = senone_scores[j];
-            *out_bestidx = j;
-        }
     }
-    return best;
+    return 0;
 }
 
 static int32
-get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores,
-                   int32 *out_bestidx)
+get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores)
 {
     int32 j;
-    int32 best = (int32)0x7fffffff;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
 
     /* Ptrs to senone prob values for the top codeword of all codebooks */
@@ -821,12 +787,8 @@
     for (j = 0; j < s->n_sen; j++) {
         senone_scores[j] =
             (pid_cw0[j] + pid_cw1[j] + pid_cw2[j] + pid_cw3[j]);
-        if (senone_scores[j] < best) {
-            best = senone_scores[j];
-            *out_bestidx = j;
-        }
     }
-    return best;
+    return 0;
 }
 
 int32

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-08-29 18:36:27 UTC (rev 8737)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-08-29 18:52:35 UTC (rev 8738)
@@ -97,8 +97,7 @@
                               int32 n_senone_active,
 			      mfcc_t **featbuf,
 			      int32 frame,
-                              int32 compallsen,
-                              int32 *out_bestidx);
+                              int32 compallsen);
 
 int32 s2_semi_mgau_load_kdtree(s2_semi_mgau_t *s, const char *kdtree_path,
 			       uint32 maxdepth, int32 maxbbi);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8739
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8739&view=rev
Author:   dhdfu
Date:     2008-08-29 19:14:57 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Also remove bestidx from ms_mgau and sdc_mgau

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-08-29 18:52:35 UTC (rev 8738)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-08-29 19:14:57 UTC (rev 8739)
@@ -157,8 +157,7 @@
 			int32 n_senone_active,
                         mfcc_t ** feat,
 			int32 frame,
-			int32 compallsen,
-			int32 *bestidx)
+			int32 compallsen)
 {
     int32 gid;
     int32 i;
@@ -192,13 +191,11 @@
     }
 
     best = (int32) 0x7fffffff;
-    *bestidx = -1;
     for (i = 0; i < n_senone_active; i++) {
 	int32 s = senone_active[i];
 	senscr[s] = senone_eval(sen, s, msg->dist[sen->mgau[s]], topn);
 	if (best > senscr[s]) {
 	    best = senscr[s];
-	    *bestidx = s;
 	}
     }
 
@@ -213,5 +210,5 @@
 	senscr[s] = bs;
     }
 
-    return best;
+    return 0;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-08-29 18:52:35 UTC (rev 8738)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-08-29 19:14:57 UTC (rev 8739)
@@ -148,8 +148,7 @@
                               int32 n_senone_active,
                               mfcc_t ** feat,
                               int32 frame,
-                              int32 compallsen,
-                              int32 *out_bestidx);
+                              int32 compallsen);
 
 #endif /* _LIBFBS_MS_CONT_MGAU_H_*/
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-08-29 18:52:35 UTC (rev 8738)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-08-29 19:14:57 UTC (rev 8739)
@@ -121,10 +121,8 @@
 
 static int32
 compute_scores(sdc_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active,
-               int32 *out_bestidx)
+               int32 *senone_active, int32 n_senone_active)
 {
-    int32 best = (int32)0x7fffffff;
     int i;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
@@ -152,19 +150,13 @@
         }
         /* Negate it since that is what everything else expects at the moment. */
         senone_scores[sen] = -senone_scores[sen];
-        if (senone_scores[sen] < best) {
-            best = senone_scores[sen];
-            *out_bestidx = sen;
-        }
     }
-    return best;
+    return 0;
 }
 
 static int32
-compute_scores_all(sdc_mgau_t * s, int16 *senone_scores,
-                   int32 *out_bestidx)
+compute_scores_all(sdc_mgau_t * s, int16 *senone_scores)
 {
-    int32 best = (int32)0x7fffffff;
     int sen;
 
     for (sen = 0; sen < s->n_sen; ++sen) {
@@ -189,12 +181,8 @@
         }
         /* Negate it since that is what everything else expects at the moment. */
         senone_scores[sen] = -senone_scores[sen];
-        if (senone_scores[sen] < best) {
-            best = senone_scores[sen];
-            *out_bestidx = sen;
-        }
     }
-    return best;
+    return 0;
 }
 
 /*
@@ -206,8 +194,7 @@
                     int32 *senone_active,
                     int32 n_senone_active,
                     mfcc_t ** featbuf, int32 frame,
-                    int32 compallsen,
-                    int32 *out_bestidx)
+                    int32 compallsen)
 {
     int32 bscore;
     int i;
@@ -222,11 +209,10 @@
 
     /* Compute senone scores. */
     if (compallsen)
-        bscore = compute_scores_all(s, senone_scores, out_bestidx);
+        bscore = compute_scores_all(s, senone_scores);
     else
         bscore = compute_scores(s, senone_scores,
-                                senone_active, n_senone_active,
-                                out_bestidx);
+                                senone_active, n_senone_active);
     /* Normalize them. */
     for (i = 0; i < s->n_sen; ++i)
         senone_scores[i] -= bscore;

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-08-29 18:52:35 UTC (rev 8738)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-08-29 19:14:57 UTC (rev 8739)
@@ -83,12 +83,11 @@
 void sdc_mgau_free(sdc_mgau_t *s);
 
 int32 sdc_mgau_frame_eval(sdc_mgau_t *s,
-                              int16 *senone_scores,
-                              int32 *senone_active,
-                              int32 n_senone_active,
-			      mfcc_t **featbuf,
-			      int32 frame,
-                              int32 compallsen,
-                              int32 *out_bestidx);
+                          int16 *senone_scores,
+                          int32 *senone_active,
+                          int32 n_senone_active,
+                          mfcc_t **featbuf,
+                          int32 frame,
+                          int32 compallsen);
 
 #endif /*  __SDC_MGAU_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8744
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8744&view=rev
Author:   dhdfu
Date:     2008-09-02 20:54:59 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Encode senone_active as deltas and use fewer bits (in fact we can use
8 bits and just eat the occasional extra senone...)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-02 20:54:59 UTC (rev 8744)
@@ -742,7 +742,7 @@
 static int32
 acmod_flags2list(acmod_t *acmod)
 {
-    int32 w, n, b, total_dists, total_words, extra_bits;
+    int32 w, l, n, b, total_dists, total_words, extra_bits;
     bitvec_t *flagptr;
 
     total_dists = bin_mdef_n_sen(acmod->mdef);
@@ -752,27 +752,27 @@
     }
     total_words = total_dists / BITVEC_BITS;
     extra_bits = total_dists % BITVEC_BITS;
-    w = n = 0;
+    w = n = l = 0;
     for (flagptr = acmod->senone_active_vec; w < total_words; ++w, ++flagptr) {
         if (*flagptr == 0)
             continue;
-        for (b = 0; b < BITVEC_BITS; ++b)
-            if (*flagptr & (1UL << b))
-                acmod->senone_active[n++] = w * BITVEC_BITS + b;
+        for (b = 0; b < BITVEC_BITS; ++b) {
+            if (*flagptr & (1UL << b)) {
+                int32 sen = w * BITVEC_BITS + b;
+                acmod->senone_active[n++] = sen - l;
+                l = sen;
+            }
+        }
     }
 
-    for (b = 0; b < extra_bits; ++b)
-        if (*flagptr & (1UL << b))
-            acmod->senone_active[n++] = w * BITVEC_BITS + b;
+    for (b = 0; b < extra_bits; ++b) {
+        if (*flagptr & (1UL << b)) {
+            int32 sen = w * BITVEC_BITS + b;
+            acmod->senone_active[n++] = sen - l;
+            l = sen;
+        }
+    }
 
     acmod->n_senone_active = n;
     return n;
 }
-
-int const *
-acmod_active_list(acmod_t *acmod, int32 *out_n_active)
-{
-    acmod_flags2list(acmod);
-    if (out_n_active) *out_n_active = acmod->n_senone_active;
-    return acmod->senone_active;
-}

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-09-02 20:54:59 UTC (rev 8744)
@@ -76,7 +76,7 @@
  */
 typedef int (*frame_eval_t)(void *eval_obj,
                             int16 *senscr,
-                            int32 *senone_active,
+                            int16 *senone_active,
                             int32 n_senone_active,
                             mfcc_t ** feat,
                             int32 frame,
@@ -121,7 +121,7 @@
     frame_eval_t frame_eval;   /**< Function to compute GMM scores. */
     int16 *senone_scores;      /**< GMM scores for current frame. */
     bitvec_t *senone_active_vec; /**< Active GMMs in current frame. */
-    int *senone_active;        /**< Array of active GMMs. */
+    int16 *senone_active;       /**< Array of deltas to active GMMs. */
     int n_senone_active;       /**< Number of active GMMs. */
     int log_zero;              /**< Zero log-probability value. */
 
@@ -280,12 +280,4 @@
  */
 void acmod_activate_hmm(acmod_t *acmod, hmm_t *hmm);
 
-/**
- * Return the array of active senones.
- *
- * @param out_n_active Output: number of elements in returned array.
- * @return array of active senone IDs.
- */
-int const *acmod_active_list(acmod_t *acmod, int *out_n_active);
-
 #endif /* __ACMOD_H__ */

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
@@ -153,14 +153,14 @@
 int32
 ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
 			int16 *senscr,
-			int32 *senone_active,
+			int16 *senone_active,
 			int32 n_senone_active,
                         mfcc_t ** feat,
 			int32 frame,
 			int32 compallsen)
 {
     int32 gid;
-    int32 i;
+    int32 i, n;
     int32 topn;
     int32 best;
     gauden_t *g;
@@ -179,9 +179,12 @@
     for (gid = 0; gid < g->n_mgau; gid++)
         msg->mgau_active[gid] = 0;
 
+    n = 0;
     for (i = 0; i < n_senone_active; i++) {
-	int32 s = senone_active[i];
+	/* senone_active consists of deltas. */
+	int32 s = senone_active[i] + n;
 	msg->mgau_active[sen->mgau[s]] = 1;
+	n = s;
     }
 
     /* Compute topn gaussian density values (for active codebooks) */
@@ -191,23 +194,27 @@
     }
 
     best = (int32) 0x7fffffff;
+    n = 0;
     for (i = 0; i < n_senone_active; i++) {
-	int32 s = senone_active[i];
+	int32 s = senone_active[i] + n;
 	senscr[s] = senone_eval(sen, s, msg->dist[sen->mgau[s]], topn);
 	if (best > senscr[s]) {
 	    best = senscr[s];
 	}
+	n = s;
     }
 
     /* Normalize senone scores */
+    n = 0;
     for (i = 0; i < n_senone_active; i++) {
-	int32 s = senone_active[i];
+	int32 s = senone_active[i] + n;
 	int32 bs = senscr[s] - best;
 	if (bs > 32767)
 	  bs = 32767;
 	if (bs < -32768)
 	  bs = -32768;
 	senscr[s] = bs;
+	n = s;
     }
 
     return 0;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
@@ -144,7 +144,7 @@
 
 int32 ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
                               int16 *senscr,
-                              int32 *senone_active,
+                              int16 *senone_active,
                               int32 n_senone_active,
                               mfcc_t ** feat,
                               int32 frame,

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
@@ -150,18 +150,17 @@
  */
 static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active);
+                            int16 *senone_active, int32 n_senone_active);
 static int32 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active);
+                            int16 *senone_active, int32 n_senone_active);
 static int32 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int32 *senone_active, int32 n_senone_active);
+                            int16 *senone_active, int32 n_senone_active);
 static int32 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                           int32 *senone_active, int32 n_senone_active);
+                           int16 *senone_active, int32 n_senone_active);
 static int32 get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
-static int32 get_scores_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 
 static void
 eval_topn(s2_semi_mgau_t *s, int32 feat, mfcc_t *z)
@@ -371,7 +370,7 @@
 int32
 s2_semi_mgau_frame_eval(s2_semi_mgau_t * s,
                         int16 *senone_scores,
-                        int32 *senone_active,
+                        int16 *senone_active,
                         int32 n_senone_active,
 			mfcc_t ** featbuf, int32 frame,
 			int32 compallsen)
@@ -427,14 +426,14 @@
 
 static int32
 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-              int32 *senone_active, int32 n_senone_active)
+              int16 *senone_active, int32 n_senone_active)
 {
-    int32 i, j, k;
+    int32 i, j, k, l;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (i = 0; i < s->n_feat; ++i) {
-        for (j = 0; j < n_senone_active; j++) {
-            int sen = senone_active[j];
+        for (l = j = 0; j < n_senone_active; j++) {
+            int sen = senone_active[j] + l;
             uint8 *pid_cw;
             int32 tmp;
             pid_cw = s->mixw[i][s->f[i][0].codeword];
@@ -445,6 +444,7 @@
                                        pid_cw[sen] + s->f[i][k].score);
             }
             senone_scores[sen] += tmp;
+            l = sen;
         }
     }
     return 0;
@@ -474,43 +474,15 @@
 }
 
 static int32
-get_scores_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores)
-{
-    int32 i, j, k;
-    int32 best = (int32)0x7fffffff;
-
-#if 0
-    memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
-    for (i = 0; i < s->n_feat; ++i) {
-        for (k = 0; k < s->topn; ++k) {
-            uint8 *pid_cw, den_cw, wden_cw;
-            /* Get compressed mixture weight array. */
-            pid_cw = s->mixw[i][s->f[i][k].codeword];
-            /* Get Gaussian density for this codeword. */
-            den_cw = s->f[i][k].score;
-
-            for (j = 0; j < s->n_sen; j++) {
-                wden = *pid_cw + den_cw;
-                tmp = fast_logmath_add(s->lmath_8b, tmp,
-                                       pid_cw[j] + s->f[i][k].score);
-                senone_scores[j] += tmp;
-            }
-        }
-    }
-#endif
-    return best;
-}
-
-
-static int32
 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active)
+               int16 *senone_active, int32 n_senone_active)
 {
     int32 j;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (j = 0; j < s->n_feat; j++) {
         uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
+        int16 *senscr;
         int32 k;
 
         /* ptrs to senone prob ids */
@@ -519,19 +491,27 @@
         pid_cw2 = s->mixw[j][s->f[j][2].codeword];
         pid_cw3 = s->mixw[j][s->f[j][3].codeword];
 
+        senscr = senone_scores;
         for (k = 0; k < n_senone_active; k++) {
             int32 tmp1, tmp2;
-	    int32 n = senone_active[k];
+	    int32 n = senone_active[k]; /* Actually a delta. */
 
-            tmp1 = pid_cw0[n] + s->f[j][0].score;
-            tmp2 = pid_cw1[n] + s->f[j][1].score;
+            /* Increment all the pointers. */
+            senscr += n;
+            pid_cw0 += n;
+            pid_cw1 += n;
+            pid_cw2 += n;
+            pid_cw3 += n;
+
+            tmp1 = *pid_cw0 + s->f[j][0].score;
+            tmp2 = *pid_cw1 + s->f[j][1].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = pid_cw2[n] + s->f[j][2].score;
+            tmp2 = *pid_cw2 + s->f[j][2].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = pid_cw3[n] + s->f[j][3].score;
+            tmp2 = *pid_cw3 + s->f[j][3].score;
             tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
 
-            senone_scores[n] += tmp1;
+            *senscr += tmp1;
         }
     }
     return 0;
@@ -669,9 +649,9 @@
 
 static int32
 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active)
+               int16 *senone_active, int32 n_senone_active)
 {
-    int32 k;
+    int32 k, l;
     uint8 *pid_cw00, *pid_cw10, *pid_cw01, *pid_cw11,
         *pid_cw02, *pid_cw12, *pid_cw03, *pid_cw13;
 
@@ -686,9 +666,9 @@
     pid_cw03 = s->mixw[3][s->f[3][0].codeword];
     pid_cw13 = s->mixw[3][s->f[3][1].codeword];
 
-    for (k = 0; k < n_senone_active; k++) {
+    for (l = k = 0; k < n_senone_active; k++) {
         int32 tmp1, tmp2, n;
-	n = senone_active[k];
+	n = senone_active[k] + l;
 
         tmp1 = pid_cw00[n] + s->f[0][0].score;
         tmp2 = pid_cw10[n] + s->f[0][1].score;
@@ -706,6 +686,7 @@
         tmp2 = pid_cw13[n] + s->f[3][1].score;
         tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
         senone_scores[n] += tmp1;
+        l = n;
     }
     return 0;
 }
@@ -753,10 +734,11 @@
 
 static int32
 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active)
+               int16 *senone_active, int32 n_senone_active)
 {
     int32 j, k;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
+    int16 *senscr;
 
     /* Ptrs to senone prob values for the top codeword of all codebooks */
     pid_cw0 = s->mixw[0][s->f[0][0].codeword];
@@ -764,10 +746,15 @@
     pid_cw2 = s->mixw[2][s->f[2][0].codeword];
     pid_cw3 = s->mixw[3][s->f[3][0].codeword];
 
+    senscr = senone_scores;
     for (k = 0; k < n_senone_active; k++) {
         j = senone_active[k];
-        senone_scores[j] =
-            (pid_cw0[j] + pid_cw1[j] + pid_cw2[j] + pid_cw3[j]);
+        senscr += j;
+        pid_cw0 += j;
+        pid_cw1 += j;
+        pid_cw2 += j;
+        pid_cw3 += j;
+        *senscr = (*pid_cw0 + *pid_cw1 + *pid_cw2 + *pid_cw3);
     }
     return 0;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
@@ -93,7 +93,7 @@
 
 int32 s2_semi_mgau_frame_eval(s2_semi_mgau_t *s,
                               int16 *senone_scores,
-                              int32 *senone_active,
+                              int16 *senone_active,
                               int32 n_senone_active,
 			      mfcc_t **featbuf,
 			      int32 frame,

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
@@ -121,14 +121,14 @@
 
 static int32
 compute_scores(sdc_mgau_t * s, int16 *senone_scores,
-               int32 *senone_active, int32 n_senone_active)
+               int16 *senone_active, int32 n_senone_active)
 {
-    int i;
+    int i, l;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
     for (i = 0; i < n_senone_active; ++i) {
         /* Get the senone ID. */
-        int sen = senone_active[i];
+        int sen = senone_active[i] + l;
         int c;
         /* Sum up mixture densities. */
         for (c = 0; c < s->n_mixw_den; ++c) {
@@ -150,6 +150,7 @@
         }
         /* Negate it since that is what everything else expects at the moment. */
         senone_scores[sen] = -senone_scores[sen];
+        l = sen;
     }
     return 0;
 }
@@ -191,7 +192,7 @@
 int32
 sdc_mgau_frame_eval(sdc_mgau_t * s,
                     int16 *senone_scores,
-                    int32 *senone_active,
+                    int16 *senone_active,
                     int32 n_senone_active,
                     mfcc_t ** featbuf, int32 frame,
                     int32 compallsen)

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-09-02 13:38:09 UTC (rev 8743)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
@@ -84,7 +84,7 @@
 
 int32 sdc_mgau_frame_eval(sdc_mgau_t *s,
                           int16 *senone_scores,
-                          int32 *senone_active,
+                          int16 *senone_active,
                           int32 n_senone_active,
                           mfcc_t **featbuf,
                           int32 frame,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8745
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8745&view=rev
Author:   dhdfu
Date:     2008-09-02 21:19:23 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Yes, use 8 bits to encode active senone list.  Seems to have a
negligible effect on the number of senones evaluated and is definitely
faster (we have reduced the senone_active array from 20k to
5k... which should be pretty nice on machines with 16k of cache)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-02 21:19:23 UTC (rev 8745)
@@ -759,7 +759,14 @@
         for (b = 0; b < BITVEC_BITS; ++b) {
             if (*flagptr & (1UL << b)) {
                 int32 sen = w * BITVEC_BITS + b;
-                acmod->senone_active[n++] = sen - l;
+                int32 delta = sen - l;
+                /* Handle excessive deltas "lossily" by adding a few
+                   extra senones to bridge the gap. */
+                while (delta > 255) {
+                    acmod->senone_active[n++] = 255;
+                    delta -= 255;
+                }
+                acmod->senone_active[n++] = delta;
                 l = sen;
             }
         }
@@ -768,7 +775,14 @@
     for (b = 0; b < extra_bits; ++b) {
         if (*flagptr & (1UL << b)) {
             int32 sen = w * BITVEC_BITS + b;
-            acmod->senone_active[n++] = sen - l;
+            int32 delta = sen - l;
+            /* Handle excessive deltas "lossily" by adding a few
+               extra senones to bridge the gap. */
+            while (delta > 255) {
+                acmod->senone_active[n++] = 255;
+                delta -= 255;
+            }
+            acmod->senone_active[n++] = delta;
             l = sen;
         }
     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2008-09-02 21:19:23 UTC (rev 8745)
@@ -76,7 +76,7 @@
  */
 typedef int (*frame_eval_t)(void *eval_obj,
                             int16 *senscr,
-                            int16 *senone_active,
+                            uint8 *senone_active,
                             int32 n_senone_active,
                             mfcc_t ** feat,
                             int32 frame,
@@ -121,7 +121,7 @@
     frame_eval_t frame_eval;   /**< Function to compute GMM scores. */
     int16 *senone_scores;      /**< GMM scores for current frame. */
     bitvec_t *senone_active_vec; /**< Active GMMs in current frame. */
-    int16 *senone_active;       /**< Array of deltas to active GMMs. */
+    uint8 *senone_active;      /**< Array of deltas to active GMMs. */
     int n_senone_active;       /**< Number of active GMMs. */
     int log_zero;              /**< Zero log-probability value. */
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2008-09-02 21:19:23 UTC (rev 8745)
@@ -153,7 +153,7 @@
 int32
 ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
 			int16 *senscr,
-			int16 *senone_active,
+			uint8 *senone_active,
 			int32 n_senone_active,
                         mfcc_t ** feat,
 			int32 frame,

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2008-09-02 21:19:23 UTC (rev 8745)
@@ -144,7 +144,7 @@
 
 int32 ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
                               int16 *senscr,
-                              int16 *senone_active,
+                              uint8 *senone_active,
                               int32 n_senone_active,
                               mfcc_t ** feat,
                               int32 frame,

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-02 21:19:23 UTC (rev 8745)
@@ -150,13 +150,13 @@
  */
 static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int16 *senone_active, int32 n_senone_active);
+                            uint8 *senone_active, int32 n_senone_active);
 static int32 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int16 *senone_active, int32 n_senone_active);
+                            uint8 *senone_active, int32 n_senone_active);
 static int32 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                            int16 *senone_active, int32 n_senone_active);
+                            uint8 *senone_active, int32 n_senone_active);
 static int32 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-                           int16 *senone_active, int32 n_senone_active);
+                           uint8 *senone_active, int32 n_senone_active);
 static int32 get_scores4_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores2_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores1_8b_all(s2_semi_mgau_t * s, int16 *senone_scores);
@@ -370,7 +370,7 @@
 int32
 s2_semi_mgau_frame_eval(s2_semi_mgau_t * s,
                         int16 *senone_scores,
-                        int16 *senone_active,
+                        uint8 *senone_active,
                         int32 n_senone_active,
 			mfcc_t ** featbuf, int32 frame,
 			int32 compallsen)
@@ -426,7 +426,7 @@
 
 static int32
 get_scores_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-              int16 *senone_active, int32 n_senone_active)
+              uint8 *senone_active, int32 n_senone_active)
 {
     int32 i, j, k, l;
 
@@ -475,7 +475,7 @@
 
 static int32
 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int16 *senone_active, int32 n_senone_active)
+               uint8 *senone_active, int32 n_senone_active)
 {
     int32 j;
 
@@ -649,7 +649,7 @@
 
 static int32
 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int16 *senone_active, int32 n_senone_active)
+               uint8 *senone_active, int32 n_senone_active)
 {
     int32 k, l;
     uint8 *pid_cw00, *pid_cw10, *pid_cw01, *pid_cw11,
@@ -734,7 +734,7 @@
 
 static int32
 get_scores1_8b(s2_semi_mgau_t * s, int16 *senone_scores,
-               int16 *senone_active, int32 n_senone_active)
+               uint8 *senone_active, int32 n_senone_active)
 {
     int32 j, k;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-02 21:19:23 UTC (rev 8745)
@@ -93,7 +93,7 @@
 
 int32 s2_semi_mgau_frame_eval(s2_semi_mgau_t *s,
                               int16 *senone_scores,
-                              int16 *senone_active,
+                              uint8 *senone_active,
                               int32 n_senone_active,
 			      mfcc_t **featbuf,
 			      int32 frame,

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2008-09-02 21:19:23 UTC (rev 8745)
@@ -121,11 +121,12 @@
 
 static int32
 compute_scores(sdc_mgau_t * s, int16 *senone_scores,
-               int16 *senone_active, int32 n_senone_active)
+               uint8 *senone_active, int32 n_senone_active)
 {
     int i, l;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
+    l = 0;
     for (i = 0; i < n_senone_active; ++i) {
         /* Get the senone ID. */
         int sen = senone_active[i] + l;
@@ -192,7 +193,7 @@
 int32
 sdc_mgau_frame_eval(sdc_mgau_t * s,
                     int16 *senone_scores,
-                    int16 *senone_active,
+                    uint8 *senone_active,
                     int32 n_senone_active,
                     mfcc_t ** featbuf, int32 frame,
                     int32 compallsen)

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-09-02 20:54:59 UTC (rev 8744)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2008-09-02 21:19:23 UTC (rev 8745)
@@ -84,7 +84,7 @@
 
 int32 sdc_mgau_frame_eval(sdc_mgau_t *s,
                           int16 *senone_scores,
-                          int16 *senone_active,
+                          uint8 *senone_active,
                           int32 n_senone_active,
                           mfcc_t **featbuf,
                           int32 frame,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8748
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8748&view=rev
Author:   dhdfu
Date:     2008-09-03 18:16:25 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
Quantize the transition matrix scores as well, which achieves nothing
at the moment, but we will move (slowly) to quantizing everything soon.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/hmm.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.h
    trunk/pocketsphinx/src/libpocketsphinx/tmat.c
    trunk/pocketsphinx/src/libpocketsphinx/tmat.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-03 17:52:58 UTC (rev 8747)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-03 18:16:25 UTC (rev 8748)
@@ -54,7 +54,7 @@
 
 hmm_context_t *
 hmm_context_init(int32 n_emit_state,
-		 int32 ** const *tp,
+		 uint8 ** const *tp,
 		 int16 const *senscore,
 		 int16 * const *sseq)
 {
@@ -220,14 +220,14 @@
         hmm_out_score(h) -= bestscr;
 }
 
-#define hmm_tprob_5st(i, j) (tp[(i)*6+(j)])
-#define nonmpx_senscr(i) (-senscore[sseq[i]] << 10)
+#define hmm_tprob_5st(i, j) (-tp[(i)*6+(j)] << SENSCR_SHIFT)
+#define nonmpx_senscr(i) (-senscore[sseq[i]] << SENSCR_SHIFT)
 
 static int32
 hmm_vit_eval_5st_lr(hmm_t * hmm)
 {
     int16 const *senscore = hmm->ctx->senscore;
-    int32 const *tp = hmm->ctx->tp[hmm->tmatid][0];
+    uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     /* Cache problem here! */
     int16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
     int32 s5, s4, s3, s2, s1, s0, t2, t1, t0, bestScore;
@@ -355,13 +355,13 @@
 }
 
 #define mpx_senid(st) sseq[ssid[st]][st]
-#define mpx_senscr(st) (-senscore[mpx_senid(st)] << 10)
+#define mpx_senscr(st) (-senscore[mpx_senid(st)] << SENSCR_SHIFT)
 
 static int32
 hmm_vit_eval_5st_lr_mpx(hmm_t * hmm)
 {
-    const int32 *tp = hmm->ctx->tp[hmm->tmatid][0];
-    const int16 *senscore = hmm->ctx->senscore;
+    uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
+    int16 const *senscore = hmm->ctx->senscore;
     int16 * const *sseq = hmm->ctx->sseq;
     int32 *ssid = hmm->s.mpx_ssid;
     int32 bestScore;
@@ -529,14 +529,14 @@
     return bestScore;
 }
 
-#define hmm_tprob_3st(i, j) (tp[(i)*4+(j)])
+#define hmm_tprob_3st(i, j) (-tp[(i)*4+(j)] << SENSCR_SHIFT)
 
 static int32
 hmm_vit_eval_3st_lr(hmm_t * hmm)
 {
-    const int16 *senscore = hmm->ctx->senscore;
-    const int32 *tp = hmm->ctx->tp[hmm->tmatid][0];
-    const int16 *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
+    int16 const *senscore = hmm->ctx->senscore;
+    uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
+    int16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
     int32 s3, s2, s1, s0, t2, t1, t0, bestScore;
 
     s2 = hmm_score(hmm, 2) + nonmpx_senscr(2);
@@ -614,7 +614,7 @@
 static int32
 hmm_vit_eval_3st_lr_mpx(hmm_t * hmm)
 {
-    int32 const *tp = hmm->ctx->tp[hmm->tmatid][0];
+    uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     int16 const *senscore = hmm->ctx->senscore;
     int16 * const *sseq = hmm->ctx->sseq;
     int32 *ssid = hmm->s.mpx_ssid;

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-03 17:52:58 UTC (rev 8747)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-03 18:16:25 UTC (rev 8748)
@@ -126,7 +126,7 @@
  */
 typedef struct hmm_context_s {
     int32 n_emit_state;     /**< Number of emitting states in this set of HMMs. */
-    int32 ** const *tp;	    /**< State transition scores tp[id][from][to] (logs3 values). */
+    uint8 ** const *tp;	    /**< State transition scores tp[id][from][to] (logs3 values). */
     int16 const *senscore;  /**< State emission scores senscore[senid]
                                (negated scaled logs3 values). */
     int16 * const *sseq;    /**< Senone sequence mapping. */
@@ -189,7 +189,7 @@
                           ? WORST_SCORE                                 \
                           : -(h)->ctx->senscore[hmm_senid(h,st)] << SENSCR_SHIFT)
 #define hmm_tmatid(h) (h)->tmatid
-#define hmm_tprob(h,i,j) (h)->ctx->tp[hmm_tmatid(h)][i][j]
+#define hmm_tprob(h,i,j) (-(h)->ctx->tp[hmm_tmatid(h)][i][j] << SENSCR_SHIFT)
 #define hmm_n_emit_state(h) ((h)->n_emit_state)
 #define hmm_n_state(h) ((h)->n_emit_state + 1)
 
@@ -197,7 +197,7 @@
  * Create an HMM context.
  **/
 hmm_context_t *hmm_context_init(int32 n_emit_state,
-                                int32 ** const *tp,
+                                uint8 ** const *tp,
                                 int16 const *senscore,
                                 int16 * const *sseq);
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/tmat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tmat.c	2008-09-03 17:52:58 UTC (rev 8747)
+++ trunk/pocketsphinx/src/libpocketsphinx/tmat.c	2008-09-03 18:16:25 UTC (rev 8748)
@@ -102,6 +102,7 @@
 
 /* Local headers. */
 #include "tmat.h"
+#include "hmm.h"
 #include "bio.h"
 #include "vector.h"
 
@@ -156,7 +157,7 @@
     for (i = 0; i < tmat->n_tmat; i++) {
         for (dst = 0; dst < tmat->n_state; dst++)
             for (src = dst + 1; src < tmat->n_state; src++)
-                if (tmat->tp[i][src][dst] > logmath_get_zero(lmath)) {
+                if (tmat->tp[i][src][dst] < 255) {
                     E_ERROR("tmat[%d][%d][%d] = %d\n",
                             i, src, dst, tmat->tp[i][src][dst]);
                     return -1;
@@ -175,7 +176,7 @@
     for (i = 0; i < tmat->n_tmat; i++) {
         for (src = 0; src < tmat->n_state; src++)
             for (dst = src + 3; dst <= tmat->n_state; dst++)
-                if (tmat->tp[i][src][dst] > logmath_get_zero(lmath)) {
+                if (tmat->tp[i][src][dst] < 255) {
                     E_ERROR("tmat[%d][%d][%d] = %d\n",
                             i, src, dst, tmat->tp[i][src][dst]);
                     return -1;
@@ -241,9 +242,9 @@
         || (bio_fread(&i, sizeof(int32), 1, fp, byteswap, &chksum) != 1)) {
         E_FATAL("bio_fread(%s) (arraysize) failed\n", file_name);
     }
-    if (t->n_tmat >= MAX_INT32) /* Comparison is always false... */
+    if (t->n_tmat >= MAX_INT16) /* Comparison is always false... */
         E_FATAL("%s: #tmat (%d) exceeds limit (%d)\n", file_name,
-                t->n_tmat, MAX_INT32);
+                t->n_tmat, MAX_INT16);
     if (n_dst != n_src + 1)
         E_FATAL("%s: #from-states(%d) != #to-states(%d)-1\n", file_name,
                 n_src, n_dst);
@@ -256,11 +257,10 @@
     }
 
     /* Allocate memory for tmat data */
-    t->tp =
-        (int32 ***) ckd_calloc_3d(t->n_tmat, n_src, n_dst, sizeof(int32));
+    t->tp = ckd_calloc_3d(t->n_tmat, n_src, n_dst, sizeof(***t->tp));
 
     /* Temporary structure to read in the float data */
-    tp = (float32 **) ckd_calloc_2d(n_src, n_dst, sizeof(float32));
+    tp = ckd_calloc_2d(n_src, n_dst, sizeof(**tp));
 
     /* Read transition matrices, normalize and floor them, and convert to log domain */
     tp_per_tmat = n_src * n_dst;
@@ -280,16 +280,20 @@
 
             /* Convert to logs3. */
             for (k = 0; k < n_dst; k++) {
+                int ltp;
                 /* For these ones, we floor them even if they are
                  * zero, otherwise HMM evaluation goes nuts. */
                 if (k >= j && k-j < 3 && tp[j][k] == 0.0f)
                     tp[j][k] = tpfloor;
-                t->tp[i][j][k] = logmath_log(lmath, tp[j][k]);
+                /* Log and quantize them. */
+                ltp = -logmath_log(lmath, tp[j][k]) >> SENSCR_SHIFT;
+                if (ltp > 255) ltp = 255;
+                t->tp[i][j][k] = (uint8)ltp;
             }
         }
     }
 
-    ckd_free_2d((void **) tp);
+    ckd_free_2d(tp);
 
     if (chksum_present)
         bio_verify_chksum(fp, byteswap, chksum);
@@ -299,7 +303,6 @@
 
     fclose(fp);
 
-
     if (tmat_chk_uppertri(t, lmath) < 0)
         E_FATAL("Tmat not upper triangular\n");
     if (tmat_chk_1skip(t, lmath) < 0)
@@ -326,7 +329,7 @@
 {
     if (t) {
         if (t->tp)
-            ckd_free_3d((void ***) t->tp);
-        ckd_free((void *) t);
+            ckd_free_3d(t->tp);
+        ckd_free(t);
     }
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/tmat.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tmat.h	2008-09-03 17:52:58 UTC (rev 8747)
+++ trunk/pocketsphinx/src/libpocketsphinx/tmat.h	2008-09-03 18:16:25 UTC (rev 8748)
@@ -107,10 +107,10 @@
  * topology.
  */
 typedef struct {
-    int32 ***tp;	/**< The transition matrices; int32 since probs in logs3 domain:
+    uint8 ***tp;	/**< The transition matrices; kept in the same scale as acoustic scores;
 			   tp[tmatid][from-state][to-state] */
-    int32 n_tmat;	/**< Number matrices */
-    int32 n_state;	/**< Number source states in matrix (only the emitting states);
+    int16 n_tmat;	/**< Number matrices */
+    int16 n_state;	/**< Number source states in matrix (only the emitting states);
 			   Number destination states = n_state+1, it includes the exit state */
 } tmat_t;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8749
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8749&view=rev
Author:   dhdfu
Date:     2008-09-03 19:02:45 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
More bit trimming, this one seems to make a noticeable difference.

32767 senone sequences is not enough, but 65534 should be just fine
(the wsj_all 15000 senone model has about 42000 of them).

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
    trunk/pocketsphinx/src/libpocketsphinx/hmm.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.h
    trunk/pocketsphinx/src/libpocketsphinx/mdef.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-03 19:02:45 UTC (rev 8749)
@@ -693,7 +693,7 @@
 }
 
 #define MPX_BITVEC_SET(a,h,i)                                           \
-    if ((h)->s.mpx_ssid[i] != -1)                                       \
+    if ((h)->s.mpx_ssid[i] != BAD_SSID)                                 \
         bitvec_set((a)->senone_active_vec,                              \
                    bin_mdef_sseq2sen((a)->mdef, (h)->s.mpx_ssid[i], (i)));
 #define NONMPX_BITVEC_SET(a,h,i)                                        \

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2008-09-03 19:02:45 UTC (rev 8749)
@@ -73,6 +73,21 @@
     if ((mdef = mdef_init((char *) filename, TRUE)) == NULL)
         return NULL;
 
+    /* Enforce some limits.  */
+    if (mdef->n_sen > BAD_SENID) {
+        E_ERROR("Number of senones exceeds limit: %d > %d\n",
+                mdef->n_sen, BAD_SENID);
+        mdef_free(mdef);
+        return NULL;
+    }
+    if (mdef->n_sseq > BAD_SSID) {
+        E_ERROR("Number of senone sequences exceeds limit: %d > %d\n",
+                mdef->n_sseq, BAD_SSID);
+        mdef_free(mdef);
+        return NULL;
+    }
+
+
     bmdef = ckd_calloc(1, sizeof(*bmdef));
 
     /* Easy stuff.  The mdef.c code has done the heavy lifting for us. */
@@ -422,7 +437,7 @@
     if (swap)
         SWAP_INT32(sseq_size);
     m->sseq = ckd_calloc(m->n_sseq, sizeof(*m->sseq));
-    m->sseq[0] = (int16 *) (sseq_size + 1);
+    m->sseq[0] = (uint16 *) (sseq_size + 1);
     if (swap) {
         for (i = 0; i < *sseq_size; ++i)
             SWAP_INT16(m->sseq[0] + i);

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2008-09-03 19:02:45 UTC (rev 8749)
@@ -90,6 +90,15 @@
 } ATTRIBUTE_PACKED;
 
 /**
+ * Invalid senone sequence ID (limited to 16 bits for PocketSphinx).
+ */
+#define BAD_SSID 0xffff
+/**
+ * Invalid senone ID (limited to 16 bits for PocketSphinx).
+ */
+#define BAD_SENID 0xffff
+
+/**
  * Node in CD phone tree (on-disk, 8 bytes).
  */
 typedef struct cd_tree_s cd_tree_t;
@@ -122,8 +131,8 @@
 	char **ciname;       /**< CI phone names */
 	cd_tree_t *cd_tree;  /**< Tree mapping CD phones to phone IDs */
 	mdef_entry_t *phone; /**< All phone structures */
-	int16 **sseq;        /**< Unique senone sequences (2D array built at load time) */
-	int8 *sseq_len;      /**< Number of states in each sseq (NULL for homogeneous) */
+	uint16 **sseq;       /**< Unique senone sequences (2D array built at load time) */
+	uint8 *sseq_len;     /**< Number of states in each sseq (NULL for homogeneous) */
 
 	/* These two are not stored on disk, but are generated at load time. */
 	int16 *cd2cisen;	/**< Parent CI-senone id for each senone */

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-03 19:02:45 UTC (rev 8749)
@@ -56,7 +56,7 @@
 hmm_context_init(int32 n_emit_state,
 		 uint8 ** const *tp,
 		 int16 const *senscore,
-		 int16 * const *sseq)
+		 uint16 * const *sseq)
 {
     hmm_context_t *ctx;
 
@@ -72,7 +72,7 @@
     ctx->senscore = senscore;
     ctx->sseq = sseq;
     ctx->st_sen_scr = ckd_calloc(n_emit_state, sizeof(*ctx->st_sen_scr));
-    ctx->mpx_ssid_alloc = listelem_alloc_init(sizeof(int32) * ctx->n_emit_state);
+    ctx->mpx_ssid_alloc = listelem_alloc_init(sizeof(int16) * ctx->n_emit_state);
 
     return ctx;
 }
@@ -88,15 +88,15 @@
 void
 hmm_init(hmm_context_t *ctx, hmm_t *hmm, int mpx, int ssid, int tmatid)
 {
-    /* Watch for integer overflows in ssids (shouldn't happen anymore) */
-    assert(ssid >= -1);
     hmm->ctx = ctx;
     hmm->mpx = mpx;
     hmm->n_emit_state = ctx->n_emit_state;
     if (mpx) {
+        int i;
         hmm->s.mpx_ssid = listelem_malloc(ctx->mpx_ssid_alloc);
-        memset(hmm->s.mpx_ssid, -1, sizeof(*hmm->s.mpx_ssid) * hmm_n_emit_state(hmm));
         hmm->s.mpx_ssid[0] = ssid;
+        for (i = 1; i < hmm_n_emit_state(hmm); ++i)
+            hmm->s.mpx_ssid[i] = BAD_SSID;
     }
     else {
         hmm->s.ssid = ssid;
@@ -229,7 +229,7 @@
     int16 const *senscore = hmm->ctx->senscore;
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     /* Cache problem here! */
-    int16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
+    uint16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
     int32 s5, s4, s3, s2, s1, s0, t2, t1, t0, bestScore;
 
     /* It was the best of scores, it was the worst of scores. */
@@ -362,19 +362,19 @@
 {
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     int16 const *senscore = hmm->ctx->senscore;
-    int16 * const *sseq = hmm->ctx->sseq;
-    int32 *ssid = hmm->s.mpx_ssid;
+    uint16 * const *sseq = hmm->ctx->sseq;
+    uint16 *ssid = hmm->s.mpx_ssid;
     int32 bestScore;
     int32 s5, s4, s3, s2, s1, s0, t2, t1, t0;
 
     /* Don't propagate WORST_SCORE */
-    if (ssid[4] == -1)
+    if (ssid[4] == BAD_SSID)
         s4 = t1 = WORST_SCORE;
     else {
         s4 = hmm_score(hmm, 4) + mpx_senscr(4);
         t1 = s4 + hmm_tprob_5st(4, 5);
     }
-    if (ssid[3] == -1)
+    if (ssid[3] == BAD_SSID)
         s3 = t2 = WORST_SCORE;
     else {
         s3 = hmm_score(hmm, 3) + mpx_senscr(3);
@@ -393,7 +393,7 @@
     bestScore = s5;
 
     /* Don't propagate WORST_SCORE */
-    if (ssid[2] == -1)
+    if (ssid[2] == BAD_SSID)
         s2 = t2 = WORST_SCORE;
     else {
         s2 = hmm_score(hmm, 2) + mpx_senscr(2);
@@ -432,7 +432,7 @@
     hmm_score(hmm, 4) = s4;
 
     /* Don't propagate WORST_SCORE */
-    if (ssid[1] == -1)
+    if (ssid[1] == BAD_SSID)
         s1 = t2 = WORST_SCORE;
     else {
         s1 = hmm_score(hmm, 1) + mpx_senscr(1);
@@ -536,7 +536,7 @@
 {
     int16 const *senscore = hmm->ctx->senscore;
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
-    int16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
+    uint16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
     int32 s3, s2, s1, s0, t2, t1, t0, bestScore;
 
     s2 = hmm_score(hmm, 2) + nonmpx_senscr(2);
@@ -616,20 +616,20 @@
 {
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     int16 const *senscore = hmm->ctx->senscore;
-    int16 * const *sseq = hmm->ctx->sseq;
-    int32 *ssid = hmm->s.mpx_ssid;
+    uint16 * const *sseq = hmm->ctx->sseq;
+    uint16 *ssid = hmm->s.mpx_ssid;
     int32 bestScore;
     int32 s3, s2, s1, s0, t2, t1, t0;
 
     /* Don't propagate WORST_SCORE */
     t2 = INT_MIN; /* Not used unless skipstate is true */
-    if (ssid[2] == -1)
+    if (ssid[2] == BAD_SSID)
         s2 = t1 = WORST_SCORE;
     else {
         s2 = hmm_score(hmm, 2) + mpx_senscr(2);
         t1 = s2 + hmm_tprob_3st(2, 3);
     }
-    if (ssid[1] == -1)
+    if (ssid[1] == BAD_SSID)
         s1 = WORST_SCORE;
     else {
         s1 = hmm_score(hmm, 1) + mpx_senscr(1);

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-03 19:02:45 UTC (rev 8749)
@@ -49,6 +49,9 @@
 #include <fixpoint.h>
 #include <listelem_alloc.h>
 
+/* PocketSphinx headers. */
+#include <bin_mdef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -129,7 +132,7 @@
     uint8 ** const *tp;	    /**< State transition scores tp[id][from][to] (logs3 values). */
     int16 const *senscore;  /**< State emission scores senscore[senid]
                                (negated scaled logs3 values). */
-    int16 * const *sseq;    /**< Senone sequence mapping. */
+    uint16 * const *sseq;   /**< Senone sequence mapping. */
     int32 *st_sen_scr;      /**< Temporary array of senone scores (for some topologies). */
     listelem_alloc_t *mpx_ssid_alloc; /**< Allocator for senone sequence ID arrays. */
     void *udata;            /**< Whatever you feel like, gosh. */
@@ -155,8 +158,8 @@
     int32 out_score;               /**< Score for non-emitting exit state. */
     int32 out_history;             /**< History index for non-emitting exit state. */
     union {
-        int32 *mpx_ssid; /**< Senone sequence IDs for each state (for multiplex HMMs). */
-        int32 ssid;      /**< Senone sequence ID. */
+        uint16 *mpx_ssid; /**< Senone sequence IDs for each state (for multiplex HMMs). */
+        uint16 ssid;      /**< Senone sequence ID. */
     } s;
     int32 bestscore;	/**< Best [emitting] state score in current frame (for pruning). */
     int16 tmatid;       /**< Transition matrix ID (see hmm_context_t). */
@@ -183,9 +186,9 @@
 #define hmm_nonmpx_ssid(h) (h)->s.ssid
 #define hmm_ssid(h,st) (hmm_is_mpx(h)                           \
                         ? hmm_mpx_ssid(h,st) : (h)->s.ssid)
-#define hmm_senid(h,st) (hmm_ssid(h,st) == -1                           \
-                         ? -1 : (h)->ctx->sseq[hmm_ssid(h,st)][st])
-#define hmm_senscr(h,st) (hmm_ssid(h,st) == -1                          \
+#define hmm_senid(h,st) (hmm_ssid(h,st) == BAD_SSID                     \
+                         ? BAD_SENID : (h)->ctx->sseq[hmm_ssid(h,st)][st])
+#define hmm_senscr(h,st) (hmm_ssid(h,st) == BAD_SSID                    \
                           ? WORST_SCORE                                 \
                           : -(h)->ctx->senscore[hmm_senid(h,st)] << SENSCR_SHIFT)
 #define hmm_tmatid(h) (h)->tmatid
@@ -199,7 +202,7 @@
 hmm_context_t *hmm_context_init(int32 n_emit_state,
                                 uint8 ** const *tp,
                                 int16 const *senscore,
-                                int16 * const *sseq);
+                                uint16 * const *sseq);
 
 /**
  * Change the senone score array for a context.

Modified: trunk/pocketsphinx/src/libpocketsphinx/mdef.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/mdef.h	2008-09-03 18:16:25 UTC (rev 8748)
+++ trunk/pocketsphinx/src/libpocketsphinx/mdef.h	2008-09-03 19:02:45 UTC (rev 8749)
@@ -147,7 +147,7 @@
     hash_table_t *ciphone_ht;	/**< Hash table for mapping ciphone strings to ids */
     ciphone_t *ciphone;		/**< CI-phone information for all ciphones */
     phone_t *phone;		/**< Information for all ciphones and triphones */
-    int16 **sseq;		/**< Unique state (or senone) sequences in this model, shared
+    uint16 **sseq;		/**< Unique state (or senone) sequences in this model, shared
                                    among all phones/triphones */
     int32 n_sseq;		/**< No. of unique senone sequences in this model */
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8751
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8751&view=rev
Author:   dhdfu
Date:     2008-09-05 02:55:23 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Mostly switch over to using BETTER_THAN and WORSE_THAN when comparing acoustic and Viterbi scores

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/fsg_history.c
    trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
    trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_history.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_history.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_history.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -169,7 +169,7 @@
     for (gn = h->frame_entries[s][lc]; gn; gn = gnode_next(gn)) {
         entry = (fsg_hist_entry_t *) gnode_ptr(gn);
 
-        if (entry->score < score)
+        if (score BETTER_THAN entry->score)
             break;              /* Found where to insert new entry */
 
         /* Existing entry score not worse than new score */

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -443,7 +443,7 @@
         hmm_dump(hmm, stdout);
 #endif
 
-        if (bestscore < score)
+        if (score BETTER_THAN bestscore)
             bestscore = score;
     }
 
@@ -503,7 +503,8 @@
          child; child = fsg_pnode_sibling(child)) {
         newscore = hmm_out_score(hmm) + child->logs2prob;
 
-        if ((newscore >= thresh) && (newscore > hmm_in_score(&child->hmm))) {
+        if ((newscore BETTER_THAN thresh)
+            && (newscore BETTER_THAN hmm_in_score(&child->hmm))) {
             /* Incoming score > pruning threshold and > target's existing score */
             if (hmm_frame(&child->hmm) < nf) {
                 /* Child node not yet activated; do so */
@@ -729,8 +730,8 @@
                  */
                 newscore = score + root->logs2prob;
 
-                if ((newscore >= thresh)
-                    && (newscore > hmm_in_score(&root->hmm))) {
+                if ((newscore BETTER_THAN thresh)
+                    && (newscore BETTER_THAN hmm_in_score(&root->hmm))) {
                     if (hmm_frame(&root->hmm) < nf) {
                         /* Newly activated node; add to active list */
                         fsgs->pnode_active_next =
@@ -984,7 +985,7 @@
         fl = fsg_hist_entry_fsglink(hist_entry);
         score = fsg_hist_entry_score(hist_entry);
 
-        if (score > bestscore) {
+        if (score BETTER_THAN bestscore) {
             /* Only enforce the final state constraint if this is a final hypothesis. */
             if ((!final)
                 || fsg_link_to_state(fl) == fsg_model_final_state(fsg)) {
@@ -1249,7 +1250,7 @@
         if (node->fef == -1 || node->fef > ef)
             node->fef = ef;
         /* Update best link score. */
-        if (node->info.best_exit < ascr)
+        if (ascr BETTER_THAN node->info.best_exit)
             node->info.best_exit = ascr;
     }
     else {

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -345,7 +345,7 @@
 
     _bp_ = ngs->word_lat_idx[w];
     if (_bp_ != NO_BP) {
-        if (ngs->bp_table[_bp_].score < score) {
+        if (ngs->bp_table[_bp_].score WORSE_THAN score) {
             if (ngs->bp_table[_bp_].bp != path) {
                 ngs->bp_table[_bp_].bp = path;
                 cache_bptable_paths(ngs, _bp_);
@@ -420,7 +420,6 @@
         frame_idx = ngs->n_frame - 1;
     end_bpidx = ngs->bp_table_idx[frame_idx];
 
-    /* FIXME: WORST_SCORE has to go away and be replaced with a log-zero number. */
     best_score = WORST_SCORE;
     best_exit = NO_BP;
 
@@ -435,7 +434,7 @@
     assert(end_bpidx < ngs->bp_table_size);
     for (bp = ngs->bp_table_idx[frame_idx]; bp < end_bpidx; ++bp) {
         if (ngs->bp_table[bp].wid == ps_search_finish_wid(ngs)
-            || ngs->bp_table[bp].score > best_score) {
+            || ngs->bp_table[bp].score BETTER_THAN best_score) {
             best_score = ngs->bp_table[bp].score;
             best_exit = bp;
         }
@@ -990,7 +989,7 @@
                                &n_used);
         l_scr = l_scr * lwf;
 
-        if (ngs->bp_table[bp].score + l_scr > bestscore) {
+        if (ngs->bp_table[bp].score + l_scr BETTER_THAN bestscore) {
             bestscore = ngs->bp_table[bp].score + l_scr;
             bestbp = bp;
         }
@@ -1093,7 +1092,7 @@
             score =
                 (ngs->bscore_stack[bp_ptr->s_idx + bss_offset] - bp_ptr->score) +
                 bp_ptr->ascr;
-            if (score > 0) {
+            if (score BETTER_THAN 0) {
                 /* Scores must be negative, or Bad Things will happen.
                    In general, they are, except in corner cases
                    involving filler words.  We don't want to throw any
@@ -1102,7 +1101,7 @@
                 ps_lattice_link(dag, from, to, -424242, bp_ptr->frame);
                 from->reachable = TRUE;
             }
-            else if (score > WORST_SCORE) {
+            else if (score BETTER_THAN WORST_SCORE) {
                 ps_lattice_link(dag, from, to, score, bp_ptr->frame);
                 from->reachable = TRUE;
             }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -382,7 +382,7 @@
         rhmm = (root_chan_t *) ngs->word_chan[w];
         if (hmm_frame(&rhmm->hmm) == frame_idx) {
             int32 score = chan_v_eval(rhmm);
-            if ((bestscore < score) && (w != ps_search_finish_wid(ngs)))
+            if ((score BETTER_THAN bestscore) && (w != ps_search_finish_wid(ngs)))
                 bestscore = score;
             ngs->st.n_fwdflat_chan++;
         }
@@ -390,7 +390,7 @@
         for (hmm = rhmm->next; hmm; hmm = hmm->next) {
             if (hmm_frame(&hmm->hmm) == frame_idx) {
                 int32 score = chan_v_eval(hmm);
-                if (bestscore < score)
+                if (score BETTER_THAN bestscore)
                     bestscore = score;
                 ngs->st.n_fwdflat_chan++;
             }
@@ -426,7 +426,7 @@
         rhmm = (root_chan_t *) ngs->word_chan[w];
         /* Propagate active root channels */
         if (hmm_frame(&rhmm->hmm) == cf
-            && hmm_bestscore(&rhmm->hmm) > thresh) {
+            && hmm_bestscore(&rhmm->hmm) BETTER_THAN thresh) {
             hmm_frame(&rhmm->hmm) = nf;
             bitvec_set(ngs->word_active, w);
 
@@ -436,13 +436,13 @@
                 assert(de->len > 1);
 
                 newscore += pip;
-                if (newscore > thresh) {
+                if (newscore BETTER_THAN thresh) {
                     hmm = rhmm->next;
                     /* Enter all right context phones */
                     if (hmm->info.rc_id >= 0) {
                         for (; hmm; hmm = hmm->next) {
                             if ((hmm_frame(&hmm->hmm) < cf)
-                                || (hmm_in_score(&hmm->hmm) < newscore)) {
+                                || (newscore BETTER_THAN hmm_in_score(&hmm->hmm))) {
                                 hmm_enter(&hmm->hmm, newscore,
                                           hmm_out_history(&rhmm->hmm), nf);
                             }
@@ -451,7 +451,7 @@
                     /* Just a normal word internal phone */
                     else {
                         if ((hmm_frame(&hmm->hmm) < cf)
-                            || (hmm_in_score(&hmm->hmm) < newscore)) {
+                            || (newscore BETTER_THAN hmm_in_score(&hmm->hmm))) {
                                 hmm_enter(&hmm->hmm, newscore,
                                           hmm_out_history(&rhmm->hmm), nf);
                         }
@@ -463,7 +463,7 @@
 
                 /* Word exit for single-phone words (where did their
                  * whmms come from?) */
-                if (newscore > wordthresh) {
+                if (newscore BETTER_THAN wordthresh) {
                     ngram_search_save_bp(ngs, cf, w, newscore,
                                          hmm_out_history(&rhmm->hmm), 0);
                 }
@@ -474,7 +474,7 @@
         for (hmm = rhmm->next; hmm; hmm = hmm->next) {
             if (hmm_frame(&hmm->hmm) >= cf) {
                 /* Propagate forward HMMs inside the beam. */
-                if (hmm_bestscore(&hmm->hmm) > thresh) {
+                if (hmm_bestscore(&hmm->hmm) BETTER_THAN thresh) {
                     hmm_frame(&hmm->hmm) = nf;
                     bitvec_set(ngs->word_active, w);
 
@@ -482,14 +482,14 @@
                     /* Word-internal phones */
                     if (hmm->info.rc_id < 0) {
                         newscore += pip;
-                        if (newscore > thresh) {
+                        if (newscore BETTER_THAN thresh) {
                             nexthmm = hmm->next;
                             /* Enter all right-context phones. */
                             if (nexthmm->info.rc_id >= 0) {
                                 for (; nexthmm; nexthmm = nexthmm->next) {
                                     if ((hmm_frame(&nexthmm->hmm) < cf)
-                                        || (hmm_in_score(&nexthmm->hmm)
-                                            < newscore)) {
+                                        || (newscore BETTER_THAN
+                                            hmm_in_score(&nexthmm->hmm))) {
                                         hmm_enter(&nexthmm->hmm,
                                                   newscore,
                                                   hmm_out_history(&hmm->hmm),
@@ -500,8 +500,8 @@
                             /* Enter single word-internal phone. */
                             else {
                                 if ((hmm_frame(&nexthmm->hmm) < cf)
-                                    || (hmm_in_score(&nexthmm->hmm)
-                                        < newscore)) {
+                                    || (newscore BETTER_THAN
+                                        hmm_in_score(&nexthmm->hmm))) {
                                     hmm_enter(&nexthmm->hmm, newscore,
                                               hmm_out_history(&hmm->hmm), nf);
                                 }
@@ -510,7 +510,7 @@
                     }
                     /* Right-context phones - apply word beam and exit. */
                     else {
-                        if (newscore > wordthresh) {
+                        if (newscore BETTER_THAN wordthresh) {
                             ngram_search_save_bp(ngs, cf, w, newscore,
                                                  hmm_out_history(&hmm->hmm),
                                                  hmm->info.rc_id);
@@ -612,10 +612,10 @@
             newscore += pip;
 
             /* Enter the next word */
-            if (newscore > thresh) {
+            if (newscore BETTER_THAN thresh) {
                 rhmm = (root_chan_t *) ngs->word_chan[w];
                 if ((hmm_frame(&rhmm->hmm) < cf)
-                    || (hmm_in_score(&rhmm->hmm) < newscore)) {
+                    || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                     hmm_enter(&rhmm->hmm, newscore, b, nf);
                     if (hmm_is_mpx(&rhmm->hmm)) {
                         rhmm->hmm.s.mpx_ssid[0] =
@@ -629,7 +629,7 @@
         }
 
         /* Get the best exit into silence. */
-        if (best_silrc_score < rcss[rcpermtab[ps_search_acmod(ngs)->mdef->sil]]) {
+        if (rcss[rcpermtab[ps_search_acmod(ngs)->mdef->sil]] BETTER_THAN best_silrc_score) {
             best_silrc_score = rcss[rcpermtab[ps_search_acmod(ngs)->mdef->sil]];
             best_silrc_bp = b;
         }
@@ -637,11 +637,11 @@
 
     /* Transition to <sil> */
     newscore = best_silrc_score + ngs->silpen + pip;
-    if ((newscore > thresh) && (newscore > WORST_SCORE)) {
+    if ((newscore BETTER_THAN thresh) && (newscore BETTER_THAN WORST_SCORE)) {
         w = ps_search_silence_wid(ngs);
         rhmm = (root_chan_t *) ngs->word_chan[w];
         if ((hmm_frame(&rhmm->hmm) < cf)
-            || (hmm_in_score(&rhmm->hmm) < newscore)) {
+            || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
             hmm_enter(&rhmm->hmm, newscore,
                       best_silrc_bp, nf);
             bitvec_set(ngs->word_active, w);
@@ -649,14 +649,14 @@
     }
     /* Transition to noise words */
     newscore = best_silrc_score + ngs->fillpen + pip;
-    if ((newscore > thresh) && (newscore > WORST_SCORE)) {
+    if ((newscore BETTER_THAN thresh) && (newscore BETTER_THAN WORST_SCORE)) {
         for (w = ps_search_silence_wid(ngs) + 1; w < ps_search_n_words(ngs); w++) {
             rhmm = (root_chan_t *) ngs->word_chan[w];
             /* Noise words that aren't a single phone will have NULL here. */
             if (rhmm == NULL)
                 continue;
             if ((hmm_frame(&rhmm->hmm) < cf)
-                || (hmm_in_score(&rhmm->hmm) < newscore)) {
+                || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                 hmm_enter(&rhmm->hmm, newscore,
                           best_silrc_bp, nf);
                 bitvec_set(ngs->word_active, w);
@@ -726,7 +726,7 @@
     ngram_search_mark_bptable(ngs, frame_idx);
 
     /* Renormalize if necessary (FIXME: Make sure to test this) */
-    if (ngs->best_score + (2 * ngs->beam) < WORST_SCORE) {
+    if (ngs->best_score + (2 * ngs->beam) WORSE_THAN WORST_SCORE) {
         E_INFO("Renormalizing Scores at frame %d, best score %d\n",
                frame_idx, ngs->best_score);
         fwdflat_renormalize_scores(ngs, frame_idx, ngs->best_score);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -574,7 +574,7 @@
     for (i = ngs->n_root_chan, rhmm = ngs->root_chan; i > 0; --i, rhmm++) {
         if (hmm_frame(&rhmm->hmm) == frame_idx) {
             int32 score = chan_v_eval(rhmm);
-            if (bestscore < score)
+            if (score BETTER_THAN bestscore)
                 bestscore = score;
             ++ngs->st.n_root_chan_eval;
         }
@@ -596,7 +596,7 @@
     for (hmm = *(acl++); i > 0; --i, hmm = *(acl++)) {
         int32 score = chan_v_eval(hmm);
         assert(hmm_frame(&hmm->hmm) == frame_idx);
-        if (bestscore < score)
+        if (score BETTER_THAN bestscore)
             bestscore = score;
     }
 
@@ -627,7 +627,7 @@
             score = chan_v_eval(hmm);
             /*printf("eval word chan %d score %d\n", w, score); */
 
-            if (bestscore < score)
+            if (score BETTER_THAN bestscore)
                 bestscore = score;
 
             k++;
@@ -646,7 +646,7 @@
 
         score = chan_v_eval(rhmm);
         /* printf("eval 1ph word chan %d score %d\n", w, score); */
-        if (bestscore < score && w != ps_search_finish_wid(ngs))
+        if (score BETTER_THAN bestscore && w != ps_search_finish_wid(ngs))
             bestscore = score;
 
         j++;
@@ -667,9 +667,9 @@
 
     hmm_context_set_senscore(ngs->hmmctx, senone_scores);
     ngs->best_score = eval_root_chan(ngs, frame_idx);
-    if ((bs = eval_nonroot_chan(ngs, frame_idx)) > ngs->best_score)
+    if ((bs = eval_nonroot_chan(ngs, frame_idx)) BETTER_THAN ngs->best_score)
         ngs->best_score = bs;
-    if ((bs = eval_word_chan(ngs, frame_idx)) > ngs->best_score)
+    if ((bs = eval_word_chan(ngs, frame_idx)) BETTER_THAN ngs->best_score)
         ngs->best_score = bs;
     ngs->last_phone_best_score = bs;
 
@@ -709,17 +709,16 @@
         if (hmm_frame(&rhmm->hmm) < frame_idx)
             continue;
 
-        if (hmm_bestscore(&rhmm->hmm) > thresh) {
+        if (hmm_bestscore(&rhmm->hmm) BETTER_THAN thresh) {
             hmm_frame(&rhmm->hmm) = nf;  /* rhmm will be active in next frame */
 
             /* transitions out of this root channel */
             newphone_score = hmm_out_score(&rhmm->hmm) + ngs->pip;
-            if (newphone_score > newphone_thresh) {
+            if (newphone_score BETTER_THAN newphone_thresh) {
                 /* transition to all next-level channels in the HMM tree */
                 for (hmm = rhmm->next; hmm; hmm = hmm->alt) {
                     if ((hmm_frame(&hmm->hmm) < frame_idx)
-                        || (hmm_in_score(&hmm->hmm)
-                            < newphone_score)) {
+                        || (newphone_score BETTER_THAN hmm_in_score(&hmm->hmm))) {
                         hmm_enter(&hmm->hmm, newphone_score,
                                   hmm_out_history(&rhmm->hmm), nf);
                         *(nacl++) = hmm;
@@ -731,7 +730,7 @@
                  * penultimate phone (the last phones may need multiple right contexts).
                  * Remember to remove the temporary newword_penalty.
                  */
-                if (newphone_score > lastphn_thresh) {
+                if (newphone_score BETTER_THAN lastphn_thresh) {
                     for (w = rhmm->penult_phn_wid; w >= 0;
                          w = ngs->homophone_set[w]) {
                         de = ps_search_dict(ngs)->dict_list[w];
@@ -782,7 +781,7 @@
          --i, hmm = *(acl++)) {
         assert(hmm_frame(&hmm->hmm) >= frame_idx);
 
-        if (hmm_bestscore(&hmm->hmm) > thresh) {
+        if (hmm_bestscore(&hmm->hmm) BETTER_THAN thresh) {
             /* retain this channel in next frame */
             if (hmm_frame(&hmm->hmm) != nf) {
                 hmm_frame(&hmm->hmm) = nf;
@@ -791,11 +790,11 @@
 
             /* transitions out of this channel */
             newphone_score = hmm_out_score(&hmm->hmm) + ngs->pip;
-            if (newphone_score > newphone_thresh) {
+            if (newphone_score BETTER_THAN newphone_thresh) {
                 /* transition to all next-level channel in the HMM tree */
                 for (nexthmm = hmm->next; nexthmm; nexthmm = nexthmm->alt) {
                     if ((hmm_frame(&nexthmm->hmm) < frame_idx)
-                        || (hmm_in_score(&nexthmm->hmm) < newphone_score)) {
+                        || (newphone_score BETTER_THAN hmm_in_score(&nexthmm->hmm))) {
                         if (hmm_frame(&nexthmm->hmm) != nf) {
                             /* Keep this HMM on the active list */
                             *(nacl++) = nexthmm;
@@ -810,7 +809,7 @@
                  * penultimate phone (the last phones may need multiple right contexts).
                  * Remember to remove the temporary newword_penalty.
                  */
-                if (newphone_score > lastphn_thresh) {
+                if (newphone_score BETTER_THAN lastphn_thresh) {
                     for (w = hmm->info.penult_phn_wid; w >= 0;
                          w = ngs->homophone_set[w]) {
                         de = ps_search_dict(ngs)->dict_list[w];
@@ -943,7 +942,7 @@
                 dscr += ngram_tg_score(ngs->lmset, de->wid, bpe->real_wid,
                                        bpe->prev_real_wid, &n_used);
 
-                if (ngs->last_ltrans[candp->wid].dscr < dscr) {
+                if (dscr BETTER_THAN ngs->last_ltrans[candp->wid].dscr) {
                     ngs->last_ltrans[candp->wid].dscr = dscr;
                     ngs->last_ltrans[candp->wid].bp = bp;
                 }
@@ -957,7 +956,7 @@
         candp->score += ngs->last_ltrans[candp->wid].dscr;
         candp->bp = ngs->last_ltrans[candp->wid].bp;
 
-        if (bestscore < candp->score)
+        if (candp->score BETTER_THAN bestscore)
             bestscore = candp->score;
     }
     ngs->last_phone_best_score = bestscore;
@@ -965,7 +964,7 @@
     /* At this pt, we know the best entry score (with LM component) for all candidates */
     thresh = bestscore + ngs->lponlybeam;
     for (i = ngs->n_lastphn_cand, candp = ngs->lastphn_cand; i > 0; --i, candp++) {
-        if (candp->score > thresh) {
+        if (candp->score BETTER_THAN thresh) {
             w = candp->wid;
 
             ngram_search_alloc_all_rc(ngs, w);
@@ -973,7 +972,7 @@
             k = 0;
             for (hmm = ngs->word_chan[w]; hmm; hmm = hmm->next) {
                 if ((hmm_frame(&hmm->hmm) < frame_idx)
-                    || (hmm_in_score(&hmm->hmm) < candp->score)) {
+                    || (candp->score BETTER_THAN hmm_in_score(&hmm->hmm))) {
                     assert(hmm_frame(&hmm->hmm) != nf);
                     hmm_enter(&hmm->hmm,
                               candp->score, candp->bp, nf);
@@ -1028,14 +1027,14 @@
             assert(hmm_frame(&hmm->hmm) >= frame_idx);
 
             thmm = hmm->next;
-            if (hmm_bestscore(&hmm->hmm) > lastphn_thresh) {
+            if (hmm_bestscore(&hmm->hmm) BETTER_THAN lastphn_thresh) {
                 /* retain this channel in next frame */
                 hmm_frame(&hmm->hmm) = nf;
                 k++;
                 phmmp = &(hmm->next);
 
                 /* Could if ((! skip_alt_frm) || (frame_idx & 0x1)) the following */
-                if (hmm_out_score(&hmm->hmm) > newword_thresh) {
+                if (hmm_out_score(&hmm->hmm) BETTER_THAN newword_thresh) {
                     /* can exit channel and recognize word */
                     ngram_search_save_bp(ngs, frame_idx, w,
                                  hmm_out_score(&hmm->hmm),
@@ -1069,11 +1068,11 @@
         rhmm = (root_chan_t *) ngs->word_chan[w];
         if (hmm_frame(&rhmm->hmm) < frame_idx)
             continue;
-        if (hmm_bestscore(&rhmm->hmm) > lastphn_thresh) {
+        if (hmm_bestscore(&rhmm->hmm) BETTER_THAN lastphn_thresh) {
             hmm_frame(&rhmm->hmm) = nf;
 
             /* Could if ((! skip_alt_frm) || (frame_idx & 0x1)) the following */
-            if (hmm_out_score(&rhmm->hmm) > newword_thresh) {
+            if (hmm_out_score(&rhmm->hmm) BETTER_THAN newword_thresh) {
                 ngram_search_save_bp(ngs, frame_idx, w,
                              hmm_out_score(&rhmm->hmm),
                              hmm_out_history(&rhmm->hmm), 0);
@@ -1159,7 +1158,7 @@
         bpe = &(ngs->bp_table[bp]);
         /* FIXME: Not the ideal way to tell if this is a filler word. */
         if (ISA_FILLER_WORD(ngs, bpe->wid)) {
-            if (bpe->score > bestscr) {
+            if (bpe->score BETTER_THAN bestscr) {
                 bestscr = bpe->score;
                 bestbpe = bpe;
             }
@@ -1182,7 +1181,7 @@
         worstbpe = NULL;
         for (bp = ngs->bp_table_idx[frame_idx]; (bp < ngs->bpidx); bp++) {
             bpe = &(ngs->bp_table[bp]);
-            if (bpe->valid && (bpe->score < worstscr)) {
+            if (bpe->valid && (bpe->score WORSE_THAN worstscr)) {
                 worstscr = bpe->score;
                 worstbpe = bpe;
             }
@@ -1234,7 +1233,7 @@
 
         rcss = &(ngs->bscore_stack[bpe->s_idx]);
         for (rc = bin_mdef_n_ciphone(ps_search_acmod(ngs)->mdef) - 1; rc >= 0; --rc) {
-            if (rcss[rcpermtab[rc]] > ngs->bestbp_rc[rc].score) {
+            if (rcss[rcpermtab[rc]] BETTER_THAN ngs->bestbp_rc[rc].score) {
                 ngs->bestbp_rc[rc].score = rcss[rcpermtab[rc]];
                 ngs->bestbp_rc[rc].path = bp;
                 ngs->bestbp_rc[rc].lc = last_ciph;
@@ -1254,9 +1253,9 @@
         bestbp_rc_ptr = &(ngs->bestbp_rc[rhmm->ciphone]);
 
         newscore = bestbp_rc_ptr->score + ngs->nwpen + ngs->pip;
-        if (newscore > thresh) {
+        if (newscore BETTER_THAN thresh) {
             if ((hmm_frame(&rhmm->hmm) < frame_idx)
-                || (hmm_in_score(&rhmm->hmm) < newscore)) {
+                || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                 ssid =
                     ps_search_dict(ngs)->lcFwdTable[rhmm->diphone][bestbp_rc_ptr->lc];
                 hmm_enter(&rhmm->hmm, newscore,
@@ -1295,7 +1294,7 @@
             newscore += ngram_tg_score(ngs->lmset, de->wid, bpe->real_wid,
                                        bpe->prev_real_wid, &n_used);
 
-            if (ngs->last_ltrans[w].dscr < newscore) {
+            if (newscore BETTER_THAN ngs->last_ltrans[w].dscr) {
                 ngs->last_ltrans[w].dscr = newscore;
                 ngs->last_ltrans[w].bp = bp;
             }
@@ -1306,12 +1305,12 @@
     for (i = 0; i < ngs->n_1ph_LMwords; i++) {
         w = ngs->single_phone_wid[i];
         rhmm = (root_chan_t *) ngs->word_chan[w];
-        if ((newscore = ngs->last_ltrans[w].dscr + ngs->pip) > thresh) {
+        if ((newscore = ngs->last_ltrans[w].dscr + ngs->pip) BETTER_THAN thresh) {
             bpe = ngs->bp_table + ngs->last_ltrans[w].bp;
             pde = ps_search_dict(ngs)->dict_list[bpe->wid];
 
             if ((hmm_frame(&rhmm->hmm) < frame_idx)
-                || (hmm_in_score(&rhmm->hmm) < newscore)) {
+                || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                 hmm_enter(&rhmm->hmm,
                           newscore, ngs->last_ltrans[w].bp, nf);
                 if (hmm_is_mpx(&rhmm->hmm)) {
@@ -1325,17 +1324,17 @@
     /* Remaining words: <sil>, noise words.  No mpx for these! */
     bestbp_rc_ptr = &(ngs->bestbp_rc[ps_search_acmod(ngs)->mdef->sil]);
     newscore = bestbp_rc_ptr->score + ngs->silpen + ngs->pip;
-    if (newscore > thresh) {
+    if (newscore BETTER_THAN thresh) {
         w = ps_search_silence_wid(ngs);
         rhmm = (root_chan_t *) ngs->word_chan[w];
         if ((hmm_frame(&rhmm->hmm) < frame_idx)
-            || (hmm_in_score(&rhmm->hmm) < newscore)) {
+            || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
             hmm_enter(&rhmm->hmm,
                       newscore, bestbp_rc_ptr->path, nf);
         }
     }
     newscore = bestbp_rc_ptr->score + ngs->fillpen + ngs->pip;
-    if (newscore > thresh) {
+    if (newscore BETTER_THAN thresh) {
         /* FIXME FIXME: This depends on having the noise words
          * immediately following silence in the dictionary... */
         for (w = ps_search_silence_wid(ngs) + 1; w < ps_search_n_words(ngs); w++) {
@@ -1344,7 +1343,7 @@
             if (rhmm == NULL)
                 continue;
             if ((hmm_frame(&rhmm->hmm) < frame_idx)
-                || (hmm_in_score(&rhmm->hmm) < newscore)) {
+                || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                 hmm_enter(&rhmm->hmm,
                           newscore, bestbp_rc_ptr->path, nf);
             }
@@ -1396,7 +1395,7 @@
     ngram_search_mark_bptable(ngs, frame_idx);
 
     /* Renormalize if necessary (FIXME: Make sure to test this) */
-    if (ngs->best_score + (2 * ngs->beam) < WORST_SCORE) {
+    if (ngs->best_score + (2 * ngs->beam) WORSE_THAN WORST_SCORE) {
         E_INFO("Renormalizing Scores at frame %d, best score %d\n",
                frame_idx, ngs->best_score);
         renormalize_scores(ngs, frame_idx, ngs->best_score);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-09-05 01:17:10 UTC (rev 8750)
+++ trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-09-05 02:55:23 UTC (rev 8751)
@@ -92,7 +92,7 @@
     }
     else {
         /* Link already exists; just retain the best ascr */
-        if (fwdlink->link->ascr < score) {
+        if (score BETTER_THAN fwdlink->link->ascr) {
             fwdlink->link->ascr = score;
             fwdlink->link->ef = ef;
         }
@@ -1173,7 +1173,7 @@
                 tscore = 0;
             /* Update link score with maximum link score. */
             score = link->path_scr + tscore + x->link->ascr;
-            if (score > x->link->path_scr) {
+            if (score BETTER_THAN x->link->path_scr) {
                 x->link->path_scr = score;
                 x->link->best_prev = link;
             }
@@ -1200,7 +1200,7 @@
         else
             bprob = 0;
         dag->norm = logmath_add(lmath, dag->norm, x->link->alpha + bprob);
-        if (x->link->path_scr > bestescr) {
+        if (x->link->path_scr BETTER_THAN bestescr) {
             bestescr = x->link->path_scr;
             bestend = x->link;
         }
@@ -1296,7 +1296,7 @@
             /* Track the best path - we will backtrace in order to
                calculate the unscaled joint probability for sentence
                posterior. */
-            if (link->path_scr > bestescr) {
+            if (link->path_scr BETTER_THAN bestescr) {
                 bestescr = link->path_scr;
                 bestend = link;
             }
@@ -1350,7 +1350,7 @@
         if (nbest->lmset)
             score += ngram_bg_score(nbest->lmset, x->link->to->basewid,
                                     from->basewid, &n_used) * nbest->lwf;
-        if (score > bestscore)
+        if (score BETTER_THAN bestscore)
             bestscore = score;
     }
     from->info.rem_score = bestscore;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8753
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8753&view=rev
Author:   dhdfu
Date:     2008-09-05 14:42:08 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
"Hoist" senone IDs into the HMM structure.  This uses a bit more
memory but should be much more cache-friendly.  And it also speeds
things up by about 15% (a lot of this probably in
acmod_activate_hmm())

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.h
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2008-09-05 14:42:08 UTC (rev 8753)
@@ -721,13 +721,12 @@
     acmod->n_senone_active = 0;
 }
 
-#define MPX_BITVEC_SET(a,h,i)                                           \
-    if ((h)->s.mpx_ssid[i] != BAD_SSID)                                 \
-        bitvec_set((a)->senone_active_vec,                              \
-                   bin_mdef_sseq2sen((a)->mdef, (h)->s.mpx_ssid[i], (i)));
+#define MPX_BITVEC_SET(a,h,i)                                   \
+    if (hmm_mpx_ssid(h,i) != BAD_SSID)                          \
+        bitvec_set((a)->senone_active_vec, hmm_mpx_senid(h,i))
 #define NONMPX_BITVEC_SET(a,h,i)                                        \
     bitvec_set((a)->senone_active_vec,                                  \
-               bin_mdef_sseq2sen((a)->mdef, (h)->s.ssid, (i)));
+               hmm_nonmpx_senid(h,i))
 
 void
 acmod_activate_hmm(acmod_t *acmod, hmm_t *hmm)

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2008-09-05 14:42:08 UTC (rev 8753)
@@ -72,7 +72,6 @@
     ctx->senscore = senscore;
     ctx->sseq = sseq;
     ctx->st_sen_scr = ckd_calloc(n_emit_state, sizeof(*ctx->st_sen_scr));
-    ctx->mpx_ssid_alloc = listelem_alloc_init(sizeof(int16) * ctx->n_emit_state);
 
     return ctx;
 }
@@ -80,7 +79,6 @@
 void
 hmm_context_free(hmm_context_t *ctx)
 {
-    listelem_alloc_free(ctx->mpx_ssid_alloc);
     ckd_free(ctx->st_sen_scr);
     ckd_free(ctx);
 }
@@ -93,13 +91,15 @@
     hmm->n_emit_state = ctx->n_emit_state;
     if (mpx) {
         int i;
-        hmm->s.mpx_ssid = listelem_malloc(ctx->mpx_ssid_alloc);
-        hmm->s.mpx_ssid[0] = ssid;
-        for (i = 1; i < hmm_n_emit_state(hmm); ++i)
-            hmm->s.mpx_ssid[i] = BAD_SSID;
+        hmm->ssid = BAD_SSID;
+        hmm->senid[0] = ssid;
+        for (i = 1; i < hmm_n_emit_state(hmm); ++i) {
+            hmm->senid[i] = BAD_SSID;
+        }
     }
     else {
-        hmm->s.ssid = ssid;
+        hmm->ssid = ssid;
+        memcpy(hmm->senid, ctx->sseq[ssid], hmm->n_emit_state * sizeof(*hmm->senid));
     }
     hmm->tmatid = tmatid;
     hmm_clear(hmm);
@@ -108,10 +108,6 @@
 void
 hmm_deinit(hmm_t *hmm)
 {
-    hmm_context_t *ctx = hmm->ctx;
-
-    if (hmm->mpx)
-        listelem_free(ctx->mpx_ssid_alloc, hmm->s.mpx_ssid);
 }
 
 void
@@ -228,8 +224,7 @@
 {
     int16 const *senscore = hmm->ctx->senscore;
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
-    /* Cache problem here! */
-    uint16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
+    uint16 const *sseq = hmm->senid;
     int32 s5, s4, s3, s2, s1, s0, t2, t1, t0, bestScore;
 
     /* It was the best of scores, it was the worst of scores. */
@@ -363,7 +358,7 @@
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     int16 const *senscore = hmm->ctx->senscore;
     uint16 * const *sseq = hmm->ctx->sseq;
-    uint16 *ssid = hmm->s.mpx_ssid;
+    uint16 *ssid = hmm->senid;
     int32 bestScore;
     int32 s5, s4, s3, s2, s1, s0, t2, t1, t0;
 
@@ -536,7 +531,7 @@
 {
     int16 const *senscore = hmm->ctx->senscore;
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
-    uint16 const *sseq = hmm->ctx->sseq[hmm_ssid(hmm, 0)];
+    uint16 const *sseq = hmm->senid;
     int32 s3, s2, s1, s0, t2, t1, t0, bestScore;
 
     s2 = hmm_score(hmm, 2) + nonmpx_senscr(2);
@@ -617,7 +612,7 @@
     uint8 const *tp = hmm->ctx->tp[hmm->tmatid][0];
     int16 const *senscore = hmm->ctx->senscore;
     uint16 * const *sseq = hmm->ctx->sseq;
-    uint16 *ssid = hmm->s.mpx_ssid;
+    uint16 *ssid = hmm->senid;
     int32 bestScore;
     int32 s3, s2, s1, s0, t2, t1, t0;
 
@@ -775,8 +770,9 @@
             if (bestfrom >= 0)
                 hmm_history(hmm, to) = hmm_history(hmm, bestfrom);
         }
+        /* Propagate ssid for multiplex HMMs */
         if (bestfrom >= 0 && hmm_is_mpx(hmm))
-            hmm->s.mpx_ssid[to] = hmm->s.mpx_ssid[bestfrom];
+            hmm->senid[to] = hmm->senid[bestfrom];
 
         if (bestscr WORSE_THAN scr)
             bestscr = scr;

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2008-09-05 14:42:08 UTC (rev 8753)
@@ -166,10 +166,8 @@
     int32 history[HMM_MAX_NSTATE]; /**< History indices for emitting states. */
     int32 out_score;               /**< Score for non-emitting exit state. */
     int32 out_history;             /**< History index for non-emitting exit state. */
-    union {
-        uint16 *mpx_ssid; /**< Senone sequence IDs for each state (for multiplex HMMs). */
-        uint16 ssid;      /**< Senone sequence ID. */
-    } s;
+    uint16 ssid;                   /**< Senone sequence ID (for non-MPX) */
+    uint16 senid[HMM_MAX_NSTATE];  /**< Senone IDs (non-MPX) or sequence IDs (MPX) */
     int32 bestscore;	/**< Best [emitting] state score in current frame (for pruning). */
     int16 tmatid;       /**< Transition matrix ID (see hmm_context_t). */
     int16 frame;	/**< Frame in which this HMM was last active; <0 if inactive */
@@ -191,13 +189,15 @@
 
 #define hmm_bestscore(h) (h)->bestscore
 #define hmm_frame(h) (h)->frame
-#define hmm_mpx_ssid(h,st) (h)->s.mpx_ssid[st]
-#define hmm_nonmpx_ssid(h) (h)->s.ssid
-#define hmm_ssid(h,st) (hmm_is_mpx(h)                           \
-                        ? hmm_mpx_ssid(h,st) : (h)->s.ssid)
-#define hmm_senid(h,st) (hmm_ssid(h,st) == BAD_SSID                     \
-                         ? BAD_SENID : (h)->ctx->sseq[hmm_ssid(h,st)][st])
-#define hmm_senscr(h,st) (hmm_ssid(h,st) == BAD_SSID                    \
+#define hmm_mpx_ssid(h,st) (h)->senid[st]
+#define hmm_nonmpx_ssid(h) (h)->ssid
+#define hmm_ssid(h,st) (hmm_is_mpx(h)                                   \
+                        ? hmm_mpx_ssid(h,st) : hmm_nonmpx_ssid(h))
+#define hmm_mpx_senid(h,st) ((h)->ctx->sseq[hmm_mpx_ssid(h,st)][st])
+#define hmm_nonmpx_senid(h,st) ((h)->senid[st])
+#define hmm_senid(h,st) (hmm_is_mpx(h)                                  \
+                         ? hmm_mpx_senid(h,st) : hmm_nonmpx_senid(h,st))
+#define hmm_senscr(h,st) (hmm_senid(h,st) == BAD_SENID                  \
                           ? WORST_SCORE                                 \
                           : -(h)->ctx->senscore[hmm_senid(h,st)] << SENSCR_SHIFT)
 #define hmm_tmatid(h) (h)->tmatid

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2008-09-05 14:42:08 UTC (rev 8753)
@@ -504,7 +504,7 @@
     sseq_rc = ps_search_dict(ngs)->rcFwdTable[de->phone_ids[de->len - 1]];
 
     hmm = ngs->word_chan[w];
-    if ((hmm == NULL) || (hmm->hmm.s.ssid != *sseq_rc)) {
+    if ((hmm == NULL) || (hmm_nonmpx_ssid(&hmm->hmm) != *sseq_rc)) {
         hmm = listelem_malloc(ngs->chan_alloc);
         hmm->next = ngs->word_chan[w];
         ngs->word_chan[w] = hmm;
@@ -514,7 +514,7 @@
         hmm_init(ngs->hmmctx, &hmm->hmm, FALSE, *sseq_rc, hmm->ciphone);
     }
     for (i = 1, sseq_rc++; *sseq_rc != 65535; sseq_rc++, i++) {
-        if ((hmm->next == NULL) || (hmm->next->hmm.s.ssid != *sseq_rc)) {
+        if ((hmm->next == NULL) || (hmm_nonmpx_ssid(&hmm->next->hmm) != *sseq_rc)) {
             thmm = listelem_malloc(ngs->chan_alloc);
             thmm->next = hmm->next;
             hmm->next = thmm;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-09-05 14:42:08 UTC (rev 8753)
@@ -618,7 +618,7 @@
                     || (newscore BETTER_THAN hmm_in_score(&rhmm->hmm))) {
                     hmm_enter(&rhmm->hmm, newscore, b, nf);
                     if (hmm_is_mpx(&rhmm->hmm)) {
-                        rhmm->hmm.s.mpx_ssid[0] =
+                        hmm_mpx_ssid(&rhmm->hmm, 0) =
                             ps_search_dict(ngs)->lcFwdTable[rhmm->diphone]
                             [de->ci_phone_ids[de->len-1]];
                     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-09-05 13:45:21 UTC (rev 8752)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2008-09-05 14:42:08 UTC (rev 8753)
@@ -225,9 +225,9 @@
             ngs->first_phone_rchan_map[de->phone_ids[0]] = ngs->n_root_chan;
             rhmm = &(ngs->root_chan[ngs->n_root_chan]);
             if (hmm_is_mpx(&rhmm->hmm))
-                rhmm->hmm.s.mpx_ssid[0] = de->phone_ids[0];
+                hmm_mpx_ssid(&rhmm->hmm, 0) = de->phone_ids[0];
             else
-                rhmm->hmm.s.ssid = de->phone_ids[0];
+                hmm_nonmpx_ssid(&rhmm->hmm) = de->phone_ids[0];
             rhmm->hmm.tmatid = de->ci_phone_ids[0];
             rhmm->diphone = de->phone_ids[0];
             rhmm->ciphone = de->ci_phone_ids[0];
@@ -259,7 +259,7 @@
             else {
                 chan_t *prev_hmm = NULL;
 
-                for (; hmm && (hmm->hmm.s.ssid != ph); hmm = hmm->alt)
+                for (; hmm && (hmm_nonmpx_ssid(&hmm->hmm) != ph); hmm = hmm->alt)
                     prev_hmm = hmm;
                 if (!hmm) {     /* thanks, rkm! */
                     prev_hmm->alt = hmm = listelem_malloc(ngs->chan_alloc);
@@ -280,7 +280,7 @@
                 else {
                     chan_t *prev_hmm = NULL;
 
-                    for (hmm = hmm->next; hmm && (hmm->hmm.s.ssid != ph);
+                    for (hmm = hmm->next; hmm && (hmm_nonmpx_ssid(&hmm->hmm) != ph);
                          hmm = hmm->alt)
                         prev_hmm = hmm;
                     if (!hmm) { /* thanks, rkm! */
@@ -1261,7 +1261,7 @@
                 hmm_enter(&rhmm->hmm, newscore,
                           bestbp_rc_ptr->path, nf);
                 if (hmm_is_mpx(&rhmm->hmm)) {
-                    rhmm->hmm.s.mpx_ssid[0] = ssid;
+                    hmm_mpx_ssid(&rhmm->hmm, 0) = ssid;
                 }
             }
         }
@@ -1314,7 +1314,7 @@
                 hmm_enter(&rhmm->hmm,
                           newscore, ngs->last_ltrans[w].bp, nf);
                 if (hmm_is_mpx(&rhmm->hmm)) {
-                    rhmm->hmm.s.mpx_ssid[0] =
+                    hmm_mpx_ssid(&rhmm->hmm, 0) =
                         ps_search_dict(ngs)->lcFwdTable[rhmm->diphone][pde->ci_phone_ids[pde->len - 1]];
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8754
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8754&view=rev
Author:   dhdfu
Date:     2008-09-08 02:02:09 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
Get rid of RLE code, it won't be used (4-bit quantization might make it in here instead)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-05 14:42:08 UTC (rev 8753)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2008-09-08 02:02:09 UTC (rev 8754)
@@ -148,7 +148,6 @@
  * Optimization for various topn cases, PDF-size(#bits) cases of
  * SCVQComputeScores() and SCVQComputeScores_all().
  */
-static int32 get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores);
 static int32 get_scores4_8b(s2_semi_mgau_t * s, int16 *senone_scores,
                             uint8 *senone_active, int32 n_senone_active);
 static int32 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
@@ -382,21 +381,9 @@
         mgau_norm(s, i);
     }
 
-    if (s->rle) {
+    if (compallsen) {
 	switch (s->topn) {
 	case 4:
-	    return get_scores4_8b_rle(s, senone_scores);
-	case 2:
-	case 1:
-	default:
-            /* FAIL, for now */
-            E_FATAL("FAIL!\n");
-            return -1;
-	}
-    }
-    else if (compallsen) {
-	switch (s->topn) {
-	case 4:
 	    return get_scores4_8b_all(s, senone_scores);
 	case 2:
 	    return get_scores2_8b_all(s, senone_scores);
@@ -554,100 +541,6 @@
 }
 
 static int32
-get_scores4_8b_rle(s2_semi_mgau_t * s, int16 *senone_scores)
-{
-    int32 j;
-
-    memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
-    for (j = 0; j < s->n_feat; j++) {
-        uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
-        uint8 zero_cw0 = 0, zero_cw1 = 0, zero_cw2 = 0, zero_cw3 = 0;
-        int16 *senscr;
-        int32 n;
-
-        /* ptrs to senone prob id arrays */
-        pid_cw0 = s->mixw[j][s->f[j][0].codeword];
-        pid_cw1 = s->mixw[j][s->f[j][1].codeword];
-        pid_cw2 = s->mixw[j][s->f[j][2].codeword];
-        pid_cw3 = s->mixw[j][s->f[j][3].codeword];
-        /* ptr to senone scores */
-        senscr = senone_scores;
-
-        for (n = 0; n < s->n_sen; n++) {
-            int32 tmp1, tmp2;
-
-            /* 255 is only ever used as a flag value (zero runs are
-               limited to 254 entries), so this is a safe check even
-               if a particular codeword is inside a zero run. */
-            if (*pid_cw0 == 255)
-                zero_cw0 = *(++pid_cw0); /* Get the run length */
-            if (*pid_cw1 == 255)
-                zero_cw1 = *(++pid_cw1);
-            if (*pid_cw2 == 255)
-                zero_cw2 = *(++pid_cw2);
-            if (*pid_cw3 == 255)
-                zero_cw3 = *(++pid_cw3);
-#if 0
-            uint8 mw0, mw1, mw2, mw3;
-            mw0 = mw1 = mw2 = mw3 = 159;
-            if (zero_cw0 == 0)
-                mw0 = *(pid_cw0++);
-            else if (--zero_cw0 == 0)
-                ++pid_cw0; /* Skip past the run length */
-            if (zero_cw1 == 0)
-                mw1 = *(pid_cw1++);
-            else if (--zero_cw1 == 0)
-                ++pid_cw1;
-            if (zero_cw2 == 0)
-                mw2 = *(pid_cw2++);
-            else if (--zero_cw2 == 0)
-                ++pid_cw2;
-            if (zero_cw3 == 0)
-                mw3 = *(pid_cw3++);
-            else if (--zero_cw3 == 0)
-                ++pid_cw3;
-
-            tmp1 = mw0 + s->f[j][0].score;
-            tmp2 = mw1 + s->f[j][1].score;
-            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = mw2 + s->f[j][1].score;
-            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            tmp2 = mw3 + s->f[j][1].score;
-            tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-#else
-            tmp1 = 159; /* default "zero" value. */
-            if (zero_cw0 == 0)
-                tmp1 = *(pid_cw0++) + s->f[j][0].score;
-            else if (--zero_cw0 == 0)
-                ++pid_cw0; /* Skip past the run length */
-            if (zero_cw1 == 0) {
-                tmp2 = *(pid_cw1++) + s->f[j][1].score;
-                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            }
-            else if (--zero_cw1 == 0)
-                ++pid_cw1;
-            if (zero_cw2 == 0) {
-                tmp2 = *(pid_cw2++) + s->f[j][2].score;
-                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            }
-            else if (--zero_cw2 == 0)
-                ++pid_cw2;
-            if (zero_cw3 == 0) {
-                tmp2 = *(pid_cw3++) + s->f[j][3].score;
-                tmp1 = fast_logmath_add(s->lmath_8b, tmp1, tmp2);
-            }
-            else if (--zero_cw3 == 0)
-                ++pid_cw3;
-#endif
-
-            *senscr += tmp1;
-            ++senscr;
-        }
-    }
-    return 0;
-}
-
-static int32
 get_scores2_8b(s2_semi_mgau_t * s, int16 *senone_scores,
                uint8 *senone_active, int32 n_senone_active)
 {
@@ -794,61 +687,6 @@
 }
 
 static int32
-read_sendump_rle(s2_semi_mgau_t *s, FILE *file,
-                 size_t offset, size_t filesize,
-                 int32 n_comp, int32 n_sen)
-{
-    uint8 *mwdata, *x, *e;
-    int32 f, c, i;
-
-    /* Read in the data. */
-    if (s->sendump_mmap) {
-        mwdata = (uint8 *)mmio_file_ptr(s->sendump_mmap) + offset;
-    }
-    else {
-        mwdata = ckd_malloc(filesize - offset);
-        if (fread(mwdata, 1, filesize - offset, file) != filesize - offset) {
-            E_ERROR("Failed to read %d bytes from sendump\n", filesize - offset);
-            return -1;
-        }
-    }
-
-    /* Now decode it to find the endpoints for each (feature,component) */
-    s->mixw = ckd_calloc_2d(s->n_feat, n_comp, sizeof(**s->mixw));
-    x = mwdata;
-    e = mwdata + filesize - offset;
-    for (f = 0; f < s->n_feat; ++f) {
-        for (c = 0; c < n_comp; ++c) {
-            s->mixw[f][c] = x;
-            i = 0;
-            while (i < n_sen) {
-                if (x >= e) {
-                    E_ERROR("Inconsistent RLE in sendump: final n_sen = %d\n", i);
-                    return -1;
-                }
-                /* Run of zeros (zero = 159) */
-                if (*x == 255) {
-                    /* Run length. */
-                    i += x[1];
-                    x += 2;
-                }
-                /* Ordinary thing. */
-                else {
-                    ++i;
-                    ++x;
-                }
-            }
-        }
-    }
-
-    /* Don't track active senones in RLE mode, since we are going to
-       knock a lot of them out anyway */
-    cmd_ln_set_boolean_r(s->config, "-compallsen", TRUE);
-    fclose(file);
-    return 0;
-}
-
-static int32
 read_sendump(s2_semi_mgau_t *s, bin_mdef_t *mdef, char const *file)
 {
     FILE *fp;
@@ -909,9 +747,6 @@
         if (!strncmp(line, "cluster_count ", strlen("cluster_count "))) {
             n_clust = atoi(line + strlen("cluster_count "));
         }
-        if (!strncmp(line, "rle_compressed 1", strlen("rle_compressed 1"))) {
-            s->rle = TRUE;
-        }
     }
 
     /* Read #codewords, #pdfs */
@@ -938,10 +773,6 @@
     if (do_mmap)
         s->sendump_mmap = mmio_file_read(file);
 
-    /* Handle RLE compressed weights separately. */
-    if (s->rle)
-        return read_sendump_rle(s, fp, offset, filesize, r, c);
-
     /* Otherwise, set up all pointers, etc. */
     if (s->sendump_mmap) {
         s->mixw = ckd_calloc(s->n_feat, sizeof(*s->mixw));

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-05 14:42:08 UTC (rev 8753)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2008-09-08 02:02:09 UTC (rev 8754)
@@ -70,7 +70,6 @@
     int16 n_density;	/* Number of mixtures per codebook */
     int32 n_sen;	/* Number of senones */
     int16 topn;		/* Number of top densities to compute (<S2_MAX_TOPN) */
-    int16 rle;          /* RLE compression applied to mixture weights */
 
     kd_tree_t **kdtrees;
     uint32 n_kdtrees;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8797
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8797&view=rev
Author:   dhdfu
Date:     2008-10-14 17:22:01 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
An actual bug, causing an actual memory leak - we were allocating the
first phone of a word HMM using one allocator, then trying to free it
with another one.

The heap profile looks a *lot* flatter now

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h	2008-10-14 16:42:26 UTC (rev 8796)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h	2008-10-14 17:22:01 UTC (rev 8797)
@@ -238,7 +238,11 @@
 
     /**
      * Channels associated with a given word (only used for right
-     * contexts and single-phone words in fwdtree search)
+     * contexts, single-phone words in fwdtree search, and word HMMs
+     * in fwdflat search).  WARNING: For single-phone words and
+     * fwdflat search, this actually contains pointers to root_chan_t,
+     * which are allocated using root_chan_alloc.  This is a
+     * suboptimal state of affairs.
      */
     chan_t **word_chan;
     bitvec_t *word_active;      /**< array of active flags for all words. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-10-14 16:42:26 UTC (rev 8796)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2008-10-14 17:22:01 UTC (rev 8797)
@@ -795,6 +795,8 @@
     dict_entry_t *de;
 
     for (i = 0; ngs->fwdflat_wordlist[i] >= 0; i++) {
+        root_chan_t *rhmm;
+        chan_t *thmm;
         wid = ngs->fwdflat_wordlist[i];
         de = ps_search_dict(ngs)->dict_list[wid];
 
@@ -804,6 +806,15 @@
         assert(de->mpx);
         assert(ngs->word_chan[wid] != NULL);
 
+        /* The first HMM in ngs->word_chan[wid] was allocated with
+         * ngs->root_chan_alloc, but this will attempt to free it
+         * using ngs->chan_alloc, which will not work.  Therefore we
+         * free it manually and move the list forward before handing
+         * it off. */
+        rhmm = (root_chan_t *)ngs->word_chan[wid];
+        thmm = rhmm->next;
+        listelem_free(ngs->root_chan_alloc, rhmm);
+        ngs->word_chan[wid] = thmm;
         ngram_search_free_all_rc(ngs, wid);
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8818
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8818&view=rev
Author:   dhdfu
Date:     2008-10-30 17:15:54 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
Sum over posterior probabilities for alternate pronunciations (in
fact, we ought to be merging them in word graph construction)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c
    trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-10-30 17:13:25 UTC (rev 8817)
+++ trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-10-30 17:15:54 UTC (rev 8818)
@@ -828,9 +828,23 @@
         seg->prob = 0; /* norm + beta - norm */
     }
     else {
+        latlink_list_t *x;
+        ps_latnode_t *n;
+        logmath_t *lmath = ps_search_acmod(seg->search)->lmath;
+
         node = link->from;
         seg->ef = link->ef;
         seg->prob = link->alpha + link->beta - itor->norm;
+        /* Sum over all exits for this word and any alternate
+           pronunciations at the same frame. */
+        for (n = node; n; n = n->alt) {
+            for (x = n->exits; x; x = x->next) {
+                if (x->link == link)
+                    continue;
+                seg->prob = logmath_add(lmath, seg->prob,
+                                        x->link->alpha + x->link->beta - itor->norm);
+            }
+        }
     }
     seg->word = dict_word_str(ps_search_dict(seg->search), node->wid);
     seg->sf = node->sf;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h	2008-10-30 17:13:25 UTC (rev 8817)
+++ trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h	2008-10-30 17:15:54 UTC (rev 8818)
@@ -123,6 +123,7 @@
     latlink_list_t *exits;      /**< Links out of this node */
     latlink_list_t *entries;    /**< Links into this node */
 
+    struct ps_latnode_s *alt;   /**< Node with alternate pronunciation for this word */
     struct ps_latnode_s *next;	/**< Next node in DAG (no ordering implied) */
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8864
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8864&view=rev
Author:   dhdfu
Date:     2008-12-12 18:58:31 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Fix (more or less) N-best list generation.  paths_done was actually
only ever used for memory management purposes, and did *not* actually
contain the next best path.  So the results were bogus, and in
addition, the last word was always missing.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
    trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c
    trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2008-12-12 02:11:10 UTC (rev 8863)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2008-12-12 18:58:31 UTC (rev 8864)
@@ -741,19 +741,19 @@
 char const *
 ps_nbest_hyp(ps_nbest_t *nbest, int32 *out_score)
 {
-    if (nbest->paths_done == NULL)
+    if (nbest->top == NULL)
         return NULL;
-    if (out_score) *out_score = nbest->paths_done->score;
-    return ps_astar_hyp(nbest, nbest->paths_done);
+    if (out_score) *out_score = nbest->top->score;
+    return ps_astar_hyp(nbest, nbest->top);
 }
 
 ps_seg_t *
 ps_nbest_seg(ps_nbest_t *nbest, int32 *out_score)
 {
-    if (nbest->paths_done == NULL)
+    if (nbest->top == NULL)
         return NULL;
-    if (out_score) *out_score = nbest->paths_done->score;
-    return ps_astar_seg_iter(nbest, nbest->paths_done, 1.0);
+    if (out_score) *out_score = nbest->top->score;
+    return ps_astar_seg_iter(nbest, nbest->top, 1.0);
 }
 
 int

Modified: trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-12-12 02:11:10 UTC (rev 8863)
+++ trunk/pocketsphinx/src/libpocketsphinx/ps_lattice.c	2008-12-12 18:58:31 UTC (rev 8864)
@@ -1496,7 +1496,7 @@
     nbest->lwf = lwf;
     nbest->sf = sf;
     if (ef < 0)
-        nbest->ef = dag->n_frames - ef;
+        nbest->ef = dag->n_frames + 1;
     else
         nbest->ef = ef;
     nbest->w1 = w1;
@@ -1541,36 +1541,30 @@
 ps_latpath_t *
 ps_astar_next(ps_astar_t *nbest)
 {
-    ps_latpath_t *top;
     ps_lattice_t *dag;
 
     dag = nbest->dag;
 
     /* Pop the top (best) partial hypothesis */
-    while ((top = nbest->path_list) != NULL) {
+    while ((nbest->top = nbest->path_list) != NULL) {
         nbest->path_list = nbest->path_list->next;
-        if (top == nbest->path_tail)
+        if (nbest->top == nbest->path_tail)
             nbest->path_tail = NULL;
         nbest->n_path--;
 
         /* Complete hypothesis? */
-        if ((top->node->sf >= nbest->ef)
-            || ((top->node == dag->end) &&
+        if ((nbest->top->node->sf >= nbest->ef)
+            || ((nbest->top->node == dag->end) &&
                 (nbest->ef > dag->end->sf))) {
-            /* FIXME: Verify that it is non-empty. */
-            return top;
+            /* FIXME: Verify that it is non-empty.  Also we may want
+             * to verify that it is actually distinct from other
+             * paths, since often this is not the case*/
+            return nbest->top;
         }
         else {
-            if (top->node->fef < nbest->ef)
-                path_extend(nbest, top);
+            if (nbest->top->node->fef < nbest->ef)
+                path_extend(nbest, nbest->top);
         }
-
-        /*
-         * Add top to paths already processed; cannot be freed because other paths
-         * point to it.
-         */
-        top->next = nbest->paths_done;
-        nbest->paths_done = top;
     }
 
     /* Did not find any more paths to extend. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h	2008-12-12 02:11:10 UTC (rev 8863)
+++ trunk/pocketsphinx/src/libpocketsphinx/ps_lattice_internal.h	2008-12-12 18:58:31 UTC (rev 8864)
@@ -172,7 +172,7 @@
 
     ps_latpath_t *path_list;
     ps_latpath_t *path_tail;
-    ps_latpath_t *paths_done;
+    ps_latpath_t *top;
 
     glist_t hyps;	             /**< List of hypothesis strings. */
     listelem_alloc_t *latpath_alloc; /**< Path allocator for N-best search. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8929
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8929&view=rev
Author:   dhdfu
Date:     2009-01-13 22:01:46 +0000 (Tue, 13 Jan 2009)

Log Message:
-----------
Calculate segment acoustic and language scores on demand, reducing the
size of the backpointer table.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-01-12 21:45:19 UTC (rev 8928)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-01-13 22:01:46 UTC (rev 8929)
@@ -558,59 +558,56 @@
 }
 
 /*
- * Compute acoustic and LM scores for each BPTable entry (segment).
+ * Compute acoustic and LM scores for a BPTable entry (segment).
  */
 void
-ngram_compute_seg_scores(ngram_search_t *ngs, float32 lwf)
+ngram_compute_seg_score(ngram_search_t *ngs, bptbl_t *bpe, float32 lwf,
+                        int32 *out_ascr, int32 *out_lscr)
 {
-    int32 bp, start_score;
-    bptbl_t *bpe, *p_bpe;
     uint16 *rcpermtab;
     dict_entry_t *de;
+    bptbl_t *p_bpe;
+    int32 start_score;
 
-    for (bp = 0; bp < ngs->bpidx; bp++) {
-        bpe = ngs->bp_table + bp;
+    /* Start of utterance. */
+    if (bpe->bp == NO_BP) {
+        *out_ascr = bpe->score;
+        *out_lscr = 0;
+        return;
+    }
 
-        /* Start of utterance. */
-        if (bpe->bp == NO_BP) {
-            bpe->ascr = bpe->score;
-            bpe->lscr = 0;
-            continue;
-        }
+    /* Otherwise, calculate lscr and ascr. */
+    de = ps_search_dict(ngs)->dict_list[bpe->wid];
+    p_bpe = ngs->bp_table + bpe->bp;
+    rcpermtab = (p_bpe->r_diph >= 0) ?
+        ps_search_dict(ngs)->rcFwdPermTable[p_bpe->r_diph] : ngs->zeroPermTab;
+    start_score =
+        ngs->bscore_stack[p_bpe->s_idx + rcpermtab[de->ci_phone_ids[0]]];
+    /* FIXME: WORST_SCORE shouldn't propagate, but sometimes it
+       does.  We cannot allow it to go any further because that
+       will result in positive acoustic scores.  Tracing the
+       source of this may be a bit involved. */
+    if (start_score == WORST_SCORE)
+        start_score = 0;
 
-        /* Otherwise, calculate lscr and ascr. */
-        de = ps_search_dict(ngs)->dict_list[bpe->wid];
-        p_bpe = ngs->bp_table + bpe->bp;
-        rcpermtab = (p_bpe->r_diph >= 0) ?
-            ps_search_dict(ngs)->rcFwdPermTable[p_bpe->r_diph] : ngs->zeroPermTab;
-        start_score =
-            ngs->bscore_stack[p_bpe->s_idx + rcpermtab[de->ci_phone_ids[0]]];
-        /* FIXME: WORST_SCORE shouldn't propagate, but sometimes it
-           does.  We cannot allow it to go any further because that
-           will result in positive acoustic scores.  Tracing the
-           source of this may be a bit involved. */
-        if (start_score == WORST_SCORE)
-            start_score = 0;
-
-        /* FIXME: These result in positive acoustic scores when filler
-           words have non-filler pronunciations.  That whole business
-           is still pretty much broken but at least it doesn't
-           segfault. */
-        if (bpe->wid == ps_search_silence_wid(ngs)) {
-            bpe->lscr = ngs->silpen;
-        }
-        else if (ISA_FILLER_WORD(ngs, bpe->wid)) {
-            bpe->lscr = ngs->fillpen;
-        }
-        else {
-            int32 n_used;
-            bpe->lscr = ngram_tg_score(ngs->lmset, de->wid,
-                                       p_bpe->real_wid,
-                                       p_bpe->prev_real_wid, &n_used);
-            bpe->lscr = bpe->lscr * lwf;
-        }
-        bpe->ascr = bpe->score - start_score - bpe->lscr;
+    /* FIXME: These result in positive acoustic scores when filler
+       words have non-filler pronunciations.  That whole business
+       is still pretty much broken but at least it doesn't
+       segfault. */
+    if (bpe->wid == ps_search_silence_wid(ngs)) {
+        *out_lscr = ngs->silpen;
     }
+    else if (ISA_FILLER_WORD(ngs, bpe->wid)) {
+        *out_lscr = ngs->fillpen;
+    }
+    else {
+        int32 n_used;
+        *out_lscr = ngram_tg_score(ngs->lmset, de->wid,
+                                   p_bpe->real_wid,
+                                   p_bpe->prev_real_wid, &n_used);
+        *out_lscr = *out_lscr * lwf;
+    }
+    *out_ascr = bpe->score - start_score - *out_lscr;
 }
 
 static int
@@ -740,8 +737,8 @@
     seg->prob = 0; /* Bogus value... */
     /* Compute acoustic and LM scores for this segment. */
     if (pbe == NULL) {
-        seg->ascr = be->ascr = be->score;
-        seg->lscr = be->lscr = 0;
+        seg->ascr = be->score;
+        seg->lscr = 0;
         seg->lback = 0;
     }
     else {
@@ -756,20 +753,18 @@
             : ngs->zeroPermTab;
         start_score = ngs->bscore_stack[pbe->s_idx + rcpermtab[de->ci_phone_ids[0]]];
         if (be->wid == ps_search_silence_wid(ngs)) {
-            be->lscr = ngs->silpen;
+            seg->lscr = ngs->silpen;
         }
         else if (ISA_FILLER_WORD(ngs, be->wid)) {
-            be->lscr = ngs->fillpen;
+            seg->lscr = ngs->fillpen;
         }
         else {
-            be->lscr = ngram_tg_score(ngs->lmset, de->wid,
+            seg->lscr = ngram_tg_score(ngs->lmset, de->wid,
                                       pbe->real_wid,
                                       pbe->prev_real_wid, &seg->lback);
-            be->lscr = (int32)(be->lscr * seg->lwf);
+            seg->lscr = (int32)(seg->lscr * seg->lwf);
         }
-        be->ascr = be->score - start_score - be->lscr;
-        seg->ascr = be->ascr;
-        seg->lscr = be->lscr;
+        seg->ascr = be->score - start_score - seg->lscr;
     }
 }
 
@@ -1036,10 +1031,11 @@
 ps_lattice_t *
 ngram_search_lattice(ps_search_t *search)
 {
-    int32 i, ef, lef, score, bss_offset;
+    int32 i, ef, lef, score, ascr, lscr, bss_offset;
     ps_latnode_t *node, *from, *to;
     ngram_search_t *ngs;
     ps_lattice_t *dag;
+    float lwf;
 
     ngs = (ngram_search_t *)search;
 
@@ -1053,9 +1049,7 @@
     search->dag = NULL;
     dag = ps_lattice_init_search(search, ngs->n_frame);
     /* Compute these such that they agree with the fwdtree language weight. */
-    ngram_compute_seg_scores(ngs,
-                             ngs->fwdflat
-                             ? ngs->fwdflat_fwdtree_lw_ratio : 1.0);
+    lwf = ngs->fwdflat ? ngs->fwdflat_fwdtree_lw_ratio : 1.0;
     create_dag_nodes(ngs, dag);
     if ((dag->start = find_start_node(ngs, dag)) == NULL)
         goto error_out;
@@ -1065,7 +1059,8 @@
            dict_word_str(search->dict, dag->start->wid), dag->start->sf,
            dict_word_str(search->dict, dag->end->wid), dag->end->sf);
 
-    dag->final_node_ascr = ngs->bp_table[dag->end->lef].ascr;
+    ngram_compute_seg_score(ngs, ngs->bp_table + dag->end->lef, lwf,
+                            &dag->final_node_ascr, &lscr);
 
     /*
      * At this point, dag->nodes is ordered such that nodes earlier in
@@ -1104,6 +1099,9 @@
                 continue;
 
             /* Find acoustic score from.sf->to.sf-1 with right context = to */
+            ngram_compute_seg_score(ngs, bp_ptr, lwf,
+                                    &ascr, &lscr);
+            /* Remove context score calculated above (FIXME: just don't calculate it...) */
             if (bp_ptr->r_diph >= 0)
                 bss_offset =
                     search->dict->rcFwdPermTable[bp_ptr->r_diph]
@@ -1111,8 +1109,7 @@
             else
                 bss_offset = 0;
             score =
-                (ngs->bscore_stack[bp_ptr->s_idx + bss_offset] - bp_ptr->score) +
-                bp_ptr->ascr;
+                (ngs->bscore_stack[bp_ptr->s_idx + bss_offset] - bp_ptr->score) + ascr;
             if (score BETTER_THAN 0) {
                 /* Scores must be negative, or Bad Things will happen.
                    In general, they are, except in corner cases

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h	2009-01-12 21:45:19 UTC (rev 8928)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.h	2009-01-13 22:01:46 UTC (rev 8929)
@@ -116,8 +116,6 @@
     int32    real_wid;		/**< wid of this or latest predecessor real word */
     int32    prev_real_wid;	/**< real word predecessor of real_wid */
     int32    r_diph;		/**< rightmost diphone of this word */
-    int32    ascr;
-    int32    lscr;
 } bptbl_t;
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8941
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8941&view=rev
Author:   dhdfu
Date:     2009-01-28 22:15:23 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
rcBwdTable actually does nothing...

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict.c
    trunk/pocketsphinx/src/libpocketsphinx/dict.h
    trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict.c	2009-01-28 10:53:18 UTC (rev 8940)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict.c	2009-01-28 22:15:23 UTC (rev 8941)
@@ -354,7 +354,6 @@
 
     E_INFO("RIGHT CONTEXT TABLES\n");
     dict->rcList = glist_reverse(dict->rcList);
-    buildEntryTable(dict, dict->rcList, &dict->rcBwdTable);
     buildExitTable(dict, dict->rcList, &dict->rcFwdTable, &dict->rcFwdPermTable,
                    &dict->rcFwdSizeTable);
 
@@ -385,10 +384,8 @@
     glist_free(dict->lcList);
 
     for (i = 0, gn = dict->rcList; gn; gn = gnode_next(gn), ++i) {
-        ckd_free(dict->rcBwdTable[i]);
         ckd_free(gnode_ptr(gn));
     }
-    ckd_free(dict->rcBwdTable);
     ckd_free_2d(dict->rcFwdTable);
     ckd_free_2d(dict->rcFwdPermTable);
     ckd_free(dict->rcFwdSizeTable);
@@ -1026,7 +1023,7 @@
             if (phoneid >= 0)
                 triphoneContext++;
             /*
-             * If we can't find the desired right context use "SIL"
+             * If we can't find the desired context use "SIL"
              */
             if (phoneid < 0) {
                 sprintf(triphoneStr, (char *)gnode_ptr(gn), "SIL");
@@ -1049,7 +1046,7 @@
             table[i][j] = bin_mdef_pid2ssid(dict->mdef, phoneid);
         }
     }
-    E_INFO("\t%6d triphones\n\t%6d pseudo diphones\n\t%6d uniphones\n",
+    E_INFO("\t%6d triphonesn\t%6d pseudo diphones\n\t%6d uniphones\n",
            triphoneContext, silContext, noContext);
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict.h	2009-01-28 10:53:18 UTC (rev 8940)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict.h	2009-01-28 22:15:23 UTC (rev 8941)
@@ -73,18 +73,73 @@
     int32		*ci_index;		/* Index to each group */
     int32		filler_start;		/* Start of filler words */
 
+    /* Context tables - these are quite mysterious and possibly unnecessary. */
     hash_table_t *lcHT;      /* Left context hash table */
+    /**
+     * List of left context triphones.  This is a list of strings
+     * describing the cross-word triphones which need to be expanded
+     * at the start of words.  They look like "B(%s,IY)b", where the
+     * %s is a placeholder for possible left contexts (yes ... it uses
+     * sprintf() to fill this in, which is extremely hacky).  This
+     * consists of all the word-initial diphones from the
+     * pronunciation dictionary.
+     */
     glist_t lcList;
+    /**
+     * Left context table.  This is a 2d array mapping each left
+     * context triphone in lcList to an array of senone sequence IDs,
+     * corresponding to all possible triphone expansions.
+     * lcFwdTable[i][ci] gives the senone sequence corresponding to
+     * filling in the placeholder in lcList[i] with the context
+     * independent phone ci.
+     */
     uint16 **lcFwdTable;
+    /**
+     * Left context table, compressed version.  It's not entirely
+     * clear what this is useful for.  It's only used in one place in
+     * FSG search and it contains the same information as lcFwdTable,
+     * except that duplicate entries in lcList[i] have been
+     * eliminated, and lcBwdPermTable[i] contains the mapping of
+     * context-independent phones to unique entries here.
+     */
     uint16 **lcBwdTable;
+    /**
+     * Mapping of context-independent phones to entries in lcBwdTable.
+     */
     uint16 **lcBwdPermTable;
+    /**
+     * Number of entries in each entry in lcBwdTable.
+     */
     uint16 *lcBwdSizeTable;
 
     hash_table_t *rcHT;      /* Right context hash table */
+    /**
+     * List of right context triphones.  This is a list of strings
+     * describing the cross-word triphones which need to be expanded
+     * at the end of words.  They look like "IY(B,%s)e", where the
+     * %s is a placeholder for possible left contexts (yes ... it uses
+     * sprintf() to fill this in, which is extremely hacky).  This
+     * consists of all the word-final diphones from the
+     * pronunciation dictionary.
+     */
     glist_t rcList;
+    /**
+     * Right context table, compressed version.  Contains the same
+     * information as rcBwdTable, except that duplicate entries in
+     * rcList[i] have been eliminated, and rcFwdPermTable[i] contains
+     * the mapping of context-independent phones to unique entries
+     * here.  This mainly exists so that forward search can activate
+     * only the set of unique senone sequences associated with a given
+     * right context triphone.
+     */
     uint16 **rcFwdTable;
+    /**
+     * Mapping of context-independent phones to entries in rcFwdTable.
+     */
     uint16 **rcFwdPermTable;
-    uint16 **rcBwdTable;
+    /**
+     * Number of entries in each entry in rcFwdTable.
+     */
     uint16 *rcFwdSizeTable;
 
     int32 initial_dummy;     /* 1st placeholder for dynamic OOVs after initialization */

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2009-01-28 10:53:18 UTC (rev 8940)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2009-01-28 22:15:23 UTC (rev 8941)
@@ -358,8 +358,6 @@
                                    possible left contexts */
     uint16 **lcbwdperm;          /* For CIphone p, lcbwdperm[d][p] = index in lcbwd[d]
                                    containing the SSID for triphone p.d */
-    uint16 **rcbwd;              /* Uncompressed right cross-word context map;
-                                   rcbwd[right-diphone][p] = SSID for right-diphone.p */
     uint16 **rcfwd;              /* Compressed right cross-word context map; similar to
                                    lcbwd */
     uint16 **rcfwdperm;
@@ -375,7 +373,6 @@
     int32 n_ci, p, lc, rc;
     glist_t lc_pnodelist;       /* Temp pnodes list for different left contexts */
     glist_t rc_pnodelist;       /* Temp pnodes list for different right contexts */
-    fsg_pnode_t **ssid_pnode_map;       /* Temp array of ssid->pnode mapping */
     int32 i, j;
 
     silcipid = bin_mdef_ciphone_id(lextree->mdef, "SIL");
@@ -383,7 +380,6 @@
     lcfwd = lextree->dict->lcFwdTable;
     lcbwd = lextree->dict->lcBwdTable;
     lcbwdperm = lextree->dict->lcBwdPermTable;
-    rcbwd = lextree->dict->rcBwdTable;
     rcfwd = lextree->dict->rcFwdTable;
     rcfwdperm = lextree->dict->rcFwdPermTable;
 
@@ -469,6 +465,7 @@
         }
     }
     else {                      /* Multi-phone word */
+        fsg_pnode_t **ssid_pnode_map;       /* Temp array of ssid->pnode mapping */
         assert(dict_mpx(lextree->dict, dictwid));    /* S2 HACK: pronlen>1 => mpx?? */
 
         ssid_pnode_map =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8942
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8942&view=rev
Author:   dhdfu
Date:     2009-01-28 22:18:24 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Add a few comments and things

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-01-28 22:15:23 UTC (rev 8941)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-01-28 22:18:24 UTC (rev 8942)
@@ -346,8 +346,8 @@
     /* Look for an existing exit for this word in this frame. */
     _bp_ = ngs->word_lat_idx[w];
     if (_bp_ != NO_BP) {
-        /* Keep only the best scoring one (actually not an
-         * unreasonable thing to do) */
+        /* Keep only the best scoring one (this is a potential source
+         * of search errors...) */
         if (ngs->bp_table[_bp_].score WORSE_THAN score) {
             if (ngs->bp_table[_bp_].bp != path) {
                 ngs->bp_table[_bp_].bp = path;
@@ -630,6 +630,23 @@
         return -1;
 }
 
+static void
+dump_bptable(ngram_search_t *ngs)
+{
+    int i;
+    E_INFO("Backpointer table (%d entries):\n", ngs->bpidx);
+    for (i = 0; i < ngs->bpidx; ++i) {
+        E_INFO_NOFN("%-5d %-10s start %-3d end %-3d score %-8d bp\n", /* %-3d history %08x\n", */
+                    i, dict_word_str(ps_search_dict(ngs), ngs->bp_table[i].wid),
+                    ngs->bp_table[i].bp == -1 ? 0 : 
+                    ngs->bp_table[ngs->bp_table[i].bp].frame + 1,
+                    ngs->bp_table[i].frame,
+                    ngs->bp_table[i].score,
+                    ngs->bp_table[i].bp);
+        /* ngs->bp_table[i].hist_hash); */
+    }
+}
+
 static int
 ngram_search_finish(ps_search_t *search)
 {

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2009-01-28 22:15:23 UTC (rev 8941)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2009-01-28 22:18:24 UTC (rev 8942)
@@ -1195,6 +1195,8 @@
     for (i = bin_mdef_n_ciphone(ps_search_acmod(ngs)->mdef) - 1; i >= 0; --i)
         ngs->bestbp_rc[i].score = WORST_SCORE;
     k = 0;
+    /* Ugh, this is complicated.  Scan all word exits for this frame
+     * (they have already been created by prune_word_chan()). */
     for (bp = ngs->bp_table_idx[frame_idx]; bp < ngs->bpidx; bp++) {
         bpe = &(ngs->bp_table[bp]);
         ngs->word_lat_idx[bpe->wid] = NO_BP;
@@ -1204,12 +1206,21 @@
         k++;
 
         de = ps_search_dict(ngs)->dict_list[bpe->wid];
+        /* Get the mapping of right context phones to score stack
+         * entries for the final phone in this word.  bpe->r_diph is a
+         * pseudo-phone ID which is actually an index into the first
+         * level of the right context tables. */
         rcpermtab =
             (bpe->r_diph >= 0)
             ? ps_search_dict(ngs)->rcFwdPermTable[bpe->r_diph]
             : ngs->zeroPermTab;
+        /* This is the context-independent phone ID. */
         last_ciph = de->ci_phone_ids[de->len - 1];
 
+        /* And this is the array of HMM scores corresponding to all
+         * the possible right context expansions of the final phone.
+         * It's likely that a lot of these are going to be missing,
+         * actually. */
         rcss = &(ngs->bscore_stack[bpe->s_idx]);
         for (rc = bin_mdef_n_ciphone(ps_search_acmod(ngs)->mdef) - 1; rc >= 0; --rc) {
             if (rcss[rcpermtab[rc]] BETTER_THAN ngs->bestbp_rc[rc].score) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8943
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8943&view=rev
Author:   dhdfu
Date:     2009-01-30 17:55:42 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
Major bugfix - 3-state left-to-right HMMs were apparently slower than
5-state ones, which is known to be quite impossible.  The reason for
this was that the skip-state transitions were being mistakenly
evaluated, due to being floored in tmat.c.  Also, the log-zero value
for tmat was out of sync with the HMM code so testing for impossible
transitions did not work.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/hmm.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.h
    trunk/pocketsphinx/src/libpocketsphinx/tmat.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2009-01-28 22:18:24 UTC (rev 8942)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2009-01-30 17:55:42 UTC (rev 8943)
@@ -545,7 +545,7 @@
     /* Transitions into non-emitting state 3 */
     if (s1 BETTER_THAN WORST_SCORE) {
         t1 = s2 + hmm_tprob_3st(2, 3);
-        if (hmm_tprob_3st(1,3) BETTER_THAN WORST_SCORE)
+        if (hmm_tprob_3st(1,3) BETTER_THAN TMAT_WORST_SCORE)
             t2 = s1 + hmm_tprob_3st(1, 3);
         if (t1 BETTER_THAN t2) {
             s3 = t1;
@@ -562,7 +562,7 @@
     /* All transitions into state 2 (state 0 is always active) */
     t0 = s2 + hmm_tprob_3st(2, 2);
     t1 = s1 + hmm_tprob_3st(1, 2);
-    if (hmm_tprob_3st(0, 2) BETTER_THAN WORST_SCORE)
+    if (hmm_tprob_3st(0, 2) BETTER_THAN TMAT_WORST_SCORE)
         t2 = s0 + hmm_tprob_3st(0, 2);
     if (t0 BETTER_THAN t1) {
         if (t2 BETTER_THAN t0) {
@@ -625,10 +625,11 @@
         t1 = s2 + hmm_tprob_3st(2, 3);
     }
     if (ssid[1] == BAD_SSID)
-        s1 = WORST_SCORE;
+        s1 = t2 = WORST_SCORE;
     else {
         s1 = hmm_score(hmm, 1) + mpx_senscr(1);
-        t2 = s1 + hmm_tprob_3st(1, 3);
+        if (hmm_tprob_3st(1,3) BETTER_THAN TMAT_WORST_SCORE)
+            t2 = s1 + hmm_tprob_3st(1, 3);
     }
     if (t1 BETTER_THAN t2) {
         s3 = t1;
@@ -651,7 +652,7 @@
         t0 = s2 + hmm_tprob_3st(2, 2);
     if (s1 != WORST_SCORE)
         t1 = s1 + hmm_tprob_3st(1, 2);
-    if (hmm_tprob_3st(0,2) BETTER_THAN WORST_SCORE)
+    if (hmm_tprob_3st(0,2) BETTER_THAN TMAT_WORST_SCORE)
         t2 = s0 + hmm_tprob_3st(0, 2);
     if (t0 BETTER_THAN t1) {
         if (t2 BETTER_THAN t0) {
@@ -728,7 +729,7 @@
     scr = WORST_SCORE;
     bestfrom = -1;
     for (from = to - 1; from >= 0; --from) {
-        if ((hmm_tprob(hmm, from, to) BETTER_THAN WORST_SCORE) &&
+        if ((hmm_tprob(hmm, from, to) BETTER_THAN TMAT_WORST_SCORE) &&
             ((newscr = ctx->st_sen_scr[from]
               + hmm_tprob(hmm, from, to)) BETTER_THAN scr)) {
             scr = newscr;
@@ -744,14 +745,14 @@
     for (to = final_state - 1; to >= 0; --to) {
         /* Score from self-transition, if any */
         scr =
-            (hmm_tprob(hmm, to, to) BETTER_THAN WORST_SCORE)
+            (hmm_tprob(hmm, to, to) BETTER_THAN TMAT_WORST_SCORE)
             ? ctx->st_sen_scr[to] + hmm_tprob(hmm, to, to)
             : WORST_SCORE;
 
         /* Scores from transitions from other states */
         bestfrom = -1;
         for (from = to - 1; from >= 0; --from) {
-            if ((hmm_tprob(hmm, from, to) BETTER_THAN WORST_SCORE) &&
+            if ((hmm_tprob(hmm, from, to) BETTER_THAN TMAT_WORST_SCORE) &&
                 ((newscr = ctx->st_sen_scr[from]
                   + hmm_tprob(hmm, from, to)) BETTER_THAN scr)) {
                 scr = newscr;

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2009-01-28 22:18:24 UTC (rev 8942)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2009-01-30 17:55:42 UTC (rev 8943)
@@ -74,6 +74,12 @@
 #define WORST_SCORE		((int)0xE0000000)
 
 /**
+ * Watch out, though!  Transition matrix entries that are supposed to
+ * be "zero" don't actually get that small due to quantization.
+ */
+#define TMAT_WORST_SCORE	(-255 << SENSCR_SHIFT)
+
+/**
  * Is one score better than another?
  */
 #define BETTER_THAN >
@@ -193,7 +199,8 @@
 #define hmm_nonmpx_ssid(h) (h)->ssid
 #define hmm_ssid(h,st) (hmm_is_mpx(h)                                   \
                         ? hmm_mpx_ssid(h,st) : hmm_nonmpx_ssid(h))
-#define hmm_mpx_senid(h,st) ((h)->ctx->sseq[hmm_mpx_ssid(h,st)][st])
+#define hmm_mpx_senid(h,st) (hmm_mpx_ssid(h,st) == BAD_SENID \
+                             ? BAD_SENID : (h)->ctx->sseq[hmm_mpx_ssid(h,st)][st])
 #define hmm_nonmpx_senid(h,st) ((h)->senid[st])
 #define hmm_senid(h,st) (hmm_is_mpx(h)                                  \
                          ? hmm_mpx_senid(h,st) : hmm_nonmpx_senid(h,st))

Modified: trunk/pocketsphinx/src/libpocketsphinx/tmat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tmat.c	2009-01-28 22:18:24 UTC (rev 8942)
+++ trunk/pocketsphinx/src/libpocketsphinx/tmat.c	2009-01-30 17:55:42 UTC (rev 8943)
@@ -281,10 +281,12 @@
             /* Convert to logs3. */
             for (k = 0; k < n_dst; k++) {
                 int ltp;
+#if 0 /* No, don't do this!  It will subtly break 3-state HMMs. */
                 /* For these ones, we floor them even if they are
                  * zero, otherwise HMM evaluation goes nuts. */
                 if (k >= j && k-j < 3 && tp[j][k] == 0.0f)
                     tp[j][k] = tpfloor;
+#endif
                 /* Log and quantize them. */
                 ltp = -logmath_log(lmath, tp[j][k]) >> SENSCR_SHIFT;
                 if (ltp > 255) ltp = 255;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8998
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8998&view=rev
Author:   dhdfu
Date:     2009-02-18 05:01:52 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Create proper vtables and such for acoustic model parameterizations.
It's a shame that C++ makes things take twice as long to compile
without actually using any of its features, and that it's generally a
slippery slope to obfuscated insanity, otherwise you'd start to see a
bit of it here.  Still waiting for D to take over the
world...................... (repeat dots here)

Also add some stubs (to be filled soon) for MLLR.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-18 05:01:52 UTC (rev 8998)
@@ -55,6 +55,9 @@
 /* Local headers. */
 #include "cmdln_macro.h"
 #include "acmod.h"
+#include "s2_semi_mgau.h"
+#include "ms_mgau.h"
+#include "sdc_mgau.h"
 
 /* Feature and front-end parameters that may be in feat.params */
 static const arg_t feat_defn[] = {
@@ -118,8 +121,6 @@
             E_ERROR("SDCHMM init failed\n");
             return -1;
         }
-        acmod->frame_eval = (frame_eval_t)&sdc_mgau_frame_eval;
-        acmod->mgau_free = (void *)&sdc_mgau_free;
     }
     /* Otherwise, try to use SCHMM or CDHMM computation. */
     else {
@@ -132,15 +133,11 @@
                 s2_semi_mgau_load_kdtree(acmod->mgau, kdtreefn,
                                          cmd_ln_int32_r(acmod->config, "-kdmaxdepth"),
                                          cmd_ln_int32_r(acmod->config, "-kdmaxbbi"));
-            acmod->frame_eval = (frame_eval_t)&s2_semi_mgau_frame_eval;
-            acmod->mgau_free = (void *)&s2_semi_mgau_free;
         }
         else {
             E_INFO("Falling back to general multi-stream GMM computation\n");
             acmod->mgau =
                 ms_mgau_init(acmod->config, acmod->lmath);
-            acmod->frame_eval = (frame_eval_t)&ms_cont_mgau_frame_eval;
-            acmod->mgau_free = (void *)&ms_mgau_free;
         }
     }
 
@@ -323,8 +320,8 @@
     if (acmod->tmat)
         tmat_free(acmod->tmat);
 
-    if (acmod->mgau_free)
-        (*acmod->mgau_free)(acmod->mgau);
+    if (acmod->mgau)
+        ps_mgau_free(acmod->mgau);
     
     ckd_free(acmod);
 }
@@ -758,13 +755,13 @@
     if (acmod->feat_outidx == acmod->n_feat_alloc)
         acmod->feat_outidx = 0;
     /* Generate scores for the next available frame */
-    (*acmod->frame_eval)(acmod->mgau,
-                         acmod->senone_scores,
-                         acmod->senone_active,
-                         acmod->n_senone_active,
-                         acmod->feat_buf[acmod->feat_outidx],
-                         acmod->output_frame,
-                         acmod->compallsen);
+    ps_mgau_frame_eval(acmod->mgau,
+                       acmod->senone_scores,
+                       acmod->senone_active,
+                       acmod->n_senone_active,
+                       acmod->feat_buf[acmod->feat_outidx],
+                       acmod->output_frame,
+                       acmod->compallsen);
     /* Advance the output pointers. */
     ++acmod->feat_outidx;
     --acmod->n_feat_frame;

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-18 05:01:52 UTC (rev 8998)
@@ -52,12 +52,10 @@
 #include <fe.h>
 #include <feat.h>
 #include <bitvec.h>
+#include <err.h>
 
 /* Local headers. */
 #include "bin_mdef.h"
-#include "s2_semi_mgau.h"
-#include "sdc_mgau.h"
-#include "ms_mgau.h"
 #include "tmat.h"
 #include "hmm.h"
 
@@ -72,16 +70,41 @@
 } acmod_state_t;
 
 /**
- * Function which computes one frame of GMM scores.
+ * Acoustic model parameter structure. 
  */
-typedef int (*frame_eval_t)(void *eval_obj,
-                            int16 *senscr,
-                            uint8 *senone_active,
-                            int32 n_senone_active,
-                            mfcc_t ** feat,
-                            int32 frame,
-                            int32 compallsen);
+typedef struct ps_mgau_s ps_mgau_t;
 
+typedef struct ps_mgaufuncs_s {
+    char const *name;
+
+    int (*frame_eval)(ps_mgau_t *mgau,
+                      int16 *senscr,
+                      uint8 *senone_active,
+                      int32 n_senone_active,
+                      mfcc_t ** feat,
+                      int32 frame,
+                      int32 compallsen);
+    int (*transform)(ps_mgau_t *mgau,
+                     float32 ***A,
+                     float32 **b,
+                     float32 **h,
+                     int32 *cb2mllr);
+    void (*free)(ps_mgau_t *mgau);
+} ps_mgaufuncs_t;    
+
+struct ps_mgau_s {
+    ps_mgaufuncs_t *vt;
+};
+
+#define ps_mgau_base(mg) ((ps_mgau_t *)(mg))
+#define ps_mgau_frame_eval(mg,senscr,senone_active,n_senone_active,feat,frame,compallsen) \
+    (*ps_mgau_base(mg)->vt->frame_eval)                                 \
+    (mg, senscr, senone_active, n_senone_active, feat, frame, compallsen)
+#define ps_mgau_transform(mg,A,b,h,cb2mllr)                                  \
+    (*ps_mgau_base(mg)->vt->transform)(mg, A, b, h, cb2mllr)
+#define ps_mgau_free(mg)                                  \
+    (*ps_mgau_base(mg)->vt->free)(mg)
+
 /**
  * Acoustic model structure.
  *
@@ -112,13 +135,9 @@
     /* Model parameters: */
     bin_mdef_t *mdef;          /**< Model definition. */
     tmat_t *tmat;              /**< Transition matrices. */
-    void *mgau;                /**< either s2_semi_mgau_t or
-                                  ms_mgau_t, will make this more
-                                  type-safe in the future. */
-    void (*mgau_free)(void *); /**< Function to dealloate mgau. */
+    ps_mgau_t *mgau;           /**< Model parameters. */
 
     /* Senone scoring: */
-    frame_eval_t frame_eval;   /**< Function to compute GMM scores. */
     int16 *senone_scores;      /**< GMM scores for current frame. */
     bitvec_t *senone_active_vec; /**< Active GMMs in current frame. */
     uint8 *senone_active;      /**< Array of deltas to active GMMs. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2009-02-18 05:01:52 UTC (rev 8998)
@@ -70,19 +70,26 @@
 /* Local headers. */
 #include "ms_mgau.h"
 
-ms_mgau_model_t *
+static ps_mgaufuncs_t ms_mgau_funcs = {
+    "ms",
+    &ms_cont_mgau_frame_eval, /* frame_eval */
+    &ms_mgau_mllr_transform,  /* transform */
+    &ms_mgau_free             /* free */
+};
+
+ps_mgau_t *
 ms_mgau_init(cmd_ln_t *config, logmath_t *lmath)
 {
     /* Codebooks */
     int32 i;
     ms_mgau_model_t *msg;
+    ps_mgau_t *mg;
     gauden_t *g;
     senone_t *s;
     mgau2sen_t *m2s;
 
     msg = (ms_mgau_model_t *) ckd_calloc(1, sizeof(ms_mgau_model_t));
-
-
+    
     msg->g = NULL;
     msg->s = NULL;
 
@@ -134,12 +141,15 @@
                       sizeof(gauden_dist_t));
     msg->mgau_active = ckd_calloc(g->n_mgau, sizeof(int8));
 
-    return msg;
+    mg = (ps_mgau_t *)msg;
+    mg->vt = &ms_mgau_funcs;
+    return mg;
 }
 
 void
-ms_mgau_free(ms_mgau_model_t * msg)
+ms_mgau_free(ps_mgau_t * mg)
 {
+    ms_mgau_model_t *msg = (ms_mgau_model_t *)mg;
     if (msg == NULL)
         return;
 
@@ -150,8 +160,18 @@
     ckd_free(msg);
 }
 
+int
+ms_mgau_mllr_transform(ps_mgau_t *s,
+                        float32 ***A,
+                        float32 **b,
+                        float32 **h,
+                        int32 *cb2mllr)
+{
+    return -1;
+}
+
 int32
-ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
+ms_cont_mgau_frame_eval(ps_mgau_t * mg,
 			int16 *senscr,
 			uint8 *senone_active,
 			int32 n_senone_active,
@@ -159,6 +179,7 @@
 			int32 frame,
 			int32 compallsen)
 {
+    ms_mgau_model_t *msg = (ms_mgau_model_t *)mg;
     int32 gid;
     int32 i, n;
     int32 topn;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2009-02-18 05:01:52 UTC (rev 8998)
@@ -102,10 +102,10 @@
 #include <feat.h>
 
 /* Local headers. */
+#include "acmod.h"
 #include "ms_gauden.h"
 #include "ms_senone.h"
 
-
 /* Lists of senones sharing each mixture Gaussian codebook */
 /* \struct mgau2sen_t
    \brief a mapping from gaussian to senone
@@ -120,6 +120,7 @@
 */
 
 typedef struct {
+    ps_mgau_t base;
     gauden_t* g;   /**< The codebook */
     senone_t* s;   /**< The senone */
     mgau2sen_t **mgau2sen; /**< Senones sharing mixture Gaussian codebooks */
@@ -136,19 +137,20 @@
 #define ms_mgau_mgau2sen(msg) (msg->mgau2sen)
 #define ms_mgau_topn(msg) (msg->topn)
 
-ms_mgau_model_t* ms_mgau_init(cmd_ln_t *config, logmath_t *lmath);
-
-/** Free memory allocated by ms_mgau_init */
-void ms_mgau_free(ms_mgau_model_t *g /**< In: A set of models to free */
-    );
-
-int32 ms_cont_mgau_frame_eval(ms_mgau_model_t * msg,
+ps_mgau_t* ms_mgau_init(cmd_ln_t *config, logmath_t *lmath);
+void ms_mgau_free(ps_mgau_t *g);
+int32 ms_cont_mgau_frame_eval(ps_mgau_t * msg,
                               int16 *senscr,
                               uint8 *senone_active,
                               int32 n_senone_active,
                               mfcc_t ** feat,
                               int32 frame,
                               int32 compallsen);
+int32 ms_mgau_mllr_transform(ps_mgau_t *s,
+                             float32 ***A,
+                             float32 **b,
+                             float32 **h,
+                             int32 *cb2mllr);
 
 #endif /* _LIBFBS_MS_CONT_MGAU_H_*/
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-18 05:01:52 UTC (rev 8998)
@@ -65,6 +65,13 @@
 #include "kdtree.h"
 #include "posixwin32.h"
 
+static ps_mgaufuncs_t s2_semi_mgau_funcs = {
+    "s2_semi",
+    &s2_semi_mgau_frame_eval,      /* frame_eval */
+    &s2_semi_mgau_mllr_transform,  /* transform */
+    &s2_semi_mgau_free             /* free */
+};
+
 #define MGAU_MIXW_VERSION	"1.0"   /* Sphinx-3 file format version for mixw */
 #define MGAU_PARAM_VERSION	"1.0"   /* Sphinx-3 file format version for mean/var */
 #define NONE		-1
@@ -367,13 +374,14 @@
  * Compute senone scores for the active senones.
  */
 int32
-s2_semi_mgau_frame_eval(s2_semi_mgau_t * s,
+s2_semi_mgau_frame_eval(ps_mgau_t * ps,
                         int16 *senone_scores,
                         uint8 *senone_active,
                         int32 n_senone_active,
 			mfcc_t ** featbuf, int32 frame,
 			int32 compallsen)
 {
+    s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
     int i;
 
     for (i = 0; i < s->n_feat; ++i) {
@@ -672,9 +680,10 @@
 }
 
 int32
-s2_semi_mgau_load_kdtree(s2_semi_mgau_t * s, const char *kdtree_path,
+s2_semi_mgau_load_kdtree(ps_mgau_t * ps, const char *kdtree_path,
                          uint32 maxdepth, int32 maxbbi)
 {
+    s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
     if (read_kd_trees(kdtree_path, &s->kdtrees, &s->n_kdtrees,
                       maxdepth, maxbbi) == -1)
         E_FATAL("Failed to read kd-trees from %s\n", kdtree_path);
@@ -1075,10 +1084,11 @@
     return 0;
 }
 
-s2_semi_mgau_t *
+ps_mgau_t *
 s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef)
 {
     s2_semi_mgau_t *s;
+    ps_mgau_t *ps;
     char const *sendump_path;
     float32 **fgau;
     int i;
@@ -1089,25 +1099,25 @@
     /* Log-add table. */
     s->lmath_8b = logmath_init(logmath_get_base(lmath), SENSCR_SHIFT, TRUE);
     if (s->lmath_8b == NULL) {
-        s2_semi_mgau_free(s);
+        s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     /* Ensure that it is only 8 bits wide so that fast_logmath_add() works. */
     if (logmath_get_width(s->lmath_8b) != 1) {
         E_ERROR("Log base %f is too small to represent add table in 8 bits\n",
                 logmath_get_base(s->lmath_8b));
-        s2_semi_mgau_free(s);
+        s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
 
     /* Read means and variances. */
     if (s3_read_mgau(s, cmd_ln_str_r(config, "-mean"), &fgau) < 0) {
-        s2_semi_mgau_free(s);
+        s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->means = (mean_t **)fgau;
     if (s3_read_mgau(s, cmd_ln_str_r(config, "-var"), &fgau) < 0) {
-        s2_semi_mgau_free(s);
+        s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->vars = (var_t **)fgau;
@@ -1138,12 +1148,25 @@
         }
     }
 
-    return s;
+    ps = (ps_mgau_t *)s;
+    ps->vt = &s2_semi_mgau_funcs;
+    return ps;
 }
 
+int
+s2_semi_mgau_mllr_transform(ps_mgau_t *s,
+                            float32 ***A,
+                            float32 **b,
+                            float32 **h,
+                            int32 *cb2mllr)
+{
+    return -1;
+}
+
 void
-s2_semi_mgau_free(s2_semi_mgau_t * s)
+s2_semi_mgau_free(ps_mgau_t *ps)
 {
+    s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
     uint32 i;
 
     logmath_free(s->lmath_8b);

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-18 05:01:52 UTC (rev 8998)
@@ -48,6 +48,7 @@
 #include <mmio.h>
 
 /* Local headers. */
+#include "acmod.h"
 #include "hmm.h"
 #include "kdtree.h"
 #include "bin_mdef.h"
@@ -56,6 +57,7 @@
 
 typedef struct s2_semi_mgau_s s2_semi_mgau_t;
 struct s2_semi_mgau_s {
+    ps_mgau_t base;     /**< base structure. */
     cmd_ln_t *config;   /* configuration parameters */
 
     mean_t  **means;	/* mean vectors foreach feature */
@@ -86,20 +88,22 @@
     logmath_t *lmath_8b;
 };
 
-s2_semi_mgau_t *s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
+ps_mgau_t *s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
+void s2_semi_mgau_free(ps_mgau_t *s);
+int s2_semi_mgau_frame_eval(ps_mgau_t *s,
+                            int16 *senone_scores,
+                            uint8 *senone_active,
+                            int32 n_senone_active,
+                            mfcc_t **featbuf,
+                            int32 frame,
+                            int32 compallsen);
+int s2_semi_mgau_mllr_transform(ps_mgau_t *s,
+                                float32 ***A,
+                                float32 **b,
+                                float32 **h,
+                                int32 *cb2mllr);
+int s2_semi_mgau_load_kdtree(ps_mgau_t *s, const char *kdtree_path,
+                             uint32 maxdepth, int32 maxbbi);
 
-void s2_semi_mgau_free(s2_semi_mgau_t *s);
 
-int32 s2_semi_mgau_frame_eval(s2_semi_mgau_t *s,
-                              int16 *senone_scores,
-                              uint8 *senone_active,
-                              int32 n_senone_active,
-			      mfcc_t **featbuf,
-			      int32 frame,
-                              int32 compallsen);
-
-int32 s2_semi_mgau_load_kdtree(s2_semi_mgau_t *s, const char *kdtree_path,
-			       uint32 maxdepth, int32 maxbbi);
-
-
 #endif /*  __S2_SEMI_MGAU_H__ */

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.c	2009-02-18 05:01:52 UTC (rev 8998)
@@ -64,6 +64,13 @@
 #include "sdc_mgau.h"
 #include "vector.h"
 
+static ps_mgaufuncs_t sdc_mgau_funcs = {
+    "sdc",
+    &sdc_mgau_frame_eval, /* frame_eval */
+    &sdc_mgau_mllr_transform,  /* transform */
+    &sdc_mgau_free             /* free */
+};
+
 #define MGAU_MIXW_VERSION	"1.0"   /* Sphinx-3 file format version for mixw */
 #define MGAU_PARAM_VERSION	"1.0"   /* Sphinx-3 file format version for mean/var */
 #define MGAU_SDMAP_VERSION	"0.1"   /* file format version for sdmap */
@@ -191,13 +198,14 @@
  * Compute senone scores for the active senones.
  */
 int32
-sdc_mgau_frame_eval(sdc_mgau_t * s,
+sdc_mgau_frame_eval(ps_mgau_t * ps,
                     int16 *senone_scores,
                     uint8 *senone_active,
                     int32 n_senone_active,
                     mfcc_t ** featbuf, int32 frame,
                     int32 compallsen)
 {
+    sdc_mgau_t *s = (sdc_mgau_t *)ps;
     int32 bscore;
     int i;
 
@@ -569,10 +577,11 @@
     return 0;
 }
 
-sdc_mgau_t *
+ps_mgau_t *
 sdc_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef)
 {
     sdc_mgau_t *s;
+    ps_mgau_t *ps;
     float32 **fgau;
 
     s = ckd_calloc(1, sizeof(*s));
@@ -581,25 +590,25 @@
     /* Log-add table. */
     s->lmath_8b = logmath_init(logmath_get_base(lmath), SENSCR_SHIFT, TRUE);
     if (s->lmath_8b == NULL) {
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     /* Ensure that it is only 8 bits wide so that fast_logmath_add() works. */
     if (logmath_get_width(s->lmath_8b) != 1) {
         E_ERROR("Log base %f is too small to represent add table in 8 bits\n",
                 logmath_get_base(s->lmath_8b));
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
 
     /* Read means and variances. */
     if (s3_read_mgau(s, cmd_ln_str_r(config, "-mean"), &fgau) < 0) {
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->means = (mean_t **)fgau;
     if (s3_read_mgau(s, cmd_ln_str_r(config, "-var"), &fgau) < 0) {
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->vars = (var_t **)fgau;
@@ -611,14 +620,14 @@
     /* Read mixture weights */
     if (read_mixw(s, cmd_ln_str_r(config, "-mixw"),
                   cmd_ln_float32_r(config, "-mixwfloor")) < 0) {
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->ds_ratio = cmd_ln_int32_r(config, "-ds");
 
     /* Read subspace cluster mapping */
     if (read_sdmap(s, cmd_ln_str_r(config, "-sdmap")) < 0) {
-        sdc_mgau_free(s);
+        sdc_mgau_free(ps_mgau_base(s));
         return NULL;
     }
 
@@ -626,12 +635,25 @@
     s->cb_scores = ckd_calloc_2d(s->n_sv, s->n_density,
                                  sizeof(**s->cb_scores));
 
-    return s;
+    ps = ps_mgau_base(ps_mgau_base(s));
+    ps->vt = &sdc_mgau_funcs;
+    return ps;
 }
 
+int
+sdc_mgau_mllr_transform(ps_mgau_t *s,
+                        float32 ***A,
+                        float32 **b,
+                        float32 **h,
+                        int32 *cb2mllr)
+{
+    return -1;
+}
+
 void
-sdc_mgau_free(sdc_mgau_t * s)
+sdc_mgau_free(ps_mgau_t * ps)
 {
+    sdc_mgau_t *s = (sdc_mgau_t *)ps;
     uint32 i;
 
     logmath_free(s->lmath_8b);

Modified: trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2009-02-17 17:52:36 UTC (rev 8997)
+++ trunk/pocketsphinx/src/libpocketsphinx/sdc_mgau.h	2009-02-18 05:01:52 UTC (rev 8998)
@@ -47,12 +47,14 @@
 #include <mmio.h>
 
 /* Local headers. */
+#include "acmod.h"
 #include "hmm.h"
 #include "bin_mdef.h"
 #include "s2_semi_mgau.h"
 
 typedef struct sdc_mgau_s sdc_mgau_t;
 struct sdc_mgau_s {
+    ps_mgau_t base;     /**< base structure. */
     cmd_ln_t *config;   /* configuration parameters */
 
     mean_t  **means;	/* mean vectors foreach feature */
@@ -78,16 +80,19 @@
     logmath_t *lmath_8b;
 };
 
-sdc_mgau_t *sdc_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
-
-void sdc_mgau_free(sdc_mgau_t *s);
-
-int32 sdc_mgau_frame_eval(sdc_mgau_t *s,
+ps_mgau_t *sdc_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
+void sdc_mgau_free(ps_mgau_t *s);
+int32 sdc_mgau_frame_eval(ps_mgau_t *s,
                           int16 *senone_scores,
                           uint8 *senone_active,
                           int32 n_senone_active,
                           mfcc_t **featbuf,
                           int32 frame,
                           int32 compallsen);
+int32 sdc_mgau_mllr_transform(ps_mgau_t *s,
+                              float32 ***A,
+                              float32 **b,
+                              float32 **h,
+                              int32 *cb2mllr);
 
 #endif /*  __SDC_MGAU_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9000
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9000&view=rev
Author:   dhdfu
Date:     2009-02-18 16:09:17 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Add (untested) MLLR adaptation to SCHMM

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-18 07:23:05 UTC (rev 8999)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-18 16:09:17 UTC (rev 9000)
@@ -76,7 +76,7 @@
 static int
 acmod_init_am(acmod_t *acmod)
 {
-    char const *mdeffn, *tmatfn, *featparams;
+    char const *mdeffn, *tmatfn, *featparams, *mllrfn;
 
     /* Look for feat.params in acoustic model dir. */
     if ((featparams = cmd_ln_str_r(acmod->config, "-featparams"))) {
@@ -141,6 +141,14 @@
         }
     }
 
+    /* If there is an MLLR transform, apply it. */
+    if ((mllrfn = cmd_ln_str_r(acmod->config, "-mllr"))) {
+        ps_mllr_t *mllr = ps_mllr_read(mllrfn);
+        if (mllr == NULL)
+            return -1;
+        acmod_update_mllr(acmod, mllr);
+    }
+
     return 0;
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-18 07:23:05 UTC (rev 8999)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-18 16:09:17 UTC (rev 9000)
@@ -1096,6 +1096,7 @@
     s = ckd_calloc(1, sizeof(*s));
     s->config = config;
 
+    s->lmath = logmath_retain(lmath);
     /* Log-add table. */
     s->lmath_8b = logmath_init(logmath_get_base(lmath), SENSCR_SHIFT, TRUE);
     if (s->lmath_8b == NULL) {
@@ -1154,10 +1155,63 @@
 }
 
 int
-s2_semi_mgau_mllr_transform(ps_mgau_t *s,
+s2_semi_mgau_mllr_transform(ps_mgau_t *ps,
                             ps_mllr_t *mllr)
 {
-    return -1;
+    s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
+    int32 i, d, l, m;
+    float32 **fmean, *mp, **fvar, *vp;
+    float64 *temp;
+
+    /* Reload means and variances. */
+    if (s3_read_mgau(s, cmd_ln_str_r(s->config, "-mean"), &fmean) < 0) {
+        return -1;
+    }
+    if (s3_read_mgau(s, cmd_ln_str_r(s->config, "-var"), &fvar) < 0) {
+        return -1;
+    }
+
+    /* Transform codebook for each stream s */
+    for (i = 0; i < s->n_feat; i++) {
+        temp = (float64 *) ckd_calloc(s->veclen[i], sizeof(float64));
+        mp = fmean[i];
+        vp = fvar[i];
+
+        /* Transform each density d in selected codebook */
+        for (d = 0; d < s->n_density; d++) {
+            for (l = 0; l < s->veclen[i]; l++) {
+                temp[l] = 0.0;
+                for (m = 0; m < s->veclen[i]; m++) {
+                    temp[l] += mllr->A[i][0][l][m] * mp[m];
+                }
+                temp[l] += mllr->b[i][0][l];
+            }
+
+            for (l = 0; l < s->veclen[i]; l++) {
+                mp[l] = (float32) temp[l];
+		vp[l] *= mllr->h[i][0][l];
+            }
+            mp += s->veclen[i];
+            vp += s->veclen[i];
+        }
+
+        ckd_free(temp);
+    }
+
+    for (i = 0; i < s->n_feat; ++i) {
+        if (s->means)
+            ckd_free(s->means[i]);
+        if (s->vars)
+            ckd_free(s->vars[i]);
+    }
+    ckd_free(s->means);
+    ckd_free(s->vars);
+
+    s->means = (mean_t **)fmean;
+    s->vars = (var_t **)fvar;
+    s3_precomp(s, s->lmath, cmd_ln_float32_r(s->config, "-varfloor"));
+
+    return 0;
 }
 
 void
@@ -1166,6 +1220,7 @@
     s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
     uint32 i;
 
+    logmath_free(s->lmath);
     logmath_free(s->lmath_8b);
     if (s->sendump_mmap) {
         for (i = 0; i < s->n_feat; ++i) {

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-18 07:23:05 UTC (rev 8999)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-18 16:09:17 UTC (rev 9000)
@@ -86,6 +86,8 @@
 
     /* Log-add table for compressed values. */
     logmath_t *lmath_8b;
+    /* Log-add object for reloading means/variances. */
+    logmath_t *lmath;
 };
 
 ps_mgau_t *s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9021
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9021&view=rev
Author:   dhdfu
Date:     2009-02-24 15:06:58 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Phone loop search ... no history though (this may be enough for phoneme lookahead)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 09:49:39 UTC (rev 9020)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 15:06:58 UTC (rev 9021)
@@ -68,6 +68,7 @@
 phone_loop_search_reinit(ps_search_t *search)
 {
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
+    cmd_ln_t *config = ps_search_config(search);
     acmod_t *acmod = ps_search_acmod(search);
     int i;
 
@@ -94,6 +95,9 @@
         /* All CI senones are active all the time. */
         acmod_activate_hmm(acmod, (hmm_t *)&pls->phones[i]);
     }
+    pls->beam = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-beam"));
+    pls->pbeam = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-pbeam"));
+    pls->pip = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-pip"));
 
     return 0;
 }
@@ -118,11 +122,15 @@
 phone_loop_search_free(ps_search_t *search)
 {
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
+    gnode_t *gn;
     int i;
 
     ps_search_deinit(search);
     for (i = 0; i < pls->n_phones; ++i)
         hmm_deinit((hmm_t *)&pls->phones[i]);
+    for (gn = pls->renorm; gn; gn = gnode_next(gn))
+        ckd_free(gnode_ptr(gn));
+    glist_free(pls->renorm);
     ckd_free(pls->phones);
     hmm_context_free(pls->hmmctx);
     ckd_free(pls);
@@ -143,23 +151,128 @@
     return 0;
 }
 
+static void
+renormalize_hmms(phone_loop_search_t *pls, int frame_idx, int32 norm)
+{
+    phone_loop_renorm_t *rn = ckd_calloc(1, sizeof(*rn));
+    int i;
+
+    pls->renorm = glist_add_ptr(pls->renorm, rn);
+    rn->frame_idx = frame_idx;
+    rn->norm = norm;
+
+    for (i = 0; i < pls->n_phones; ++i) {
+        hmm_normalize((hmm_t *)&pls->phones[i], norm);
+    }
+}
+
+static int32
+evaluate_hmms(phone_loop_search_t *pls, int16 const *senscr, int frame_idx)
+{
+    int32 bs = WORST_SCORE;
+    int i;
+
+    hmm_context_set_senscore(pls->hmmctx, senscr);
+
+    for (i = 0; i < pls->n_phones; ++i) {
+        hmm_t *hmm = (hmm_t *)&pls->phones[i];
+        int32 score;
+
+        if (hmm_frame(hmm) < frame_idx)
+            continue;
+        score = hmm_vit_eval(hmm);
+        if (score BETTER_THAN bs)
+            bs = score;
+    }
+    pls->best_score = bs;
+
+    return bs;
+}
+
+static void
+prune_hmms(phone_loop_search_t *pls, int frame_idx)
+{
+    int32 thresh = pls->best_score + pls->beam;
+    int nf = frame_idx + 1;
+    int i;
+
+    /* Check all phones to see if they remain active in the next frame. */
+    for (i = 0; i < pls->n_phones; ++i) {
+        hmm_t *hmm = (hmm_t *)&pls->phones[i];
+
+        if (hmm_frame(hmm) < frame_idx)
+            continue;
+        /* Retain if score better than threshold. */
+        if (hmm_bestscore(hmm) BETTER_THAN thresh)
+            hmm_frame(hmm) = nf;
+        else
+            hmm_clear_scores(hmm);
+    }
+}
+
+static void
+phone_transition(phone_loop_search_t *pls, int frame_idx)
+{
+    int32 thresh = pls->best_score + pls->pbeam;
+    int nf = frame_idx + 1;
+    int i;
+
+    /* Now transition out of phones whose last states are inside the
+     * phone transition beam. */
+    for (i = 0; i < pls->n_phones; ++i) {
+        hmm_t *hmm = (hmm_t *)&pls->phones[i];
+        int32 newphone_score;
+        int j;
+
+        if (hmm_frame(hmm) != nf)
+            continue;
+
+        newphone_score = hmm_out_score(hmm) + pls->pip;
+        if (hmm_bestscore(hmm) BETTER_THAN thresh) {
+            /* Transition into all phones using the usual Viterbi rule. */
+            for (j = 0; j < pls->n_phones; ++j) {
+                hmm_t *nhmm = (hmm_t *)&pls->phones[j];
+
+                if (hmm_frame(nhmm) < frame_idx
+                    || newphone_score BETTER_THAN hmm_in_score(nhmm)) {
+                    hmm_enter(nhmm, newphone_score, hmm_out_history(hmm), nf);
+                }
+            }
+        }
+    }
+}
+
 static int
 phone_loop_search_step(ps_search_t *search)
 {
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
     acmod_t *acmod = ps_search_acmod(search);
+    int16 const *senscr;
+    int frame_idx;
 
+    /* Determine if we actually have a frame to process. */
+    if (acmod->n_feat_frame == 0)
+        return 0;
+
     /* Calculate senone scores for current frame. */
-    /* senscr = acmod_score(acmod, &frame_idx); */
+    senscr = acmod_score(acmod, &frame_idx);
 
+    /* Renormalize, if necessary. */
+    if (pls->best_score + (2 * pls->beam) WORSE_THAN WORST_SCORE) {
+        E_INFO("Renormalizing Scores at frame %d, best score %d\n",
+               frame_idx, pls->best_score);
+        renormalize_hmms(pls, frame_idx, pls->best_score);
+    }
+
     /* Evaluate phone HMMs for current frame. */
+    pls->best_score = evaluate_hmms(pls, senscr, frame_idx);
 
     /* Prune phone HMMs. */
+    prune_hmms(pls, frame_idx);
 
     /* Do phone transitions. */
+    phone_transition(pls, frame_idx);
 
-    /* Renormalize? */
-
     return -1;
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.h	2009-02-24 09:49:39 UTC (rev 9020)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.h	2009-02-24 15:06:58 UTC (rev 9021)
@@ -68,6 +68,15 @@
 typedef struct phone_loop_s phone_loop_t;
 
 /**
+ * Renormalization event.
+ */
+struct phone_loop_renorm_s {
+    int frame_idx;  /**< Frame of renormalization. */
+    int32 norm;     /**< Normalization constant. */
+};
+typedef struct phone_loop_renorm_s phone_loop_renorm_t;
+
+/**
  * Phone loop search structure.
  */
 struct phone_loop_search_s {
@@ -76,6 +85,12 @@
     int16 frame;            /**< Current frame being searched. */
     int16 n_phones;         /**< Size of phone array. */
     phone_loop_t *phones;   /**< Array of phone arcs. */
+
+    int32 best_score;       /**< Best Viterbi score in current frame. */
+    int32 beam;             /**< HMM pruning beam width. */
+    int32 pbeam;            /**< Phone exit pruning beam width. */
+    int32 pip;              /**< Phone insertion penalty ("language score"). */
+    glist_t renorm;         /**< List of renormalizations. */
 };
 typedef struct phone_loop_search_s phone_loop_search_t;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9024
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9024&view=rev
Author:   dhdfu
Date:     2009-02-24 17:40:40 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Make acmod_score() not advance automatically, so that multiple
searches can be run in parallel.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx_internal.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-24 17:40:40 UTC (rev 9024)
@@ -408,6 +408,8 @@
     acmod->mfc_outidx = 0;
     acmod->feat_outidx = 0;
     acmod->output_frame = 0;
+    acmod->senscr_frame = -1;
+    acmod->n_senone_active = 0;
     return 0;
 }
 
@@ -753,10 +755,21 @@
     /* Reset output pointers. */
     acmod->feat_outidx = 0;
     acmod->output_frame = 0;
+    acmod->senscr_frame = -1;
 
     return 0;
 }
 
+int
+acmod_advance(acmod_t *acmod)
+{
+    /* Advance the output pointers. */
+    ++acmod->feat_outidx;
+    --acmod->n_feat_frame;
+
+    return ++acmod->output_frame;
+}
+
 int16 const *
 acmod_score(acmod_t *acmod,
 	    int *out_frame_idx)
@@ -765,16 +778,20 @@
     if (acmod->n_feat_frame == 0)
         return NULL;
 
+    /* Current frame has already been scored. */
+    if (acmod->senscr_frame == acmod->output_frame)
+        return acmod->senone_scores;
+
     /* Build active senone list. */
     acmod_flags2list(acmod);
 
-    /* Wrap around output pointer.  It is very important that we do
-     * this *before* scoring instead of after, in order for
-     * acmod_rewind() to work - i.e. the output pointer always needs
-     * to reflect the number of frames processed when the buffer is
-     * not circular. */
+    /* If the buffer is circular, then wrap it around if necessary.
+     * This has to be done here so that acmod_rewind() will calculate
+     * the number of available frames properly.
+     */
     if (acmod->feat_outidx == acmod->n_feat_alloc)
         acmod->feat_outidx = 0;
+
     /* Generate scores for the next available frame */
     ps_mgau_frame_eval(acmod->mgau,
                        acmod->senone_scores,
@@ -783,13 +800,8 @@
                        acmod->feat_buf[acmod->feat_outidx],
                        acmod->output_frame,
                        acmod->compallsen);
-    /* Advance the output pointers. */
-    ++acmod->feat_outidx;
-    --acmod->n_feat_frame;
 
-    *out_frame_idx = acmod->output_frame;
-    ++acmod->output_frame;
-
+    acmod->senscr_frame = *out_frame_idx = acmod->output_frame;
     return acmod->senone_scores;
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-24 17:40:40 UTC (rev 9024)
@@ -158,6 +158,7 @@
     int16 *senone_scores;      /**< GMM scores for current frame. */
     bitvec_t *senone_active_vec; /**< Active GMMs in current frame. */
     uint8 *senone_active;      /**< Array of deltas to active GMMs. */
+    int senscr_frame;          /**< Frame index for senone_scores. */
     int n_senone_active;       /**< Number of active GMMs. */
     int log_zero;              /**< Zero log-probability value. */
 
@@ -261,6 +262,17 @@
 int acmod_rewind(acmod_t *acmod);
 
 /**
+ * Advance the frame index.
+ *
+ * This function moves to the next frame of input data.  Subsequent
+ * calls to acmod_score() will return scores for that frame, until the
+ * next call to acmod_advance().
+ *
+ * @return New frame index.
+ */
+int acmod_advance(acmod_t *acmod);
+
+/**
  * Set memory allocation policy for utterance processing.
  *
  * @param grow_feat If non-zero, the internal dynamic feature buffer
@@ -337,7 +349,7 @@
  *                       of scores.
  * @return Array of senone scores for this frame, or NULL if no frame
  *         is available for scoring.  The data pointed to persists only
- *         until the next call to acmod_score().
+ *         until the next call to acmod_advance().
  */
 int16 const *acmod_score(acmod_t *acmod,
                          int *out_frame_idx);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-02-24 17:40:40 UTC (rev 9024)
@@ -665,7 +665,8 @@
             /* Now redo search. */
             ngram_fwdflat_start(ngs);
             while ((nfr = ngram_fwdflat_search(ngs)) > 0) {
-                /* Do nothing! */
+                assert(nfr == 1);
+                acmod_advance(ps_search_acmod(ngs));
             }
             if (nfr < 0)
                 return nfr;

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 17:40:40 UTC (rev 9024)
@@ -118,19 +118,26 @@
     return ps_search_base(pls);
 }
 
+static void
+phone_loop_search_free_renorm(phone_loop_search_t *pls)
+{
+    gnode_t *gn;
+    for (gn = pls->renorm; gn; gn = gnode_next(gn))
+        ckd_free(gnode_ptr(gn));
+    glist_free(pls->renorm);
+    pls->renorm = NULL;
+}
+
 void
 phone_loop_search_free(ps_search_t *search)
 {
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
-    gnode_t *gn;
     int i;
 
     ps_search_deinit(search);
     for (i = 0; i < pls->n_phones; ++i)
         hmm_deinit((hmm_t *)&pls->phones[i]);
-    for (gn = pls->renorm; gn; gn = gnode_next(gn))
-        ckd_free(gnode_ptr(gn));
-    glist_free(pls->renorm);
+    phone_loop_search_free_renorm(pls);
     ckd_free(pls->phones);
     hmm_context_free(pls->hmmctx);
     ckd_free(pls);
@@ -147,6 +154,7 @@
         hmm_clear((hmm_t *)&pls->phones[i]);
         pls->phones[i].frame = -1;
     }
+    pls->best_score = WORST_SCORE;
 
     return 0;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-02-24 17:40:40 UTC (rev 9024)
@@ -50,6 +50,7 @@
 #include "pocketsphinx_internal.h"
 #include "ps_lattice_internal.h"
 #include "fsg_search_internal.h"
+#include "phone_loop_search.h"
 #include "ngram_search.h"
 #include "ngram_search_fwdtree.h"
 #include "ngram_search_fwdflat.h"
@@ -210,9 +211,14 @@
     /* Otherwise, we will initialize the search whenever the user
      * decides to load an FSG or a language model. */
 
-    /* TODO: If phoneme lookahead is requested then initialize an
-     * auxiliary phone loop search, which will run in "parallel" with
-     * FSG or N-Gram search. */
+#if 0
+    /* Initialize an auxiliary phone loop search, which will run in
+     * "parallel" with FSG or N-Gram search. */
+    if ((ps->phone_loop = phone_loop_search_init(ps->config,
+                                                 ps->acmod, ps->dict)) == NULL)
+        return -1;
+    ps->searches = glist_add_ptr(ps->searches, ps->phone_loop);
+#endif
 
     /* Initialize performance timer. */
     ps->perf.name = "decode";
@@ -520,7 +526,9 @@
         acmod_set_rawfh(ps->acmod, rawfh);
     }
 
-    /* TODO: Start the auxiliary phone loop search if requested. */
+    /* Start auxiliary phone loop search. */
+    if (ps->phone_loop)
+        ps_search_start(ps->phone_loop);
 
     return ps_search_start(ps->search);
 }
@@ -548,6 +556,10 @@
         /* Score and search as much data as possible */
         if (!no_search) {
             while ((nfr = ps_search_step(ps->search)) > 0) {
+                assert(nfr == 1);
+                if (ps->phone_loop)
+                    ps_search_step(ps->phone_loop);
+                acmod_advance(ps->acmod);
                 n_searchfr += nfr;
             }
             if (nfr < 0)
@@ -582,6 +594,10 @@
         /* Score and search as much data as possible */
         if (!no_search) {
             while ((nfr = ps_search_step(ps->search)) > 0) {
+                assert(nfr == 1);
+                if (ps->phone_loop)
+                    ps_search_step(ps->phone_loop);
+                acmod_advance(ps->acmod);
                 n_searchfr += nfr;
             }
             if (nfr < 0)
@@ -600,12 +616,17 @@
 
     acmod_end_utt(ps->acmod);
     while ((rv = ps_search_step(ps->search)) > 0) {
+        assert(rv == 1);
+        if (ps->phone_loop)
+            ps_search_step(ps->phone_loop);
     }
     if (rv < 0) {
         ptmr_stop(&ps->perf);
         return rv;
     }
     rv = ps_search_finish(ps->search);
+    if (ps->phone_loop)
+        ps_search_finish(ps->phone_loop);
     ptmr_stop(&ps->perf);
 
     /* Log a backtrace if requested. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx_internal.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx_internal.h	2009-02-24 16:47:27 UTC (rev 9023)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx_internal.h	2009-02-24 17:40:40 UTC (rev 9024)
@@ -181,8 +181,9 @@
     logmath_t *lmath;  /**< Log math computation. */
 
     /* Search modules. */
-    glist_t searches;   /**< List of search modules. */
-    ps_search_t *search; /**< Currently active search module. */
+    glist_t searches;        /**< List of search modules. */
+    ps_search_t *search;     /**< Currently active search module. */
+    ps_search_t *phone_loop; /**< Phone loop search for lookahead. */
 
     /* Utterance-processing related stuff. */
     uint32 uttno;       /**< Utterance counter. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9025
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9025&view=rev
Author:   dhdfu
Date:     2009-02-24 18:50:14 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Fix phone loop search and acmod stuff.  Not totally sure how to use it yet.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-24 17:40:40 UTC (rev 9024)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-24 18:50:14 UTC (rev 9025)
@@ -778,8 +778,8 @@
     if (acmod->n_feat_frame == 0)
         return NULL;
 
-    /* Current frame has already been scored. */
-    if (acmod->senscr_frame == acmod->output_frame)
+    /* If all senones are being computed then we can reuse existing scores. */
+    if (acmod->compallsen && acmod->senscr_frame == acmod->output_frame)
         return acmod->senone_scores;
 
     /* Build active senone list. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 17:40:40 UTC (rev 9024)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 18:50:14 UTC (rev 9025)
@@ -92,12 +92,12 @@
                  FALSE,
                  bin_mdef_pid2ssid(acmod->mdef, i),
                  bin_mdef_pid2tmatid(acmod->mdef, i));
-        /* All CI senones are active all the time. */
-        acmod_activate_hmm(acmod, (hmm_t *)&pls->phones[i]);
     }
     pls->beam = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-beam"));
     pls->pbeam = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-pbeam"));
     pls->pip = logmath_log(acmod->lmath, cmd_ln_float64_r(config, "-pip"));
+    E_INFO("State beam %d Phone exit beam %d Insertion penalty %d\n",
+           pls->beam, pls->pbeam, pls->pip);
 
     return 0;
 }
@@ -149,12 +149,14 @@
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
     int i;
 
-    /* Reset scores and backpointers in phone HMMs. */
+    /* Reset and enter all phone HMMs. */
     for (i = 0; i < pls->n_phones; ++i) {
-        hmm_clear((hmm_t *)&pls->phones[i]);
-        pls->phones[i].frame = -1;
+        hmm_t *hmm = (hmm_t *)&pls->phones[i];
+        hmm_clear(hmm);
+        hmm_enter(hmm, 0, -1, 0);
     }
-    pls->best_score = WORST_SCORE;
+    phone_loop_search_free_renorm(pls);
+    pls->best_score = 0;
 
     return 0;
 }
@@ -178,10 +180,12 @@
 evaluate_hmms(phone_loop_search_t *pls, int16 const *senscr, int frame_idx)
 {
     int32 bs = WORST_SCORE;
-    int i;
+    int i, bi;
 
     hmm_context_set_senscore(pls->hmmctx, senscr);
 
+    /* E_INFO("Active in frame %d:", frame_idx); */
+    bi = 0;
     for (i = 0; i < pls->n_phones; ++i) {
         hmm_t *hmm = (hmm_t *)&pls->phones[i];
         int32 score;
@@ -189,10 +193,17 @@
         if (hmm_frame(hmm) < frame_idx)
             continue;
         score = hmm_vit_eval(hmm);
-        if (score BETTER_THAN bs)
+        /* E_INFOCONT(" %s(%d)",
+           bin_mdef_ciphone_str(ps_search_acmod(pls)->mdef, i), score); */
+        if (score BETTER_THAN bs) {
             bs = score;
+            bi = i;
+        }
     }
     pls->best_score = bs;
+    /* E_INFOCONT("\n"); */
+    /* E_INFO("Best phone %s score %d\n",
+       bin_mdef_ciphone_str(ps_search_acmod(pls)->mdef, bi), bs); */
 
     return bs;
 }
@@ -211,8 +222,9 @@
         if (hmm_frame(hmm) < frame_idx)
             continue;
         /* Retain if score better than threshold. */
-        if (hmm_bestscore(hmm) BETTER_THAN thresh)
+        if (hmm_bestscore(hmm) BETTER_THAN thresh) {
             hmm_frame(hmm) = nf;
+        }
         else
             hmm_clear_scores(hmm);
     }
@@ -236,7 +248,12 @@
             continue;
 
         newphone_score = hmm_out_score(hmm) + pls->pip;
-        if (hmm_bestscore(hmm) BETTER_THAN thresh) {
+        if (newphone_score BETTER_THAN thresh) {
+#if 0
+            E_INFO("Exiting phone %s in frame %d score %d thresh %d\n",
+                   bin_mdef_ciphone_str(ps_search_acmod(pls)->mdef, i),
+                   frame_idx, newphone_score, thresh);
+#endif
             /* Transition into all phones using the usual Viterbi rule. */
             for (j = 0; j < pls->n_phones; ++j) {
                 hmm_t *nhmm = (hmm_t *)&pls->phones[j];
@@ -256,12 +273,17 @@
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
     acmod_t *acmod = ps_search_acmod(search);
     int16 const *senscr;
-    int frame_idx;
+    int frame_idx, i;
 
     /* Determine if we actually have a frame to process. */
     if (acmod->n_feat_frame == 0)
         return 0;
 
+    /* All CI senones are active all the time. */
+    if (!ps_search_acmod(pls)->compallsen)
+        for (i = 0; i < pls->n_phones; ++i)
+            acmod_activate_hmm(acmod, (hmm_t *)&pls->phones[i]);
+
     /* Calculate senone scores for current frame. */
     senscr = acmod_score(acmod, &frame_idx);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9026
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9026&view=rev
Author:   dhdfu
Date:     2009-02-25 19:41:36 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Slight refactoring in advance of asynchronous searches

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -772,16 +772,23 @@
 
 int16 const *
 acmod_score(acmod_t *acmod,
-	    int *out_frame_idx)
+	    int *inout_frame_idx)
 {
+    int frame_idx;
+
     /* No frames available to score. */
     if (acmod->n_feat_frame == 0)
         return NULL;
 
+    if (inout_frame_idx == NULL || *inout_frame_idx == -1)
+        frame_idx = acmod->output_frame;
+
     /* If all senones are being computed then we can reuse existing scores. */
-    if (acmod->compallsen && acmod->senscr_frame == acmod->output_frame)
+    if (acmod->compallsen && frame_idx == acmod->senscr_frame)
         return acmod->senone_scores;
 
+    /* Check to make sure features are available for the requested frame index. */
+
     /* Build active senone list. */
     acmod_flags2list(acmod);
 
@@ -798,10 +805,13 @@
                        acmod->senone_active,
                        acmod->n_senone_active,
                        acmod->feat_buf[acmod->feat_outidx],
-                       acmod->output_frame,
+                       frame_idx,
                        acmod->compallsen);
 
-    acmod->senscr_frame = *out_frame_idx = acmod->output_frame;
+    if (inout_frame_idx)
+        *inout_frame_idx = frame_idx;
+    acmod->senscr_frame = frame_idx;
+
     return acmod->senone_scores;
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-25 19:41:36 UTC (rev 9026)
@@ -345,14 +345,18 @@
 /**
  * Score one frame of data.
  *
- * @param out_frame_idx  Output: frame index corresponding to this set
- *                       of scores.
+ * @param inout_frame_idx Input: frame index to score, or -1 or NULL
+ *                        to obtain scores for the most recent frame.
+ *                        Output: frame index corresponding to this
+ *                        set of scores.
  * @return Array of senone scores for this frame, or NULL if no frame
- *         is available for scoring.  The data pointed to persists only
- *         until the next call to acmod_advance().
+ *         is available for scoring (such as if a frame index is
+ *         requested that is not yet or no longer available).  The
+ *         data pointed to persists only until the next call to
+ *         acmod_score() or acmod_advance().
  */
 int16 const *acmod_score(acmod_t *acmod,
-                         int *out_frame_idx);
+                         int *inout_frame_idx);
 
 /**
  * Get best score and senone index for current frame.

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -816,7 +816,7 @@
 {
     fsg_search_t *fsgs = (fsg_search_t *)search;
     int16 const *senscr;
-    int frame_idx;
+    int frame_idx = -1;
     acmod_t *acmod = search->acmod;
     gnode_t *gn;
     fsg_pnode_t *pnode;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -707,7 +707,7 @@
 ngram_fwdflat_search(ngram_search_t *ngs)
 {
     int16 const *senscr;
-    int frame_idx;
+    int frame_idx = -1;
     int32 nf, i, j;
     int32 *nawl;
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -1368,7 +1368,7 @@
 ngram_fwdtree_search(ngram_search_t *ngs)
 {
     int16 const *senscr;
-    int frame_idx;
+    int frame_idx = -1;
 
     /* Determine if we actually have a frame to process. */
     if (ps_search_acmod(ngs)->n_feat_frame == 0)

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -273,7 +273,7 @@
     phone_loop_search_t *pls = (phone_loop_search_t *)search;
     acmod_t *acmod = ps_search_acmod(search);
     int16 const *senscr;
-    int frame_idx, i;
+    int frame_idx = -1, i;
 
     /* Determine if we actually have a frame to process. */
     if (acmod->n_feat_frame == 0)

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-02-24 18:50:14 UTC (rev 9025)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-02-25 19:41:36 UTC (rev 9026)
@@ -210,7 +210,6 @@
     }
     /* Otherwise, we will initialize the search whenever the user
      * decides to load an FSG or a language model. */
-
 #if 0
     /* Initialize an auxiliary phone loop search, which will run in
      * "parallel" with FSG or N-Gram search. */
@@ -533,6 +532,24 @@
     return ps_search_start(ps->search);
 }
 
+static int
+ps_search_forward(ps_decoder_t *ps)
+{
+    int nfr, k;
+
+    nfr = 0;
+    while ((k = ps_search_step(ps->search)) > 0) {
+        assert(k == 1);
+        if (ps->phone_loop)
+            ps_search_step(ps->phone_loop);
+        acmod_advance(ps->acmod);
+        nfr += k;
+    }
+    if (k < 0)
+        return k;
+    return nfr;
+}
+
 int
 ps_process_raw(ps_decoder_t *ps,
                int16 const *data,
@@ -554,17 +571,11 @@
             return nfr;
 
         /* Score and search as much data as possible */
-        if (!no_search) {
-            while ((nfr = ps_search_step(ps->search)) > 0) {
-                assert(nfr == 1);
-                if (ps->phone_loop)
-                    ps_search_step(ps->phone_loop);
-                acmod_advance(ps->acmod);
-                n_searchfr += nfr;
-            }
-            if (nfr < 0)
-                return nfr;
-        }
+        if (!no_search)
+            continue;
+        if ((nfr = ps_search_forward(ps)) < 0)
+            return nfr;
+        n_searchfr += nfr;
     }
 
     ps->n_frame += n_searchfr;
@@ -592,17 +603,11 @@
             return nfr;
 
         /* Score and search as much data as possible */
-        if (!no_search) {
-            while ((nfr = ps_search_step(ps->search)) > 0) {
-                assert(nfr == 1);
-                if (ps->phone_loop)
-                    ps_search_step(ps->phone_loop);
-                acmod_advance(ps->acmod);
-                n_searchfr += nfr;
-            }
-            if (nfr < 0)
-                return nfr;
-        }
+        if (!no_search)
+            continue;
+        if ((nfr = ps_search_forward(ps)) < 0)
+            return nfr;
+        n_searchfr += nfr;
     }
 
     ps->n_frame += n_searchfr;
@@ -612,19 +617,19 @@
 int
 ps_end_utt(ps_decoder_t *ps)
 {
-    int rv;
+    int nfr;
 
     acmod_end_utt(ps->acmod);
-    while ((rv = ps_search_step(ps->search)) > 0) {
-        assert(rv == 1);
-        if (ps->phone_loop)
-            ps_search_step(ps->phone_loop);
+    if ((nfr = ps_search_forward(ps)) < 0) {
+        ptmr_stop(&ps->perf);
+        return nfr;
     }
-    if (rv < 0) {
+    ps->n_frame += nfr;
+    if ((nfr = ps_search_finish(ps->search)) < 0) {
         ptmr_stop(&ps->perf);
-        return rv;
+        return nfr;
     }
-    rv = ps_search_finish(ps->search);
+    ps->n_frame += nfr;
     if (ps->phone_loop)
         ps_search_finish(ps->phone_loop);
     ptmr_stop(&ps->perf);
@@ -652,7 +657,7 @@
                         word, sf, ef, logmath_exp(ps_get_logmath(ps), post), ascr, lscr, lback);
         }
     }
-    return rv;
+    return nfr;
 }
 
 char const *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9031
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9031&view=rev
Author:   dhdfu
Date:     2009-02-27 20:11:18 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
Use a ringbuffer for past frames of top-N so that phoneme lookahead
can be done efficiently (not quite yet, but this is the first step)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-27 16:46:53 UTC (rev 9030)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-27 20:11:18 UTC (rev 9031)
@@ -303,9 +303,6 @@
 static void
 mgau_dist(s2_semi_mgau_t * s, int32 frame, int32 feat, mfcc_t * z)
 {
-    /* Initialize topn codewords to topn codewords from previous
-     * frame, and calculate their densities. */
-    memcpy(s->f[feat], s->lastf[feat], sizeof(vqFeature_t) * s->max_topn);
     eval_topn(s, feat, z);
 
     /* If this frame is skipped, do nothing else. */
@@ -327,9 +324,6 @@
     else {
         eval_cb(s, feat, z);
     }
-
-    /* Make a copy of current topn. */
-    memcpy(s->lastf[feat], s->f[feat], sizeof(vqFeature_t) * s->max_topn);
 }
 
 static int
@@ -605,12 +599,21 @@
 			int32 compallsen)
 {
     s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
+    vqFeature_t **lastf;
     int i;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
+
+    /* Find previous frame of topn. */
+    if (s->cur_topn_hist == 0)
+        lastf = s->topn_hist[s->n_topn_hist-1];
+    else
+        lastf = s->topn_hist[s->cur_topn_hist-1];
     for (i = 0; i < s->n_feat; ++i) {
         int topn;
 
+        /* Initialize topn codewords to topn codewords from previous frame. */
+        memcpy(s->f[i], lastf[i], sizeof(vqFeature_t) * s->max_topn);
         mgau_dist(s, frame, i, featbuf[i]);
         topn = mgau_norm(s, i);
 
@@ -620,6 +623,11 @@
             get_scores_8b_feat(s, i, topn, senone_scores,
                                senone_active, n_senone_active);
     }
+    /* Advance topn codeword pointer to next frame */
+    if (++s->cur_topn_hist >= s->n_topn_hist)
+        s->cur_topn_hist = 0;
+    s->f = s->topn_hist[s->cur_topn_hist];
+
     return 0;
 }
 
@@ -1118,18 +1126,24 @@
     }
     E_INFOCONT("\n");
 
-    /* Top-N scores from current, previous frame */
-    s->f = (vqFeature_t **) ckd_calloc_2d(s->n_feat, s->max_topn,
-                                          sizeof(vqFeature_t));
-    s->lastf = (vqFeature_t **) ckd_calloc_2d(s->n_feat, s->max_topn,
-                                              sizeof(vqFeature_t));
-    for (i = 0; i < s->n_feat; ++i) {
-        int32 j;
-        for (j = 0; j < s->max_topn; ++j) {
-            s->lastf[i][j].score = WORST_DIST;
-            s->lastf[i][j].codeword = j;
+    /* Top-N scores from recent frames */
+    s->n_topn_hist = cmd_ln_int32_r(config, "-pl_window");
+    if (s->n_topn_hist < 2) s->n_topn_hist = 2;
+    s->topn_hist = (vqFeature_t ***)
+        ckd_calloc_3d(s->n_topn_hist, s->n_feat, s->max_topn,
+                      sizeof(vqFeature_t));
+    for (i = 0; i < s->n_topn_hist; ++i) {
+        int j;
+        for (j = 0; j < s->n_feat; ++j) {
+            int k;
+            for (k = 0; k < s->max_topn; ++k) {
+                s->topn_hist[i][j][k].score = WORST_DIST;
+                s->topn_hist[i][j][k].codeword = k;
+            }
         }
     }
+    s->f = s->topn_hist[0];
+    s->cur_topn_hist = 0;
 
     ps = (ps_mgau_t *)s;
     ps->vt = &s2_semi_mgau_funcs;
@@ -1225,8 +1239,7 @@
     ckd_free(s->means);
     ckd_free(s->vars);
     ckd_free(s->topn_beam);
-    ckd_free_2d((void **)s->f);
-    ckd_free_2d((void **)s->lastf);
+    ckd_free_3d((void **)s->topn_hist);
     ckd_free_2d((void **)s->dets);
     ckd_free(s);
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-27 16:46:53 UTC (rev 9030)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-27 20:11:18 UTC (rev 9031)
@@ -80,8 +80,10 @@
     uint32 kd_maxdepth;
     int32 kd_maxbbi;
 
-    /* Top-N scores and codewords from current, last frame. */
-    vqFeature_t **f, **lastf;
+    /* Top-N scores and codewords from last N frames. */
+    vqFeature_t ***topn_hist;
+    vqFeature_t **f;
+    int16 n_topn_hist, cur_topn_hist;
 
     /* Log-add table for compressed values. */
     logmath_t *lmath_8b;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9032
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9032&view=rev
Author:   dhdfu
Date:     2009-02-27 20:38:44 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
(Hopefully) fast senone scoring of past frames

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/acmod.h
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-27 20:11:18 UTC (rev 9031)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-02-27 20:38:44 UTC (rev 9032)
@@ -397,6 +397,7 @@
     acmod->output_frame = 0;
     acmod->senscr_frame = -1;
     acmod->n_senone_active = 0;
+    acmod->mgau->frame_idx = 0;
     return 0;
 }
 
@@ -741,6 +742,7 @@
     acmod->feat_outidx = 0;
     acmod->output_frame = 0;
     acmod->senscr_frame = -1;
+    acmod->mgau->frame_idx = 0;
 
     return 0;
 }
@@ -751,6 +753,7 @@
     /* Advance the output pointers. */
     ++acmod->feat_outidx;
     --acmod->n_feat_frame;
+    ++acmod->mgau->frame_idx;
 
     return ++acmod->output_frame;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-27 20:11:18 UTC (rev 9031)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.h	2009-02-27 20:38:44 UTC (rev 9032)
@@ -105,7 +105,8 @@
 } ps_mgaufuncs_t;    
 
 struct ps_mgau_s {
-    ps_mgaufuncs_t *vt;
+    ps_mgaufuncs_t *vt;  /**< vtable of mgau functions. */
+    int frame_idx;       /**< frame counter. */
 };
 
 #define ps_mgau_base(mg) ((ps_mgau_t *)(mg))

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-27 20:11:18 UTC (rev 9031)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-02-27 20:38:44 UTC (rev 9032)
@@ -174,7 +174,6 @@
         obs = z;
         for (j = 0; j < ceplen; j++) {
             diff = *obs++ - *mean++;
-            /* FIXME: Use standard deviations, to avoid squaring, as per Bhiksha. */
             sqdiff = MFCCMUL(diff, diff);
             compl = MFCCMUL(sqdiff, *var);
             d = GMMSUB(d, compl);
@@ -216,7 +215,6 @@
         obs = z;
         for (j = 0; (j < ceplen) && (d >= worst->score); j++) {
             diff = *obs++ - *mean++;
-            /* FIXME: Use standard deviations, to avoid squaring, as per Bhiksha. */
             sqdiff = MFCCMUL(diff, diff);
             compl = MFCCMUL(sqdiff, *var);
             d = GMMSUB(d, compl);
@@ -270,7 +268,6 @@
         cw = detP - det;
         for (j = 0; (j < ceplen) && (d >= worst->score); ++j) {
             diff = *obs++ - *mean++;
-            /* FIXME: Use standard deviations, to avoid squaring, as per Bhiksha. */
             sqdiff = MFCCMUL(diff, diff);
             compl = MFCCMUL(sqdiff, *var);
             d = GMMSUB(d, compl);
@@ -599,34 +596,33 @@
 			int32 compallsen)
 {
     s2_semi_mgau_t *s = (s2_semi_mgau_t *)ps;
-    vqFeature_t **lastf;
-    int i;
+    int i, topn_idx;
 
     memset(senone_scores, 0, s->n_sen * sizeof(*senone_scores));
-
-    /* Find previous frame of topn. */
-    if (s->cur_topn_hist == 0)
-        lastf = s->topn_hist[s->n_topn_hist-1];
-    else
-        lastf = s->topn_hist[s->cur_topn_hist-1];
+    /* No bounds checking is done here, which just means you'll get
+     * semi-random crap if you request a frame in the future or one
+     * that's too far in the past. */
+    topn_idx = frame % s->n_topn_hist;
+    s->f = s->topn_hist[topn_idx];
     for (i = 0; i < s->n_feat; ++i) {
-        int topn;
+        /* For past frames this will already be computed. */
+        if (frame >= ps_mgau_base(ps)->frame_idx) {
+            vqFeature_t **lastf;
+            if (topn_idx == 0)
+                lastf = s->topn_hist[s->n_topn_hist-1];
+            else
+                lastf = s->topn_hist[topn_idx-1];
+            memcpy(s->f[i], lastf[i], sizeof(vqFeature_t) * s->max_topn);
+            mgau_dist(s, frame, i, featbuf[i]);
+            s->topn_hist_n[topn_idx] = mgau_norm(s, i);
+        }
 
-        /* Initialize topn codewords to topn codewords from previous frame. */
-        memcpy(s->f[i], lastf[i], sizeof(vqFeature_t) * s->max_topn);
-        mgau_dist(s, frame, i, featbuf[i]);
-        topn = mgau_norm(s, i);
-
         if (compallsen)
-	    get_scores_8b_feat_all(s, i, topn, senone_scores);
+	    get_scores_8b_feat_all(s, i, s->topn_hist_n[topn_idx], senone_scores);
         else
-            get_scores_8b_feat(s, i, topn, senone_scores,
+            get_scores_8b_feat(s, i, s->topn_hist_n[topn_idx], senone_scores,
                                senone_active, n_senone_active);
     }
-    /* Advance topn codeword pointer to next frame */
-    if (++s->cur_topn_hist >= s->n_topn_hist)
-        s->cur_topn_hist = 0;
-    s->f = s->topn_hist[s->cur_topn_hist];
 
     return 0;
 }
@@ -1127,11 +1123,11 @@
     E_INFOCONT("\n");
 
     /* Top-N scores from recent frames */
-    s->n_topn_hist = cmd_ln_int32_r(config, "-pl_window");
-    if (s->n_topn_hist < 2) s->n_topn_hist = 2;
+    s->n_topn_hist = cmd_ln_int32_r(config, "-pl_window") + 2;
     s->topn_hist = (vqFeature_t ***)
         ckd_calloc_3d(s->n_topn_hist, s->n_feat, s->max_topn,
-                      sizeof(vqFeature_t));
+                      sizeof(***s->topn_hist));
+    s->topn_hist_n = ckd_calloc(s->n_topn_hist, sizeof(*s->topn_hist_n));
     for (i = 0; i < s->n_topn_hist; ++i) {
         int j;
         for (j = 0; j < s->n_feat; ++j) {
@@ -1142,8 +1138,6 @@
             }
         }
     }
-    s->f = s->topn_hist[0];
-    s->cur_topn_hist = 0;
 
     ps = (ps_mgau_t *)s;
     ps->vt = &s2_semi_mgau_funcs;
@@ -1239,6 +1233,7 @@
     ckd_free(s->means);
     ckd_free(s->vars);
     ckd_free(s->topn_beam);
+    ckd_free(s->topn_hist_n);
     ckd_free_3d((void **)s->topn_hist);
     ckd_free_2d((void **)s->dets);
     ckd_free(s);

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-27 20:11:18 UTC (rev 9031)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-02-27 20:38:44 UTC (rev 9032)
@@ -80,10 +80,10 @@
     uint32 kd_maxdepth;
     int32 kd_maxbbi;
 
-    /* Top-N scores and codewords from last N frames. */
-    vqFeature_t ***topn_hist;
-    vqFeature_t **f;
-    int16 n_topn_hist, cur_topn_hist;
+    vqFeature_t ***topn_hist; /**< Top-N scores and codewords for past frames. */
+    uint8 *topn_hist_n;       /**< Variable top-N for past frames. */
+    vqFeature_t **f;          /**< Topn-N for currently scoring frame. */
+    int n_topn_hist;          /**< Number of past frames tracked. */
 
     /* Log-add table for compressed values. */
     logmath_t *lmath_8b;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9040
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9040&view=rev
Author:   dhdfu
Date:     2009-03-03 21:20:02 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
Oops, topn_hist_n has to be 2-dimensional since topn varies per feature

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-03-03 20:22:57 UTC (rev 9039)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-03-03 21:20:02 UTC (rev 9040)
@@ -614,20 +614,12 @@
                 lastf = s->topn_hist[topn_idx-1];
             memcpy(s->f[i], lastf[i], sizeof(vqFeature_t) * s->max_topn);
             mgau_dist(s, frame, i, featbuf[i]);
-            s->topn_hist_n[topn_idx] = mgau_norm(s, i);
+            s->topn_hist_n[topn_idx][i] = mgau_norm(s, i);
         }
-#if 0
-        int j;
-        E_INFO("TopN[%d][%d] =", frame, i);
-        for (j = 0; j < s->topn_hist_n[topn_idx]; ++j) {
-            E_INFOCONT(" %d:%d", s->f[i][j].codeword, s->f[i][j].score);
-        }
-        E_INFOCONT("\n");
-#endif
         if (compallsen)
-	    get_scores_8b_feat_all(s, i, s->topn_hist_n[topn_idx], senone_scores);
+	    get_scores_8b_feat_all(s, i, s->topn_hist_n[topn_idx][i], senone_scores);
         else
-            get_scores_8b_feat(s, i, s->topn_hist_n[topn_idx], senone_scores,
+            get_scores_8b_feat(s, i, s->topn_hist_n[topn_idx][i], senone_scores,
                                senone_active, n_senone_active);
     }
 
@@ -1134,7 +1126,8 @@
     s->topn_hist = (vqFeature_t ***)
         ckd_calloc_3d(s->n_topn_hist, s->n_feat, s->max_topn,
                       sizeof(***s->topn_hist));
-    s->topn_hist_n = ckd_calloc(s->n_topn_hist, sizeof(*s->topn_hist_n));
+    s->topn_hist_n = ckd_calloc_2d(s->n_topn_hist, s->n_feat,
+                                   sizeof(**s->topn_hist_n));
     for (i = 0; i < s->n_topn_hist; ++i) {
         int j;
         for (j = 0; j < s->n_feat; ++j) {
@@ -1240,7 +1233,7 @@
     ckd_free(s->means);
     ckd_free(s->vars);
     ckd_free(s->topn_beam);
-    ckd_free(s->topn_hist_n);
+    ckd_free_2d(s->topn_hist_n);
     ckd_free_3d((void **)s->topn_hist);
     ckd_free_2d((void **)s->dets);
     ckd_free(s);

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-03-03 20:22:57 UTC (rev 9039)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-03-03 21:20:02 UTC (rev 9040)
@@ -81,7 +81,7 @@
     int32 kd_maxbbi;
 
     vqFeature_t ***topn_hist; /**< Top-N scores and codewords for past frames. */
-    uint8 *topn_hist_n;       /**< Variable top-N for past frames. */
+    uint8 **topn_hist_n;      /**< Variable top-N for past frames. */
     vqFeature_t **f;          /**< Topn-N for currently scoring frame. */
     int n_topn_hist;          /**< Number of past frames tracked. */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9064
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9064&view=rev
Author:   dhdfu
Date:     2009-03-17 20:47:14 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Make -cmn none actually work, and also check feature dimensions for consistency.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-03-17 17:33:58 UTC (rev 9063)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-03-17 20:47:14 UTC (rev 9064)
@@ -76,15 +76,8 @@
 static int
 acmod_init_am(acmod_t *acmod)
 {
-    char const *mdeffn, *tmatfn, *featparams, *mllrfn;
+    char const *mdeffn, *tmatfn, *mllrfn;
 
-    /* Look for feat.params in acoustic model dir. */
-    if ((featparams = cmd_ln_str_r(acmod->config, "-featparams"))) {
-        if (cmd_ln_parse_file_r(acmod->config, feat_defn, featparams, FALSE) != NULL) {
-	    E_INFO("Parsed model-specific feature parameters from %s\n", featparams);
-        }
-    }
-
     /* Read model definition. */
     if ((mdeffn = cmd_ln_str_r(acmod->config, "-mdef")) == NULL) {
         E_ERROR("Must specify -mdef or -hmm\n");
@@ -114,8 +107,7 @@
     }
 
     E_INFO("Attempting to use SCHMM computation module\n");
-    acmod->mgau
-        = s2_semi_mgau_init(acmod->config, acmod->lmath, acmod->mdef);
+    acmod->mgau = s2_semi_mgau_init(acmod);
     if (acmod->mgau) {
         char const *kdtreefn = cmd_ln_str_r(acmod->config, "-kdtree");
         if (kdtreefn)
@@ -125,8 +117,7 @@
     }
     else {
         E_INFO("Falling back to general multi-stream GMM computation\n");
-        acmod->mgau =
-            ms_mgau_init(acmod->config, acmod->lmath);
+        acmod->mgau = ms_mgau_init(acmod->config, acmod->lmath);
     }
 
     /* If there is an MLLR transform, apply it. */
@@ -177,7 +168,8 @@
                           cmd_ln_float32_r(acmod->config, "-agcthresh"));
     }
 
-    if (cmd_ln_exists_r(acmod->config, "-cmninit")) {
+    if (acmod->fcb->cmn_struct
+        && cmd_ln_exists_r(acmod->config, "-cmninit")) {
         char *c, *cc, *vallist;
         int32 nvals;
 
@@ -227,16 +219,21 @@
 acmod_init(cmd_ln_t *config, logmath_t *lmath, fe_t *fe, feat_t *fcb)
 {
     acmod_t *acmod;
+    char const *featparams;
 
     acmod = ckd_calloc(1, sizeof(*acmod));
     acmod->config = config;
     acmod->lmath = lmath;
     acmod->state = ACMOD_IDLE;
 
-    /* Load acoustic model parameters. */
-    if (acmod_init_am(acmod) < 0)
-        goto error_out;
+    /* Look for feat.params in acoustic model dir. */
+    if ((featparams = cmd_ln_str_r(acmod->config, "-featparams"))) {
+        if (cmd_ln_parse_file_r(acmod->config, feat_defn, featparams, FALSE) != NULL) {
+	    E_INFO("Parsed model-specific feature parameters from %s\n", featparams);
+        }
+    }
 
+    /* Initialize feature computation. */
     if (fe) {
         if (acmod_fe_mismatch(acmod, fe))
             goto error_out;
@@ -262,6 +259,11 @@
             goto error_out;
     }
 
+    /* Load acoustic model parameters. */
+    if (acmod_init_am(acmod) < 0)
+        goto error_out;
+
+
     /* The MFCC buffer needs to be at least as large as the dynamic
      * feature window.  */
     acmod->n_mfc_alloc = acmod->fcb->window_size * 2 + 1;

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-03-17 17:33:58 UTC (rev 9063)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2009-03-17 20:47:14 UTC (rev 9064)
@@ -159,7 +159,7 @@
 
     topn = s->f[feat];
     ceplen = s->veclen[feat];
-    
+
     for (i = 0; i < s->max_topn; i++) {
         mfcc_t *mean, diff, sqdiff, compl; /* diff, diff^2, component likelihood */
         vqFeature_t vtmp;
@@ -939,8 +939,6 @@
                 file_name, n_mgau, s->n_density);
 
     /* Vector length of feature stream */
-    if (s->veclen == NULL)
-        s->veclen = ckd_calloc(s->n_feat, sizeof(int32));
     veclen = ckd_calloc(s->n_feat, sizeof(int32));
     if (bio_fread(veclen, sizeof(int32), s->n_feat,
                   fp, byteswap, &chksum) != s->n_feat)
@@ -1060,7 +1058,7 @@
 
 
 ps_mgau_t *
-s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef)
+s2_semi_mgau_init(acmod_t *acmod)
 {
     s2_semi_mgau_t *s;
     ps_mgau_t *ps;
@@ -1069,11 +1067,11 @@
     int i;
 
     s = ckd_calloc(1, sizeof(*s));
-    s->config = config;
+    s->config = acmod->config;
 
-    s->lmath = logmath_retain(lmath);
+    s->lmath = logmath_retain(acmod->lmath);
     /* Log-add table. */
-    s->lmath_8b = logmath_init(logmath_get_base(lmath), SENSCR_SHIFT, TRUE);
+    s->lmath_8b = logmath_init(logmath_get_base(acmod->lmath), SENSCR_SHIFT, TRUE);
     if (s->lmath_8b == NULL) {
         s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
@@ -1086,13 +1084,19 @@
         return NULL;
     }
 
+    /* Inherit stream dimensions from acmod, will be checked below. */
+    s->n_feat = feat_dimension1(acmod->fcb);
+    s->veclen = ckd_calloc(s->n_feat, sizeof(int32));
+    for (i = 0; i < s->n_feat; ++i)
+        s->veclen[i] = feat_dimension2(acmod->fcb, i);
+
     /* Read means and variances. */
-    if (s3_read_mgau(s, cmd_ln_str_r(config, "-mean"), &fgau) < 0) {
+    if (s3_read_mgau(s, cmd_ln_str_r(s->config, "-mean"), &fgau) < 0) {
         s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
     s->means = (mfcc_t **)fgau;
-    if (s3_read_mgau(s, cmd_ln_str_r(config, "-var"), &fgau) < 0) {
+    if (s3_read_mgau(s, cmd_ln_str_r(s->config, "-var"), &fgau) < 0) {
         s2_semi_mgau_free(ps_mgau_base(s));
         return NULL;
     }
@@ -1100,20 +1104,20 @@
 
     /* Precompute (and fixed-point-ize) means, variances, and determinants. */
     s->dets = (mfcc_t **)ckd_calloc_2d(s->n_feat, s->n_density, sizeof(**s->dets));
-    s3_precomp(s, lmath, cmd_ln_float32_r(config, "-varfloor"));
+    s3_precomp(s, s->lmath, cmd_ln_float32_r(s->config, "-varfloor"));
 
     /* Read mixture weights */
-    if ((sendump_path = cmd_ln_str_r(config, "-sendump")))
-        read_sendump(s, mdef, sendump_path);
+    if ((sendump_path = cmd_ln_str_r(s->config, "-sendump")))
+        read_sendump(s, acmod->mdef, sendump_path);
     else
-        read_mixw(s, cmd_ln_str_r(config, "-mixw"),
-                  cmd_ln_float32_r(config, "-mixwfloor"));
-    s->ds_ratio = cmd_ln_int32_r(config, "-ds");
+        read_mixw(s, cmd_ln_str_r(s->config, "-mixw"),
+                  cmd_ln_float32_r(s->config, "-mixwfloor"));
+    s->ds_ratio = cmd_ln_int32_r(s->config, "-ds");
 
     /* Determine top-N for each feature */
     s->topn_beam = ckd_calloc(s->n_feat, sizeof(*s->topn_beam));
-    s->max_topn = cmd_ln_int32_r(config, "-topn");
-    split_topn(cmd_ln_str_r(config, "-topn_beam"), s->topn_beam, s->n_feat);
+    s->max_topn = cmd_ln_int32_r(s->config, "-topn");
+    split_topn(cmd_ln_str_r(s->config, "-topn_beam"), s->topn_beam, s->n_feat);
     E_INFO("Maximum top-N: %d ", s->max_topn);
     E_INFOCONT("Top-N beams:");
     for (i = 0; i < s->n_feat; ++i) {
@@ -1122,7 +1126,7 @@
     E_INFOCONT("\n");
 
     /* Top-N scores from recent frames */
-    s->n_topn_hist = cmd_ln_int32_r(config, "-pl_window") + 2;
+    s->n_topn_hist = cmd_ln_int32_r(s->config, "-pl_window") + 2;
     s->topn_hist = (vqFeature_t ***)
         ckd_calloc_3d(s->n_topn_hist, s->n_feat, s->max_topn,
                       sizeof(***s->topn_hist));

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-03-17 17:33:58 UTC (rev 9063)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2009-03-17 20:47:14 UTC (rev 9064)
@@ -91,7 +91,7 @@
     logmath_t *lmath;
 };
 
-ps_mgau_t *s2_semi_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
+ps_mgau_t *s2_semi_mgau_init(acmod_t *acmod);
 void s2_semi_mgau_free(ps_mgau_t *s);
 int s2_semi_mgau_frame_eval(ps_mgau_t *s,
                             int16 *senone_scores,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9090
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9090&view=rev
Author:   dhdfu
Date:     2009-03-25 21:14:14 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
A few more fixes for WinCE compilation.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
    trunk/pocketsphinx/src/libpocketsphinx/hmm.h
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2009-03-25 20:42:11 UTC (rev 9089)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2009-03-25 21:14:14 UTC (rev 9090)
@@ -53,10 +53,11 @@
 #endif /* __cplusplus */
 
 /* SphinxBase headers. */
-#include <mdef.h>
 #include <mmio.h>
 #include <cmd_ln.h>
 
+#include "mdef.h"
+
 #define BIN_MDEF_FORMAT_VERSION 1
 /* Little-endian machines will write "BMDF" to disk, big-endian ones "FDMB". */
 #define BIN_MDEF_NATIVE_ENDIAN 0x46444d42 /* 'BMDF' in little-endian order */

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2009-03-25 20:42:11 UTC (rev 9089)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.h	2009-03-25 21:14:14 UTC (rev 9090)
@@ -50,7 +50,7 @@
 #include <listelem_alloc.h>
 
 /* PocketSphinx headers. */
-#include <bin_mdef.h>
+#include "bin_mdef.h"
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-03-25 20:42:11 UTC (rev 9089)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-03-25 21:14:14 UTC (rev 9090)
@@ -143,9 +143,11 @@
         cmd_ln_free_r(ps->config);
         ps->config = config;
     }
+#ifndef _WIN32_WCE
     /* Set up logging. */
     if (cmd_ln_str_r(ps->config, "-logfn"))
         err_set_logfile(cmd_ln_str_r(ps->config, "-logfn"));
+#endif
     ps->mfclogdir = cmd_ln_str_r(ps->config, "-mfclogdir");
     ps->rawlogdir = cmd_ln_str_r(ps->config, "-rawlogdir");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9134
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9134&view=rev
Author:   dhdfu
Date:     2009-05-19 21:45:43 +0000 (Tue, 19 May 2009)

Log Message:
-----------
Remove unused function

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2009-05-19 21:45:28 UTC (rev 9133)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2009-05-19 21:45:43 UTC (rev 9134)
@@ -212,11 +212,13 @@
      * s->n_gauden.
      */
     if (s->n_gauden > 1) {
+	E_INFO("Not transposing mixture weights in memory\n");
         s->pdf =
             (senprob_t ***) ckd_calloc_3d(s->n_sen, s->n_feat, s->n_cw,
                                           sizeof(senprob_t));
     }
     else {
+	E_INFO("Transposing mixture weights in memory\n");
         s->pdf =
             (senprob_t ***) ckd_calloc_3d(s->n_feat, s->n_cw, s->n_sen,
                                           sizeof(senprob_t));
@@ -371,17 +373,17 @@
         fdist = dist[f];
 
         /* Top codeword for feature f */
-	fden = ((int32)fdist[0].dist) >> SENSCR_SHIFT;
+	fden = ((int32)fdist[0].dist + ((1<<SENSCR_SHIFT) - 1)) >> SENSCR_SHIFT;
         fscr = (s->n_gauden > 1)
-	    ? (fden - s->pdf[id][f][fdist[0].id])  /* untransposed */
-	    : (fden - s->pdf[f][fdist[0].id][id]); /* transposed */
+	    ? (fden + -s->pdf[id][f][fdist[0].id])  /* untransposed */
+	    : (fden + -s->pdf[f][fdist[0].id][id]); /* transposed */
 
         /* Remaining of n_top codewords for feature f */
         for (t = 1; t < n_top; t++) {
-	    fden = ((int32)fdist[t].dist) >> SENSCR_SHIFT;
+	    fden = ((int32)fdist[t].dist + ((1<<SENSCR_SHIFT) - 1)) >> SENSCR_SHIFT;
             fwscr = (s->n_gauden > 1) ?
-                (fden - s->pdf[id][f][fdist[t].id]) :
-                (fden - s->pdf[f][fdist[t].id][id]);
+                (fden + -s->pdf[id][f][fdist[t].id]) :
+                (fden + -s->pdf[f][fdist[t].id][id]);
             fscr = logmath_add(s->lmath, fscr, fwscr);
         }
 	/* Senone scores are also scaled, negated logs3 values.  Hence
@@ -396,70 +398,3 @@
       scr = -32768;
     return scr;
 }
-
-
-/*
- * Optimized for special case of all senones sharing one codebook (perhaps many features).
- * In particular, the PDF tables are transposed in memory.
- */
-void
-senone_eval_all(senone_t * s, gauden_dist_t ** dist, int32 n_top,
-                int16 * senscr)
-{
-    int32 i, f, k, cwdist, scr;
-
-    senprob_t *pdf;
-    int32 *featscr = NULL;
-    featscr = s->featscr;
-
-    assert(s->n_gauden == 1);
-    assert((n_top > 0) && (n_top <= s->n_cw));
-
-    if ((s->n_feat > 1) && (!featscr))
-        featscr = (int32 *) ckd_calloc(s->n_sen, sizeof(int32));
-
-    /* Feature 0 */
-    /* Top-N codeword 0 */
-    cwdist = ((int32)dist[0][0].dist) >> SENSCR_SHIFT;
-    pdf = s->pdf[0][dist[0][0].id];
-
-    for (i = 0; i < s->n_sen; i++)
-        senscr[i] = cwdist - pdf[i];
-
-    /* Remaining top-N codewords */
-    for (k = 1; k < n_top; k++) {
-        cwdist = ((int32)dist[0][k].dist) >> SENSCR_SHIFT;
-        pdf = s->pdf[0][dist[0][k].id];
-
-        for (i = 0; i < s->n_sen; i++) {
-            scr = cwdist - pdf[i];
-            senscr[i] = logmath_add(s->lmath, senscr[i], scr);
-	    if (k == n_top - 1)
-		senscr[i] = -senscr[i];
-        }
-    }
-
-    /* Remaining features */
-    for (f = 1; f < s->n_feat; f++) {
-        /* Top-N codeword 0 */
-        cwdist = ((int32)dist[f][0].dist) >> SENSCR_SHIFT;
-        pdf = s->pdf[f][dist[f][0].id];
-
-        for (i = 0; i < s->n_sen; i++)
-            featscr[i] = cwdist - pdf[i];
-
-        /* Remaining top-N codewords */
-        for (k = 1; k < n_top; k++) {
-            cwdist = ((int32)dist[f][k].dist) >> SENSCR_SHIFT;
-            pdf = s->pdf[f][dist[f][k].id];
-
-            for (i = 0; i < s->n_sen; i++) {
-                scr = cwdist - pdf[i];
-                featscr[i] = logmath_add(s->lmath, featscr[i], scr);
-            }
-        }
-
-        for (i = 0; i < s->n_sen; i++)
-            senscr[i] -= featscr[i];
-    }
-}

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h	2009-05-19 21:45:28 UTC (rev 9133)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h	2009-05-19 21:45:43 UTC (rev 9134)
@@ -192,17 +192,6 @@
 		   int n_top		/**< In: Length of dist[f], for each f */
     );
 
-/**
- * Like senone_eval, but compute all senone scores for the shared density case (ie,
- * number of codebooks = 1).
- */
-void senone_eval_all (senone_t *s,		/**< In: Senone structure */
-		      gauden_dist_t **dist,	/**< In: as in senone_eval above */
-		      int32 n_top,		/**< In: as in senone_eval above */
-		      int16 *senscr		/**< Out: Upon return, senscr[i] will contain
-						   score for senone i */
-    );
-
 #if 0
 { /* Stop indent from complaining */
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9191
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9191&view=rev
Author:   dhdfu
Date:     2009-07-07 14:40:07 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Add Sphinx3 search code.  This is the "baseline" commit which has just
been renamed and re-indented, no integration yet.

Added Paths:
-----------
    trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c
    trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.h
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/lextree.h
    trunk/pocketsphinx/src/libpocketsphinx/lts.c
    trunk/pocketsphinx/src/libpocketsphinx/lts.h
    trunk/pocketsphinx/src/libpocketsphinx/s3_dict.c
    trunk/pocketsphinx/src/libpocketsphinx/s3_dict.h
    trunk/pocketsphinx/src/libpocketsphinx/s3types.h
    trunk/pocketsphinx/src/libpocketsphinx/srch_time_switch_tree.c
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.h
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.h

Added: trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c	2009-07-07 14:40:07 UTC (rev 9191)
@@ -0,0 +1,13307 @@
+/*************************************************************************/
+/*                                                                       */
+/*                  Language Technologies Institute                      */
+/*                     Carnegie Mellon University                        */
+/*                        Copyright (c) 2001                             */
+/*                        All Rights Reserved.                           */
+/*                                                                       */
+/*  Permission is hereby granted, free of charge, to use and distribute  */
+/*  this software and its documentation without restriction, including   */
+/*  without limitation the rights to use, copy, modify, merge, publish,  */
+/*  distribute, sublicense, and/or sell copies of this work, and to      */
+/*  permit persons to whom this work is furnished to do so, subject to   */
+/*  the following conditions:                                            */
+/*   1. The code must retain the above copyright notice, this list of    */
+/*      conditions and the following disclaimer.                         */
+/*   2. Any modifications must be clearly marked as such.                */
+/*   3. Original authors' names are not deleted.                         */
+/*   4. The authors' names are not used to endorse or promote products   */
+/*      derived from this software without specific prior written        */
+/*      permission.                                                      */
+/*                                                                       */
+/*  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         */
+/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
+/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
+/*  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      */
+/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
+/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
+/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
+/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+/*  THIS SOFTWARE.                                                       */
+/*                                                                       */
+/*************************************************************************/
+/*             Author:  Alan W Black (awb@...)                    */
+/*                      Kevin A. Lenzo (lenzo@...)                */
+/*               Date:  January 2001                                     */
+/*************************************************************************/
+/*                                                                       */
+/*  CMU(6) letter to sound rule decision graphs                          */
+/*                                                                       */
+/*************************************************************************/
+/*******************************************************/
+/**  Autogenerated llts rules (regex) for cmu6    */
+/**  from /home/awb/projects/lts/cmu6/regex    */
+/*******************************************************/
+
+/*
+ * cmu6_lts_rules.c -- Letter to sound rule support 
+ * 
+ * $Log$
+ * Revision 1.2  2006/02/22  20:42:51  arthchan2003
+ * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: As we have done in SphinxTrain and with the permission of flite developer. check in the LTS rule of flite. In dict.c, one will see detail comment on how it was used and how we avoid problematic conditions.
+ * 
+ * Revision 1.1.2.1  2005/09/25 19:07:52  arthchan2003
+ * Added LTS rules and the module to use it.
+ *
+ *
+ */
+
+
+#include <stdlib.h>
+#include "lts.h"
+#include "cmu6_lts_rules.h"
+
+static const cst_lts_model cmu6_lts_model[] = {
+   /** letter a **/
+    4, 'r', LTS_STATE_a_2, LTS_STATE_a_1,
+    6, '0', LTS_STATE_a_4, LTS_STATE_a_3,
+    3, 'e', LTS_STATE_a_6, LTS_STATE_a_5,
+    4, 'u', LTS_STATE_a_8, LTS_STATE_a_7,
+    4, 'y', LTS_STATE_a_10, LTS_STATE_a_9,
+    3, 'w', LTS_STATE_a_12, LTS_STATE_a_11,
+    5, 't', LTS_STATE_a_14, LTS_STATE_a_13,
+    3, 'e', LTS_STATE_a_16, LTS_STATE_a_15,
+    3, 'e', LTS_STATE_a_18, LTS_STATE_a_17,
+    4, '#', LTS_STATE_a_20, LTS_STATE_a_19,
+    3, 'w', LTS_STATE_a_22, LTS_STATE_a_21,
+    1, '0', LTS_STATE_a_24, LTS_STATE_a_23,
+    5, 'e', LTS_STATE_a_26, LTS_STATE_a_25,
+    5, 'n', LTS_STATE_a_28, LTS_STATE_a_27,
+    2, 'h', LTS_STATE_a_29, LTS_STATE_a_28,
+    5, 'e', LTS_STATE_a_31, LTS_STATE_a_30,
+    2, 'r', LTS_STATE_a_33, LTS_STATE_a_32,
+    5, 'e', LTS_STATE_a_35, LTS_STATE_a_34,
+    5, 't', LTS_STATE_a_28, LTS_STATE_a_36,
+    3, 'e', LTS_STATE_a_38, LTS_STATE_a_37,
+    3, 'e', LTS_STATE_a_40, LTS_STATE_a_39,
+    2, 'c', LTS_STATE_a_42, LTS_STATE_a_41,
+    2, 'a', LTS_STATE_a_43, LTS_STATE_a_42,
+    5, 'y', LTS_STATE_a_45, LTS_STATE_a_44,
+    5, 'r', LTS_STATE_a_47, LTS_STATE_a_46,
+    5, 'd', LTS_STATE_a_49, LTS_STATE_a_48,
+    255, 1, 0, 0, 0, 0,
+    5, 'm', LTS_STATE_a_52, LTS_STATE_a_51,
+    255, 0, 0, 0, 0, 0,
+    255, 2, 0, 0, 0, 0,
+    4, 'i', LTS_STATE_a_54, LTS_STATE_a_53,
+    4, 'g', LTS_STATE_a_56, LTS_STATE_a_55,
+    4, 'n', LTS_STATE_a_58, LTS_STATE_a_57,
+    1, '#', LTS_STATE_a_60, LTS_STATE_a_59,
+    5, 'g', LTS_STATE_a_62, LTS_STATE_a_61,
+    1, '0', LTS_STATE_a_64, LTS_STATE_a_63,
+    1, 'u', LTS_STATE_a_29, LTS_STATE_a_65,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_66,
+    4, 'u', LTS_STATE_a_68, LTS_STATE_a_67,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_69,
+    2, 'l', LTS_STATE_a_69, LTS_STATE_a_70,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_71,
+    255, 3, 0, 0, 0, 0,
+    1, 'l', LTS_STATE_a_73, LTS_STATE_a_72,
+    5, 'i', LTS_STATE_a_75, LTS_STATE_a_74,
+    3, 'n', LTS_STATE_a_26, LTS_STATE_a_76,
+    5, 'a', LTS_STATE_a_78, LTS_STATE_a_77,
+    2, '#', LTS_STATE_a_80, LTS_STATE_a_79,
+    5, 'i', LTS_STATE_a_26, LTS_STATE_a_81,
+    1, '0', LTS_STATE_a_83, LTS_STATE_a_82,
+    2, 'w', LTS_STATE_a_28, LTS_STATE_a_84,
+    2, 'r', LTS_STATE_a_29, LTS_STATE_a_85,
+    5, 'i', LTS_STATE_a_87, LTS_STATE_a_86,
+    5, 'r', LTS_STATE_a_89, LTS_STATE_a_88,
+    6, '#', LTS_STATE_a_91, LTS_STATE_a_90,
+    1, '0', LTS_STATE_a_93, LTS_STATE_a_92,
+    4, 'b', LTS_STATE_a_95, LTS_STATE_a_94,
+    1, '#', LTS_STATE_a_97, LTS_STATE_a_96,
+    4, 'k', LTS_STATE_a_99, LTS_STATE_a_98,
+    5, 't', LTS_STATE_a_101, LTS_STATE_a_100,
+    1, '0', LTS_STATE_a_103, LTS_STATE_a_102,
+    2, '#', LTS_STATE_a_105, LTS_STATE_a_104,
+    1, '#', LTS_STATE_a_64, LTS_STATE_a_106,
+    255, 4, 0, 0, 0, 0,
+    6, 'e', LTS_STATE_a_108, LTS_STATE_a_107,
+    4, 'w', LTS_STATE_a_110, LTS_STATE_a_109,
+    4, 'd', LTS_STATE_a_28, LTS_STATE_a_111,
+    1, 'o', LTS_STATE_a_112, LTS_STATE_a_108,
+    255, 5, 0, 0, 0, 0,
+    2, 'y', LTS_STATE_a_69, LTS_STATE_a_113,
+    2, 'p', LTS_STATE_a_42, LTS_STATE_a_114,
+    1, 't', LTS_STATE_a_73, LTS_STATE_a_42,
+    255, 6, 0, 0, 0, 0,
+    5, 'e', LTS_STATE_a_116, LTS_STATE_a_115,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_117,
+    2, 'c', LTS_STATE_a_26, LTS_STATE_a_118,
+    5, 'i', LTS_STATE_a_120, LTS_STATE_a_119,
+    3, 'p', LTS_STATE_a_26, LTS_STATE_a_121,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_28,
+    3, 'n', LTS_STATE_a_26, LTS_STATE_a_122,
+    1, '0', LTS_STATE_a_83, LTS_STATE_a_123,
+    1, '#', LTS_STATE_a_83, LTS_STATE_a_124,
+    255, 7, 0, 0, 0, 0,
+    1, 's', LTS_STATE_a_126, LTS_STATE_a_125,
+    1, '#', LTS_STATE_a_28, LTS_STATE_a_127,
+    4, 'y', LTS_STATE_a_129, LTS_STATE_a_128,
+    6, 'o', LTS_STATE_a_131, LTS_STATE_a_130,
+    5, 'n', LTS_STATE_a_133, LTS_STATE_a_132,
+    3, 'z', LTS_STATE_a_134, LTS_STATE_a_26,
+    3, 'w', LTS_STATE_a_136, LTS_STATE_a_135,
+    4, 't', LTS_STATE_a_138, LTS_STATE_a_137,
+    1, '#', LTS_STATE_a_140, LTS_STATE_a_139,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_141,
+    1, 'i', LTS_STATE_a_143, LTS_STATE_a_142,
+    1, '#', LTS_STATE_a_28, LTS_STATE_a_69,
+    1, 'c', LTS_STATE_a_28, LTS_STATE_a_144,
+    5, 'd', LTS_STATE_a_101, LTS_STATE_a_145,
+    4, 't', LTS_STATE_a_147, LTS_STATE_a_146,
+    1, 'b', LTS_STATE_a_42, LTS_STATE_a_28,
+    6, 'n', LTS_STATE_a_149, LTS_STATE_a_148,
+    255, 8, 0, 0, 0, 0,
+    1, '#', LTS_STATE_a_151, LTS_STATE_a_150,
+    3, 'c', LTS_STATE_a_153, LTS_STATE_a_152,
+    2, 'n', LTS_STATE_a_155, LTS_STATE_a_154,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_83,
+    255, 9, 0, 0, 0, 0,
+    1, 'o', LTS_STATE_a_112, LTS_STATE_a_156,
+    255, 10, 0, 0, 0, 0,
+    1, '#', LTS_STATE_a_158, LTS_STATE_a_157,
+    3, 'l', LTS_STATE_a_83, LTS_STATE_a_159,
+    4, 'n', LTS_STATE_a_161, LTS_STATE_a_160,
+    255, 11, 0, 0, 0, 0,
+    1, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
+    1, 'l', LTS_STATE_a_163, LTS_STATE_a_162,
+    5, 'r', LTS_STATE_a_165, LTS_STATE_a_164,
+    6, 'l', LTS_STATE_a_167, LTS_STATE_a_166,
+    6, 'z', LTS_STATE_a_28, LTS_STATE_a_168,
+    2, 'e', LTS_STATE_a_26, LTS_STATE_a_169,
+    5, 'e', LTS_STATE_a_171, LTS_STATE_a_170,
+    6, 's', LTS_STATE_a_173, LTS_STATE_a_172,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_174,
+    3, 'h', LTS_STATE_a_176, LTS_STATE_a_175,
+    5, '#', LTS_STATE_a_28, LTS_STATE_a_177,
+    1, 'r', LTS_STATE_a_83, LTS_STATE_a_28,
+    5, 'l', LTS_STATE_a_179, LTS_STATE_a_178,
+    6, '#', LTS_STATE_a_180, LTS_STATE_a_127,
+    255, 12, 0, 0, 0, 0,
+    2, '#', LTS_STATE_a_182, LTS_STATE_a_181,
+    5, 'a', LTS_STATE_a_184, LTS_STATE_a_183,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_185,
+    4, 't', LTS_STATE_a_187, LTS_STATE_a_186,
+    5, 'l', LTS_STATE_a_189, LTS_STATE_a_188,
+    3, 't', LTS_STATE_a_191, LTS_STATE_a_190,
+    255, 13, 0, 0, 0, 0,
+    6, 'd', LTS_STATE_a_193, LTS_STATE_a_192,
+    4, 't', LTS_STATE_a_195, LTS_STATE_a_194,
+    3, 'i', LTS_STATE_a_197, LTS_STATE_a_196,
+    3, 'u', LTS_STATE_a_199, LTS_STATE_a_198,
+    3, 'i', LTS_STATE_a_28, LTS_STATE_a_200,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_201,
+    6, 'r', LTS_STATE_a_42, LTS_STATE_a_202,
+    1, 't', LTS_STATE_a_204, LTS_STATE_a_203,
+    2, 'n', LTS_STATE_a_42, LTS_STATE_a_205,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_206,
+    2, 'd', LTS_STATE_a_101, LTS_STATE_a_28,
+    5, 'o', LTS_STATE_a_28, LTS_STATE_a_207,
+    1, 'c', LTS_STATE_a_42, LTS_STATE_a_208,
+    5, 'e', LTS_STATE_a_28, LTS_STATE_a_209,
+    4, 'g', LTS_STATE_a_42, LTS_STATE_a_28,
+    5, 'l', LTS_STATE_a_211, LTS_STATE_a_210,
+    3, 'h', LTS_STATE_a_83, LTS_STATE_a_212,
+    2, '#', LTS_STATE_a_214, LTS_STATE_a_213,
+    6, 'a', LTS_STATE_a_83, LTS_STATE_a_215,
+    1, '#', LTS_STATE_a_83, LTS_STATE_a_216,
+    255, 14, 0, 0, 0, 0,
+    2, 'b', LTS_STATE_a_218, LTS_STATE_a_217,
+    4, 'n', LTS_STATE_a_220, LTS_STATE_a_219,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_221,
+    1, 'e', LTS_STATE_a_155, LTS_STATE_a_83,
+    2, 'n', LTS_STATE_a_223, LTS_STATE_a_222,
+    1, 'c', LTS_STATE_a_28, LTS_STATE_a_224,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_225,
+    3, 'd', LTS_STATE_a_226, LTS_STATE_a_73,
+    5, 't', LTS_STATE_a_228, LTS_STATE_a_227,
+    2, 'q', LTS_STATE_a_83, LTS_STATE_a_229,
+    6, 't', LTS_STATE_a_28, LTS_STATE_a_230,
+    2, 'c', LTS_STATE_a_28, LTS_STATE_a_231,
+    6, 'o', LTS_STATE_a_233, LTS_STATE_a_232,
+    3, 'u', LTS_STATE_a_26, LTS_STATE_a_234,
+    5, 'o', LTS_STATE_a_236, LTS_STATE_a_235,
+    6, 'e', LTS_STATE_a_28, LTS_STATE_a_237,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_238,
+    2, '#', LTS_STATE_a_239, LTS_STATE_a_28,
+    6, 's', LTS_STATE_a_241, LTS_STATE_a_240,
+    6, 'y', LTS_STATE_a_26, LTS_STATE_a_242,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_243,
+    2, 'e', LTS_STATE_a_28, LTS_STATE_a_244,
+    2, 'b', LTS_STATE_a_246, LTS_STATE_a_245,
+    2, 'p', LTS_STATE_a_28, LTS_STATE_a_247,
+    2, 'h', LTS_STATE_a_248, LTS_STATE_a_28,
+    1, '#', LTS_STATE_a_250, LTS_STATE_a_249,
+    3, 'w', LTS_STATE_a_252, LTS_STATE_a_251,
+    5, 'o', LTS_STATE_a_254, LTS_STATE_a_253,
+    6, 's', LTS_STATE_a_231, LTS_STATE_a_255,
+    6, 'z', LTS_STATE_a_257, LTS_STATE_a_256,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_258,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_259,
+    6, '#', LTS_STATE_a_261, LTS_STATE_a_260,
+    3, 'm', LTS_STATE_a_262, LTS_STATE_a_42,
+    1, 'a', LTS_STATE_a_264, LTS_STATE_a_263,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_265,
+    6, 's', LTS_STATE_a_267, LTS_STATE_a_266,
+    4, 't', LTS_STATE_a_269, LTS_STATE_a_268,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_42,
+    2, 't', LTS_STATE_a_29, LTS_STATE_a_83,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_270,
+    4, 'l', LTS_STATE_a_29, LTS_STATE_a_101,
+    3, 't', LTS_STATE_a_42, LTS_STATE_a_271,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_272,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_273,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_274,
+    6, '#', LTS_STATE_a_42, LTS_STATE_a_275,
+    1, '#', LTS_STATE_a_28, LTS_STATE_a_276,
+    4, 't', LTS_STATE_a_277, LTS_STATE_a_28,
+    4, 's', LTS_STATE_a_28, LTS_STATE_a_278,
+    2, 'c', LTS_STATE_a_69, LTS_STATE_a_279,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_280,
+    1, 't', LTS_STATE_a_28, LTS_STATE_a_281,
+    5, 's', LTS_STATE_a_69, LTS_STATE_a_282,
+    6, '#', LTS_STATE_a_284, LTS_STATE_a_283,
+    3, 'n', LTS_STATE_a_108, LTS_STATE_a_285,
+    2, 'c', LTS_STATE_a_83, LTS_STATE_a_286,
+    5, 't', LTS_STATE_a_83, LTS_STATE_a_287,
+    5, 'n', LTS_STATE_a_83, LTS_STATE_a_288,
+    5, 's', LTS_STATE_a_29, LTS_STATE_a_289,
+    2, 'e', LTS_STATE_a_155, LTS_STATE_a_290,
+    1, 'e', LTS_STATE_a_112, LTS_STATE_a_108,
+    5, 'c', LTS_STATE_a_108, LTS_STATE_a_291,
+    4, 'l', LTS_STATE_a_293, LTS_STATE_a_292,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_294,
+    4, 'u', LTS_STATE_a_64, LTS_STATE_a_295,
+    1, 'a', LTS_STATE_a_28, LTS_STATE_a_296,
+    1, 'i', LTS_STATE_a_69, LTS_STATE_a_28,
+    1, '#', LTS_STATE_a_28, LTS_STATE_a_297,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_298,
+    2, 'i', LTS_STATE_a_73, LTS_STATE_a_42,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_299,
+    2, 'q', LTS_STATE_a_83, LTS_STATE_a_300,
+    1, 'r', LTS_STATE_a_26, LTS_STATE_a_301,
+    1, 'c', LTS_STATE_a_303, LTS_STATE_a_302,
+    255, 15, 0, 0, 0, 0,
+    6, 'a', LTS_STATE_a_26, LTS_STATE_a_304,
+    3, 's', LTS_STATE_a_29, LTS_STATE_a_305,
+    3, 'r', LTS_STATE_a_26, LTS_STATE_a_306,
+    5, 'y', LTS_STATE_a_308, LTS_STATE_a_307,
+    6, 'l', LTS_STATE_a_310, LTS_STATE_a_309,
+    2, '#', LTS_STATE_a_312, LTS_STATE_a_311,
+    3, 'v', LTS_STATE_a_314, LTS_STATE_a_313,
+    3, 'p', LTS_STATE_a_28, LTS_STATE_a_26,
+    6, 'b', LTS_STATE_a_101, LTS_STATE_a_315,
+    3, 'h', LTS_STATE_a_28, LTS_STATE_a_29,
+    6, 'i', LTS_STATE_a_317, LTS_STATE_a_316,
+    6, 'o', LTS_STATE_a_26, LTS_STATE_a_101,
+    1, '#', LTS_STATE_a_83, LTS_STATE_a_318,
+    5, 'c', LTS_STATE_a_28, LTS_STATE_a_319,
+    5, 'd', LTS_STATE_a_127, LTS_STATE_a_28,
+    1, '#', LTS_STATE_a_320, LTS_STATE_a_28,
+    255, 16, 0, 0, 0, 0,
+    5, 'o', LTS_STATE_a_322, LTS_STATE_a_321,
+    3, 'o', LTS_STATE_a_324, LTS_STATE_a_323,
+    4, 'w', LTS_STATE_a_326, LTS_STATE_a_325,
+    4, 'l', LTS_STATE_a_328, LTS_STATE_a_327,
+    5, 'r', LTS_STATE_a_329, LTS_STATE_a_42,
+    2, '#', LTS_STATE_a_42, LTS_STATE_a_330,
+    2, 'a', LTS_STATE_a_332, LTS_STATE_a_331,
+    6, 'n', LTS_STATE_a_334, LTS_STATE_a_333,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, '0', LTS_STATE_a_336, LTS_STATE_a_335,
+    3, 'n', LTS_STATE_a_338, LTS_STATE_a_337,
+    5, 'o', LTS_STATE_a_28, LTS_STATE_a_339,
+    5, 'a', LTS_STATE_a_29, LTS_STATE_a_42,
+    2, 'e', LTS_STATE_a_73, LTS_STATE_a_42,
+    6, 'g', LTS_STATE_a_29, LTS_STATE_a_340,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_341,
+    6, 'e', LTS_STATE_a_42, LTS_STATE_a_342,
+    4, 'k', LTS_STATE_a_344, LTS_STATE_a_343,
+    4, 't', LTS_STATE_a_346, LTS_STATE_a_345,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_347,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_42,
+    2, 'a', LTS_STATE_a_349, LTS_STATE_a_348,
+    2, 'i', LTS_STATE_a_351, LTS_STATE_a_350,
+    1, 'a', LTS_STATE_a_42, LTS_STATE_a_69,
+    6, 'r', LTS_STATE_a_353, LTS_STATE_a_352,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_69,
+    2, '#', LTS_STATE_a_355, LTS_STATE_a_354,
+    2, 'm', LTS_STATE_a_42, LTS_STATE_a_356,
+    5, 'r', LTS_STATE_a_101, LTS_STATE_a_69,
+    4, 'l', LTS_STATE_a_28, LTS_STATE_a_69,
+    2, 'g', LTS_STATE_a_69, LTS_STATE_a_357,
+    4, 'l', LTS_STATE_a_28, LTS_STATE_a_358,
+    5, 'h', LTS_STATE_a_28, LTS_STATE_a_359,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_360,
+    5, 's', LTS_STATE_a_362, LTS_STATE_a_361,
+    5, 'd', LTS_STATE_a_108, LTS_STATE_a_363,
+    3, 's', LTS_STATE_a_83, LTS_STATE_a_364,
+    6, 'e', LTS_STATE_a_366, LTS_STATE_a_365,
+    5, 'd', LTS_STATE_a_83, LTS_STATE_a_367,
+    5, 'r', LTS_STATE_a_369, LTS_STATE_a_368,
+    5, 'l', LTS_STATE_a_29, LTS_STATE_a_83,
+    2, 'o', LTS_STATE_a_155, LTS_STATE_a_370,
+    6, 'o', LTS_STATE_a_108, LTS_STATE_a_371,
+    4, 's', LTS_STATE_a_373, LTS_STATE_a_372,
+    3, 'h', LTS_STATE_a_374, LTS_STATE_a_69,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_375,
+    4, 'i', LTS_STATE_a_28, LTS_STATE_a_376,
+    4, 'k', LTS_STATE_a_28, LTS_STATE_a_377,
+    1, 'o', LTS_STATE_a_69, LTS_STATE_a_378,
+    1, 'c', LTS_STATE_a_42, LTS_STATE_a_379,
+    1, '#', LTS_STATE_a_381, LTS_STATE_a_380,
+    1, '#', LTS_STATE_a_29, LTS_STATE_a_382,
+    1, 'e', LTS_STATE_a_384, LTS_STATE_a_383,
+    6, '#', LTS_STATE_a_386, LTS_STATE_a_385,
+    3, 's', LTS_STATE_a_29, LTS_STATE_a_231,
+    6, 'c', LTS_STATE_a_388, LTS_STATE_a_387,
+    3, 'c', LTS_STATE_a_26, LTS_STATE_a_389,
+    2, 'i', LTS_STATE_a_26, LTS_STATE_a_390,
+    5, 'u', LTS_STATE_a_392, LTS_STATE_a_391,
+    6, '#', LTS_STATE_a_26, LTS_STATE_a_393,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_394,
+    3, 'p', LTS_STATE_a_28, LTS_STATE_a_395,
+    6, 'n', LTS_STATE_a_28, LTS_STATE_a_231,
+    3, 'm', LTS_STATE_a_231, LTS_STATE_a_396,
+    6, 't', LTS_STATE_a_26, LTS_STATE_a_397,
+    6, 'e', LTS_STATE_a_28, LTS_STATE_a_26,
+    2, '#', LTS_STATE_a_399, LTS_STATE_a_398,
+    3, 'm', LTS_STATE_a_401, LTS_STATE_a_400,
+    3, 'm', LTS_STATE_a_26, LTS_STATE_a_402,
+    2, 'h', LTS_STATE_a_83, LTS_STATE_a_403,
+    5, 's', LTS_STATE_a_405, LTS_STATE_a_404,
+    6, 'e', LTS_STATE_a_28, LTS_STATE_a_127,
+    5, 'l', LTS_STATE_a_407, LTS_STATE_a_406,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_408,
+    4, 'w', LTS_STATE_a_410, LTS_STATE_a_409,
+    2, 'j', LTS_STATE_a_29, LTS_STATE_a_28,
+    4, 'l', LTS_STATE_a_412, LTS_STATE_a_411,
+    5, 'a', LTS_STATE_a_414, LTS_STATE_a_413,
+    4, 'g', LTS_STATE_a_101, LTS_STATE_a_415,
+    6, 'o', LTS_STATE_a_289, LTS_STATE_a_83,
+    6, 'e', LTS_STATE_a_26, LTS_STATE_a_42,
+    6, '#', LTS_STATE_a_42, LTS_STATE_a_416,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_417,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_69,
+    6, 'a', LTS_STATE_a_419, LTS_STATE_a_418,
+    4, 't', LTS_STATE_a_421, LTS_STATE_a_420,
+    2, 't', LTS_STATE_a_101, LTS_STATE_a_422,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_423,
+    3, 'u', LTS_STATE_a_42, LTS_STATE_a_424,
+    2, 'i', LTS_STATE_a_42, LTS_STATE_a_425,
+    6, 'a', LTS_STATE_a_427, LTS_STATE_a_426,
+    2, 'a', LTS_STATE_a_26, LTS_STATE_a_428,
+    3, 'g', LTS_STATE_a_69, LTS_STATE_a_42,
+    1, 'u', LTS_STATE_a_69, LTS_STATE_a_429,
+    4, 'y', LTS_STATE_a_42, LTS_STATE_a_430,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_431,
+    4, 'w', LTS_STATE_a_83, LTS_STATE_a_432,
+    3, 'u', LTS_STATE_a_42, LTS_STATE_a_433,
+    4, 'w', LTS_STATE_a_83, LTS_STATE_a_434,
+    1, '0', LTS_STATE_a_42, LTS_STATE_a_435,
+    1, 'l', LTS_STATE_a_29, LTS_STATE_a_436,
+    3, 'n', LTS_STATE_a_438, LTS_STATE_a_437,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_439,
+    6, 'o', LTS_STATE_a_42, LTS_STATE_a_440,
+    2, 'l', LTS_STATE_a_248, LTS_STATE_a_441,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_42,
+    6, 'n', LTS_STATE_a_443, LTS_STATE_a_442,
+    1, 'a', LTS_STATE_a_445, LTS_STATE_a_444,
+    5, 's', LTS_STATE_a_69, LTS_STATE_a_28,
+    5, 't', LTS_STATE_a_446, LTS_STATE_a_28,
+    1, 'h', LTS_STATE_a_28, LTS_STATE_a_69,
+    4, 'f', LTS_STATE_a_69, LTS_STATE_a_447,
+    2, 's', LTS_STATE_a_28, LTS_STATE_a_448,
+    6, 't', LTS_STATE_a_83, LTS_STATE_a_449,
+    3, 'n', LTS_STATE_a_83, LTS_STATE_a_450,
+    6, 't', LTS_STATE_a_451, LTS_STATE_a_83,
+    5, 's', LTS_STATE_a_453, LTS_STATE_a_452,
+    5, 'b', LTS_STATE_a_64, LTS_STATE_a_454,
+    6, 't', LTS_STATE_a_456, LTS_STATE_a_455,
+    5, 'l', LTS_STATE_a_458, LTS_STATE_a_457,
+    3, 'l', LTS_STATE_a_83, LTS_STATE_a_459,
+    1, '0', LTS_STATE_a_461, LTS_STATE_a_460,
+    1, '#', LTS_STATE_a_112, LTS_STATE_a_108,
+    4, 'u', LTS_STATE_a_106, LTS_STATE_a_462,
+    3, 'a', LTS_STATE_a_231, LTS_STATE_a_463,
+    2, 't', LTS_STATE_a_464, LTS_STATE_a_69,
+    1, 'n', LTS_STATE_a_466, LTS_STATE_a_465,
+    4, 'o', LTS_STATE_a_28, LTS_STATE_a_467,
+    4, 't', LTS_STATE_a_28, LTS_STATE_a_468,
+    2, 'r', LTS_STATE_a_28, LTS_STATE_a_469,
+    1, 'e', LTS_STATE_a_42, LTS_STATE_a_470,
+    6, 'e', LTS_STATE_a_472, LTS_STATE_a_471,
+    5, 'a', LTS_STATE_a_474, LTS_STATE_a_473,
+    3, 'p', LTS_STATE_a_29, LTS_STATE_a_475,
+    2, 'c', LTS_STATE_a_477, LTS_STATE_a_476,
+    2, 'r', LTS_STATE_a_101, LTS_STATE_a_26,
+    3, 'v', LTS_STATE_a_29, LTS_STATE_a_478,
+    3, 'c', LTS_STATE_a_26, LTS_STATE_a_479,
+    1, 'i', LTS_STATE_a_26, LTS_STATE_a_480,
+    2, 'a', LTS_STATE_a_28, LTS_STATE_a_101,
+    3, 'l', LTS_STATE_a_29, LTS_STATE_a_26,
+    2, 's', LTS_STATE_a_26, LTS_STATE_a_481,
+    3, 'h', LTS_STATE_a_483, LTS_STATE_a_482,
+    6, 's', LTS_STATE_a_231, LTS_STATE_a_28,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_26,
+    6, 's', LTS_STATE_a_231, LTS_STATE_a_484,
+    3, 'c', LTS_STATE_a_26, LTS_STATE_a_485,
+    6, 'l', LTS_STATE_a_231, LTS_STATE_a_486,
+    6, 'b', LTS_STATE_a_101, LTS_STATE_a_487,
+    6, 'm', LTS_STATE_a_26, LTS_STATE_a_28,
+    3, 'n', LTS_STATE_a_231, LTS_STATE_a_488,
+    3, 'g', LTS_STATE_a_101, LTS_STATE_a_489,
+    6, 'o', LTS_STATE_a_231, LTS_STATE_a_29,
+    3, 'p', LTS_STATE_a_29, LTS_STATE_a_101,
+    5, 't', LTS_STATE_a_28, LTS_STATE_a_29,
+    5, 'r', LTS_STATE_a_28, LTS_STATE_a_490,
+    6, '#', LTS_STATE_a_127, LTS_STATE_a_28,
+    1, '0', LTS_STATE_a_492, LTS_STATE_a_491,
+    4, 'b', LTS_STATE_a_494, LTS_STATE_a_493,
+    4, 't', LTS_STATE_a_496, LTS_STATE_a_495,
+    4, 'l', LTS_STATE_a_498, LTS_STATE_a_497,
+    5, 'a', LTS_STATE_a_69, LTS_STATE_a_499,
+    5, 'a', LTS_STATE_a_501, LTS_STATE_a_500,
+    5, 'a', LTS_STATE_a_503, LTS_STATE_a_502,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_504,
+    3, 'k', LTS_STATE_a_29, LTS_STATE_a_69,
+    5, 't', LTS_STATE_a_506, LTS_STATE_a_505,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_73,
+    3, 'p', LTS_STATE_a_42, LTS_STATE_a_28,
+    6, 'v', LTS_STATE_a_508, LTS_STATE_a_507,
+    2, '#', LTS_STATE_a_510, LTS_STATE_a_509,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_511,
+    1, '0', LTS_STATE_a_513, LTS_STATE_a_512,
+    3, 'n', LTS_STATE_a_29, LTS_STATE_a_514,
+    4, 'v', LTS_STATE_a_42, LTS_STATE_a_515,
+    1, 'i', LTS_STATE_a_516, LTS_STATE_a_42,
+    1, 'e', LTS_STATE_a_101, LTS_STATE_a_517,
+    5, 's', LTS_STATE_a_519, LTS_STATE_a_518,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_520,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_521,
+    1, '0', LTS_STATE_a_42, LTS_STATE_a_522,
+    2, '#', LTS_STATE_a_524, LTS_STATE_a_523,
+    2, '#', LTS_STATE_a_526, LTS_STATE_a_525,
+    4, 'l', LTS_STATE_a_528, LTS_STATE_a_527,
+    1, 't', LTS_STATE_a_530, LTS_STATE_a_529,
+    4, 'x', LTS_STATE_a_101, LTS_STATE_a_531,
+    2, 'i', LTS_STATE_a_533, LTS_STATE_a_532,
+    4, 'l', LTS_STATE_a_29, LTS_STATE_a_534,
+    3, 'r', LTS_STATE_a_536, LTS_STATE_a_535,
+    2, 'e', LTS_STATE_a_42, LTS_STATE_a_537,
+    1, 'c', LTS_STATE_a_42, LTS_STATE_a_538,
+    2, 's', LTS_STATE_a_540, LTS_STATE_a_539,
+    3, 'l', LTS_STATE_a_73, LTS_STATE_a_541,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_542,
+    3, 'h', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'd', LTS_STATE_a_28, LTS_STATE_a_543,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_28,
+    1, 'b', LTS_STATE_a_28, LTS_STATE_a_101,
+    5, 'l', LTS_STATE_a_101, LTS_STATE_a_544,
+    6, 'h', LTS_STATE_a_106, LTS_STATE_a_545,
+    3, 'h', LTS_STATE_a_64, LTS_STATE_a_546,
+    3, 'b', LTS_STATE_a_64, LTS_STATE_a_547,
+    3, 'f', LTS_STATE_a_83, LTS_STATE_a_108,
+    5, 't', LTS_STATE_a_548, LTS_STATE_a_83,
+    2, 'k', LTS_STATE_a_64, LTS_STATE_a_83,
+    2, 'k', LTS_STATE_a_64, LTS_STATE_a_549,
+    5, 'r', LTS_STATE_a_83, LTS_STATE_a_550,
+    5, 's', LTS_STATE_a_83, LTS_STATE_a_499,
+    3, 'g', LTS_STATE_a_552, LTS_STATE_a_551,
+    6, 'i', LTS_STATE_a_83, LTS_STATE_a_553,
+    6, 'e', LTS_STATE_a_106, LTS_STATE_a_83,
+    2, 'c', LTS_STATE_a_83, LTS_STATE_a_554,
+    6, 'u', LTS_STATE_a_83, LTS_STATE_a_555,
+    4, 'i', LTS_STATE_a_557, LTS_STATE_a_556,
+    3, 'v', LTS_STATE_a_559, LTS_STATE_a_558,
+    1, 'n', LTS_STATE_a_29, LTS_STATE_a_83,
+    2, 's', LTS_STATE_a_561, LTS_STATE_a_560,
+    3, 'h', LTS_STATE_a_563, LTS_STATE_a_562,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_564,
+    1, 'e', LTS_STATE_a_69, LTS_STATE_a_565,
+    1, 'a', LTS_STATE_a_69, LTS_STATE_a_566,
+    1, 't', LTS_STATE_a_42, LTS_STATE_a_567,
+    3, 'l', LTS_STATE_a_569, LTS_STATE_a_568,
+    3, 'b', LTS_STATE_a_570, LTS_STATE_a_29,
+    5, 'o', LTS_STATE_a_572, LTS_STATE_a_571,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_573,
+    3, 'c', LTS_STATE_a_29, LTS_STATE_a_574,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_575,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_576,
+    3, 'p', LTS_STATE_a_26, LTS_STATE_a_577,
+    3, 'f', LTS_STATE_a_26, LTS_STATE_a_578,
+    3, 'l', LTS_STATE_a_580, LTS_STATE_a_579,
+    2, 'u', LTS_STATE_a_26, LTS_STATE_a_581,
+    5, 'k', LTS_STATE_a_29, LTS_STATE_a_582,
+    6, 'o', LTS_STATE_a_583, LTS_STATE_a_29,
+    6, 'u', LTS_STATE_a_28, LTS_STATE_a_584,
+    3, 'k', LTS_STATE_a_26, LTS_STATE_a_101,
+    6, '#', LTS_STATE_a_26, LTS_STATE_a_585,
+    6, 'e', LTS_STATE_a_26, LTS_STATE_a_586,
+    6, 'c', LTS_STATE_a_231, LTS_STATE_a_587,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_588,
+    2, 'l', LTS_STATE_a_590, LTS_STATE_a_589,
+    3, 'o', LTS_STATE_a_592, LTS_STATE_a_591,
+    4, 'l', LTS_STATE_a_594, LTS_STATE_a_593,
+    6, 'y', LTS_STATE_a_596, LTS_STATE_a_595,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_597,
+    6, 's', LTS_STATE_a_599, LTS_STATE_a_598,
+    6, 'r', LTS_STATE_a_601, LTS_STATE_a_600,
+    2, 't', LTS_STATE_a_603, LTS_STATE_a_602,
+    2, 's', LTS_STATE_a_605, LTS_STATE_a_604,
+    5, 'c', LTS_STATE_a_29, LTS_STATE_a_83,
+    5, 'o', LTS_STATE_a_607, LTS_STATE_a_606,
+    6, '#', LTS_STATE_a_609, LTS_STATE_a_608,
+    5, 'o', LTS_STATE_a_611, LTS_STATE_a_610,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_612,
+    5, 'h', LTS_STATE_a_83, LTS_STATE_a_613,
+    4, 'c', LTS_STATE_a_615, LTS_STATE_a_614,
+    4, 's', LTS_STATE_a_42, LTS_STATE_a_29,
+    6, 'e', LTS_STATE_a_617, LTS_STATE_a_616,
+    4, 't', LTS_STATE_a_619, LTS_STATE_a_618,
+    4, 'z', LTS_STATE_a_29, LTS_STATE_a_620,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_621,
+    4, 'g', LTS_STATE_a_623, LTS_STATE_a_622,
+    3, 'u', LTS_STATE_a_624, LTS_STATE_a_42,
+    3, 'l', LTS_STATE_a_231, LTS_STATE_a_42,
+    4, 'z', LTS_STATE_a_101, LTS_STATE_a_625,
+    2, '#', LTS_STATE_a_231, LTS_STATE_a_29,
+    2, 'r', LTS_STATE_a_626, LTS_STATE_a_42,
+    1, 'd', LTS_STATE_a_101, LTS_STATE_a_42,
+    5, 'a', LTS_STATE_a_28, LTS_STATE_a_627,
+    6, 't', LTS_STATE_a_29, LTS_STATE_a_628,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_629,
+    3, 'l', LTS_STATE_a_630, LTS_STATE_a_42,
+    6, 't', LTS_STATE_a_69, LTS_STATE_a_631,
+    1, '#', LTS_STATE_a_633, LTS_STATE_a_632,
+    6, 'k', LTS_STATE_a_635, LTS_STATE_a_634,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_636,
+    3, 't', LTS_STATE_a_42, LTS_STATE_a_637,
+    4, 'n', LTS_STATE_a_639, LTS_STATE_a_638,
+    1, '0', LTS_STATE_a_641, LTS_STATE_a_640,
+    3, 'g', LTS_STATE_a_643, LTS_STATE_a_642,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_42,
+    1, '0', LTS_STATE_a_645, LTS_STATE_a_644,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_646,
+    4, 'l', LTS_STATE_a_29, LTS_STATE_a_42,
+    4, 'c', LTS_STATE_a_29, LTS_STATE_a_647,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_648,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_649,
+    1, 'i', LTS_STATE_a_69, LTS_STATE_a_650,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_651,
+    1, 'e', LTS_STATE_a_653, LTS_STATE_a_652,
+    3, 's', LTS_STATE_a_332, LTS_STATE_a_42,
+    3, 'r', LTS_STATE_a_29, LTS_STATE_a_654,
+    3, 'p', LTS_STATE_a_101, LTS_STATE_a_42,
+    6, 'o', LTS_STATE_a_28, LTS_STATE_a_655,
+    6, 'g', LTS_STATE_a_69, LTS_STATE_a_656,
+    2, 'e', LTS_STATE_a_658, LTS_STATE_a_657,
+    3, 'r', LTS_STATE_a_64, LTS_STATE_a_83,
+    5, 's', LTS_STATE_a_660, LTS_STATE_a_659,
+    2, 't', LTS_STATE_a_64, LTS_STATE_a_83,
+    3, 'r', LTS_STATE_a_83, LTS_STATE_a_64,
+    5, 'b', LTS_STATE_a_83, LTS_STATE_a_661,
+    3, 's', LTS_STATE_a_663, LTS_STATE_a_662,
+    5, 'c', LTS_STATE_a_64, LTS_STATE_a_664,
+    6, 't', LTS_STATE_a_83, LTS_STATE_a_665,
+    1, 'o', LTS_STATE_a_155, LTS_STATE_a_666,
+    6, 'm', LTS_STATE_a_231, LTS_STATE_a_83,
+    4, 'o', LTS_STATE_a_668, LTS_STATE_a_667,
+    2, 'a', LTS_STATE_a_29, LTS_STATE_a_28,
+    3, 'j', LTS_STATE_a_231, LTS_STATE_a_69,
+    2, 'i', LTS_STATE_a_231, LTS_STATE_a_69,
+    3, 'h', LTS_STATE_a_670, LTS_STATE_a_669,
+    3, 's', LTS_STATE_a_69, LTS_STATE_a_671,
+    3, 'g', LTS_STATE_a_673, LTS_STATE_a_672,
+    255, 17, 0, 0, 0, 0,
+    3, 'u', LTS_STATE_a_29, LTS_STATE_a_674,
+    4, 'm', LTS_STATE_a_28, LTS_STATE_a_675,
+    1, 'e', LTS_STATE_a_28, LTS_STATE_a_69,
+    2, 'o', LTS_STATE_a_42, LTS_STATE_a_676,
+    3, 'p', LTS_STATE_a_678, LTS_STATE_a_677,
+    2, 'u', LTS_STATE_a_28, LTS_STATE_a_679,
+    1, 'e', LTS_STATE_a_231, LTS_STATE_a_29,
+    2, 's', LTS_STATE_a_681, LTS_STATE_a_680,
+    3, 'h', LTS_STATE_a_26, LTS_STATE_a_29,
+    3, 'h', LTS_STATE_a_683, LTS_STATE_a_682,
+    2, 'g', LTS_STATE_a_28, LTS_STATE_a_684,
+    6, '#', LTS_STATE_a_101, LTS_STATE_a_685,
+    6, 'e', LTS_STATE_a_26, LTS_STATE_a_101,
+    1, '#', LTS_STATE_a_687, LTS_STATE_a_686,
+    1, '#', LTS_STATE_a_26, LTS_STATE_a_688,
+    6, 'e', LTS_STATE_a_26, LTS_STATE_a_689,
+    6, 't', LTS_STATE_a_26, LTS_STATE_a_690,
+    3, 'i', LTS_STATE_a_28, LTS_STATE_a_691,
+    6, 's', LTS_STATE_a_29, LTS_STATE_a_692,
+    5, 'b', LTS_STATE_a_29, LTS_STATE_a_693,
+    3, 'm', LTS_STATE_a_28, LTS_STATE_a_694,
+    3, 'l', LTS_STATE_a_28, LTS_STATE_a_695,
+    6, 'c', LTS_STATE_a_101, LTS_STATE_a_696,
+    3, 'c', LTS_STATE_a_101, LTS_STATE_a_697,
+    6, 'e', LTS_STATE_a_699, LTS_STATE_a_698,
+    1, 'n', LTS_STATE_a_28, LTS_STATE_a_700,
+    1, 'c', LTS_STATE_a_127, LTS_STATE_a_701,
+    4, 'n', LTS_STATE_a_703, LTS_STATE_a_702,
+    5, 't', LTS_STATE_a_705, LTS_STATE_a_704,
+    4, 'e', LTS_STATE_a_28, LTS_STATE_a_706,
+    5, 'a', LTS_STATE_a_708, LTS_STATE_a_707,
+    4, 'l', LTS_STATE_a_710, LTS_STATE_a_709,
+    3, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
+    1, '0', LTS_STATE_a_42, LTS_STATE_a_69,
+    4, 'g', LTS_STATE_a_712, LTS_STATE_a_711,
+    4, 'g', LTS_STATE_a_231, LTS_STATE_a_713,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_714,
+    1, 'd', LTS_STATE_a_42, LTS_STATE_a_715,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_716,
+    5, 's', LTS_STATE_a_718, LTS_STATE_a_717,
+    6, '#', LTS_STATE_a_720, LTS_STATE_a_719,
+    3, 't', LTS_STATE_a_83, LTS_STATE_a_721,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_722,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_723,
+    3, 'v', LTS_STATE_a_725, LTS_STATE_a_724,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_29,
+    5, 'm', LTS_STATE_a_727, LTS_STATE_a_726,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_728,
+    3, 'b', LTS_STATE_a_101, LTS_STATE_a_729,
+    3, 'p', LTS_STATE_a_730, LTS_STATE_a_83,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_731,
+    5, 'h', LTS_STATE_a_83, LTS_STATE_a_101,
+    6, 'c', LTS_STATE_a_733, LTS_STATE_a_732,
+    4, 'n', LTS_STATE_a_735, LTS_STATE_a_734,
+    4, 's', LTS_STATE_a_42, LTS_STATE_a_736,
+    2, 'r', LTS_STATE_a_69, LTS_STATE_a_737,
+    3, 't', LTS_STATE_a_739, LTS_STATE_a_738,
+    3, 'm', LTS_STATE_a_741, LTS_STATE_a_740,
+    4, 'w', LTS_STATE_a_83, LTS_STATE_a_742,
+    2, 'i', LTS_STATE_a_101, LTS_STATE_a_743,
+    255, 18, 0, 0, 0, 0,
+    1, 'o', LTS_STATE_a_42, LTS_STATE_a_744,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_101,
+    6, 's', LTS_STATE_a_42, LTS_STATE_a_745,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_746,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_28,
+    2, 'p', LTS_STATE_a_42, LTS_STATE_a_747,
+    1, 'o', LTS_STATE_a_42, LTS_STATE_a_748,
+    1, '0', LTS_STATE_a_750, LTS_STATE_a_749,
+    6, 'r', LTS_STATE_a_752, LTS_STATE_a_751,
+    3, 'v', LTS_STATE_a_754, LTS_STATE_a_753,
+    4, 'c', LTS_STATE_a_29, LTS_STATE_a_755,
+    6, 'n', LTS_STATE_a_42, LTS_STATE_a_756,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_757,
+    4, 'x', LTS_STATE_a_101, LTS_STATE_a_758,
+    2, '0', LTS_STATE_a_101, LTS_STATE_a_759,
+    2, 'o', LTS_STATE_a_29, LTS_STATE_a_760,
+    2, '#', LTS_STATE_a_42, LTS_STATE_a_231,
+    2, 'c', LTS_STATE_a_42, LTS_STATE_a_761,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_42,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_762,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_763,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_764,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_741,
+    3, 'i', LTS_STATE_a_766, LTS_STATE_a_765,
+    2, 'u', LTS_STATE_a_69, LTS_STATE_a_767,
+    1, 't', LTS_STATE_a_69, LTS_STATE_a_42,
+    1, 't', LTS_STATE_a_42, LTS_STATE_a_768,
+    2, 'e', LTS_STATE_a_248, LTS_STATE_a_769,
+    3, 'g', LTS_STATE_a_42, LTS_STATE_a_248,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_248,
+    5, 'h', LTS_STATE_a_28, LTS_STATE_a_770,
+    6, 'u', LTS_STATE_a_69, LTS_STATE_a_28,
+    2, 't', LTS_STATE_a_106, LTS_STATE_a_771,
+    6, 'e', LTS_STATE_a_772, LTS_STATE_a_83,
+    3, 'h', LTS_STATE_a_108, LTS_STATE_a_773,
+    3, 'h', LTS_STATE_a_64, LTS_STATE_a_106,
+    6, 'i', LTS_STATE_a_64, LTS_STATE_a_774,
+    6, '#', LTS_STATE_a_83, LTS_STATE_a_775,
+    5, 't', LTS_STATE_a_155, LTS_STATE_a_83,
+    5, 'd', LTS_STATE_a_112, LTS_STATE_a_776,
+    6, 'e', LTS_STATE_a_83, LTS_STATE_a_777,
+    2, 'a', LTS_STATE_a_155, LTS_STATE_a_778,
+    4, 'e', LTS_STATE_a_629, LTS_STATE_a_779,
+    2, 'a', LTS_STATE_a_28, LTS_STATE_a_106,
+    3, 'w', LTS_STATE_a_781, LTS_STATE_a_780,
+    1, 'l', LTS_STATE_a_563, LTS_STATE_a_782,
+    3, 't', LTS_STATE_a_101, LTS_STATE_a_783,
+    2, 'a', LTS_STATE_a_101, LTS_STATE_a_69,
+    2, 'i', LTS_STATE_a_69, LTS_STATE_a_563,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_784,
+    1, '#', LTS_STATE_a_28, LTS_STATE_a_785,
+    3, 'l', LTS_STATE_a_787, LTS_STATE_a_786,
+    5, 'k', LTS_STATE_a_789, LTS_STATE_a_788,
+    5, 'a', LTS_STATE_a_791, LTS_STATE_a_790,
+    2, 'c', LTS_STATE_a_28, LTS_STATE_a_792,
+    3, 'h', LTS_STATE_a_29, LTS_STATE_a_793,
+    3, 'c', LTS_STATE_a_794, LTS_STATE_a_29,
+    2, 'g', LTS_STATE_a_26, LTS_STATE_a_28,
+    6, 'c', LTS_STATE_a_26, LTS_STATE_a_28,
+    6, 'y', LTS_STATE_a_29, LTS_STATE_a_795,
+    2, 'a', LTS_STATE_a_796, LTS_STATE_a_29,
+    1, 'e', LTS_STATE_a_26, LTS_STATE_a_797,
+    3, 'h', LTS_STATE_a_26, LTS_STATE_a_798,
+    3, 'm', LTS_STATE_a_26, LTS_STATE_a_799,
+    6, 'u', LTS_STATE_a_26, LTS_STATE_a_800,
+    1, '#', LTS_STATE_a_26, LTS_STATE_a_28,
+    1, 'a', LTS_STATE_a_28, LTS_STATE_a_801,
+    5, 'c', LTS_STATE_a_803, LTS_STATE_a_802,
+    5, 'p', LTS_STATE_a_231, LTS_STATE_a_29,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_804,
+    3, 'p', LTS_STATE_a_805, LTS_STATE_a_26,
+    3, 'c', LTS_STATE_a_231, LTS_STATE_a_806,
+    3, 't', LTS_STATE_a_231, LTS_STATE_a_807,
+    3, 'd', LTS_STATE_a_101, LTS_STATE_a_808,
+    3, 'f', LTS_STATE_a_26, LTS_STATE_a_809,
+    2, 't', LTS_STATE_a_28, LTS_STATE_a_810,
+    1, '#', LTS_STATE_a_127, LTS_STATE_a_28,
+    5, 'a', LTS_STATE_a_812, LTS_STATE_a_811,
+    5, 'g', LTS_STATE_a_814, LTS_STATE_a_813,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_28,
+    2, 'c', LTS_STATE_a_28, LTS_STATE_a_101,
+    4, 'n', LTS_STATE_a_816, LTS_STATE_a_815,
+    5, 't', LTS_STATE_a_818, LTS_STATE_a_817,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_819,
+    4, 'h', LTS_STATE_a_821, LTS_STATE_a_820,
+    6, '#', LTS_STATE_a_823, LTS_STATE_a_822,
+    2, 'a', LTS_STATE_a_825, LTS_STATE_a_824,
+    6, 'n', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, 'o', LTS_STATE_a_101, LTS_STATE_a_826,
+    2, 'u', LTS_STATE_a_69, LTS_STATE_a_827,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_828,
+    3, 'i', LTS_STATE_a_830, LTS_STATE_a_829,
+    5, 'a', LTS_STATE_a_231, LTS_STATE_a_831,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_832,
+    5, 't', LTS_STATE_a_83, LTS_STATE_a_833,
+    5, 'a', LTS_STATE_a_29, LTS_STATE_a_834,
+    3, 'm', LTS_STATE_a_83, LTS_STATE_a_835,
+    4, 'e', LTS_STATE_a_837, LTS_STATE_a_836,
+    6, 'r', LTS_STATE_a_839, LTS_STATE_a_838,
+    6, 'n', LTS_STATE_a_841, LTS_STATE_a_840,
+    4, 'c', LTS_STATE_a_73, LTS_STATE_a_842,
+    5, 'd', LTS_STATE_a_844, LTS_STATE_a_843,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_845,
+    6, 's', LTS_STATE_a_69, LTS_STATE_a_846,
+    6, 's', LTS_STATE_a_29, LTS_STATE_a_847,
+    5, 'l', LTS_STATE_a_231, LTS_STATE_a_83,
+    5, 'g', LTS_STATE_a_101, LTS_STATE_a_848,
+    6, 't', LTS_STATE_a_850, LTS_STATE_a_849,
+    4, 't', LTS_STATE_a_101, LTS_STATE_a_851,
+    1, '0', LTS_STATE_a_853, LTS_STATE_a_852,
+    1, '0', LTS_STATE_a_854, LTS_STATE_a_69,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_231,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_855,
+    4, 'n', LTS_STATE_a_857, LTS_STATE_a_856,
+    4, 'l', LTS_STATE_a_859, LTS_STATE_a_858,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_860,
+    4, 'n', LTS_STATE_a_42, LTS_STATE_a_29,
+    4, 'y', LTS_STATE_a_42, LTS_STATE_a_861,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_248,
+    4, 'c', LTS_STATE_a_42, LTS_STATE_a_862,
+    6, 'n', LTS_STATE_a_42, LTS_STATE_a_863,
+    3, 'n', LTS_STATE_a_42, LTS_STATE_a_864,
+    6, 'e', LTS_STATE_a_42, LTS_STATE_a_69,
+    6, 'i', LTS_STATE_a_42, LTS_STATE_a_865,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_866,
+    4, 'm', LTS_STATE_a_868, LTS_STATE_a_867,
+    2, 's', LTS_STATE_a_870, LTS_STATE_a_869,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_871,
+    6, 'l', LTS_STATE_a_873, LTS_STATE_a_872,
+    4, 'l', LTS_STATE_a_874, LTS_STATE_a_563,
+    4, 's', LTS_STATE_a_29, LTS_STATE_a_101,
+    3, 'b', LTS_STATE_a_42, LTS_STATE_a_69,
+    3, 'b', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'j', LTS_STATE_a_69, LTS_STATE_a_875,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_876,
+    1, '#', LTS_STATE_a_69, LTS_STATE_a_877,
+    3, 'l', LTS_STATE_a_879, LTS_STATE_a_878,
+    4, 'h', LTS_STATE_a_69, LTS_STATE_a_880,
+    4, 'l', LTS_STATE_a_101, LTS_STATE_a_881,
+    4, 'c', LTS_STATE_a_883, LTS_STATE_a_882,
+    2, 'e', LTS_STATE_a_42, LTS_STATE_a_884,
+    2, 'c', LTS_STATE_a_42, LTS_STATE_a_885,
+    1, 't', LTS_STATE_a_69, LTS_STATE_a_886,
+    1, 'd', LTS_STATE_a_42, LTS_STATE_a_887,
+    3, 'p', LTS_STATE_a_42, LTS_STATE_a_888,
+    1, 'u', LTS_STATE_a_28, LTS_STATE_a_889,
+    1, 'r', LTS_STATE_a_29, LTS_STATE_a_890,
+    3, 'l', LTS_STATE_a_106, LTS_STATE_a_83,
+    3, 'r', LTS_STATE_a_64, LTS_STATE_a_772,
+    5, 's', LTS_STATE_a_64, LTS_STATE_a_891,
+    5, 'm', LTS_STATE_a_64, LTS_STATE_a_892,
+    5, 't', LTS_STATE_a_83, LTS_STATE_a_64,
+    6, '#', LTS_STATE_a_83, LTS_STATE_a_893,
+    2, 'r', LTS_STATE_a_155, LTS_STATE_a_83,
+    4, 'k', LTS_STATE_a_895, LTS_STATE_a_894,
+    3, 'g', LTS_STATE_a_69, LTS_STATE_a_896,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_897,
+    1, 'u', LTS_STATE_a_69, LTS_STATE_a_898,
+    3, 'c', LTS_STATE_a_101, LTS_STATE_a_69,
+    3, 'w', LTS_STATE_a_29, LTS_STATE_a_899,
+    4, 'f', LTS_STATE_a_28, LTS_STATE_a_900,
+    1, 'u', LTS_STATE_a_902, LTS_STATE_a_901,
+    1, 'i', LTS_STATE_a_42, LTS_STATE_a_903,
+    5, 'a', LTS_STATE_a_905, LTS_STATE_a_904,
+    3, 'm', LTS_STATE_a_29, LTS_STATE_a_906,
+    2, 'p', LTS_STATE_a_28, LTS_STATE_a_907,
+    6, 'g', LTS_STATE_a_26, LTS_STATE_a_28,
+    1, 'o', LTS_STATE_a_28, LTS_STATE_a_908,
+    3, 'u', LTS_STATE_a_29, LTS_STATE_a_909,
+    6, 'e', LTS_STATE_a_29, LTS_STATE_a_910,
+    1, 'n', LTS_STATE_a_29, LTS_STATE_a_911,
+    3, 'v', LTS_STATE_a_28, LTS_STATE_a_231,
+    6, 's', LTS_STATE_a_29, LTS_STATE_a_28,
+    3, 'l', LTS_STATE_a_26, LTS_STATE_a_912,
+    2, 's', LTS_STATE_a_26, LTS_STATE_a_29,
+    6, 'l', LTS_STATE_a_26, LTS_STATE_a_913,
+    2, 'a', LTS_STATE_a_28, LTS_STATE_a_914,
+    6, 'a', LTS_STATE_a_916, LTS_STATE_a_915,
+    3, 'm', LTS_STATE_a_918, LTS_STATE_a_917,
+    6, 't', LTS_STATE_a_101, LTS_STATE_a_919,
+    6, 'n', LTS_STATE_a_28, LTS_STATE_a_26,
+    6, 'm', LTS_STATE_a_28, LTS_STATE_a_920,
+    6, 'h', LTS_STATE_a_101, LTS_STATE_a_921,
+    3, 'p', LTS_STATE_a_26, LTS_STATE_a_922,
+    3, 'c', LTS_STATE_a_231, LTS_STATE_a_923,
+    6, 'n', LTS_STATE_a_127, LTS_STATE_a_924,
+    4, 'l', LTS_STATE_a_926, LTS_STATE_a_925,
+    6, '#', LTS_STATE_a_928, LTS_STATE_a_927,
+    6, '#', LTS_STATE_a_930, LTS_STATE_a_929,
+    6, 'e', LTS_STATE_a_932, LTS_STATE_a_931,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_933,
+    5, 'y', LTS_STATE_a_26, LTS_STATE_a_934,
+    5, 'd', LTS_STATE_a_936, LTS_STATE_a_935,
+    6, 'e', LTS_STATE_a_83, LTS_STATE_a_937,
+    6, 'n', LTS_STATE_a_231, LTS_STATE_a_938,
+    4, 'e', LTS_STATE_a_940, LTS_STATE_a_939,
+    6, '#', LTS_STATE_a_941, LTS_STATE_a_29,
+    6, 's', LTS_STATE_a_83, LTS_STATE_a_942,
+    3, 'b', LTS_STATE_a_83, LTS_STATE_a_943,
+    1, '0', LTS_STATE_a_945, LTS_STATE_a_944,
+    1, 'p', LTS_STATE_a_69, LTS_STATE_a_946,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_947,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_948,
+    2, 'i', LTS_STATE_a_950, LTS_STATE_a_949,
+    4, 'e', LTS_STATE_a_952, LTS_STATE_a_951,
+    2, 'd', LTS_STATE_a_954, LTS_STATE_a_953,
+    5, 'o', LTS_STATE_a_29, LTS_STATE_a_955,
+    6, 'l', LTS_STATE_a_563, LTS_STATE_a_956,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_957,
+    5, 'l', LTS_STATE_a_83, LTS_STATE_a_69,
+    5, 'a', LTS_STATE_a_29, LTS_STATE_a_958,
+    4, 'h', LTS_STATE_a_960, LTS_STATE_a_959,
+    3, 'm', LTS_STATE_a_28, LTS_STATE_a_961,
+    6, 's', LTS_STATE_a_963, LTS_STATE_a_962,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_964,
+    6, 's', LTS_STATE_a_966, LTS_STATE_a_965,
+    3, 'p', LTS_STATE_a_231, LTS_STATE_a_967,
+    4, 'n', LTS_STATE_a_563, LTS_STATE_a_101,
+    5, 'v', LTS_STATE_a_969, LTS_STATE_a_968,
+    6, 'a', LTS_STATE_a_231, LTS_STATE_a_970,
+    3, 'c', LTS_STATE_a_29, LTS_STATE_a_971,
+    6, 'm', LTS_STATE_a_231, LTS_STATE_a_972,
+    3, 't', LTS_STATE_a_231, LTS_STATE_a_973,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_974,
+    1, '0', LTS_STATE_a_976, LTS_STATE_a_975,
+    2, 'q', LTS_STATE_a_29, LTS_STATE_a_977,
+    4, 's', LTS_STATE_a_757, LTS_STATE_a_978,
+    1, '#', LTS_STATE_a_980, LTS_STATE_a_979,
+    4, 'v', LTS_STATE_a_42, LTS_STATE_a_981,
+    3, 'd', LTS_STATE_a_101, LTS_STATE_a_563,
+    1, 'c', LTS_STATE_a_69, LTS_STATE_a_982,
+    2, 'o', LTS_STATE_a_29, LTS_STATE_a_983,
+    3, 'm', LTS_STATE_a_42, LTS_STATE_a_984,
+    2, 's', LTS_STATE_a_29, LTS_STATE_a_42,
+    1, 'r', LTS_STATE_a_101, LTS_STATE_a_29,
+    3, 'f', LTS_STATE_a_231, LTS_STATE_a_985,
+    4, 'k', LTS_STATE_a_42, LTS_STATE_a_986,
+    2, 'e', LTS_STATE_a_42, LTS_STATE_a_987,
+    3, 'b', LTS_STATE_a_28, LTS_STATE_a_988,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_989,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_990,
+    4, 'i', LTS_STATE_a_28, LTS_STATE_a_991,
+    4, 'd', LTS_STATE_a_101, LTS_STATE_a_992,
+    6, 'l', LTS_STATE_a_69, LTS_STATE_a_993,
+    3, 'r', LTS_STATE_a_995, LTS_STATE_a_994,
+    3, 'p', LTS_STATE_a_42, LTS_STATE_a_996,
+    3, 'x', LTS_STATE_a_101, LTS_STATE_a_997,
+    3, 'm', LTS_STATE_a_999, LTS_STATE_a_998,
+    3, 'l', LTS_STATE_a_1001, LTS_STATE_a_1000,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1002,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1003,
+    2, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
+    2, 'i', LTS_STATE_a_530, LTS_STATE_a_42,
+    1, 'm', LTS_STATE_a_42, LTS_STATE_a_1004,
+    4, 'm', LTS_STATE_a_1006, LTS_STATE_a_1005,
+    2, '#', LTS_STATE_a_42, LTS_STATE_a_69,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1007,
+    2, 'p', LTS_STATE_a_42, LTS_STATE_a_1008,
+    1, 'l', LTS_STATE_a_73, LTS_STATE_a_1009,
+    1, 'e', LTS_STATE_a_69, LTS_STATE_a_42,
+    1, 'd', LTS_STATE_a_69, LTS_STATE_a_42,
+    3, 'n', LTS_STATE_a_42, LTS_STATE_a_1010,
+    3, 'r', LTS_STATE_a_1012, LTS_STATE_a_1011,
+    2, 'n', LTS_STATE_a_1013, LTS_STATE_a_28,
+    5, 'd', LTS_STATE_a_83, LTS_STATE_a_1014,
+    6, 'e', LTS_STATE_a_64, LTS_STATE_a_83,
+    6, 'u', LTS_STATE_a_29, LTS_STATE_a_1015,
+    6, 'k', LTS_STATE_a_83, LTS_STATE_a_1016,
+    4, 'h', LTS_STATE_a_1018, LTS_STATE_a_1017,
+    3, 'i', LTS_STATE_a_563, LTS_STATE_a_1019,
+    3, 'f', LTS_STATE_a_101, LTS_STATE_a_1020,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_231,
+    1, 'e', LTS_STATE_a_69, LTS_STATE_a_1021,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1022,
+    4, 'l', LTS_STATE_a_28, LTS_STATE_a_1023,
+    2, 'r', LTS_STATE_a_42, LTS_STATE_a_1024,
+    2, 'r', LTS_STATE_a_28, LTS_STATE_a_42,
+    1, 'a', LTS_STATE_a_73, LTS_STATE_a_42,
+    5, 'o', LTS_STATE_a_1026, LTS_STATE_a_1025,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_1027,
+    2, 'm', LTS_STATE_a_29, LTS_STATE_a_231,
+    5, 'o', LTS_STATE_a_28, LTS_STATE_a_1028,
+    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1029,
+    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1030,
+    6, 'i', LTS_STATE_a_231, LTS_STATE_a_29,
+    2, 'i', LTS_STATE_a_231, LTS_STATE_a_1031,
+    6, 'd', LTS_STATE_a_26, LTS_STATE_a_28,
+    6, 't', LTS_STATE_a_1033, LTS_STATE_a_1032,
+    1, 'u', LTS_STATE_a_28, LTS_STATE_a_1034,
+    6, 'o', LTS_STATE_a_1036, LTS_STATE_a_1035,
+    5, 'j', LTS_STATE_a_29, LTS_STATE_a_1037,
+    3, 's', LTS_STATE_a_231, LTS_STATE_a_910,
+    6, 'e', LTS_STATE_a_231, LTS_STATE_a_1038,
+    3, 'g', LTS_STATE_a_231, LTS_STATE_a_1039,
+    6, 'z', LTS_STATE_a_28, LTS_STATE_a_1040,
+    3, 's', LTS_STATE_a_26, LTS_STATE_a_1041,
+    6, 'u', LTS_STATE_a_231, LTS_STATE_a_1042,
+    3, 'b', LTS_STATE_a_101, LTS_STATE_a_29,
+    6, '#', LTS_STATE_a_1043, LTS_STATE_a_127,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_1044,
+    5, 's', LTS_STATE_a_1046, LTS_STATE_a_1045,
+    6, 'b', LTS_STATE_a_1048, LTS_STATE_a_1047,
+    4, 'h', LTS_STATE_a_231, LTS_STATE_a_29,
+    5, 'c', LTS_STATE_a_1050, LTS_STATE_a_1049,
+    5, 'a', LTS_STATE_a_1052, LTS_STATE_a_1051,
+    6, '#', LTS_STATE_a_101, LTS_STATE_a_1053,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_1054,
+    4, 'm', LTS_STATE_a_1056, LTS_STATE_a_1055,
+    5, 't', LTS_STATE_a_1058, LTS_STATE_a_1057,
+    5, 'm', LTS_STATE_a_1060, LTS_STATE_a_1059,
+    6, 'e', LTS_STATE_a_83, LTS_STATE_a_1061,
+    6, 'a', LTS_STATE_a_83, LTS_STATE_a_1062,
+    6, 'm', LTS_STATE_a_101, LTS_STATE_a_69,
+    4, 'w', LTS_STATE_a_83, LTS_STATE_a_1063,
+    2, 'c', LTS_STATE_a_69, LTS_STATE_a_1064,
+    2, 'r', LTS_STATE_a_231, LTS_STATE_a_1065,
+    2, 'h', LTS_STATE_a_83, LTS_STATE_a_1066,
+    3, 'f', LTS_STATE_a_83, LTS_STATE_a_1067,
+    4, 'b', LTS_STATE_a_1069, LTS_STATE_a_1068,
+    6, 'i', LTS_STATE_a_1071, LTS_STATE_a_1070,
+    6, 't', LTS_STATE_a_231, LTS_STATE_a_1072,
+    4, 'd', LTS_STATE_a_29, LTS_STATE_a_1073,
+    1, 'o', LTS_STATE_a_69, LTS_STATE_a_1074,
+    3, 'l', LTS_STATE_a_1076, LTS_STATE_a_1075,
+    1, 'p', LTS_STATE_a_69, LTS_STATE_a_1077,
+    3, 'w', LTS_STATE_a_1079, LTS_STATE_a_1078,
+    3, 'r', LTS_STATE_a_28, LTS_STATE_a_1080,
+    2, 'c', LTS_STATE_a_83, LTS_STATE_a_1081,
+    6, 'n', LTS_STATE_a_1083, LTS_STATE_a_1082,
+    4, 'c', LTS_STATE_a_1085, LTS_STATE_a_1084,
+    6, 'c', LTS_STATE_a_563, LTS_STATE_a_1086,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1087,
+    3, 'c', LTS_STATE_a_1089, LTS_STATE_a_1088,
+    4, 'n', LTS_STATE_a_1091, LTS_STATE_a_1090,
+    6, 'a', LTS_STATE_a_1093, LTS_STATE_a_1092,
+    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1094,
+    6, 'o', LTS_STATE_a_1096, LTS_STATE_a_1095,
+    4, 'n', LTS_STATE_a_1098, LTS_STATE_a_1097,
+    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1099,
+    4, 't', LTS_STATE_a_1101, LTS_STATE_a_1100,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1102,
+    4, 'v', LTS_STATE_a_69, LTS_STATE_a_1103,
+    6, 'e', LTS_STATE_a_1105, LTS_STATE_a_1104,
+    3, 'm', LTS_STATE_a_29, LTS_STATE_a_1106,
+    3, 'v', LTS_STATE_a_231, LTS_STATE_a_1107,
+    3, 'b', LTS_STATE_a_29, LTS_STATE_a_1108,
+    3, 's', LTS_STATE_a_69, LTS_STATE_a_1109,
+    3, 's', LTS_STATE_a_101, LTS_STATE_a_1110,
+    4, 'n', LTS_STATE_a_29, LTS_STATE_a_1111,
+    6, 'u', LTS_STATE_a_42, LTS_STATE_a_1112,
+    6, 's', LTS_STATE_a_1114, LTS_STATE_a_1113,
+    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1115,
+    2, 't', LTS_STATE_a_69, LTS_STATE_a_1116,
+    4, 't', LTS_STATE_a_42, LTS_STATE_a_1117,
+    4, 'z', LTS_STATE_a_42, LTS_STATE_a_194,
+    4, 'l', LTS_STATE_a_1119, LTS_STATE_a_1118,
+    2, 'i', LTS_STATE_a_1121, LTS_STATE_a_1120,
+    2, 's', LTS_STATE_a_29, LTS_STATE_a_1122,
+    2, 'l', LTS_STATE_a_42, LTS_STATE_a_1123,
+    4, 'n', LTS_STATE_a_29, LTS_STATE_a_101,
+    1, '#', LTS_STATE_a_1125, LTS_STATE_a_1124,
+    2, 'b', LTS_STATE_a_29, LTS_STATE_a_1126,
+    3, 'n', LTS_STATE_a_42, LTS_STATE_a_1127,
+    1, '0', LTS_STATE_a_1128, LTS_STATE_a_42,
+    2, 'r', LTS_STATE_a_42, LTS_STATE_a_69,
+    6, 'z', LTS_STATE_a_29, LTS_STATE_a_1129,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1130,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_874,
+    6, 'n', LTS_STATE_a_1132, LTS_STATE_a_1131,
+    6, 'l', LTS_STATE_a_1134, LTS_STATE_a_1133,
+    4, 'd', LTS_STATE_a_101, LTS_STATE_a_1135,
+    2, 'd', LTS_STATE_a_42, LTS_STATE_a_1136,
+    6, 't', LTS_STATE_a_1138, LTS_STATE_a_1137,
+    6, 'y', LTS_STATE_a_42, LTS_STATE_a_1139,
+    3, 'h', LTS_STATE_a_1141, LTS_STATE_a_1140,
+    4, 'b', LTS_STATE_a_42, LTS_STATE_a_69,
+    2, '#', LTS_STATE_a_1143, LTS_STATE_a_1142,
+    1, '0', LTS_STATE_a_42, LTS_STATE_a_1144,
+    1, 'c', LTS_STATE_a_69, LTS_STATE_a_42,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1145,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_69,
+    4, 'l', LTS_STATE_a_1147, LTS_STATE_a_1146,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_1148,
+    3, 'g', LTS_STATE_a_1149, LTS_STATE_a_42,
+    3, 'g', LTS_STATE_a_42, LTS_STATE_a_1150,
+    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1151,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_1152,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_28,
+    5, 'r', LTS_STATE_a_83, LTS_STATE_a_1153,
+    6, 'i', LTS_STATE_a_83, LTS_STATE_a_1154,
+    6, 'l', LTS_STATE_a_83, LTS_STATE_a_1155,
+    4, 'm', LTS_STATE_a_1157, LTS_STATE_a_1156,
+    2, 'r', LTS_STATE_a_1158, LTS_STATE_a_69,
+    2, 'c', LTS_STATE_a_1160, LTS_STATE_a_1159,
+    3, 'l', LTS_STATE_a_69, LTS_STATE_a_1161,
+    2, 't', LTS_STATE_a_69, LTS_STATE_a_1162,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1163,
+    2, 'r', LTS_STATE_a_69, LTS_STATE_a_28,
+    3, 's', LTS_STATE_a_28, LTS_STATE_a_1164,
+    6, '#', LTS_STATE_a_1166, LTS_STATE_a_1165,
+    6, '#', LTS_STATE_a_1167, LTS_STATE_a_28,
+    3, 'h', LTS_STATE_a_1169, LTS_STATE_a_1168,
+    1, 'e', LTS_STATE_a_28, LTS_STATE_a_1170,
+    5, '#', LTS_STATE_a_28, LTS_STATE_a_1171,
+    3, 'i', LTS_STATE_a_28, LTS_STATE_a_1172,
+    1, 's', LTS_STATE_a_29, LTS_STATE_a_1173,
+    1, 'm', LTS_STATE_a_29, LTS_STATE_a_1174,
+    1, 'a', LTS_STATE_a_28, LTS_STATE_a_26,
+    3, 't', LTS_STATE_a_28, LTS_STATE_a_1175,
+    5, 'q', LTS_STATE_a_1177, LTS_STATE_a_1176,
+    5, 't', LTS_STATE_a_1179, LTS_STATE_a_1178,
+    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1180,
+    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1181,
+    6, 'c', LTS_STATE_a_28, LTS_STATE_a_1182,
+    2, '#', LTS_STATE_a_1183, LTS_STATE_a_101,
+    3, 'k', LTS_STATE_a_26, LTS_STATE_a_1184,
+    3, 'c', LTS_STATE_a_1186, LTS_STATE_a_1185,
+    5, 'y', LTS_STATE_a_127, LTS_STATE_a_28,
+    4, 'w', LTS_STATE_a_1188, LTS_STATE_a_1187,
+    3, 'w', LTS_STATE_a_1190, LTS_STATE_a_1189,
+    6, 'k', LTS_STATE_a_29, LTS_STATE_a_69,
+    3, 'b', LTS_STATE_a_712, LTS_STATE_a_1191,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_42,
+    6, 's', LTS_STATE_a_1193, LTS_STATE_a_1192,
+    6, 'e', LTS_STATE_a_1195, LTS_STATE_a_1194,
+    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1196,
+    2, 'u', LTS_STATE_a_29, LTS_STATE_a_1197,
+    6, 'i', LTS_STATE_a_42, LTS_STATE_a_1198,
+    3, 'r', LTS_STATE_a_1199, LTS_STATE_a_42,
+    5, 'r', LTS_STATE_a_1201, LTS_STATE_a_1200,
+    5, 'a', LTS_STATE_a_1203, LTS_STATE_a_1202,
+    5, 'n', LTS_STATE_a_1205, LTS_STATE_a_1204,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1206,
+    5, 'u', LTS_STATE_a_69, LTS_STATE_a_1207,
+    6, 'o', LTS_STATE_a_29, LTS_STATE_a_231,
+    6, 'r', LTS_STATE_a_83, LTS_STATE_a_29,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1208,
+    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1209,
+    1, 'a', LTS_STATE_a_134, LTS_STATE_a_42,
+    2, 'n', LTS_STATE_a_29, LTS_STATE_a_1210,
+    2, 's', LTS_STATE_a_1212, LTS_STATE_a_1211,
+    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1213,
+    3, 'h', LTS_STATE_a_1215, LTS_STATE_a_1214,
+    1, 'b', LTS_STATE_a_42, LTS_STATE_a_1216,
+    6, 'r', LTS_STATE_a_1218, LTS_STATE_a_1217,
+    4, 'l', LTS_STATE_a_231, LTS_STATE_a_69,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1219,
+    4, 'n', LTS_STATE_a_29, LTS_STATE_a_69,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_938,
+    1, 'n', LTS_STATE_a_42, LTS_STATE_a_1220,
+    1, 'g', LTS_STATE_a_73, LTS_STATE_a_42,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1221,
+    2, 'a', LTS_STATE_a_1223, LTS_STATE_a_1222,
+    5, 'g', LTS_STATE_a_101, LTS_STATE_a_1224,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_28,
+    2, 'g', LTS_STATE_a_1226, LTS_STATE_a_1225,
+    4, 'g', LTS_STATE_a_69, LTS_STATE_a_1227,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1228,
+    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1229,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1230,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1231,
+    5, 'l', LTS_STATE_a_1232, LTS_STATE_a_29,
+    5, 'p', LTS_STATE_a_101, LTS_STATE_a_1233,
+    3, 'o', LTS_STATE_a_28, LTS_STATE_a_1234,
+    5, 'g', LTS_STATE_a_1236, LTS_STATE_a_1235,
+    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1237,
+    5, 'r', LTS_STATE_a_28, LTS_STATE_a_29,
+    5, 'n', LTS_STATE_a_28, LTS_STATE_a_1238,
+    6, 'n', LTS_STATE_a_1240, LTS_STATE_a_1239,
+    4, 'b', LTS_STATE_a_563, LTS_STATE_a_1241,
+    3, 'l', LTS_STATE_a_69, LTS_STATE_a_29,
+    3, 'j', LTS_STATE_a_69, LTS_STATE_a_563,
+    4, 'b', LTS_STATE_a_1243, LTS_STATE_a_1242,
+    4, 'n', LTS_STATE_a_1245, LTS_STATE_a_1244,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1246,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_29,
+    4, 'h', LTS_STATE_a_69, LTS_STATE_a_1247,
+    6, '#', LTS_STATE_a_83, LTS_STATE_a_1248,
+    5, 't', LTS_STATE_a_83, LTS_STATE_a_1249,
+    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1250,
+    6, 'o', LTS_STATE_a_1252, LTS_STATE_a_1251,
+    6, 'e', LTS_STATE_a_231, LTS_STATE_a_1253,
+    6, 'g', LTS_STATE_a_101, LTS_STATE_a_1254,
+    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1255,
+    5, 'm', LTS_STATE_a_83, LTS_STATE_a_1256,
+    1, '#', LTS_STATE_a_1258, LTS_STATE_a_1257,
+    6, 'k', LTS_STATE_a_609, LTS_STATE_a_1259,
+    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1260,
+    3, 'b', LTS_STATE_a_69, LTS_STATE_a_1261,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1262,
+    3, 'v', LTS_STATE_a_231, LTS_STATE_a_69,
+    2, '#', LTS_STATE_a_1263, LTS_STATE_a_101,
+    2, '#', LTS_STATE_a_231, LTS_STATE_a_42,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1264,
+    3, 't', LTS_STATE_a_42, LTS_STATE_a_69,
+    2, 'g', LTS_STATE_a_1266, LTS_STATE_a_1265,
+    1, '#', LTS_STATE_a_29, LTS_STATE_a_1267,
+    2, '#', LTS_STATE_a_1269, LTS_STATE_a_1268,
+    3, 't', LTS_STATE_a_29, LTS_STATE_a_1270,
+    4, 's', LTS_STATE_a_29, LTS_STATE_a_42,
+    5, 'c', LTS_STATE_a_42, LTS_STATE_a_1271,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1272,
+    6, 'o', LTS_STATE_a_1274, LTS_STATE_a_1273,
+    4, 'b', LTS_STATE_a_1276, LTS_STATE_a_1275,
+    4, 't', LTS_STATE_a_1278, LTS_STATE_a_1277,
+    2, 'p', LTS_STATE_a_231, LTS_STATE_a_1279,
+    2, 'g', LTS_STATE_a_42, LTS_STATE_a_1280,
+    4, 'v', LTS_STATE_a_1281, LTS_STATE_a_101,
+    3, 'h', LTS_STATE_a_42, LTS_STATE_a_1282,
+    2, 'f', LTS_STATE_a_42, LTS_STATE_a_1283,
+    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1284,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_1285,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_1286,
+    4, 'n', LTS_STATE_a_1288, LTS_STATE_a_1287,
+    4, 'z', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'k', LTS_STATE_a_42, LTS_STATE_a_1289,
+    3, 't', LTS_STATE_a_101, LTS_STATE_a_42,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_272,
+    4, 'y', LTS_STATE_a_42, LTS_STATE_a_1290,
+    3, 'g', LTS_STATE_a_42, LTS_STATE_a_1291,
+    1, 'e', LTS_STATE_a_42, LTS_STATE_a_1292,
+    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1097,
+    2, 'n', LTS_STATE_a_73, LTS_STATE_a_42,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_69,
+    1, 'i', LTS_STATE_a_248, LTS_STATE_a_1293,
+    1, 'o', LTS_STATE_a_248, LTS_STATE_a_332,
+    2, 'a', LTS_STATE_a_29, LTS_STATE_a_83,
+    3, 'f', LTS_STATE_a_1295, LTS_STATE_a_1294,
+    6, 's', LTS_STATE_a_83, LTS_STATE_a_1296,
+    4, 'a', LTS_STATE_a_28, LTS_STATE_a_1297,
+    2, 'g', LTS_STATE_a_101, LTS_STATE_a_1298,
+    1, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
+    3, 'y', LTS_STATE_a_563, LTS_STATE_a_1299,
+    3, 'h', LTS_STATE_a_69, LTS_STATE_a_563,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_1300,
+    2, 'o', LTS_STATE_a_231, LTS_STATE_a_1301,
+    2, 'i', LTS_STATE_a_29, LTS_STATE_a_1302,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_73,
+    5, '#', LTS_STATE_a_1304, LTS_STATE_a_1303,
+    3, 'y', LTS_STATE_a_29, LTS_STATE_a_1305,
+    2, 'i', LTS_STATE_a_231, LTS_STATE_a_29,
+    1, 'd', LTS_STATE_a_28, LTS_STATE_a_1306,
+    1, 's', LTS_STATE_a_101, LTS_STATE_a_28,
+    6, '#', LTS_STATE_a_28, LTS_STATE_a_1307,
+    1, 'h', LTS_STATE_a_28, LTS_STATE_a_1308,
+    2, 'a', LTS_STATE_a_1309, LTS_STATE_a_29,
+    2, 'e', LTS_STATE_a_231, LTS_STATE_a_1310,
+    3, 'u', LTS_STATE_a_231, LTS_STATE_a_1311,
+    1, 'e', LTS_STATE_a_26, LTS_STATE_a_28,
+    6, 'i', LTS_STATE_a_1313, LTS_STATE_a_1312,
+    3, 'm', LTS_STATE_a_29, LTS_STATE_a_231,
+    5, 'd', LTS_STATE_a_1315, LTS_STATE_a_1314,
+    3, 'm', LTS_STATE_a_231, LTS_STATE_a_1316,
+    5, 't', LTS_STATE_a_231, LTS_STATE_a_1317,
+    6, 'h', LTS_STATE_a_29, LTS_STATE_a_401,
+    6, 'm', LTS_STATE_a_28, LTS_STATE_a_1318,
+    6, 'n', LTS_STATE_a_1320, LTS_STATE_a_1319,
+    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1321,
+    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1322,
+    6, 'a', LTS_STATE_a_231, LTS_STATE_a_101,
+    5, 't', LTS_STATE_a_1324, LTS_STATE_a_1323,
+    6, 'k', LTS_STATE_a_29, LTS_STATE_a_83,
+    6, '#', LTS_STATE_a_1326, LTS_STATE_a_1325,
+    5, 'k', LTS_STATE_a_1328, LTS_STATE_a_1327,
+    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1329,
+    3, 'w', LTS_STATE_a_1331, LTS_STATE_a_1330,
+    5, 't', LTS_STATE_a_69, LTS_STATE_a_1332,
+    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1333,
+    2, 'f', LTS_STATE_a_231, LTS_STATE_a_1334,
+    5, 'd', LTS_STATE_a_1336, LTS_STATE_a_1335,
+    1, 't', LTS_STATE_a_29, LTS_STATE_a_1337,
+    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1338,
+    1, 'a', LTS_STATE_a_42, LTS_STATE_a_1339,
+    4, 'w', LTS_STATE_a_1341, LTS_STATE_a_1340,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1342,
+    5, 'u', LTS_STATE_a_69, LTS_STATE_a_1343,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1344,
+    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1345,
+    6, 'o', LTS_STATE_a_69, LTS_STATE_a_101,
+    6, 'a', LTS_STATE_a_563, LTS_STATE_a_101,
+    5, 'p', LTS_STATE_a_101, LTS_STATE_a_1346,
+    6, 'i', LTS_STATE_a_29, LTS_STATE_a_101,
+    4, 'g', LTS_STATE_a_1348, LTS_STATE_a_1347,
+    3, 'd', LTS_STATE_a_29, LTS_STATE_a_231,
+    3, 'w', LTS_STATE_a_83, LTS_STATE_a_1349,
+    1, 'n', LTS_STATE_a_83, LTS_STATE_a_1350,
+    2, 'e', LTS_STATE_a_1352, LTS_STATE_a_1351,
+    4, 'v', LTS_STATE_a_1354, LTS_STATE_a_1353,
+    2, 's', LTS_STATE_a_101, LTS_STATE_a_1355,
+    1, 'o', LTS_STATE_a_101, LTS_STATE_a_69,
+    6, 'u', LTS_STATE_a_69, LTS_STATE_a_1356,
+    4, 'm', LTS_STATE_a_101, LTS_STATE_a_1227,
+    6, 'g', LTS_STATE_a_69, LTS_STATE_a_1357,
+    3, 'i', LTS_STATE_a_42, LTS_STATE_a_1358,
+    3, 't', LTS_STATE_a_42, LTS_STATE_a_1359,
+    3, 'u', LTS_STATE_a_1361, LTS_STATE_a_1360,
+    3, 'v', LTS_STATE_a_29, LTS_STATE_a_1362,
+    5, 'k', LTS_STATE_a_83, LTS_STATE_a_29,
+    4, 'n', LTS_STATE_a_1364, LTS_STATE_a_1363,
+    6, 'a', LTS_STATE_a_69, LTS_STATE_a_1365,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_69,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_29,
+    5, 't', LTS_STATE_a_101, LTS_STATE_a_1366,
+    6, 'm', LTS_STATE_a_563, LTS_STATE_a_1367,
+    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1368,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_29,
+    5, 'l', LTS_STATE_a_101, LTS_STATE_a_83,
+    4, 'o', LTS_STATE_a_1370, LTS_STATE_a_1369,
+    3, 'v', LTS_STATE_a_1372, LTS_STATE_a_1371,
+    6, 'e', LTS_STATE_a_1374, LTS_STATE_a_1373,
+    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1375,
+    5, 't', LTS_STATE_a_28, LTS_STATE_a_1376,
+    4, 'k', LTS_STATE_a_69, LTS_STATE_a_1377,
+    4, 'x', LTS_STATE_a_101, LTS_STATE_a_1378,
+    4, 'h', LTS_STATE_a_29, LTS_STATE_a_69,
+    3, 'l', LTS_STATE_a_231, LTS_STATE_a_1379,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'k', LTS_STATE_a_1381, LTS_STATE_a_1380,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1382,
+    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1383,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1384,
+    5, 'u', LTS_STATE_a_1386, LTS_STATE_a_1385,
+    5, 'k', LTS_STATE_a_83, LTS_STATE_a_1387,
+    3, 's', LTS_STATE_a_1389, LTS_STATE_a_1388,
+    6, 'e', LTS_STATE_a_1390, LTS_STATE_a_83,
+    3, 'b', LTS_STATE_a_231, LTS_STATE_a_29,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1391,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1392,
+    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1393,
+    5, 'r', LTS_STATE_a_29, LTS_STATE_a_1394,
+    6, 's', LTS_STATE_a_1396, LTS_STATE_a_1395,
+    2, 'q', LTS_STATE_a_29, LTS_STATE_a_1397,
+    6, 'm', LTS_STATE_a_1399, LTS_STATE_a_1398,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1400,
+    4, 'l', LTS_STATE_a_1402, LTS_STATE_a_1401,
+    4, 'l', LTS_STATE_a_1404, LTS_STATE_a_1403,
+    4, 't', LTS_STATE_a_42, LTS_STATE_a_1405,
+    3, 'n', LTS_STATE_a_42, LTS_STATE_a_69,
+    4, 'l', LTS_STATE_a_1406, LTS_STATE_a_42,
+    4, 'c', LTS_STATE_a_42, LTS_STATE_a_101,
+    1, 'o', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'm', LTS_STATE_a_1408, LTS_STATE_a_1407,
+    3, 'm', LTS_STATE_a_1410, LTS_STATE_a_1409,
+    3, 'x', LTS_STATE_a_101, LTS_STATE_a_1411,
+    1, 't', LTS_STATE_a_42, LTS_STATE_a_1412,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1413,
+    4, 'm', LTS_STATE_a_1415, LTS_STATE_a_1414,
+    2, 'n', LTS_STATE_a_101, LTS_STATE_a_42,
+    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1416,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1417,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1418,
+    6, 'a', LTS_STATE_a_563, LTS_STATE_a_1419,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_42,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_1420,
+    2, 't', LTS_STATE_a_101, LTS_STATE_a_42,
+    6, 'n', LTS_STATE_a_101, LTS_STATE_a_42,
+    4, 't', LTS_STATE_a_42, LTS_STATE_a_1421,
+    6, 'y', LTS_STATE_a_1423, LTS_STATE_a_1422,
+    4, 'm', LTS_STATE_a_101, LTS_STATE_a_1424,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'm', LTS_STATE_a_1426, LTS_STATE_a_1425,
+    3, 'p', LTS_STATE_a_101, LTS_STATE_a_69,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1427,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_42,
+    4, 'k', LTS_STATE_a_42, LTS_STATE_a_1428,
+    3, 'g', LTS_STATE_a_29, LTS_STATE_a_1429,
+    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1430,
+    6, 'h', LTS_STATE_a_83, LTS_STATE_a_1431,
+    5, 's', LTS_STATE_a_83, LTS_STATE_a_64,
+    3, 'p', LTS_STATE_a_83, LTS_STATE_a_64,
+    4, 'z', LTS_STATE_a_231, LTS_STATE_a_1432,
+    3, 'h', LTS_STATE_a_672, LTS_STATE_a_1433,
+    1, 't', LTS_STATE_a_231, LTS_STATE_a_1434,
+    3, 'y', LTS_STATE_a_69, LTS_STATE_a_1435,
+    2, 'g', LTS_STATE_a_69, LTS_STATE_a_1436,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_1437,
+    6, 's', LTS_STATE_a_1439, LTS_STATE_a_1438,
+    3, 'g', LTS_STATE_a_28, LTS_STATE_a_1440,
+    3, 'c', LTS_STATE_a_29, LTS_STATE_a_1441,
+    1, 'm', LTS_STATE_a_29, LTS_STATE_a_1442,
+    5, '#', LTS_STATE_a_28, LTS_STATE_a_29,
+    2, 'l', LTS_STATE_a_28, LTS_STATE_a_1443,
+    5, '#', LTS_STATE_a_29, LTS_STATE_a_28,
+    1, 't', LTS_STATE_a_29, LTS_STATE_a_1444,
+    1, 'a', LTS_STATE_a_28, LTS_STATE_a_1445,
+    6, 'e', LTS_STATE_a_1446, LTS_STATE_a_29,
+    5, 't', LTS_STATE_a_29, LTS_STATE_a_1447,
+    3, 'k', LTS_STATE_a_29, LTS_STATE_a_1448,
+    3, 'c', LTS_STATE_a_231, LTS_STATE_a_29,
+    3, 'c', LTS_STATE_a_231, LTS_STATE_a_1252,
+    3, 'k', LTS_STATE_a_29, LTS_STATE_a_1449,
+    3, 'b', LTS_STATE_a_1451, LTS_STATE_a_1450,
+    3, 'p', LTS_STATE_a_28, LTS_STATE_a_1452,
+    3, 'm', LTS_STATE_a_28, LTS_STATE_a_26,
+    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1453,
+    3, 'b', LTS_STATE_a_1454, LTS_STATE_a_29,
+    3, 'b', LTS_STATE_a_1456, LTS_STATE_a_1455,
+    4, 't', LTS_STATE_a_1458, LTS_STATE_a_1457,
+    5, 'd', LTS_STATE_a_1460, LTS_STATE_a_1459,
+    5, 'd', LTS_STATE_a_69, LTS_STATE_a_1461,
+    5, 'd', LTS_STATE_a_1462, LTS_STATE_a_69,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_83,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_1463,
+    5, 'a', LTS_STATE_a_1465, LTS_STATE_a_1464,
+    5, 'd', LTS_STATE_a_29, LTS_STATE_a_83,
+    5, 'd', LTS_STATE_a_1467, LTS_STATE_a_1466,
+    6, 'i', LTS_STATE_a_1469, LTS_STATE_a_1468,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1470,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1471,
+    3, 'l', LTS_STATE_a_1473, LTS_STATE_a_1472,
+    3, 't', LTS_STATE_a_101, LTS_STATE_a_1474,
+    6, 'u', LTS_STATE_a_101, LTS_STATE_a_1475,
+    2, 't', LTS_STATE_a_42, LTS_STATE_a_73,
+    5, 'a', LTS_STATE_a_1477, LTS_STATE_a_1476,
+    5, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
+    6, 'i', LTS_STATE_a_1479, LTS_STATE_a_1478,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1480,
+    6, 'z', LTS_STATE_a_101, LTS_STATE_a_1481,
+    5, 'g', LTS_STATE_a_1483, LTS_STATE_a_1482,
+    6, 'i', LTS_STATE_a_1485, LTS_STATE_a_1484,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1486,
+    3, 't', LTS_STATE_a_563, LTS_STATE_a_1487,
+    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1488,
+    1, 'y', LTS_STATE_a_69, LTS_STATE_a_29,
+    3, 'd', LTS_STATE_a_69, LTS_STATE_a_1489,
+    3, 'r', LTS_STATE_a_83, LTS_STATE_a_1490,
+    3, 'r', LTS_STATE_a_1492, LTS_STATE_a_1491,
+    6, 'r', LTS_STATE_a_42, LTS_STATE_a_231,
+    2, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
+    6, 'l', LTS_STATE_a_1494, LTS_STATE_a_1493,
+    6, 'm', LTS_STATE_a_69, LTS_STATE_a_1071,
+    2, 'o', LTS_STATE_a_1496, LTS_STATE_a_1495,
+    1, 't', LTS_STATE_a_1497, LTS_STATE_a_42,
+    2, 'u', LTS_STATE_a_1499, LTS_STATE_a_1498,
+    6, 'r', LTS_STATE_a_231, LTS_STATE_a_1500,
+    5, 'o', LTS_STATE_a_332, LTS_STATE_a_1501,
+    2, 'v', LTS_STATE_a_69, LTS_STATE_a_1502,
+    5, 'c', LTS_STATE_a_231, LTS_STATE_a_29,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1503,
+    6, 'e', LTS_STATE_a_42, LTS_STATE_a_101,
+    6, 'p', LTS_STATE_a_563, LTS_STATE_a_1504,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1505,
+    6, 'e', LTS_STATE_a_1507, LTS_STATE_a_1506,
+    6, 'i', LTS_STATE_a_1508, LTS_STATE_a_231,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1509,
+    5, 'd', LTS_STATE_a_101, LTS_STATE_a_1510,
+    6, 'i', LTS_STATE_a_1512, LTS_STATE_a_1511,
+    3, 't', LTS_STATE_a_101, LTS_STATE_a_1513,
+    5, 'r', LTS_STATE_a_29, LTS_STATE_a_1514,
+    3, 'b', LTS_STATE_a_28, LTS_STATE_a_1515,
+    3, 'c', LTS_STATE_a_1517, LTS_STATE_a_1516,
+    3, 'l', LTS_STATE_a_1519, LTS_STATE_a_1518,
+    4, 'p', LTS_STATE_a_231, LTS_STATE_a_1520,
+    6, 'l', LTS_STATE_a_1522, LTS_STATE_a_1521,
+    3, 'n', LTS_STATE_a_231, LTS_STATE_a_1523,
+    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1524,
+    3, 'c', LTS_STATE_a_101, LTS_STATE_a_1525,
+    3, 'b', LTS_STATE_a_42, LTS_STATE_a_1526,
+    3, 'm', LTS_STATE_a_1528, LTS_STATE_a_1527,
+    3, 'v', LTS_STATE_a_563, LTS_STATE_a_1529,
+    3, 'b', LTS_STATE_a_1531, LTS_STATE_a_1530,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1532,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1533,
+    3, 'b', LTS_STATE_a_231, LTS_STATE_a_83,
+    6, 'i', LTS_STATE_a_83, LTS_STATE_a_101,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1534,
+    3, 'k', LTS_STATE_a_101, LTS_STATE_a_1535,
+    4, 'h', LTS_STATE_a_29, LTS_STATE_a_1536,
+    4, 'b', LTS_STATE_a_1538, LTS_STATE_a_1537,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1539,
+    3, 't', LTS_STATE_a_1541, LTS_STATE_a_1540,
+    6, 'f', LTS_STATE_a_101, LTS_STATE_a_1542,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1543,
+    4, 'l', LTS_STATE_a_101, LTS_STATE_a_1544,
+    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1545,
+    1, '0', LTS_STATE_a_69, LTS_STATE_a_1546,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1547,
+    1, '0', LTS_STATE_a_69, LTS_STATE_a_101,
+    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1548,
+    2, 'a', LTS_STATE_a_29, LTS_STATE_a_42,
+    3, 'r', LTS_STATE_a_1550, LTS_STATE_a_1549,
+    1, 'o', LTS_STATE_a_101, LTS_STATE_a_1551,
+    3, 'j', LTS_STATE_a_69, LTS_STATE_a_1552,
+    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1553,
+    2, 'c', LTS_STATE_a_1555, LTS_STATE_a_1554,
+    6, 'h', LTS_STATE_a_42, LTS_STATE_a_1556,
+    6, 'e', LTS_STATE_a_28, LTS_STATE_a_42,
+    6, 'r', LTS_STATE_a_1558, LTS_STATE_a_1557,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1559,
+    6, 'x', LTS_STATE_a_69, LTS_STATE_a_1560,
+    6, 'l', LTS_STATE_a_101, LTS_STATE_a_69,
+    6, 't', LTS_STATE_a_101, LTS_STATE_a_1561,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
+    2, 'c', LTS_STATE_a_42, LTS_STATE_a_1562,
+    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1563,
+    4, 'p', LTS_STATE_a_42, LTS_STATE_a_1564,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_42,
+    4, 'c', LTS_STATE_a_101, LTS_STATE_a_69,
+    3, 'p', LTS_STATE_a_69, LTS_STATE_a_1565,
+    4, 'd', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_1566,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1567,
+    3, 'v', LTS_STATE_a_42, LTS_STATE_a_1568,
+    1, 'd', LTS_STATE_a_69, LTS_STATE_a_1569,
+    5, 't', LTS_STATE_a_1571, LTS_STATE_a_1570,
+    4, 'x', LTS_STATE_a_1573, LTS_STATE_a_1572,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1574,
+    1, 'b', LTS_STATE_a_69, LTS_STATE_a_1575,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1576,
+    2, 'a', LTS_STATE_a_1577, LTS_STATE_a_69,
+    3, 'y', LTS_STATE_a_69, LTS_STATE_a_101,
+    6, 'z', LTS_STATE_a_28, LTS_STATE_a_1578,
+    3, 'y', LTS_STATE_a_29, LTS_STATE_a_1579,
+    2, 's', LTS_STATE_a_1581, LTS_STATE_a_1580,
+    5, 'z', LTS_STATE_a_231, LTS_STATE_a_1582,
+    3, 'c', LTS_STATE_a_28, LTS_STATE_a_1583,
+    5, 'd', LTS_STATE_a_29, LTS_STATE_a_1584,
+    1, 'c', LTS_STATE_a_29, LTS_STATE_a_1585,
+    3, 'p', LTS_STATE_a_26, LTS_STATE_a_1586,
+    5, 'm', LTS_STATE_a_1588, LTS_STATE_a_1587,
+    5, 'p', LTS_STATE_a_231, LTS_STATE_a_1589,
+    3, 'g', LTS_STATE_a_29, LTS_STATE_a_1590,
+    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1591,
+    3, 'c', LTS_STATE_a_28, LTS_STATE_a_26,
+    6, 'n', LTS_STATE_a_101, LTS_STATE_a_28,
+    6, 'o', LTS_STATE_a_231, LTS_STATE_a_26,
+    3, 'm', LTS_STATE_a_28, LTS_STATE_a_1592,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_29,
+    4, 'e', LTS_STATE_a_1594, LTS_STATE_a_1593,
+    5, 'h', LTS_STATE_a_1596, LTS_STATE_a_1595,
+    2, 'a', LTS_STATE_a_1598, LTS_STATE_a_1597,
+    6, '#', LTS_STATE_a_69, LTS_STATE_a_1599,
+    5, 'y', LTS_STATE_a_69, LTS_STATE_a_1600,
+    2, 'e', LTS_STATE_a_69, LTS_STATE_a_1601,
+    5, 't', LTS_STATE_a_83, LTS_STATE_a_1602,
+    1, 'e', LTS_STATE_a_1604, LTS_STATE_a_1603,
+    2, 'd', LTS_STATE_a_83, LTS_STATE_a_1605,
+    5, 's', LTS_STATE_a_1607, LTS_STATE_a_1606,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1608,
+    3, 'b', LTS_STATE_a_101, LTS_STATE_a_1609,
+    1, 'r', LTS_STATE_a_101, LTS_STATE_a_1610,
+    2, 'r', LTS_STATE_a_29, LTS_STATE_a_1611,
+    1, 'f', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, 'f', LTS_STATE_a_101, LTS_STATE_a_1612,
+    5, 'y', LTS_STATE_a_1614, LTS_STATE_a_1613,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1615,
+    2, 'l', LTS_STATE_a_69, LTS_STATE_a_1616,
+    3, 'i', LTS_STATE_a_101, LTS_STATE_a_1617,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_29,
+    5, 'u', LTS_STATE_a_1619, LTS_STATE_a_1618,
+    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1620,
+    6, 'e', LTS_STATE_a_1622, LTS_STATE_a_1621,
+    4, 'd', LTS_STATE_a_231, LTS_STATE_a_101,
+    5, 'm', LTS_STATE_a_101, LTS_STATE_a_1623,
+    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1624,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1625,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1626,
+    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1627,
+    5, 'b', LTS_STATE_a_231, LTS_STATE_a_1628,
+    4, 'd', LTS_STATE_a_101, LTS_STATE_a_1629,
+    6, 'i', LTS_STATE_a_29, LTS_STATE_a_69,
+    1, 'p', LTS_STATE_a_69, LTS_STATE_a_1630,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1631,
+    3, 'w', LTS_STATE_a_69, LTS_STATE_a_83,
+    4, 'n', LTS_STATE_a_1632, LTS_STATE_a_69,
+    2, 't', LTS_STATE_a_69, LTS_STATE_a_1633,
+    4, 'v', LTS_STATE_a_101, LTS_STATE_a_1634,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'r', LTS_STATE_a_1635, LTS_STATE_a_1121,
+    3, 'r', LTS_STATE_a_69, LTS_STATE_a_1290,
+    3, 'g', LTS_STATE_a_42, LTS_STATE_a_69,
+    5, 'a', LTS_STATE_a_1637, LTS_STATE_a_1636,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
+    4, 'd', LTS_STATE_a_29, LTS_STATE_a_1638,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1639,
+    4, 's', LTS_STATE_a_101, LTS_STATE_a_1102,
+    5, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
+    6, 'f', LTS_STATE_a_563, LTS_STATE_a_1640,
+    6, 's', LTS_STATE_a_29, LTS_STATE_a_1641,
+    5, 'y', LTS_STATE_a_1643, LTS_STATE_a_1642,
+    5, 'l', LTS_STATE_a_1645, LTS_STATE_a_1644,
+    5, 'l', LTS_STATE_a_231, LTS_STATE_a_73,
+    5, 't', LTS_STATE_a_1647, LTS_STATE_a_1646,
+    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1648,
+    6, 'a', LTS_STATE_a_1512, LTS_STATE_a_101,
+    3, 'm', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1649,
+    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1650,
+    6, 'e', LTS_STATE_a_28, LTS_STATE_a_1651,
+    3, 'i', LTS_STATE_a_29, LTS_STATE_a_1652,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_1494,
+    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1653,
+    4, 'm', LTS_STATE_a_231, LTS_STATE_a_1654,
+    3, 'c', LTS_STATE_a_69, LTS_STATE_a_530,
+    6, 'r', LTS_STATE_a_1656, LTS_STATE_a_1655,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1657,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_231,
+    3, 'f', LTS_STATE_a_69, LTS_STATE_a_1658,
+    3, 'n', LTS_STATE_a_231, LTS_STATE_a_1512,
+    3, 'l', LTS_STATE_a_231, LTS_STATE_a_1659,
+    5, 't', LTS_STATE_a_1661, LTS_STATE_a_1660,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_1662,
+    6, 't', LTS_STATE_a_69, LTS_STATE_a_101,
+    5, 'l', LTS_STATE_a_1664, LTS_STATE_a_1663,
+    5, 'l', LTS_STATE_a_101, LTS_STATE_a_42,
+    3, 'g', LTS_STATE_a_101, LTS_STATE_a_1186,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_231,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
+    6, 'd', LTS_STATE_a_101, LTS_STATE_a_1665,
+    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1666,
+    2, 'q', LTS_STATE_a_29, LTS_STATE_a_1667,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_69,
+    3, 's', LTS_STATE_a_101, LTS_STATE_a_1668,
+    6, 'k', LTS_STATE_a_29, LTS_STATE_a_1669,
+    4, 'b', LTS_STATE_a_42, LTS_STATE_a_1670,
+    3, 'w', LTS_STATE_a_231, LTS_STATE_a_1671,
+    2, '#', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'n', LTS_STATE_a_29, LTS_STATE_a_1672,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1673,
+    2, 'c', LTS_STATE_a_69, LTS_STATE_a_101,
+    1, 'd', LTS_STATE_a_101, LTS_STATE_a_1674,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1675,
+    2, 'o', LTS_STATE_a_1677, LTS_STATE_a_1676,
+    2, 'g', LTS_STATE_a_42, LTS_STATE_a_1678,
+    1, 'e', LTS_STATE_a_101, LTS_STATE_a_69,
+    4, 'n', LTS_STATE_a_42, LTS_STATE_a_1679,
+    4, 'l', LTS_STATE_a_101, LTS_STATE_a_231,
+    2, 'g', LTS_STATE_a_69, LTS_STATE_a_1680,
+    4, 'v', LTS_STATE_a_42, LTS_STATE_a_101,
+    2, 'c', LTS_STATE_a_42, LTS_STATE_a_1681,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_1682,
+    4, 't', LTS_STATE_a_274, LTS_STATE_a_1683,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_1684,
+    4, 'v', LTS_STATE_a_1686, LTS_STATE_a_1685,
+    3, 'n', LTS_STATE_a_101, LTS_STATE_a_1687,
+    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1688,
+    2, 't', LTS_STATE_a_1689, LTS_STATE_a_42,
+    3, 'h', LTS_STATE_a_1691, LTS_STATE_a_1690,
+    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1692,
+    1, 'e', LTS_STATE_a_42, LTS_STATE_a_1693,
+    2, 'o', LTS_STATE_a_42, LTS_STATE_a_1694,
+    2, 'e', LTS_STATE_a_42, LTS_STATE_a_1695,
+    3, 'd', LTS_STATE_a_248, LTS_STATE_a_1696,
+    3, 't', LTS_STATE_a_64, LTS_STATE_a_1697,
+    6, 'z', LTS_STATE_a_83, LTS_STATE_a_64,
+    4, 'v', LTS_STATE_a_231, LTS_STATE_a_1698,
+    3, 'n', LTS_STATE_a_563, LTS_STATE_a_1699,
+    2, 't', LTS_STATE_a_69, LTS_STATE_a_1700,
+    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1701,
+    3, 'u', LTS_STATE_a_231, LTS_STATE_a_1702,
+    1, 'r', LTS_STATE_a_563, LTS_STATE_a_69,
+    2, 'a', LTS_STATE_a_1704, LTS_STATE_a_1703,
+    3, 'z', LTS_STATE_a_28, LTS_STATE_a_1705,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1706,
+    3, 's', LTS_STATE_a_28, LTS_STATE_a_29,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1707,
+    2, 'a', LTS_STATE_a_28, LTS_STATE_a_231,
+    1, 'm', LTS_STATE_a_28, LTS_STATE_a_29,
+    3, 't', LTS_STATE_a_29, LTS_STATE_a_1708,
+    2, 's', LTS_STATE_a_26, LTS_STATE_a_1709,
+    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1710,
+    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1711,
+    3, 's', LTS_STATE_a_29, LTS_STATE_a_1712,
+    3, 't', LTS_STATE_a_29, LTS_STATE_a_1713,
+    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1714,
+    6, 'n', LTS_STATE_a_28, LTS_STATE_a_1715,
+    2, 'a', LTS_STATE_a_1717, LTS_STATE_a_1716,
+    6, '#', LTS_STATE_a_42, LTS_STATE_a_28,
+    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1718,
+    4, 'c', LTS_STATE_a_1720, LTS_STATE_a_1719,
+    4, 'c', LTS_STATE_a_1722, LTS_STATE_a_1721,
+    1, 'h', LTS_STATE_a_69, LTS_STATE_a_101,
+    2, 'a', LTS_STATE_a_29, LTS_STATE_a_1723,
+    5, 't', LTS_STATE_a_69, LTS_STATE_a_1724,
+    3, 'n', LTS_STATE_a_29, LTS_STATE_a_1725,
+    5, 'k', LTS_STATE_a_83, LTS_STATE_a_101,
+    2, 'e', LTS_STATE_a_155, LTS_STATE_a_69,
+    2, 'n', LTS_STATE_a_83, LTS_STATE_a_155,
+    2, 'a', LTS_STATE_a_1727, LTS_STATE_a_1726,
+    6, 'l', LTS_STATE_a_1729, LTS_STATE_a_1728,
+    6, 'k', LTS_STATE_a_101, LTS_STATE_a_1730,
+    6, 'r', LTS_STATE_a_231, LTS_STATE_a_1731,
+    5, 'n', LTS_STATE_a_69, LTS_STATE_a_1732,
+    2, 's', LTS_STATE_a_101, LTS_STATE_a_1733,
+    3, 'i', LTS_STATE_a_29, LTS_STATE_a_1734,
+    2, 'd', LTS_STATE_a_1736, LTS_STATE_a_1735,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1737,
+    2, 'l', LTS_STATE_a_42, LTS_STATE_a_69,
+    3, 'r', LTS_STATE_a_1739, LTS_STATE_a_1738,
+    1, 'g', LTS_STATE_a_69, LTS_STATE_a_1740,
+    1, 'i', LTS_STATE_a_29, LTS_STATE_a_101,
+    5, 'h', LTS_STATE_a_1742, LTS_STATE_a_1741,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1743,
+    4, 'g', LTS_STATE_a_101, LTS_STATE_a_1744,
+    6, 'a', LTS_STATE_a_69, LTS_STATE_a_1745,
+    4, 'g', LTS_STATE_a_69, LTS_STATE_a_29,
+    5, 'b', LTS_STATE_a_1746, LTS_STATE_a_101,
+    6, 's', LTS_STATE_a_69, LTS_STATE_a_1747,
+    5, 'a', LTS_STATE_a_101, LTS_STATE_a_1748,
+    6, 'o', LTS_STATE_a_563, LTS_STATE_a_101,
+    6, 'e', LTS_STATE_a_1750, LTS_STATE_a_1749,
+    5, 'v', LTS_STATE_a_231, LTS_STATE_a_101,
+    4, 't', LTS_STATE_a_101, LTS_STATE_a_1751,
+    6, 'o', LTS_STATE_a_1753, LTS_STATE_a_1752,
+    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1754,
+    6, 'v', LTS_STATE_a_101, LTS_STATE_a_1755,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
+    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1756,
+    2, 'e', LTS_STATE_a_42, LTS_STATE_a_69,
+    5, 'o', LTS_STATE_a_1758, LTS_STATE_a_1757,
+    6, '#', LTS_STATE_a_609, LTS_STATE_a_1759,
+    5, 't', LTS_STATE_a_29, LTS_STATE_a_1760,
+    4, 'p', LTS_STATE_a_101, LTS_STATE_a_1761,
+    6, 'g', LTS_STATE_a_563, LTS_STATE_a_1762,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_69,
+    5, 'u', LTS_STATE_a_1764, LTS_STATE_a_1763,
+    6, '#', LTS_STATE_a_42, LTS_STATE_a_1765,
+    3, 'c', LTS_STATE_a_1767, LTS_STATE_a_1766,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1768,
+    5, 'u', LTS_STATE_a_1770, LTS_STATE_a_1769,
+    3, 's', LTS_STATE_a_1771, LTS_STATE_a_101,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_1772,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_626,
+    5, 'u', LTS_STATE_a_101, LTS_STATE_a_1773,
+    3, 'k', LTS_STATE_a_28, LTS_STATE_a_1774,
+    3, 'z', LTS_STATE_a_69, LTS_STATE_a_1775,
+    4, 'g', LTS_STATE_a_231, LTS_STATE_a_1776,
+    4, 'f', LTS_STATE_a_101, LTS_STATE_a_231,
+    3, 'c', LTS_STATE_a_1778, LTS_STATE_a_1777,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1779,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1780,
+    3, 'p', LTS_STATE_a_101, LTS_STATE_a_1781,
+    4, 't', LTS_STATE_a_42, LTS_STATE_a_1782,
+    5, 'k', LTS_STATE_a_1784, LTS_STATE_a_1783,
+    3, 's', LTS_STATE_a_83, LTS_STATE_a_1785,
+    6, 'r', LTS_STATE_a_563, LTS_STATE_a_1786,
+    3, 'f', LTS_STATE_a_83, LTS_STATE_a_1787,
+    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1788,
+    6, 'm', LTS_STATE_a_101, LTS_STATE_a_1789,
+    5, 'd', LTS_STATE_a_29, LTS_STATE_a_1790,
+    6, 'm', LTS_STATE_a_1792, LTS_STATE_a_1791,
+    4, 'k', LTS_STATE_a_29, LTS_STATE_a_1793,
+    6, 'l', LTS_STATE_a_1795, LTS_STATE_a_1794,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'd', LTS_STATE_a_1797, LTS_STATE_a_1796,
+    4, 't', LTS_STATE_a_101, LTS_STATE_a_1798,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1799,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_1800,
+    4, 'p', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'd', LTS_STATE_a_513, LTS_STATE_a_1801,
+    3, 'm', LTS_STATE_a_231, LTS_STATE_a_69,
+    1, 'p', LTS_STATE_a_42, LTS_STATE_a_1802,
+    3, 'r', LTS_STATE_a_1804, LTS_STATE_a_1803,
+    2, 'h', LTS_STATE_a_69, LTS_STATE_a_1805,
+    5, 'g', LTS_STATE_a_1807, LTS_STATE_a_1806,
+    6, 'k', LTS_STATE_a_1809, LTS_STATE_a_1808,
+    4, 'p', LTS_STATE_a_42, LTS_STATE_a_1810,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1811,
+    6, 't', LTS_STATE_a_69, LTS_STATE_a_1812,
+    6, 'n', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1813,
+    2, 'd', LTS_STATE_a_69, LTS_STATE_a_1814,
+    4, 'v', LTS_STATE_a_101, LTS_STATE_a_42,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1815,
+    4, 'b', LTS_STATE_a_101, LTS_STATE_a_1816,
+    3, 'g', LTS_STATE_a_69, LTS_STATE_a_1817,
+    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1818,
+    1, 'o', LTS_STATE_a_42, LTS_STATE_a_1819,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_29,
+    2, 'a', LTS_STATE_a_248, LTS_STATE_a_1820,
+    3, 'h', LTS_STATE_a_774, LTS_STATE_a_1821,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1822,
+    3, 'r', LTS_STATE_a_563, LTS_STATE_a_101,
+    3, 'd', LTS_STATE_a_69, LTS_STATE_a_1823,
+    2, 's', LTS_STATE_a_69, LTS_STATE_a_1824,
+    2, 't', LTS_STATE_a_1826, LTS_STATE_a_1825,
+    6, 'l', LTS_STATE_a_28, LTS_STATE_a_1827,
+    6, 'a', LTS_STATE_a_29, LTS_STATE_a_1828,
+    1, 'r', LTS_STATE_a_29, LTS_STATE_a_28,
+    3, 'n', LTS_STATE_a_1830, LTS_STATE_a_1829,
+    5, 'd', LTS_STATE_a_1832, LTS_STATE_a_1831,
+    2, 'l', LTS_STATE_a_29, LTS_STATE_a_1833,
+    2, 'e', LTS_STATE_a_28, LTS_STATE_a_1834,
+    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1835,
+    2, '#', LTS_STATE_a_1315, LTS_STATE_a_231,
+    3, 'd', LTS_STATE_a_29, LTS_STATE_a_1836,
+    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1837,
+    3, 'v', LTS_STATE_a_231, LTS_STATE_a_1838,
+    3, 'g', LTS_STATE_a_28, LTS_STATE_a_1839,
+    5, 'y', LTS_STATE_a_1841, LTS_STATE_a_1840,
+    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1842,
+    4, 'b', LTS_STATE_a_29, LTS_STATE_a_1843,
+    6, '#', LTS_STATE_a_69, LTS_STATE_a_29,
+    1, 'e', LTS_STATE_a_1845, LTS_STATE_a_1844,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1846,
+    2, 'm', LTS_STATE_a_1847, LTS_STATE_a_101,
+    6, 'a', LTS_STATE_a_29, LTS_STATE_a_101,
+    5, 'v', LTS_STATE_a_29, LTS_STATE_a_1848,
+    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1060,
+    2, 'i', LTS_STATE_a_1850, LTS_STATE_a_1849,
+    6, 'n', LTS_STATE_a_1852, LTS_STATE_a_1851,
+    2, 'c', LTS_STATE_a_1854, LTS_STATE_a_1853,
+    5, 't', LTS_STATE_a_1855, LTS_STATE_a_101,
+    2, 'x', LTS_STATE_a_101, LTS_STATE_a_1856,
+    6, 'n', LTS_STATE_a_101, LTS_STATE_a_1857,
+    1, 'a', LTS_STATE_a_101, LTS_STATE_a_29,
+    1, 'e', LTS_STATE_a_101, LTS_STATE_a_1858,
+    1, 'n', LTS_STATE_a_101, LTS_STATE_a_1859,
+    1, 'n', LTS_STATE_a_69, LTS_STATE_a_1860,
+    3, 'v', LTS_STATE_a_101, LTS_STATE_a_69,
+    5, 't', LTS_STATE_a_1862, LTS_STATE_a_1861,
+    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1863,
+    1, 'e', LTS_STATE_a_563, LTS_STATE_a_1864,
+    1, 'c', LTS_STATE_a_69, LTS_STATE_a_1865,
+    4, 's', LTS_STATE_a_1867, LTS_STATE_a_1866,
+    4, 's', LTS_STATE_a_101, LTS_STATE_a_1868,
+    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1869,
+    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1870,
+    6, 'u', LTS_STATE_a_231, LTS_STATE_a_69,
+    6, 'i', LTS_STATE_a_563, LTS_STATE_a_1206,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1871,
+    5, 'c', LTS_STATE_a_1872, LTS_STATE_a_101,
+    6, 'a', LTS_STATE_a_1874, LTS_STATE_a_1873,
+    5, 'v', LTS_STATE_a_231, LTS_STATE_a_1875,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1876,
+    6, 'u', LTS_STATE_a_69, LTS_STATE_a_1877,
+    2, 'e', LTS_STATE_a_29, LTS_STATE_a_1878,
+    3, 'h', LTS_STATE_a_1880, LTS_STATE_a_1879,
+    1, 'r', LTS_STATE_a_231, LTS_STATE_a_69,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1881,
+    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1882,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_1883,
+    4, 'h', LTS_STATE_a_28, LTS_STATE_a_1884,
+    2, 'q', LTS_STATE_a_101, LTS_STATE_a_1885,
+    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1886,
+    6, 'i', LTS_STATE_a_563, LTS_STATE_a_101,
+    6, 'a', LTS_STATE_a_1888, LTS_STATE_a_1887,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_1889,
+    4, 't', LTS_STATE_a_29, LTS_STATE_a_1890,
+    5, 'u', LTS_STATE_a_1892, LTS_STATE_a_1891,
+    5, 't', LTS_STATE_a_231, LTS_STATE_a_1893,
+    4, 'b', LTS_STATE_a_42, LTS_STATE_a_1894,
+    5, 'y', LTS_STATE_a_101, LTS_STATE_a_1895,
+    6, 's', LTS_STATE_a_42, LTS_STATE_a_1896,
+    6, 'o', LTS_STATE_a_231, LTS_STATE_a_1186,
+    5, 'n', LTS_STATE_a_563, LTS_STATE_a_1897,
+    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1898,
+    6, '#', LTS_STATE_a_28, LTS_STATE_a_42,
+    6, 'b', LTS_STATE_a_101, LTS_STATE_a_1899,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_1900,
+    4, 'j', LTS_STATE_a_69, LTS_STATE_a_1901,
+    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1902,
+    3, 'c', LTS_STATE_a_231, LTS_STATE_a_1903,
+    3, 'c', LTS_STATE_a_1905, LTS_STATE_a_1904,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1906,
+    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1907,
+    5, 'l', LTS_STATE_a_1909, LTS_STATE_a_1908,
+    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1910,
+    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1911,
+    6, 'u', LTS_STATE_a_563, LTS_STATE_a_101,
+    3, 's', LTS_STATE_a_42, LTS_STATE_a_101,
+    3, 'v', LTS_STATE_a_101, LTS_STATE_a_1912,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1686,
+    5, 'a', LTS_STATE_a_29, LTS_STATE_a_1913,
+    6, 'l', LTS_STATE_a_1915, LTS_STATE_a_1914,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_28,
+    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1916,
+    2, 'd', LTS_STATE_a_69, LTS_STATE_a_1917,
+    3, 'r', LTS_STATE_a_1918, LTS_STATE_a_69,
+    3, 't', LTS_STATE_a_101, LTS_STATE_a_1919,
+    6, 'd', LTS_STATE_a_42, LTS_STATE_a_69,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_1555,
+    2, 'o', LTS_STATE_a_231, LTS_STATE_a_1920,
+    4, 'v', LTS_STATE_a_101, LTS_STATE_a_29,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1921,
+    4, 'f', LTS_STATE_a_231, LTS_STATE_a_1922,
+    3, 'k', LTS_STATE_a_1924, LTS_STATE_a_1923,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_42,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1925,
+    6, 'e', LTS_STATE_a_42, LTS_STATE_a_1926,
+    3, 'd', LTS_STATE_a_42, LTS_STATE_a_28,
+    6, 'l', LTS_STATE_a_1928, LTS_STATE_a_1927,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1929,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1930,
+    3, 'h', LTS_STATE_a_69, LTS_STATE_a_101,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1931,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1932,
+    2, 'b', LTS_STATE_a_101, LTS_STATE_a_29,
+    4, 'c', LTS_STATE_a_1048, LTS_STATE_a_1933,
+    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1282,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1934,
+    4, 's', LTS_STATE_a_69, LTS_STATE_a_42,
+    2, 'p', LTS_STATE_a_42, LTS_STATE_a_1935,
+    1, 'r', LTS_STATE_a_248, LTS_STATE_a_1936,
+    3, 'b', LTS_STATE_a_64, LTS_STATE_a_1937,
+    3, 'c', LTS_STATE_a_101, LTS_STATE_a_1938,
+    2, 'l', LTS_STATE_a_69, LTS_STATE_a_1939,
+    3, 'l', LTS_STATE_a_69, LTS_STATE_a_1940,
+    3, 'p', LTS_STATE_a_101, LTS_STATE_a_1941,
+    3, 'r', LTS_STATE_a_101, LTS_STATE_a_69,
+    6, 't', LTS_STATE_a_1943, LTS_STATE_a_1942,
+    6, 'i', LTS_STATE_a_28, LTS_STATE_a_29,
+    2, 'l', LTS_STATE_a_1945, LTS_STATE_a_1944,
+    1, 'o', LTS_STATE_a_29, LTS_STATE_a_28,
+    5, 's', LTS_STATE_a_28, LTS_STATE_a_29,
+    3, 'i', LTS_STATE_a_28, LTS_STATE_a_1946,
+    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1947,
+    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1948,
+    3, 't', LTS_STATE_a_29, LTS_STATE_a_1949,
+    3, 'j', LTS_STATE_a_29, LTS_STATE_a_1950,
+    2, '#', LTS_STATE_a_1951, LTS_STATE_a_29,
+    3, 'c', LTS_STATE_a_29, LTS_STATE_a_1952,
+    3, 'l', LTS_STATE_a_101, LTS_STATE_a_231,
+    3, 'w', LTS_STATE_a_1954, LTS_STATE_a_1953,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1955,
+    6, 'i', LTS_STATE_a_1957, LTS_STATE_a_1956,
+    4, 'g', LTS_STATE_a_101, LTS_STATE_a_1958,
+    2, 'r', LTS_STATE_a_231, LTS_STATE_a_1959,
+    2, 'n', LTS_STATE_a_231, LTS_STATE_a_1960,
+    6, 'a', LTS_STATE_a_1962, LTS_STATE_a_1961,
+    6, '#', LTS_STATE_a_563, LTS_STATE_a_101,
+    1, 'd', LTS_STATE_a_101, LTS_STATE_a_1963,
+    6, 'g', LTS_STATE_a_101, LTS_STATE_a_1964,
+    3, 'y', LTS_STATE_a_231, LTS_STATE_a_69,
+    6, 'k', LTS_STATE_a_231, LTS_STATE_a_1965,
+    3, 't', LTS_STATE_a_231, LTS_STATE_a_69,
+    1, 'r', LTS_STATE_a_101, LTS_STATE_a_1966,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_101,
+    1, 'i', LTS_STATE_a_101, LTS_STATE_a_69,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1967,
+    6, 'h', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, 'o', LTS_STATE_a_101, LTS_STATE_a_1968,
+    3, 'r', LTS_STATE_a_29, LTS_STATE_a_1969,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_1970,
+    5, 's', LTS_STATE_a_69, LTS_STATE_a_101,
+    2, 'p', LTS_STATE_a_101, LTS_STATE_a_1971,
+    2, 'e', LTS_STATE_a_101, LTS_STATE_a_1972,
+    1, 's', LTS_STATE_a_69, LTS_STATE_a_1973,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1974,
+    6, 'r', LTS_STATE_a_1976, LTS_STATE_a_1975,
+    5, 's', LTS_STATE_a_69, LTS_STATE_a_1977,
+    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1978,
+    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1979,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1980,
+    6, 'd', LTS_STATE_a_231, LTS_STATE_a_101,
+    6, 'h', LTS_STATE_a_101, LTS_STATE_a_1981,
+    5, 'g', LTS_STATE_a_563, LTS_STATE_a_101,
+    5, 'v', LTS_STATE_a_101, LTS_STATE_a_1982,
+    5, 'g', LTS_STATE_a_101, LTS_STATE_a_1983,
+    4, 's', LTS_STATE_a_69, LTS_STATE_a_1984,
+    6, 'a', LTS_STATE_a_1986, LTS_STATE_a_1985,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_1987,
+    3, 'g', LTS_STATE_a_69, LTS_STATE_a_1988,
+    2, 's', LTS_STATE_a_69, LTS_STATE_a_1989,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1990,
+    5, 'y', LTS_STATE_a_1992, LTS_STATE_a_1991,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1993,
+    3, 'p', LTS_STATE_a_231, LTS_STATE_a_1994,
+    2, 'g', LTS_STATE_a_29, LTS_STATE_a_1995,
+    4, 's', LTS_STATE_a_1997, LTS_STATE_a_1996,
+    5, 'r', LTS_STATE_a_1999, LTS_STATE_a_1998,
+    4, 'j', LTS_STATE_a_2001, LTS_STATE_a_2000,
+    3, 'm', LTS_STATE_a_2003, LTS_STATE_a_2002,
+    3, 'b', LTS_STATE_a_42, LTS_STATE_a_2004,
+    5, 'h', LTS_STATE_a_2006, LTS_STATE_a_2005,
+    4, 'g', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'p', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1675,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_2007,
+    6, 'e', LTS_STATE_a_231, LTS_STATE_a_101,
+    5, 'v', LTS_STATE_a_563, LTS_STATE_a_2008,
+    6, '#', LTS_STATE_a_101, LTS_STATE_a_29,
+    4, 'n', LTS_STATE_a_2010, LTS_STATE_a_2009,
+    4, 'm', LTS_STATE_a_69, LTS_STATE_a_2011,
+    6, 't', LTS_STATE_a_2013, LTS_STATE_a_2012,
+    4, 's', LTS_STATE_a_1871, LTS_STATE_a_69,
+    3, 'h', LTS_STATE_a_101, LTS_STATE_a_2014,
+    4, 'b', LTS_STATE_a_231, LTS_STATE_a_2015,
+    4, 'v', LTS_STATE_a_101, LTS_STATE_a_231,
+    3, 'k', LTS_STATE_a_101, LTS_STATE_a_2016,
+    3, 'h', LTS_STATE_a_42, LTS_STATE_a_2017,
+    5, 's', LTS_STATE_a_2019, LTS_STATE_a_2018,
+    6, 'a', LTS_STATE_a_101, LTS_STATE_a_2020,
+    3, 't', LTS_STATE_a_83, LTS_STATE_a_2021,
+    6, 'h', LTS_STATE_a_101, LTS_STATE_a_2022,
+    3, 'g', LTS_STATE_a_101, LTS_STATE_a_2023,
+    4, 'f', LTS_STATE_a_29, LTS_STATE_a_2024,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_2025,
+    3, 'f', LTS_STATE_a_101, LTS_STATE_a_69,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_2026,
+    6, 'r', LTS_STATE_a_69, LTS_STATE_a_2027,
+    4, 'z', LTS_STATE_a_69, LTS_STATE_a_101,
+    4, 's', LTS_STATE_a_2029, LTS_STATE_a_2028,
+    3, 'd', LTS_STATE_a_101, LTS_STATE_a_2030,
+    1, 'o', LTS_STATE_a_69, LTS_STATE_a_2031,
+    2, 'a', LTS_STATE_a_231, LTS_STATE_a_69,
+    4, 's', LTS_STATE_a_42, LTS_STATE_a_2032,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_101,
+    2, 's', LTS_STATE_a_42, LTS_STATE_a_2033,
+    2, '#', LTS_STATE_a_2035, LTS_STATE_a_2034,
+    4, 'd', LTS_STATE_a_69, LTS_STATE_a_2036,
+    4, 'n', LTS_STATE_a_2038, LTS_STATE_a_2037,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
+    3, 's', LTS_STATE_a_42, LTS_STATE_a_2039,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_2040,
+    2, 'c', LTS_STATE_a_69, LTS_STATE_a_2041,
+    4, 'x', LTS_STATE_a_101, LTS_STATE_a_2042,
+    3, 's', LTS_STATE_a_69, LTS_STATE_a_2043,
+    3, 's', LTS_STATE_a_42, LTS_STATE_a_2044,
+    1, 'a', LTS_STATE_a_2046, LTS_STATE_a_2045,
+    5, 'b', LTS_STATE_a_64, LTS_STATE_a_2047,
+    3, 't', LTS_STATE_a_2049, LTS_STATE_a_2048,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_2050,
+    1, 'p', LTS_STATE_a_69, LTS_STATE_a_2051,
+    3, 'b', LTS_STATE_a_69, LTS_STATE_a_2052,
+    2, 'c', LTS_STATE_a_29, LTS_STATE_a_2053,
+    3, 'h', LTS_STATE_a_2054, LTS_STATE_a_29,
+    2, 'h', LTS_STATE_a_28, LTS_STATE_a_2055,
+    1, 'a', LTS_STATE_a_231, LTS_STATE_a_28,
+    3, 'k', LTS_STATE_a_28, LTS_STATE_a_2056,
+    3, 'b', LTS_STATE_a_29, LTS_STATE_a_2057,
+    6, 'n', LTS_STATE_a_28, LTS_STATE_a_2058,
+    3, 'k', LTS_STATE_a_29, LTS_STATE_a_2059,
+    3, 't', LTS_STATE_a_29, LTS_STATE_a_2060,
+    3, 'c', LTS_STATE_a_29, LTS_STATE_a_2061,
+    5, 'b', LTS_STATE_a_29, LTS_STATE_a_2062,
+    5, 'u', LTS_STATE_a_2064, LTS_STATE_a_2063,
+    2, 'o', LTS_STATE_a_69, LTS_STATE_a_2065,
+    6, '#', LTS_STATE_a_2066, LTS_STATE_a_69,
+    4, 's', LTS_STATE_a_2068, LTS_STATE_a_2067,
+    1, 'p', LTS_STATE_a_42, LTS_STATE_a_2069,
+    2, 'm', LTS_STATE_a_101, LTS_STATE_a_2070,
+    1, 'i', LTS_STATE_a_29, LTS_STATE_a_2071,
+    2, 'r', LTS_STATE_a_29, LTS_STATE_a_231,
+    3, 'c', LTS_STATE_a_101, LTS_STATE_a_2072,
+    1, 'd', LTS_STATE_a_69, LTS_STATE_a_101,
+    6, 'a', LTS_STATE_a_2074, LTS_STATE_a_2073,
+    4, 'f', LTS_STATE_a_231, LTS_STATE_a_2075,
+    3, 'k', LTS_STATE_a_231, LTS_STATE_a_2076,
+    5, 'd', LTS_STATE_a_2078, LTS_STATE_a_2077,
+    2, 't', LTS_STATE_a_101, LTS_STATE_a_69,
+    3, 'l', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'l', LTS_STATE_a_2079, LTS_STATE_a_101,
+    3, 'd', LTS_STATE_a_69, LTS_STATE_a_2080,
+    2, 'u', LTS_STATE_a_69, LTS_STATE_a_2081,
+    1, 'o', LTS_STATE_a_69, LTS_STATE_a_1987,
+    2, 'b', LTS_STATE_a_101, LTS_STATE_a_69,
+    1, 's', LTS_STATE_a_101, LTS_STATE_a_1855,
+    4, 'h', LTS_STATE_a_29, LTS_STATE_a_2082,
+    4, 'g', LTS_STATE_a_69, LTS_STATE_a_2083,
+    5, 'y', LTS_STATE_a_42, LTS_STATE_a_2084,
+    4, 'c', LTS_STATE_a_101, LTS_STATE_a_2085,
+    4, 'c', LTS_STATE_a_69, LTS_STATE_a_2086,
+    6, 't', LTS_STATE_a_101, LTS_STATE_a_2087,
+    6, 'e', LTS_STATE_a_101, LTS_STATE_a_231,
+    5, 'b', LTS_STATE_a_101, LTS_STATE_a_2088,
+    5, 'b', LTS_STATE_a_101, LTS_STATE_a_563,
+    4, 'f', LTS_STATE_a_69, LTS_STATE_a_1286,
+    6, 'e', LTS_STATE_a_2090, LTS_STATE_a_2089,
+    1, 'a', LTS_STATE_a_101, LTS_STATE_a_1404,
+    2, 'i', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'w', LTS_STATE_a_83, LTS_STATE_a_2091,
+    2, 'c', LTS_STATE_a_69, LTS_STATE_a_83,
+    4, 'n', LTS_STATE_a_69, LTS_STATE_a_2092,
+    6, 'e', LTS_STATE_a_2094, LTS_STATE_a_2093,
+    6, '#', LTS_STATE_a_42, LTS_STATE_a_101,
+    4, 'v', LTS_STATE_a_2096, LTS_STATE_a_2095,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_2097,
+    6, '#', LTS_STATE_a_29, LTS_STATE_a_231,
+    3, 'r', LTS_STATE_a_69, LTS_STATE_a_2098,
+    3, 'n', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'm', LTS_STATE_a_2100, LTS_STATE_a_2099,
+    4, 't', LTS_STATE_a_2102, LTS_STATE_a_2101,
+    3, 'm', LTS_STATE_a_2104, LTS_STATE_a_2103,
+    255, 19, 0, 0, 0, 0,
+    4, 'k', LTS_STATE_a_69, LTS_STATE_a_2105,
+    4, 't', LTS_STATE_a_69, LTS_STATE_a_1918,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_101,
+    5, 'r', LTS_STATE_a_1787, LTS_STATE_a_2106,
+    3, 'f', LTS_STATE_a_29, LTS_STATE_a_2107,
+    6, 'o', LTS_STATE_a_2109, LTS_STATE_a_2108,
+    5, 'c', LTS_STATE_a_101, LTS_STATE_a_2110,
+    3, 'n', LTS_STATE_a_2029, LTS_STATE_a_2111,
+    3, 'j', LTS_STATE_a_69, LTS_STATE_a_101,
+    4, 'p', LTS_STATE_a_231, LTS_STATE_a_2112,
+    4, 'c', LTS_STATE_a_2114, LTS_STATE_a_2113,
+    4, 'b', LTS_STATE_a_29, LTS_STATE_a_1839,
+    4, 'h', LTS_STATE_a_29, LTS_STATE_a_2115,
+    4, 's', LTS_STATE_a_69, LTS_STATE_a_231,
+    3, 'b', LTS_STATE_a_69, LTS_STATE_a_101,
+    3, 'm', LTS_STATE_a_69, LTS_STATE_a_2116,
+    5, 'z', LTS_STATE_a_2118, LTS_STATE_a_2117,
+    3, 'f', LTS_STATE_a_83, LTS_STATE_a_2021,
+    6, 'u', LTS_STATE_a_2120, LTS_STATE_a_2119,
+    3, 'b', LTS_STATE_a_83, LTS_STATE_a_101,
+    3, 'b', LTS_STATE_a_101, LTS_STATE_a_83,
+    3, 't', LTS_STATE_a_83, LTS_STATE_a_101,
+    5, 'h', LTS_STATE_a_29, LTS_STATE_a_2121,
+    4, 'v', LTS_STATE_a_231, LTS_STATE_a_2122,
+    3, 't', LTS_STATE_a_1286, LTS_STATE_a_2123,
+    2, 's', LTS_STATE_a_231, LTS_STATE_a_101,
+    3, 'f', LTS_STATE_a_69, LTS_STATE_a_2124,
+    6, 'l', LTS_STATE_a_231, LTS_STATE_a_69,
+    2, '#', LTS_STATE_a_2126, LTS_STATE_a_2125,
+    2, 'a', LTS_STATE_a_69, LTS_STATE_a_2127,
+    3, 's', LTS_STATE_a_2129, LTS_STATE_a_2128,
+    2, 'b', LTS_STATE_a_42, LTS_STATE_a_2130,
+    1, '#', LTS_STATE_a_42, LTS_STATE_a_2131,
+    6, 'l', LTS_STATE_a_42, LTS_STATE_a_2132,
+    6, 'm', LTS_STATE_a_42, LTS_STATE_a_2133,
+    2, 'n', LTS_STATE_a_69, LTS_STATE_a_2134,
+    2, 'm', LTS_STATE_a_101, LTS_STATE_a_231,
+    4, 'v', LTS_STATE_a_231, LTS_STATE_a_2135,
+    6, 'r', LTS_STATE_a_29, LTS_STATE_a_69,
+    2, 'a', LTS_STATE_a_2137, LTS_STATE_a_2136,
+    3, 'c', LTS_STATE_a_2139, LTS_STATE_a_2138,
+    3, 'n', LTS_STATE_a_42, LTS_STATE_a_2140,
+    3, 'r', LTS_STATE_a_42, LTS_STATE_a_2141,
+    2, 'i', LTS_STATE_a_248, LTS_STATE_a_69,
+    2, 'n', LTS_STATE_a_248, LTS_STATE_a_2142,
+    6, 'c', LTS_STATE_a_64, LTS_STATE_a_2143,
+    2, 'a', LTS_STATE_a_2145, LTS_STATE_a_2144,
+    4, 'd', LTS_STATE_a_69, LTS_STATE_a_2146,
+    2, 'i', LTS_STATE_a_69, LTS_STATE_a_2147,
+    1, 'h', LTS_STATE_a_69, LTS_STATE_a_2148,
+    1, 'r', LTS_STATE_a_69, LTS_STATE_a_2149,
+    3, 'n', LTS_STATE_a_2151, LTS_STATE_a_2150,
+    1, 'e', LTS_STATE_a_231, LTS_STATE_a_2152,
+    3, 'y', LTS_STATE_a_29, LTS_STATE_a_2153,
+    1, 'r', LTS_STATE_a_2155, LTS_STATE_a_2154,
+    3, 'h', LTS_STATE_a_2157, LTS_STATE_a_2156,
+    3, 't', LTS_STATE_a_28, LTS_STATE_a_29,
+    3, 'm', LTS_STATE_a_2158, LTS_STATE_a_29,
+    3, 'f', LTS_STATE_a_29, LTS_STATE_a_2159,
+    5, 'g', LTS_STATE_a_231, LTS_STATE_a_29,
+    2, '#', LTS_STATE_a_29, LTS_STATE_a_2160,
+    1, 's', LTS_STATE_a_2162, LTS_STATE_a_2161,
+    6, 'l', LTS_STATE_a_2164, LTS_STATE_a_2163,
+    5, 'h', LTS_STATE_a_29, LTS_STATE_a_2165,
+    4, 'd', LTS_STATE_a_42, LTS_STATE_a_69,
+    6, 'e', LTS_STATE_a_69, LTS_STATE_a_2166,
+    6, '#', LTS_STATE_a_2168, LTS_STATE_a_2167,
+    4, 's', LTS_STATE_a_29, LTS_STATE_a_2169,
+    4, 's', LTS_STATE_a_69, LTS_STATE_a_101,
+    2, 'h', LTS_STATE_a_29, LTS_STATE_a_2170,
+    2, 'c', LTS_STATE_a_101, LTS_STATE_a_2171,
+    5, 'u', LTS_STATE_a_1736, LTS_STATE_a_2172,
+    5, 'c', LTS_STATE_a_231, LTS_STATE_a_101,
+    1, 's', LTS_STATE_a_29, LTS_STATE_a_2173,
+    6, 's', LTS_STATE_a_29, LTS_STATE_a_69,
+    2, 'i', LTS_STATE_a_101, LTS_STATE_a_2174,
+    3, 'l', LTS_STATE_a_2176, LTS_STATE_a_2175,
+    6, 'h', LTS_STATE_a_69, LTS_STATE_a_29,
+    1, 'm', LTS_STATE_a_2177, LTS_STATE_a_69,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_2178,
+    4, 'p', LTS_STATE_a_2180, LTS_STATE_a_2179,
+    4, 'b', LTS_STATE_a_69, LTS_STATE_a_2181,
+    6, 'h', LTS_STATE_a_101, LTS_STATE_a_2182,
+    6, 'a', LTS_STATE_a_2184, LTS_STATE_a_2183,
+    6, 'a', LTS_STATE_a_29, LTS_STATE_a_2185,
+    6, 'p', LTS_STATE_a_69, LTS_STATE_a_2186,
+    5, 'c', LTS_STATE_a_101, LTS_STATE_a_563,
+    6, 'i', LTS_STATE_a_101, LTS_STATE_a_2187,
+    1, '0', LTS_STATE_a_101, LTS_STATE_a_2188,
+    3, 'n', LTS_STATE_a_69, LTS_STATE_a_2189,
+    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1494,
+    5, 'r', LTS_STATE_a_2191, LTS_STATE_a_2190,
+    2, 'i', LTS_STATE_a_69, LTS_STATE_a_2192,
+    6, 's', LTS_STATE_a_42, LTS_STATE_a_2193,
+    2, 'f', LTS_STATE_a_42, LTS_STATE_a_69,

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9198
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9198&view=rev
Author:   dhdfu
Date:     2009-07-10 00:11:20 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Add skeleton search structure for time-conditioned tree search.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.h

Added Paths:
-----------
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-10 00:01:36 UTC (rev 9197)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-10 00:11:20 UTC (rev 9198)
@@ -26,6 +26,7 @@
 	ps_mllr.c				\
 	s2_semi_mgau.c				\
 	tmat.c					\
+	tst_search.c				\
 	vector.c				\
 	pocketsphinx.c
 
@@ -53,6 +54,7 @@
 	posixwin32.h				\
 	s2_semi_mgau.h				\
 	tmat.h					\
+	tst_search.h				\
 	vector.h
 
 INCLUDES = -I$(top_srcdir)/include \

Added: trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-10 00:11:20 UTC (rev 9198)
@@ -0,0 +1,124 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* ====================================================================
+ * Copyright (c) 2009 Carnegie Mellon University.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This work was supported in part by funding from the Defense Advanced 
+ * Research Projects Agency and the National Science Foundation of the 
+ * United States of America, and the CMU Sphinx Speech Consortium.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ */
+
+/**
+ * @file tst_search.c Time-conditioned lexicon tree search ("S3")
+ */
+
+/* System headers. */
+#include <string.h>
+#include <assert.h>
+
+/* SphinxBase headers. */
+#include <ckd_alloc.h>
+#include <listelem_alloc.h>
+#include <err.h>
+
+/* Local headers. */
+#include "pocketsphinx_internal.h"
+#include "ps_lattice_internal.h"
+#include "tst_search.h"
+
+static int tst_search_start(ps_search_t *search);
+static int tst_search_step(ps_search_t *search, int frame_idx);
+static int tst_search_finish(ps_search_t *search);
+static int tst_search_reinit(ps_search_t *search);
+static ps_lattice_t *tst_search_lattice(ps_search_t *search);
+static char const *tst_search_hyp(ps_search_t *search, int32 *out_score);
+static int32 tst_search_prob(ps_search_t *search);
+static ps_seg_t *tst_search_seg_iter(ps_search_t *search, int32 *out_score);
+
+static ps_searchfuncs_t tst_funcs = {
+    /* name: */   "tst",
+    /* start: */  tst_search_start,
+    /* step: */   tst_search_step,
+    /* finish: */ tst_search_finish,
+    /* reinit: */ tst_search_reinit,
+    /* free: */   tst_search_free,
+    /* lattice: */  tst_search_lattice,
+    /* hyp: */      tst_search_hyp,
+    /* prob: */     tst_search_prob,
+    /* seg_iter: */ tst_search_seg_iter,
+};
+
+static int
+tst_search_start(ps_search_t *search)
+{
+    return -1;
+}
+
+static int
+tst_search_step(ps_search_t *search, int frame_idx)
+{
+    return -1;
+}
+
+static int
+tst_search_finish(ps_search_t *search)
+{
+    return -1;
+}
+
+static int
+tst_search_reinit(ps_search_t *search)
+{
+    return -1;
+}
+
+static ps_lattice_t *
+tst_search_lattice(ps_search_t *search)
+{
+    return NULL;
+}
+
+static char const *
+tst_search_hyp(ps_search_t *search, int32 *out_score)
+{
+    return NULL;
+}
+
+static int32
+tst_search_prob(ps_search_t *search)
+{
+    return 1;
+}
+
+static ps_seg_t *
+tst_search_seg_iter(ps_search_t *search, int32 *out_score)
+{
+    return NULL;
+}


Property changes on: trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
___________________________________________________________________
Added: svn:mime-type
   + text/x-csrc
Added: svn:eol-style
   + native

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-10 00:01:36 UTC (rev 9197)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-10 00:11:20 UTC (rev 9198)
@@ -53,5 +53,27 @@
 #include "pocketsphinx_internal.h"
 #include "hmm.h"
 
+/**
+ * Time-switch tree search module structure.
+ */
+struct tst_search_s {
+    ps_search_t base;
+    ngram_model_t *lmset;  /**< Set of language models. */
+    hmm_context_t *hmmctx; /**< HMM context. */
+};
+typedef struct tst_search_s tst_search_t;
 
+/**
+ * Initialize the N-Gram search module.
+ */
+ps_search_t *tst_search_init(cmd_ln_t *config,
+                             acmod_t *acmod,
+                             dict_t *dict);
+
+/**
+ * Finalize the N-Gram search module.
+ */
+void tst_search_free(ps_search_t *ngs);
+
+
 #endif /* __TST_SEARCH_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9200
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9200&view=rev
Author:   dhdfu
Date:     2009-07-10 17:45:08 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Merge changes from Krisztian's branch of Sphinx3

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/lextree.h
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-10 15:52:08 UTC (rev 9199)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-10 17:45:08 UTC (rev 9200)
@@ -176,8 +176,13 @@
 }
 
 lextree_t *
-lextree_init(kbcore_t * kbc, lm_t * lm, char *lmname, int32 istreeUgProb,
+#ifdef OLD_LM_API
+lextree_init(kbcore_t * kbc, lm_t * lm, const char *lmname, int32 istreeUgProb,
              int32 bReport, int32 type)
+#else
+lextree_init(kbcore_t * kbc, ngram_model_t * lm, const char *lmname, int32 istreeUgProb,
+             int32 bReport, int32 type)
+#endif
 {
     s3cipid_t *lc;
     s3cipid_t ci;
@@ -229,6 +234,7 @@
         wp[j].wid = -1;
         wp[j].prob = -1;
     }
+#ifdef OLD_LM_API
     n = lm_ug_wordprob(lm, dict, MAX_NEG_INT32, wp);
 
     if (bReport)
@@ -243,6 +249,31 @@
     if (bReport)
         E_INFO("Size of word table after adding alternative prons: %d.\n",
                n);
+#else
+    j = dict_size(dict);
+    for (i = 0, n = 0; i < j; ++i) {
+        int32 lmwid;
+        if (dict_basewid(dict, i) != i || dict_startwid(dict) == i || dict_finishwid(dict) == i)
+            continue;
+        if ((lmwid = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, i)))) == NGRAM_INVALID_WID) {
+            continue;
+        }
+        wp[n].prob = ngram_ng_score(lm, lmwid, NULL, 0, &n_lc);
+        wp[n].wid = i;
+        ++n;
+    }
+    for (i = 0; i < j; ++i) {
+        int32 lmwid;
+        if (dict_basewid(dict, i) == i || dict_startwid(dict) == i || dict_finishwid(dict) == i)
+            continue;
+        if ((lmwid = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, i)))) == NGRAM_INVALID_WID) {
+            continue;
+        }
+        wp[n].prob = ngram_ng_score(lm, lmwid, NULL, 0, &n_lc);
+        wp[n].wid = i;
+        ++n;
+    }
+#endif
     if (istreeUgProb == 0) {
         for (i = 0; i < n; i++) {
             wp[i].prob = -1;    /* Flatten all initial probabilities */
@@ -298,7 +329,7 @@
     E_INFO_NOFN("Type of the tree %d (0:unigram, 1: 2g, 2: 3g etc.)\n",
                 ltree->type);
     E_INFO_NOFN("Number of left contexts %d \n", ltree->n_lc);
-    E_INFO_NOFN("Number of node %d \n", ltree->n_node);
+    E_INFO_NOFN("Number of nodes %d \n", ltree->n_node);
     E_INFO_NOFN("Number of links in the tree %d\n",
                 num_lextree_links(ltree));
     /*
@@ -773,7 +804,6 @@
 
 
     return k;
-
 }
 
 void
@@ -951,8 +981,6 @@
     if (!dict2pid_is_composite(kbc->dict2pid)) {
         lextree_shrub_cw_leaves(l);
     }
-
-
 }
 
 
@@ -1013,7 +1041,6 @@
 {
     gnode_t *gn;
     lextree_node_t *ln;
-    int32 i;
 
     if (fmt > 2) {
         fmt = GRAPH_RAVIFMT;
@@ -1025,6 +1052,7 @@
         }
 
         if (lextree->n_lc > 0) {
+            int32 i;
             for (i = 0; i < lextree->n_lc; i++) {
                 fprintf(fp, "lcroot %d\n", lextree->lcroot[i].lc);
                 for (gn = lextree->lcroot[i].root; gn; gn = gnode_next(gn)) {
@@ -1077,7 +1105,6 @@
         E_INFO("Reallocating more memory, now has node %d\n",
                lextree_n_alloc_node(lt));
     }
-
 }
 
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-10 15:52:08 UTC (rev 9199)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-10 17:45:08 UTC (rev 9200)
@@ -118,13 +118,18 @@
 #include <glist.h>
 #include "kbcore.h"
 #include "hmm.h"
-#include "lm.h"
 #include "vithist.h"
 #include "ascr.h"
 #include "fast_algo_struct.h"
 #include "dict.h"
 #include "mdef.h"
+#ifdef OLD_LM_API
+#include "lm.h"
+#else
+#include <ngram_model.h>
+#include "wid.h"
 
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -274,8 +279,12 @@
  */
 lextree_t* lextree_init(
     kbcore_t *kbcore, /**< In: Initialized kbcore */
+#ifdef OLD_LM_API
     lm_t* lm,         /**< In: LM, to decide which set of word list is used */
-    char *lmname,     /**< In: LM name */
+#else
+    ngram_model_t* lm,
+#endif
+    const char *lmname,     /**< In: LM name */
     int32 istreeUgProb, /**< In: Decide whether LM factoring is used or not */
     int32 bReport,     /**< In: Whether to report the progress so far. */
     int32 type        /**< In: Type of the lexical tree, 0: unigram lextree, 1: 2g, 2: 3g lextree*/

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-10 15:52:08 UTC (rev 9199)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-10 17:45:08 UTC (rev 9200)
@@ -143,7 +143,6 @@
 void
 vithist_entry_display(vithist_entry_t * ve, dict_t * dict)
 {
-
     E_INFO("Word ID %d \n", ve->wid);
     E_INFO("Sf %d Ef %d \n", ve->sf, ve->ef);
     E_INFO("Ascr %d Lscr %d \n", ve->ascr, ve->lscr);
@@ -158,9 +157,13 @@
 vithist_init(kbcore_t * kbc, int32 wbeam, int32 bghist, int32 report)
 {
     vithist_t *vh;
+#ifdef OLD_LM_API
     lmset_t *lmset;
+    int i;
+#else
+    ngram_model_t *lmset;
+#endif
     dict_t *dict;
-    int i;
 
     int max = -1;
 
@@ -187,12 +190,17 @@
     lmset = kbcore_lmset(kbc);
     dict = kbcore_dict(kbc);
 
+#ifdef OLD_LM_API
     for (i = 0; i < kbc->lmset->n_lm; i++) {
         if (lm_n_ug(lmset->lmarray[i]) > max) {
             max = lm_n_ug(lmset->lmarray[i]);
         }
     }
-    /*E_INFO("Allocation for Viterbi history, final size %d\n", max); */
+#else
+    max = ngram_model_get_counts(lmset)[0];
+#endif
+
+    E_INFO("Allocation for Viterbi history, lmset-final size: %d\n", max);
     vh->lms2vh_root =
         (vh_lms2vh_t **) ckd_calloc(max, sizeof(vh_lms2vh_t *));
     vh->n_ci = mdef_n_ciphone(kbc->mdef);
@@ -298,10 +306,12 @@
 vithist_utt_begin(vithist_t * vh, kbcore_t * kbc)
 {
     vithist_entry_t *ve;
+    dict_t *dict;
+#ifdef OLD_LM_API
     lm_t *lm;
-    dict_t *dict;
 
     lm = kbcore_lm(kbc);
+#endif
     dict = kbcore_dict(kbc);
 
     assert(vh->n_entry == 0);
@@ -320,8 +330,13 @@
     ve->path.pred = -1;
     ve->type = 0;
     ve->valid = 1;
+#ifdef OLD_LM_API
     ve->lmstate.lm3g.lwid[0] = lm_startwid(lm);
     ve->lmstate.lm3g.lwid[1] = BAD_LMWID(lm);
+#else
+    ve->lmstate.lm3g.lwid[0] = ngram_wid(kbcore_lm(kbc), S3_START_WORD);
+    ve->lmstate.lm3g.lwid[1] = NGRAM_INVALID_WID;
+#endif
     vh->n_frm = 0;
     vh->frame_start[0] = 1;
     vh->bestscore[0] = MAX_NEG_INT32;
@@ -492,7 +507,11 @@
                 int32 pred, int32 type, int32 rc)
 {
     vithist_entry_t *pve, tve;
+#ifdef OLD_LM_API
     s3lmwid32_t lwid;
+#else
+    int32 lwid;
+#endif
     int32 se, fe;
     int32 i;
 
@@ -520,14 +539,6 @@
     tve.rc = NULL;
     tve.n_rc = 0;
 
-    if (pred == 0) {            /* Special case for the initial <s> entry */
-        se = 0;
-        fe = 1;
-    }
-    else {
-        se = vh->frame_start[pve->ef];
-        fe = vh->frame_start[pve->ef + 1];
-    }
 
     if (dict_filler_word(kbcore_dict(kbc), wid)) {
 
@@ -540,12 +551,28 @@
         vithist_enter(vh, kbc, &tve, rc);
     }
     else {
+#ifndef OLD_LM_API
+        int32 n_used;
+#endif
 
+        if (pred == 0) {            /* Special case for the initial <s> entry */
+            se = 0;
+            fe = 1;
+        }
+        else {
+            se = vh->frame_start[pve->ef];
+            fe = vh->frame_start[pve->ef + 1];
+        }
+
         /* Now if it is a word, backtrack again to get all possible previous word
            So  pve becomes the w_{n-2}. 
          */
 
+#ifdef OLD_LM_API
         lwid = kbc->lmset->cur_lm->dict2lmwid[wid];
+#else
+        lwid = ngram_wid(kbcore_lm(kbc), dict_wordstr(kbcore_dict(kbc), dict_basewid(kbcore_dict(kbc), wid)));
+#endif
 
         tve.lmstate.lm3g.lwid[0] = lwid;
 
@@ -554,10 +581,14 @@
 
             if (pve->valid) {
                 tve.path.score = pve->path.score + tve.ascr;
+#ifdef OLD_LM_API
                 tve.lscr = lm_tg_score(kbcore_lm(kbc),
                                        pve->lmstate.lm3g.lwid[1],
                                        pve->lmstate.lm3g.lwid[0],
                                        lwid, wid);
+#else
+                tve.lscr = ngram_tg_score(kbcore_lm(kbc), lwid, pve->lmstate.lm3g.lwid[0], pve->lmstate.lm3g.lwid[1], &n_used);
+#endif
                 tve.path.score += tve.lscr;
                 if ((tve.path.score - vh->wbeam) >= vh->bestscore[vh->n_frm]) {
                     tve.path.pred = i;
@@ -760,8 +791,13 @@
     int32 f, i;
     int32 sv, nsv, scr, bestscore, bestvh, vhid;
     vithist_entry_t *ve, *bestve = 0;
+#ifdef OLD_LM_API
     s3lmwid32_t endwid = BAD_S3LMWID32;
     lm_t *lm;
+#else
+    int32 endwid = NGRAM_INVALID_WID;
+    ngram_model_t *lm;
+#endif
     dict_t *dict;
 
     bestscore = MAX_NEG_INT32;
@@ -788,15 +824,26 @@
     lm = kbcore_lm(kbc);
     dict = kbcore_dict(kbc);
 
+#ifdef OLD_LM_API
     endwid = lm_finishwid(lm);
+#else
+    endwid = ngram_wid(lm, S3_FINISH_WORD);
+#endif
 
     for (i = sv; i < nsv; i++) {
+#ifndef OLD_LM_API
+        int32 n_used;
+#endif
         ve = vithist_id2entry(vh, i);
         scr = ve->path.score;
+#ifdef OLD_LM_API
         scr +=
             lm_tg_score(lm, ve->lmstate.lm3g.lwid[1],
                         ve->lmstate.lm3g.lwid[0], endwid,
                         dict_finishwid(dict));
+#else
+        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0], ve->lmstate.lm3g.lwid[1], &n_used);
+#endif
 
         if (bestscore < scr) {
             bestscore = scr;
@@ -855,8 +902,13 @@
     int32 f, i;
     int32 sv, nsv, scr, bestscore, bestvh;
     vithist_entry_t *ve, *bestve;
+#ifdef OLD_LM_API
     s3lmwid32_t endwid;
     lm_t *lm;
+#else
+    ngram_model_t *lm;
+    int32 endwid;
+#endif
     dict_t *dict;
 
     /* Find last frame with entries in vithist table */
@@ -879,19 +931,31 @@
     /* Terminate in a final </s> node (make this optional?) */
     lm = kbcore_lm(kbc);
     dict = kbcore_dict(kbc);
+
+#ifdef OLD_LM_API
     endwid = lm_finishwid(lm);
+#else
+    endwid = ngram_wid(lm, S3_FINISH_WORD);
+#endif
 
     bestscore = MAX_NEG_INT32;
     bestvh = -1;
 
     for (i = sv; i < nsv; i++) {
+#ifndef OLD_LM_API
+        int32 n_used;
+#endif
         ve = vithist_id2entry(vh, i);
 
         scr = ve->path.score;
+#ifdef OLD_LM_API
         scr +=
             lm_tg_score(lm, ve->lmstate.lm3g.lwid[1],
                         ve->lmstate.lm3g.lwid[0], endwid,
                         dict_finishwid(dict));
+#else
+        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0], ve->lmstate.lm3g.lwid[1], &n_used);
+#endif
 
         if (bestscore < scr) {
             bestscore = scr;
@@ -938,7 +1002,11 @@
     gnode_t *gn;
     vh_lmstate2vithist_t *child;
     int32 i;
+#ifdef OLD_LM_API
     lm_t *lm;
+#else
+    ngram_model_t *lm;
+#endif
 
     lm = kbcore_lm(kbc);
 
@@ -947,8 +1015,13 @@
 
         for (i = 0; i < level; i++)
             fprintf(fp, "\t");
+#ifdef OLD_LM_API
         fprintf(fp, "\t%s -> %d\n", lm_wordstr(lm, child->state),
                 child->vhid);
+#else
+        fprintf(fp, "\t%s -> %d\n", ngram_word(lm, child->state),
+                child->vhid);
+#endif
 
         vithist_lmstate_subtree_dump(vh, kbc, child, level + 1, fp);
     }
@@ -963,7 +1036,11 @@
     int32 i;
     vh_lmstate2vithist_t *lms2vh;
     mdef_t *mdef;
+#ifdef OLD_LM_API
     lm_t *lm;
+#else
+    ngram_model_t *lm;
+#endif
 
     mdef = kbcore_mdef(kbc);
     lm = kbcore_lm(kbc);
@@ -979,7 +1056,11 @@
             lms2vh = (vh_lmstate2vithist_t *) gnode_ptr(gn);
 
             fprintf(fp, "\t%s.%s -> %d\n",
+#ifdef OLD_LM_API
                     lm_wordstr(lm, i), mdef_ciphone_str(mdef,
+#else
+                    ngram_word(lm, i), mdef_ciphone_str(mdef,
+#endif
                                                         lms2vh->state),
                     lms2vh->vhid);
             vithist_lmstate_subtree_dump(vh, kbc, lms2vh, 1, fp);
@@ -996,9 +1077,14 @@
 {
     int32 i, j;
     dict_t *dict;
+    vithist_entry_t *ve;
+#ifdef OLD_LM_API
     lm_t *lm;
-    vithist_entry_t *ve;
     s3lmwid32_t lwid;
+#else
+    ngram_model_t *lm;
+    int32 lwid;
+#endif
     int32 sf, ef;
 
     dict = kbcore_dict(kbc);
@@ -1034,10 +1120,16 @@
                     ve->sf, ve->ef, ve->path.score, ve->ascr, ve->lscr,
                     ve->path.pred, ve->type, dict_wordstr(dict, ve->wid));
 
+#ifdef OLD_LM_API
             fprintf(fp, " (%s", lm_wordstr(lm, ve->lmstate.lm3g.lwid[0]));
             lwid = ve->lmstate.lm3g.lwid[1];
             if (IS_LMWID(lm, lwid))
                 fprintf(fp, ", %s", lm_wordstr(lm, lwid));
+#else
+            fprintf(fp, " (%s", ngram_word(lm, ve->lmstate.lm3g.lwid[0]));
+            lwid = ve->lmstate.lm3g.lwid[1];
+            fprintf(fp, ", %s", ngram_word(lm, lwid));
+#endif
             fprintf(fp, ")\n");
         }
 
@@ -1545,21 +1637,34 @@
  * Find LM score for transition into lattice entry l.
  */
 int32
+#ifdef OLD_LM_API
 lat_seg_lscr(latticehist_t * lathist, s3latid_t l, lm_t * lm,
              dict_t * dict, ctxt_table_t * ct, fillpen_t * fpen,
              int32 isCand)
+#else
+lat_seg_lscr(latticehist_t * lathist, s3latid_t l, ngram_model_t * lm,
+             dict_t * dict, ctxt_table_t * ct, fillpen_t * fpen,
+             int32 isCand)
+#endif
 {
     s3wid_t bw0, bw1, bw2;
+#ifdef OLD_LM_API
     s3lmwid32_t lw0;
-    int32 lscr, bowt, bo_lscr;
+    int32 bowt;
+#else
+    int32 lw0;
+    int32 n_used;
+#endif
+    int32 lscr, bo_lscr;
+#ifdef OLD_LM_API
     tg_t *tgptr;
     bg_t *bgptr;
 
     tg32_t *tgptr32;
     bg32_t *bgptr32;
     int is32bits;
-
     is32bits = lm->is32bits;
+#endif
     bw2 = dict_basewid(dict, lathist->lattice[l].wid);
 
     if (dict_filler_word(dict, bw2))
@@ -1574,12 +1679,17 @@
                      dict);
 
     /*    E_INFO("lathist->lattice[l].history %d , bw0 %d, bw1 %d. bw2 %d\n",lathist->lattice[l].history,bw0,bw1,bw2); */
+#ifdef OLD_LM_API
     lw0 =
         IS_S3WID(bw0) ? lm->
         dict2lmwid[dict_basewid(dict, bw0)] : BAD_LMWID(lm);
     lscr =
         lm_tg_score(lm, lw0, lm->dict2lmwid[dict_basewid(dict, bw1)],
                     lm->dict2lmwid[bw2], bw2);
+#else
+    lw0 = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw0)));
+    lscr = ngram_tg_score(lm, ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw2))), ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw1))), lw0, &n_used);
+#endif
     if (isCand)
         return lscr;
 
@@ -1587,6 +1697,7 @@
     bo_lscr = 0;
 
 
+#ifdef OLD_LM_API
     if (is32bits) {
         if ((IS_S3WID(bw0)) && (lm_tg32list(lm,
                                             lm->
@@ -1621,6 +1732,10 @@
     bo_lscr +=
         lm_ug_score(lm, lm->dict2lmwid[dict_basewid(dict, bw2)],
                     dict_basewid(dict, bw2));
+#else
+#warning Finish porting lat_seg_lscr
+    bo_lscr += ngram_ng_score(lm, ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw2))), NULL, 0, &n_used);
+#endif
 
     return ((lscr > bo_lscr) ? lscr : bo_lscr);
 }
@@ -1637,7 +1752,11 @@
                   s3wid_t w_rc,
                   int32 * ascr,
                   int32 * lscr,
+#ifdef OLD_LM_API
                   lm_t * lm,
+#else
+                  ngram_model_t * lm,
+#endif
                   dict_t * dict, ctxt_table_t * ct, fillpen_t * fillpen)
 {
     int32 start_score, end_score;
@@ -1714,7 +1833,11 @@
                   s3latid_t l,
                   s3wid_t w_rc,
                   srch_hyp_t ** hyp,
+#ifdef OLD_LM_API
                   lm_t * lm,
+#else
+                  ngram_model_t * lm,
+#endif
                   dict_t * dict, ctxt_table_t * ct, fillpen_t * fillpen)
 {
     srch_hyp_t *h, *prevh;
@@ -1763,7 +1886,11 @@
  */
 dag_t *
 latticehist_dag_build(latticehist_t * vh, glist_t hyp, dict_t * dict,
+#ifdef OLD_LM_API
                       lm_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
+#else
+                      ngram_model_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
+#endif
                       int32 endid, cmd_ln_t *config, logmath_t *logmath)
 {
     glist_t *sfwid;             /* To maintain <start-frame, word-id> pair dagnodes */
@@ -1971,7 +2098,11 @@
 latticehist_dag_write(latticehist_t * lathist,
                       const char *filename,
                       dag_t * dag,
+#ifdef OLD_LM_API
                       lm_t * lm,
+#else
+                      ngram_model_t * lm,
+#endif
                       dict_t * dict,
                       ctxt_table_t * ct, fillpen_t * fillpen)
 {

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-10 15:52:08 UTC (rev 9199)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-10 17:45:08 UTC (rev 9200)
@@ -133,7 +133,11 @@
 #include "kbcore.h"
 #include "search.h"
 #include "dict.h"
+#ifdef OLD_LM_API
 #include "lm.h"
+#else
+#include <ngram_model.h>
+#endif
 #include "fillpen.h"
 
 #include "dag.h"  
@@ -161,7 +165,11 @@
  */
 typedef union vh_lmstate_u {
     struct {
+#ifdef OLD_LM_API
         s3lmwid32_t lwid[2];	/**< 2-word history; [0] is most recent */
+#else
+        int32 lwid[2];		/**< 2-word history; [0] is most recent */
+#endif
     } lm3g;
 } vh_lmstate_t;
 
@@ -407,15 +415,6 @@
 dag_t *vithist_dag_build(vithist_t * vh, glist_t hyp, dict_t * dict, int32 endid,
                          cmd_ln_t *config, logmath_t *logmath);
 
-/**
- * Write a word graph (DAG) built from Viterbi history (temporary function)
- */
-int32 vithist_dag_write(vithist_t *vithist,
-                        const char *filename,
-                        dag_t * dag,
-                        lm_t * lm,
-                        dict_t * dict);
-
 /** 
  * Free a Viterbi history data structure 
  */
@@ -584,12 +583,16 @@
 			       dict_t *dict     /** The dictionary */
     );
 
-int32 lat_seg_lscr (latticehist_t *lathist, 
-		    s3latid_t l, 
-		    lm_t *lm, 
-		    dict_t *dict, 
-		    ctxt_table_t *ct, 
-		    fillpen_t *fillpen, 
+int32 lat_seg_lscr (latticehist_t *lathist,
+		    s3latid_t l,
+#ifdef OLD_LM_API
+		    lm_t *lm,
+#else
+		    ngram_model_t *lm,
+#endif
+		    dict_t *dict,
+		    ctxt_table_t *ct,
+		    fillpen_t *fillpen,
 		    int32 isCand);
 
 
@@ -602,7 +605,11 @@
 			s3wid_t w_rc, /**< The right context word */
 			int32 *ascr,  /**< Out: Acoustic score */
 			int32 *lscr,  /**< Out: language score */
+#ifdef OLD_LM_API
 			lm_t *lm,     /**< LM */
+#else
+			ngram_model_t *lm,
+#endif
 			dict_t *dict,  /**< Dictionary */
 			ctxt_table_t *ct,  /** Context table */
 			fillpen_t *fillpen /**< filler penalty */
@@ -625,7 +632,11 @@
 			       s3latid_t l,   /**< The lattice ID */
 			       s3wid_t w_rc,   /**< The word on the right */
 			       srch_hyp_t **hyp, /**< Output: final hypothesis */ 
+#ifdef OLD_LM_API
 			       lm_t *lm,       /**< LM */
+#else
+			       ngram_model_t *lm,
+#endif
 			       dict_t *dict,   /**< Dictionary */
 			       ctxt_table_t *ct,  /**< Context table */
 			       fillpen_t *fillpen /**< filler penalty struct */
@@ -644,7 +655,11 @@
  * absurdum.
  */
 dag_t * latticehist_dag_build(latticehist_t * vh, glist_t hyp, dict_t * dict,
+#ifdef OLD_LM_API
                               lm_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
+#else
+                              ngram_model_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
+#endif
                               int32 endid, cmd_ln_t *config, logmath_t *logmath);
 
 /** 
@@ -653,7 +668,11 @@
 int32 latticehist_dag_write (latticehist_t *lathist,  /**< A table off lattice entries */
                              const char *filename,
 			     dag_t *dag,
-			     lm_t *lm, 
+#ifdef OLD_LM_API
+			     lm_t *lm,
+#else
+			     ngram_model_t *lm,
+#endif
 			     dict_t *dict, 
 			     ctxt_table_t *ct, 
 			     fillpen_t *fillpen


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9202
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9202&view=rev
Author:   dhdfu
Date:     2009-07-10 17:55:10 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Missed these ones...

Added Paths:
-----------
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h

Added: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	2009-07-10 17:55:10 UTC (rev 9202)
@@ -0,0 +1,524 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* ====================================================================
+ * Copyright (c) 1995-2004 Carnegie Mellon University.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This work was supported in part by funding from the Defense Advanced 
+ * Research Projects Agency and the National Science Foundation of the 
+ * United States of America, and the CMU Sphinx Speech Consortium.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ */
+/*
+ * ctxt_table.c -- Building a context table , split from flat_fwd.c (or fwd.c)
+ *
+ * **********************************************
+ * CMU ARPA Speech Project
+ *
+ * Copyright (c) 1995 Carnegie Mellon University.
+ * ALL RIGHTS RESERVED.
+ * **********************************************
+ * 14-Jul-05    ARCHAN (archan@...) at Carnegie Mellon Unversity 
+ *              First created it. 
+ *
+ * $Log$
+ * Revision 1.2  2006/02/22  20:46:05  arthchan2003
+ * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: ctxt_table is a wrapper of the triphone context structure and its maniuplations which were used in flat_fwd.c .  The original flat_fwd.c was very long (3000) lines.  It was broken in 5 parts, ctxt_table is one of the 5.
+ * 
+ * Revision 1.1.2.3  2005/10/09 19:55:33  arthchan2003
+ * Changed int8 to uint8. This follows Dave's change in the trunk.
+ *
+ * Revision 1.1.2.2  2005/09/27 07:39:17  arthchan2003
+ * Added ctxt_table_free.
+ *
+ * Revision 1.1.2.1  2005/09/25 19:08:25  arthchan2003
+ * Move context table from search to here.
+ *
+ * Revision 1.1.2.4  2005/09/07 23:32:03  arthchan2003
+ * 1, Added get_lcpid in parrallel with get_rcpid. 2, Also fixed small mistakes in the macro.
+ *
+ * Revision 1.1.2.3  2005/07/24 01:32:54  arthchan2003
+ * Flush the output of the cross word triphone in ctxt_table.c
+ *
+ * Revision 1.1.2.2  2005/07/17 05:42:27  arthchan2003
+ * Added super-detailed comments ctxt_table.h. Also added dimension to the arrays that stores all context tables.
+ *
+ * Revision 1.1.2.1  2005/07/15 07:48:32  arthchan2003
+ * split the hmm (whmm_t) and context building process (ctxt_table_t) from the the flat_fwd.c
+ *
+ *
+ */
+
+#include <string.h>
+
+#include <ctxt_table.h>
+#include <ckd_alloc.h>
+
+void
+dump_xwdssidmap(xwdssid_t ** x, mdef_t * mdef)
+{
+    s3cipid_t b, c1, c2;
+    s3ssid_t p;
+
+    for (b = 0; b < mdef->n_ciphone; b++) {
+        if (!x[b])
+            continue;
+
+        for (c1 = 0; c1 < mdef->n_ciphone; c1++) {
+            if (!x[b][c1].cimap)
+                continue;
+
+            printf("n_ssid(%s, %s) = %d\n",
+                   mdef_ciphone_str(mdef, b), mdef_ciphone_str(mdef, c1),
+                   x[b][c1].n_ssid);
+
+            for (c2 = 0; c2 < mdef->n_ciphone; c2++) {
+                p = x[b][c1].ssid[x[b][c1].cimap[c2]];
+                printf("  %10s %5d\n", mdef_ciphone_str(mdef, c2), p);
+            }
+        }
+    }
+    fflush(stdout);
+}
+
+/**
+ * Utility function for building cross-word ssid maps.  Looks up
+ * senone sequence IDs.
+ */
+int32
+xwdssid_compress(s3pid_t p, s3ssid_t * out_ssid, s3cipid_t * map, s3cipid_t ctx,
+                 int32 n, mdef_t * mdef)
+{
+    s3cipid_t i;
+    int32 ssid;
+
+    ssid = mdef_pid2ssid(mdef, p);
+    for (i = 0; i < n; i++) {
+        if (out_ssid[i] == ssid) {
+            /* This state sequence same as a previous ones; just map to it */
+            map[ctx] = i;
+            return n;
+        }
+    }
+
+    /* This state sequence different from all previous ones; allocate new entry */
+    map[ctx] = n;
+    out_ssid[n] = ssid;
+
+    return (n + 1);
+}
+
+
+/**
+ * Given base b, and right context rc, build left context cross-word triphones map
+ * for all left context ciphones.  Compress map to unique list.
+ */
+void
+build_lcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t rc, mdef_t * mdef,
+             uint8 *word_end_ci, s3pid_t *tmp_xwdssid)
+
+{
+    s3cipid_t lc, *map;
+    s3ssid_t p;
+    int32 n;
+
+    /* Maps left CI phone to index in "compressed" phone ID table */
+    map = (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
+
+    n = 0;
+    for (lc = 0; lc < mdef->n_ciphone; lc++) {
+        p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_BEGIN);
+        if ((!mdef->ciphone[b].filler) && word_end_ci[lc] &&
+            mdef_is_ciphone(mdef, p))
+            ct->n_backoff_ci++;
+
+        n = xwdssid_compress(p, tmp_xwdssid, map, lc, n, mdef);
+    }
+
+    /* Copy/Move to lcssid */
+    ct->lcssid[b][rc].cimap = map;
+    ct->lcssid[b][rc].n_ssid = n;
+    /* Array of phone IDs with unique senone sequences, pointed to by cimap. */
+    ct->lcssid[b][rc].ssid = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
+    memcpy(ct->lcssid[b][rc].ssid, tmp_xwdssid, n * sizeof(s3ssid_t));
+}
+
+
+/**
+ * Given base b, and left context lc, build right context cross-word triphones map
+ * for all right context ciphones.  Compress map to unique list.
+ *
+ * \note This is identical to build_lcssid except for right contexts.
+ */
+void
+build_rcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t lc, mdef_t * mdef,
+             uint8 *word_start_ci, s3pid_t *tmp_xwdssid)
+{
+    s3cipid_t rc, *map;
+    s3ssid_t p;
+    int32 n;
+
+    /* Maps right CI phone to index in "compressed" phone ID table */
+    map = (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
+
+    n = 0;
+    for (rc = 0; rc < mdef->n_ciphone; rc++) {
+        p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_END);
+        if ((!mdef->ciphone[b].filler) && word_start_ci[rc] &&
+            mdef_is_ciphone(mdef, p))
+            ct->n_backoff_ci++;
+
+        n = xwdssid_compress(p, tmp_xwdssid, map, rc, n, mdef);
+    }
+
+    /* Copy/Move to rcssid */
+    ct->rcssid[b][lc].cimap = map;
+    ct->rcssid[b][lc].n_ssid = n;
+    /* Array of phone IDs with unique senone sequences, pointed to by cimap. */
+    ct->rcssid[b][lc].ssid = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
+    memcpy(ct->rcssid[b][lc].ssid, tmp_xwdssid, n * sizeof(s3ssid_t));
+}
+
+/**
+ * Given base b for a single-phone word, build context cross-word triphones map
+ * for all left and right context ciphones.
+ *
+ * These are uncompressed for some reason.
+ */
+void
+build_lrcssid(ctxt_table_t * ct, s3cipid_t b, mdef_t * mdef,
+              uint8 *word_start_ci, uint8 *word_end_ci)
+{
+    s3cipid_t rc, lc;
+
+    for (lc = 0; lc < mdef->n_ciphone; lc++) {
+        s3ssid_t p;
+
+        ct->lrcssid[b][lc].ssid =
+            (s3ssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3ssid_t));
+        ct->lrcssid[b][lc].cimap =
+            (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
+
+        for (rc = 0; rc < mdef->n_ciphone; rc++) {
+            p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_SINGLE);
+            ct->lrcssid[b][lc].cimap[rc] = rc;
+            ct->lrcssid[b][lc].ssid[rc] = mdef_pid2ssid(mdef, p);
+            if ((!mdef->ciphone[b].filler) && word_start_ci[rc]
+                && word_end_ci[lc] && mdef_is_ciphone(mdef, p))
+                ct->n_backoff_ci++;
+        }
+        ct->lrcssid[b][lc].n_ssid = mdef->n_ciphone;
+    }
+}
+
+
+
+
+/**
+ * Build within-word triphones sequence for each word.  The extreme ends are not needed
+ * since cross-word modelling is used for those.  (See lcssid, rcssid, lrcssid.)
+ */
+
+void
+build_wwssid(ctxt_table_t * ct, dict_t * dict, mdef_t * mdef)
+{
+    s3wid_t w;
+    s3ssid_t p;
+    int32 pronlen, l;
+    s3cipid_t b, lc, rc;
+
+    E_INFO("Building within-word triphones\n");
+    ct->n_backoff_ci = 0;
+
+    ct->wwssid = (s3ssid_t **) ckd_calloc(dict->n_word, sizeof(s3ssid_t *));
+    for (w = 0; w < dict->n_word; w++) {
+        pronlen = dict->word[w].pronlen;
+        if (pronlen >= 3)
+            ct->wwssid[w] =
+                (s3ssid_t *) ckd_calloc(pronlen - 1, sizeof(s3ssid_t));
+        else
+            continue;
+
+        lc = dict->word[w].ciphone[0];
+        b = dict->word[w].ciphone[1];
+        for (l = 1; l < pronlen - 1; l++) {
+            rc = dict->word[w].ciphone[l + 1];
+            p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_INTERNAL);
+            ct->wwssid[w][l] = mdef_pid2ssid(mdef, p);
+            if ((!mdef->ciphone[b].filler) && mdef_is_ciphone(mdef, p))
+                ct->n_backoff_ci++;
+
+            lc = b;
+            b = rc;
+        }
+#if 0
+        printf("%-25s ", dict->word[w].word);
+        for (l = 1; l < pronlen - 1; l++)
+            printf(" %5d", ct->wwssid[w][l]);
+        printf("\n");
+#endif
+    }
+
+    E_INFO("%d within-word triphone instances mapped to CI-phones\n",
+           ct->n_backoff_ci);
+
+}
+
+/**
+ * Build cross-word triphones map for the entire dictionary.
+ */
+void
+build_xwdssid_map(ctxt_table_t * ct, dict_t * dict, mdef_t * mdef)
+{
+    s3wid_t w;
+    int32 pronlen;
+    s3cipid_t b, lc, rc;
+    s3ssid_t *tmp_xwdssid;
+    uint8 *word_start_ci;
+    uint8 *word_end_ci;
+
+
+    ct->n_backoff_ci = 0;
+
+    /* Build cross-word triphone models */
+    E_INFO("Building cross-word triphones\n");
+
+    word_start_ci = (uint8 *) ckd_calloc(mdef->n_ciphone, sizeof(uint8));
+    word_end_ci = (uint8 *) ckd_calloc(mdef->n_ciphone, sizeof(uint8));
+
+    /* Mark word beginning and ending ciphones that occur in given dictionary */
+    for (w = 0; w < dict->n_word; w++) {
+        word_start_ci[dict->word[w].ciphone[0]] = 1;
+        word_end_ci[dict->word[w].ciphone[dict->word[w].pronlen - 1]] = 1;
+    }
+    ct->lcssid =
+        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
+    ct->rcssid =
+        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
+    ct->lrcssid =
+        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
+    tmp_xwdssid = (s3ssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3ssid_t));
+
+    for (w = 0; w < dict->n_word; w++) {
+        pronlen = dict->word[w].pronlen;
+        if (pronlen > 1) {
+            /* Multi-phone word; build rcmap and lcmap if not already present */
+	    /* Right edge of word: rcmap */
+            b = dict->word[w].ciphone[pronlen - 1];
+            lc = dict->word[w].ciphone[pronlen - 2];
+            if (!ct->rcssid[b])
+                ct->rcssid[b] =
+                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
+                                             sizeof(xwdssid_t));
+            if (!ct->rcssid[b][lc].cimap)
+                build_rcssid(ct, b, lc, mdef,
+                             word_start_ci, tmp_xwdssid);
+
+            /* Left edge of word: lcmap */
+            b = dict->word[w].ciphone[0];
+            rc = dict->word[w].ciphone[1];
+            if (!ct->lcssid[b])
+                ct->lcssid[b] =
+                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
+                                            sizeof(xwdssid_t));
+            if (!ct->lcssid[b][rc].cimap)
+                build_lcssid(ct, b, rc, mdef,
+                             word_end_ci, tmp_xwdssid);
+
+        }
+        else {
+            /* Single-phone word; build lrcmap if not already present */
+            b = dict->word[w].ciphone[0];
+            if (!ct->lrcssid[b]) {
+                ct->lrcssid[b] =
+                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
+                                            sizeof(xwdssid_t));
+                build_lrcssid(ct, b, mdef,
+                              word_start_ci, word_end_ci);
+            }
+        }
+    }
+
+    ckd_free(word_start_ci);
+    ckd_free(word_end_ci);
+    ckd_free(tmp_xwdssid);
+    E_INFO("%d cross-word triphones mapped to CI-phones\n",
+           ct->n_backoff_ci);
+
+#if 0
+    E_INFO("LCXWDSSID\n");
+    dump_xwdssidmap(ct->lcssid, mdef);
+
+    E_INFO("RCXWDSSID\n");
+    dump_xwdssidmap(ct->rcssid, mdef);
+
+    E_INFO("LRCXWDSSID\n");
+    dump_xwdssidmap(ct->lrcssid, mdef);
+#endif
+}
+
+ctxt_table_t *
+ctxt_table_init(dict_t * dict, mdef_t * mdef)
+{
+    ctxt_table_t *ct;
+    ct = (ctxt_table_t *) ckd_calloc(1, sizeof(ctxt_table_t));
+
+    ct->n_ci = mdef->n_ciphone;
+    ct->n_word = dict->n_word;
+
+    build_wwssid(ct, dict, mdef);
+    build_xwdssid_map(ct, dict, mdef);
+
+    return ct;
+}
+
+void
+xwdssid_free(xwdssid_t **xs, int32 n_ci)
+{
+    s3cipid_t b, c;
+
+    if (xs == NULL)
+        return;
+    for (b = 0; b < n_ci; ++b) {
+        if (xs[b] == NULL)
+            continue;
+        for (c = 0; c < n_ci; ++c) {
+            ckd_free(xs[b][c].cimap);
+            ckd_free(xs[b][c].ssid);
+        }
+        ckd_free(xs[b]);
+    }
+    ckd_free(xs);
+}
+
+void
+ctxt_table_free(ctxt_table_t * ct)
+{
+    xwdssid_free(ct->lcssid, ct->n_ci);
+    xwdssid_free(ct->rcssid, ct->n_ci);
+    xwdssid_free(ct->lrcssid, ct->n_ci);
+
+    if (ct->wwssid) {
+        s3wid_t w;
+        for (w = 0; w < ct->n_word; ++w)
+            ckd_free(ct->wwssid[w]);
+        ckd_free(ct->wwssid);
+    }
+    ckd_free(ct);
+}
+
+s3cipid_t *
+get_rc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+{
+    int32 pronlen;
+    s3cipid_t b, lc;
+
+    pronlen = dict->word[w].pronlen;
+    b = dict->word[w].ciphone[pronlen - 1];
+    if (pronlen == 1) {
+        /* No known left context.  But all cimaps (for any l) are identical; pick one */
+        return (ct->lrcssid[b][0].cimap);
+    }
+    else {
+        lc = dict->word[w].ciphone[pronlen - 2];
+        return (ct->rcssid[b][lc].cimap);
+    }
+}
+
+s3cipid_t *
+get_lc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+{
+    int32 pronlen;
+    s3cipid_t b, rc;
+
+    pronlen = dict->word[w].pronlen;
+    b = dict->word[w].ciphone[0];
+    if (pronlen == 1) {
+        /* No known right context.  But all cimaps (for any l) are identical; pick one */
+        return (ct->lrcssid[b][0].cimap);
+    }
+    else {
+        rc = dict->word[w].ciphone[1];
+        return (ct->lcssid[b][rc].cimap);
+    }
+}
+
+
+void
+get_rcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
+           dict_t * dict)
+{
+    int32 pronlen;
+    s3cipid_t b, lc;
+
+    pronlen = dict->word[w].pronlen;
+    assert(pronlen > 1);
+
+    b = dict->word[w].ciphone[pronlen - 1];
+    lc = dict->word[w].ciphone[pronlen - 2];
+
+    *ssid = ct->rcssid[b][lc].ssid;
+    *nssid = ct->rcssid[b][lc].n_ssid;
+}
+
+void
+get_lcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
+           dict_t * dict)
+{
+    int32 pronlen;
+    s3cipid_t b, rc;
+
+    pronlen = dict->word[w].pronlen;
+    assert(pronlen > 1);
+
+    b = dict->word[w].ciphone[0];
+    rc = dict->word[w].ciphone[1];
+
+    *ssid = ct->lcssid[b][rc].ssid;
+    *nssid = ct->lcssid[b][rc].n_ssid;
+}
+
+int32
+ct_get_rc_nssid(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+{
+    int32 pronlen;
+    s3cipid_t b, lc;
+
+    pronlen = dict->word[w].pronlen;
+    b = dict->word[w].ciphone[pronlen - 1];
+    assert(ct);
+    assert(ct->lrcssid);
+    if (pronlen == 1) {
+        /* No known left context.  But all cimaps (for any l) are identical; pick one */
+        return (ct->lrcssid[b][0].n_ssid);
+    }
+    else {
+        lc = dict->word[w].ciphone[pronlen - 2];
+        return (ct->rcssid[b][lc].n_ssid);
+    }
+}


Property changes on: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
___________________________________________________________________
Added: svn:mime-type
   + text/x-csrc
Added: svn:eol-style
   + native

Added: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	2009-07-10 17:55:10 UTC (rev 9202)
@@ -0,0 +1,449 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* ====================================================================
+ * Copyright (c) 1995-2004 Carnegie Mellon University.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This work was supported in part by funding from the Defense Advanced 
+ * Research Projects Agency and the National Science Foundation of the 
+ * United States of America, and the CMU Sphinx Speech Consortium.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ */
+/*
+ * ctxt_table.h -- Phone Context Table Structure
+ *
+ * **********************************************
+ * CMU ARPA Speech Project
+ *
+ * Copyright (c) 1995 Carnegie Mellon University.
+ * ALL RIGHTS RESERVED.
+ * **********************************************
+ * 14-Jul-05    ARCHAN (archan@...) at Carnegie Mellon Unversity 
+ *              First created it. 
+ *
+ * $Log$
+ * Revision 1.1  2006/04/05  20:27:30  dhdfu
+ * A Great Reorganzation of header files and executables
+ * 
+ * Revision 1.2  2006/02/22 20:46:05  arthchan2003
+ * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: ctxt_table is a wrapper of the triphone context structure and its maniuplations which were used in flat_fwd.c .  The original flat_fwd.c was very long (3000) lines.  It was broken in 5 parts, ctxt_table is one of the 5.
+ *
+ * Revision 1.1.2.2  2005/09/27 07:39:17  arthchan2003
+ * Added ctxt_table_free.
+ *
+ * Revision 1.1.2.1  2005/09/25 19:08:25  arthchan2003
+ * Move context table from search to here.
+ *
+ * Revision 1.1.2.3  2005/09/07 23:32:03  arthchan2003
+ * 1, Added get_lcpid in parrallel with get_rcpid. 2, Also fixed small mistakes in the macro.
+ *
+ * Revision 1.1.2.2  2005/07/17 05:42:27  arthchan2003
+ * Added super-detailed comments ctxt_table.h. Also added dimension to the arrays that stores all context tables.
+ *
+ * Revision 1.1.2.1  2005/07/15 07:48:32  arthchan2003
+ * split the hmm (whmm_t) and context building process (ctxt_table_t) from the the flat_fwd.c
+ *
+ *
+ */
+
+/* 
+ * \file ctxt_table.h
+ * \brief data structure for building cross word triphones for Sphinx 3. 
+ */
+
+#ifndef _CTX_TAB_
+#define _CTX_TAB_
+
+#include <prim_type.h>
+
+#include "s3types.h"
+#include "bin_mdef.h"
+#include "s3dict.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if 0
+/* Fool Emacs. */
+}
+#endif
+
+/**
+ * Triphone information in the flat lexicon search in Sphinx 3.0
+ * for all word hmm modelling broken up into 4 cases:
+ * 	within-word triphones
+ * 	left-context cross-word triphones (multi-phone words)
+ * 	right-context cross-word triphones (multi-phone words)
+ * 	left- and right-cross-word triphones (single-phone words)
+ * These 4 cases captured by the following data structures.
+ */
+
+/**
+ * \struct xwdssid_t
+ * \brief cross word triphone model structure 
+ */
+
+typedef struct {
+    s3ssid_t  *ssid;	/**< Senone Sequence ID list for all context ciphones */
+    s3cipid_t *cimap;	/**< Index into ssid[] above for each ci phone */
+    int32     n_ssid;	/**< #Unique ssid in above, compressed ssid list */
+} xwdssid_t;
+
+
+#define ctxt_table_left_ctxt_ssid(ct,l,b,r)  ((ct)->lcssid[b][r].ssid[ct->lcssid[b][r].cimap[l]])
+#define ctxt_table_word_int_ssid(ct,wid,wpos)  ((ct)->wwssid[wid][wpos])
+#define ctxt_table_right_ctxt_ssid(ct,l,b,r)  ((ct)->rcssid[b][l].ssid[ct->rcssid[b][l].cimap[r]])
+#define ctxt_table_single_phone_ssid(ct,l,b,r)  ((ct)->lrcssid[b][l].ssid[ct->lrcssid[b][l].cimap[r]])
+
+/**
+ * \struct ctxt_table_t 
+ *
+ * Ravi's Comment
+ * First, the within word triphone models.  wwssid[w] = list of
+ * senone sequences for word w.  Since left and right extremes
+ * require cross-word modelling (see below), wwssid[w][0] and
+ * wwssid[w][pronlen-1] contain no information and shouldn't be
+ * touched.
+ *
+ * Left context mapping (for multiphone words): given the 1st base phone, b, of a word
+ * and its right context, r, the senone sequence for any left context l =
+ *     lcssid[b][r].ssid[lcssid[b][r].cimap[l]].
+ * 
+ * Similarly, right context mapping (for multiphone words): given b and left context l,
+ * the senone sequence for any right context r =
+ *     rcssid[b][l].ssid[lcssid[b][l].cimap[r]].
+ * 
+ * A single phone word is a combination of the above, where both l and r are unknown.
+ * Senone sequence, given any l and r context ciphones:
+ *     lrcssid[b][l].ssid[lcssid[b][l].cimap[r]].
+ * For simplicity, all cimap[] vectors (for all l) must be identical.  For now, this is
+ * attained by avoiding any compression and letting cimap be the identity map.
+ *
+ *
+ * Note by ARCHAN at 20050715
+ *
+ * Ever wonder how cross word triphones in a search actually work? I
+ * will guess sphinx 3.x is perhaps the best example of how
+ * context-dependent phone is implemented. Either exact or approximation. 
+ * 
+ * The following is more a mental exercise that help all of you who
+ * are not familiar with this part of programming and get you
+ * understand what Ravi and I were actually do it.  (I used this note
+ * to train myself when I tried to understand Ravi's code.)
+ *
+ * If you know some stuffs, you will know that the following are all
+ * well-explored by some other people (I think), one can also use FSM
+ * to implement most of the below so why bother? Well, it is always
+ * not a bad idea to work things our from its simplest form.  I always
+ * find insights when working things out step by step. Therefore I
+ * believe you will find the following discussion be interesting. 
+ *
+ * First part, If you are into static allocation of a CD graph. 
+ *
+ * 0, Something very very trivial. In the case of word internal
+ * triphone expansion, what will be the graph look like? Hmm. This
+ * looks trivial but could already many block many people. I will
+ * guess the reason is how CD phone is expressed is already something
+ * very non-intuitive. For example, with base phone b, left context l,
+ * right context r. Many will represent it as b(l,r), so I found it
+ * pretty hard to understand.  So I prefer the following "tied-fighter"
+ * representation for triphones
+ * l<-b->r 
+ *
+ * For quinphones:
+ * l2<-l1<-b->r1->r2
+ *
+ * For septaphone
+ * l3<-l2<l1<-b->r1->r2->r3
+ *
+ * So for a ci-phone graph look like this
+ *
+ * -> ph1 -> ph2 -> ph3 -> 
+ * -> ph4 -> ph5 -> ph6 ->
+ * 
+ * Then the ci phone graph will look like
+ * -> (ph1->ph2) -> (ph1<-ph2->ph3) -> (ph2<-ph3) ->
+ * -> (ph4->ph5) -> (ph4<-ph5->ph6) -> (ph5<-ph6) ->
+ *
+ * 1, Something trivial: In the case of full cross word triphone
+ * expansion, how do you quickly decide which phone to expand?  Assume
+ * you have an arbitrary polyphone with Base phone B, with L phone
+ * context at the left and R phone context at the right (or a
+ * (L+R+1)-phone).
+ * 
+ * Then what you need to do is just to look at all R phones right
+ * after word begin.  And to look at all L phones before the word end.
+ *
+ * For example, In this two words case, AND: AE N D , BIT, B IY D. And
+ * you consider triphone, i.e. L=1, R=1, then You know that the D in
+ * "AE N D" needs to be expanded to the right.  As well as D in "B IY
+ * D".  You will also know that AE in "AE N D" and B in "B IY D".  
+ *
+ * 2, Another something which is trivial, Once we know that a ci-phone
+ * in a word need to be expanded.  How to expand then? The first thing
+ * to remember is that context-dependent phone (triphone,quinphone,
+ * setaphone) is a stupid approach.  It just tries to eliminate
+ * things.  For example, when you know that the word-end phone need to
+ * be expanded to the right by 2 contexts.  Then what you need to do
+ * is to enumerate all possible 2 phones begins. 
+ *
+ * 3, Here comes a part which is slighly non-trivial.  This is related
+ * to state-tying. What is the effect of having tied-state in the HMM
+ * (or in CMU terminology, senone)? This is one of the fun-part. You
+ * will come up with situations where the definition of state of a HMM
+ * (means, variances) would be exactly the same as another state of a
+ * HMM. (usually the same location.). So in some situations, one
+ * triphone HMM could actually be exactly the same as another one. 
+ *
+ * Once you enumerate all possible contexts (either left or right),
+ * then, you will find that some of them are actually the same because
+ * of state-tying. So, here comes a process where we (CMU folks) call
+ * it compression.  That is why in Sphinx's code, you will see a term
+ * call "senone sequence ID". Which essentially means a unique HMM
+ * instance that is shared by multiple expanded triphones.  You can
+ * imagine this will be the same for quinphones or septaphones. 
+ *
+ * 4, What if we have a very short word?  Simple example is a
+ * single-phone word in the case of triphone. How do we deal with
+ * that? In a single word case for triphone expansion case, we just
+ * need to enumerate all possible left **and** right context.  Then,
+ * you will get everything you want. HTK's HVite will exactly handle
+ * this. When I first read its code, I am very impressed. 
+ * 
+ * Now in general, how long of a word will be affected by
+ * context-dependent phone expansion which has L left phone context
+ * and R right phone context? Or we need to think of "a special case"
+ * to consider both left and right context at the same time?  First,
+ * consider what length of the word, the answer is trivial, if you
+ * have a crossword n-phone, then if a word has less (n-2) phones,
+ * then you need to consider both left and right context together. I
+ * usually think in this way, this is case where the phone has totally
+ * "covered" the whole word! 
+ * 
+ * An even more detail question, how many contexts one needs to expand
+ * in position i of a word with m phones but we are using n-phone
+ * expansion where m<=n-2? This is slightly tougher. This is how you
+ * could think about it.  What you need to do to think you always need
+ * to consider L left context and R right context. Let's just say they
+ * are all right context for the sake of argument.  Then, for i=1 to
+ * m, if m-i <= R, then you don't need to consider right context. else
+ * you will need to consider R-(m-i) cross word context.  Similar
+ * argument will work for left context. 
+ *
+ *
+ * 5, Now make all together, the following is one way for you to
+ * allocate a graph with CD phone or m-phone.  
+ *
+ * i, look at its length, if it is smaller than m-2, then use the
+ * discussion in 4 to handle it. 
+ *
+ * ii, if it is larger than m-2, then 
+ *     iia, identify all position which will have CD phone expansion
+ *     iib, expand those which will not have CD phone expansion first
+ *     iic then expand those which has CD phone expansion by enumerate
+ *     its context. If it is at the right of the word begin, then
+ *     consider all L phone combination at the word end.  Vice versa. 
+ *
+ * Most algorithm essentially just work in this way but this
+ * simplistic views forgot the one important problem. After the phone
+ * expanded, how do we link expanded CD phone together within a word?
+ * There is no such problem at all in triphones because we just need
+ * to consider the left-most or right most context.  So if you work on
+ * quinphone for the first time, you will be slightly surprised. What
+ * you got from a flat lexicon after quinphone expansion will be
+ * actually a tree lexicon.  Why?
+ *
+ * Consider this example
+ *
+ * ph1 -> ph2 -> ph3 -> ph4 ->ph5
+ *     -> ph2_2-> ......
+ * ph6 -> ph7 -> ph8 -> ph9 ->ph10
+ *     -> ph7_2-> ......
+ *
+ * If we just consider expansion to right context and we start the the
+ * internal phone. Then we have
+ *
+ * Step 1
+ * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> ph4 ->ph5
+ *   |--> ph2_2-> ......
+ * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> ph9 ->ph10
+ *   |--> ph7_2-> ......
+ * 
+ * Step 2
+ * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> (ph2<-ph3<-ph4->ph5->ph1) -> ph5
+ *   |--> ph2_2-> ......                  |--> (ph2<-ph3<-ph4->ph5->ph6) -> ph5
+ * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> (ph7<-ph8<-ph9->ph10->ph1)-> ph10
+ *   |--> ph7_2-> ......                  |--> (ph7<-ph8<-ph9->ph10->ph1)-> ph10
+ *
+ * Step 3
+ * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> (ph2<-ph3<-ph4->ph5->ph1) -> (ph3<-ph4<-ph5->ph1->ph2)
+ *   |                                    |                           |---> (ph3<-ph4<-ph5->ph1->ph2_2)
+ *   |--> ph2_2-> ......                  |--> (ph2<-ph3<-ph4->ph5->ph6) -> (ph3<-ph4<-ph5->ph6->ph7)
+ *                                                                    |---> (ph3<-ph4<-ph5->6->ph7_2)
+ * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> (ph7<-ph8<-ph9->ph10->ph1)-> (ph8<-ph9->ph10->ph1->ph2 )
+ *   |                                    |                           |---> (ph8<-ph9->ph10->ph1->ph2_2 )
+ *   |--> ph7_2-> ......                  |--> (ph7<-ph8<-ph9->ph10->ph1)-> (ph8<-ph9->ph10->ph1->ph7) 
+ *                                                                    |---> (ph8<-ph9->ph10->ph1->ph7_2 )
+ *
+ * See? A tree!
+ *
+ * So, here comes an important insight.  If there is a techniques that
+ * could be used in lexical tree, it can also be used in cross word
+ * triphones. Vice versa. Of course, there is small difference, but
+ * this is one way you can understand algorithm in the field.  See XW
+ * triphone lookahead below. 
+ *
+ * 6, We are almost done with static allocation. How about silence in
+ * between the words? What should we do with them? This is actually a
+ * simpler situation. As an approximation, you could treat silence not
+ * as a word, then, you will avoid CD phone but a one phone word (sil
+ * with sil as prounciation). Then, you could treat it just as another
+ * left or right context. This is perhaps nice enough. 
+ * 
+ * 7, What we have done so far.  What we observe is how consideration
+ * of context dependency complicates the search graph if we statically
+ * allocate the tree.  No fast search algorithm will even bother to do
+ * these things.  So, here we come an important aspects of search in
+ * speech recognition.  i.e. For most of the time time, one could not
+ * statically allocate the search graph with context-dependency. Most
+ * of the context are dynamically allocated.  
+ * 
+ * Another important aspect is you will seldom see a good fast search
+ * implement triphones to be exact because it usually causes too much
+ * computation than necessary.  
+ * 
+ * So, we will spend more time on this in the second part.  This is
+ * also more relate to your purpose, tracing the source code of Sphinx
+ * 2 and Sphinx 3 to try to understand something out of it. 
+ *
+ * Second part, cross-word context-dependent phone in search in speech
+ * recognition.
+ *
+ * 8, Types of approximation of triphones. 
+ * 
+ * 
+ * 
+ */
+
+typedef struct {
+    xwdssid_t **lcssid; /**< Left context phone id table 
+                           First dimension: basephone, 
+                           Second dimension: right context
+                        */
+  
+    xwdssid_t **rcssid; /**< right context phone id table 
+                           First dimension: basephone, 
+                           Second dimension: left context
+
+                        */
+    xwdssid_t **lrcssid; /**< left-right ntext phone id table 
+                            First dimension: basephone
+                            Second dimension: left context. 
+                         */
+
+
+    s3ssid_t **wwssid;  /**< Within word triphone models 
+                           First dimension: the word id
+                           Second dimension: the phone position. 
+                        */
+    int32 n_backoff_ci; /**< # of backoff CI phone */
+    int32 n_ci, n_word;
+} ctxt_table_t ;
+
+/**
+ * Initialize a context table 
+ */
+
+ctxt_table_t *ctxt_table_init(dict_t *dict,  /**< A dictionary*/
+			      bin_mdef_t *mdef   /**< A model definition*/
+    );
+
+/**
+ * Uninitialize a context table
+ */
+
+void ctxt_table_free(ctxt_table_t *ct); /**< Context Table */
+
+/**
+ * Get the array of right context senone sequence ID for the last phone. 
+ */
+void get_rcssid(ctxt_table_t *ct,   /**< A context table */
+                s3wid_t w,          /**< A word for query */
+                s3ssid_t **ssid,    /**< Out: An array of right context phone ID */
+                int32 *nssid,       /**< Out: Number of SSID */
+                dict_t *dict        /**< In: a dictionary */
+    );
+
+/**
+ * Get the array of left context senone sequence ID for the first phone.
+ */
+void get_lcssid(ctxt_table_t *ct,  /**< A context table */
+                s3wid_t w,         /**< A word for query */
+                s3ssid_t **ssid,    /**< Out: An array of right context SSID */
+                int32 *nssid,      /**< Out: Number of SSID */
+                dict_t *dict       /**< In: a dictionary */
+    );
+
+
+/**
+ * Get the context-independent phone map for the last phone of a
+ * parcitular word 
+ * @return an array of ciphone ID. 
+ */
+s3cipid_t *get_rc_cimap(ctxt_table_t *ct, /**< A context table */
+                        s3wid_t w, /**< A word for query*/
+                        dict_t *dict /**< A dictionary */
+    );
+
+/**
+ * Get the context-independent phone map for the last phone of a
+ * parcitular word 
+ * @return an array of ciphone ID. 
+ */
+s3cipid_t *get_lc_cimap(ctxt_table_t *ct, /**< A context table */
+                        s3wid_t w, /**< A word for query*/
+                        dict_t *dict /**< A dictionary */
+    );
+
+/**
+ * Get number of right context for the last phone of a word. 
+ * @return number of right context 
+ *
+ */
+int32 ct_get_rc_nssid(ctxt_table_t *ct,  /**< A context table */
+                      s3wid_t w,          /**< Word for query. */
+                      dict_t *dict        /**< A dictionary */
+    );
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /*_CTX_TAB_*/


Property changes on: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h
___________________________________________________________________
Added: svn:mime-type
   + text/x-chdr
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9206
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9206&view=rev
Author:   dhdfu
Date:     2009-07-10 20:49:06 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Port one more Sphinx3 search file over...  No unit test yet.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-10 20:04:04 UTC (rev 9205)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-10 20:49:06 UTC (rev 9206)
@@ -8,6 +8,7 @@
 	acmod.c					\
 	bin_mdef.c				\
 	blkarray_list.c				\
+	ctxt_table.c				\
 	dict.c					\
 	fsg_history.c				\
 	fsg_lextree.c				\
@@ -39,6 +40,7 @@
 	ngram_search.h				\
 	bin_mdef.h				\
 	blkarray_list.h				\
+	ctxt_table.h				\
 	dict.h					\
 	fsg_history.h				\
 	fsg_lextree.h				\

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2009-07-10 20:04:04 UTC (rev 9205)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2009-07-10 20:49:06 UTC (rev 9206)
@@ -793,6 +793,53 @@
 }
 
 int
+bin_mdef_phone_id_nearest(bin_mdef_t * m, int32 b, int32 l, int32 r, int32 pos)
+{
+    int p, tmppos;
+
+    /* In the future, we might back off when context is not available,
+     * but for now we'll just return the CI phone. */
+    if (l < 0 || r < 0)
+        return b;
+
+    p = bin_mdef_phone_id(m, b, l, r, pos);
+    if (p >= 0)
+        return p;
+
+    /* Exact triphone not found; backoff to other word positions */
+    for (tmppos = 0; tmppos < N_WORD_POSN; tmppos++) {
+        if (tmppos != pos) {
+            p = bin_mdef_phone_id(m, b, l, r, tmppos);
+            if (p >= 0)
+                return p;
+        }
+    }
+
+    /* Nothing yet; backoff to silence phone if non-silence filler context */
+    if (m->sil >= 0) {
+        int newl, newr;
+        newl = m->phone[(int)l].info.ci.filler ? m->sil : l;
+        newr = m->phone[(int)r].info.ci.filler ? m->sil : r;
+        if ((newl != l) || (newr != r)) {
+            p = bin_mdef_phone_id(m, b, newl, newr, pos);
+            if (p >= 0)
+                return p;
+
+            for (tmppos = 0; tmppos < N_WORD_POSN; tmppos++) {
+                if (tmppos != pos) {
+                    p = bin_mdef_phone_id(m, b, newl, newr, tmppos);
+                    if (p >= 0)
+                        return p;
+                }
+            }
+        }
+    }
+
+    /* Nothing yet; backoff to base phone */
+    return b;
+}
+
+int
 bin_mdef_phone_str(bin_mdef_t * m, int pid, char *buf)
 {
     char *wpos_name;

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2009-07-10 20:04:04 UTC (rev 9205)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2009-07-10 20:49:06 UTC (rev 9206)
@@ -199,6 +199,10 @@
 		      int32 r,		/* In: right context ciphone id */
 		      int32 pos);	/* In: Word position */
 
+/* Look up a phone id, backing off to other word positions. */
+int bin_mdef_phone_id_nearest(bin_mdef_t * m, int32 b,
+			      int32 l, int32 r, int32 pos);
+
 /**
  * Create a phone string for the given phone (base or triphone) id in the given buf.
  *

Modified: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	2009-07-10 20:04:04 UTC (rev 9205)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	2009-07-10 20:49:06 UTC (rev 9206)
@@ -80,7 +80,7 @@
 #include "ctxt_table.h"
 
 void
-dump_xwdssidmap(xwdssid_t ** x, mdef_t * mdef)
+dump_xwdssidmap(xwdssid_t ** x, bin_mdef_t * mdef)
 {
     s3cipid_t b, c1, c2;
     s3ssid_t p;
@@ -94,12 +94,12 @@
                 continue;
 
             printf("n_ssid(%s, %s) = %d\n",
-                   mdef_ciphone_str(mdef, b), mdef_ciphone_str(mdef, c1),
+                   bin_mdef_ciphone_str(mdef, b), bin_mdef_ciphone_str(mdef, c1),
                    x[b][c1].n_ssid);
 
             for (c2 = 0; c2 < mdef->n_ciphone; c2++) {
                 p = x[b][c1].ssid[x[b][c1].cimap[c2]];
-                printf("  %10s %5d\n", mdef_ciphone_str(mdef, c2), p);
+                printf("  %10s %5d\n", bin_mdef_ciphone_str(mdef, c2), p);
             }
         }
     }
@@ -112,12 +112,12 @@
  */
 int32
 xwdssid_compress(s3pid_t p, s3ssid_t * out_ssid, s3cipid_t * map, s3cipid_t ctx,
-                 int32 n, mdef_t * mdef)
+                 int32 n, bin_mdef_t * mdef)
 {
     s3cipid_t i;
     int32 ssid;
 
-    ssid = mdef_pid2ssid(mdef, p);
+    ssid = bin_mdef_pid2ssid(mdef, p);
     for (i = 0; i < n; i++) {
         if (out_ssid[i] == ssid) {
             /* This state sequence same as a previous ones; just map to it */
@@ -139,7 +139,7 @@
  * for all left context ciphones.  Compress map to unique list.
  */
 void
-build_lcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t rc, mdef_t * mdef,
+build_lcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t rc, bin_mdef_t * mdef,
              uint8 *word_end_ci, s3pid_t *tmp_xwdssid)
 
 {
@@ -152,9 +152,9 @@
 
     n = 0;
     for (lc = 0; lc < mdef->n_ciphone; lc++) {
-        p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_BEGIN);
-        if ((!mdef->ciphone[b].filler) && word_end_ci[lc] &&
-            mdef_is_ciphone(mdef, p))
+        p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_BEGIN);
+        if ((!mdef->phone[b].info.ci.filler) && word_end_ci[lc] &&
+            bin_mdef_is_ciphone(mdef, p))
             ct->n_backoff_ci++;
 
         n = xwdssid_compress(p, tmp_xwdssid, map, lc, n, mdef);
@@ -176,7 +176,7 @@
  * \note This is identical to build_lcssid except for right contexts.
  */
 void
-build_rcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t lc, mdef_t * mdef,
+build_rcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t lc, bin_mdef_t * mdef,
              uint8 *word_start_ci, s3pid_t *tmp_xwdssid)
 {
     s3cipid_t rc, *map;
@@ -188,9 +188,9 @@
 
     n = 0;
     for (rc = 0; rc < mdef->n_ciphone; rc++) {
-        p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_END);
-        if ((!mdef->ciphone[b].filler) && word_start_ci[rc] &&
-            mdef_is_ciphone(mdef, p))
+        p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_END);
+        if ((!mdef->phone[b].info.ci.filler) && word_start_ci[rc] &&
+            bin_mdef_is_ciphone(mdef, p))
             ct->n_backoff_ci++;
 
         n = xwdssid_compress(p, tmp_xwdssid, map, rc, n, mdef);
@@ -211,7 +211,7 @@
  * These are uncompressed for some reason.
  */
 void
-build_lrcssid(ctxt_table_t * ct, s3cipid_t b, mdef_t * mdef,
+build_lrcssid(ctxt_table_t * ct, s3cipid_t b, bin_mdef_t * mdef,
               uint8 *word_start_ci, uint8 *word_end_ci)
 {
     s3cipid_t rc, lc;
@@ -225,11 +225,11 @@
             (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
 
         for (rc = 0; rc < mdef->n_ciphone; rc++) {
-            p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_SINGLE);
+            p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_SINGLE);
             ct->lrcssid[b][lc].cimap[rc] = rc;
-            ct->lrcssid[b][lc].ssid[rc] = mdef_pid2ssid(mdef, p);
-            if ((!mdef->ciphone[b].filler) && word_start_ci[rc]
-                && word_end_ci[lc] && mdef_is_ciphone(mdef, p))
+            ct->lrcssid[b][lc].ssid[rc] = bin_mdef_pid2ssid(mdef, p);
+            if ((!mdef->phone[b].info.ci.filler) && word_start_ci[rc]
+                && word_end_ci[lc] && bin_mdef_is_ciphone(mdef, p))
                 ct->n_backoff_ci++;
         }
         ct->lrcssid[b][lc].n_ssid = mdef->n_ciphone;
@@ -245,7 +245,7 @@
  */
 
 void
-build_wwssid(ctxt_table_t * ct, dict_t * dict, mdef_t * mdef)
+build_wwssid(ctxt_table_t * ct, s3dict_t * dict, bin_mdef_t * mdef)
 {
     s3wid_t w;
     s3ssid_t p;
@@ -268,9 +268,9 @@
         b = dict->word[w].ciphone[1];
         for (l = 1; l < pronlen - 1; l++) {
             rc = dict->word[w].ciphone[l + 1];
-            p = mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_INTERNAL);
-            ct->wwssid[w][l] = mdef_pid2ssid(mdef, p);
-            if ((!mdef->ciphone[b].filler) && mdef_is_ciphone(mdef, p))
+            p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_INTERNAL);
+            ct->wwssid[w][l] = bin_mdef_pid2ssid(mdef, p);
+            if ((!mdef->phone[b].info.ci.filler) && bin_mdef_is_ciphone(mdef, p))
                 ct->n_backoff_ci++;
 
             lc = b;
@@ -293,7 +293,7 @@
  * Build cross-word triphones map for the entire dictionary.
  */
 void
-build_xwdssid_map(ctxt_table_t * ct, dict_t * dict, mdef_t * mdef)
+build_xwdssid_map(ctxt_table_t * ct, s3dict_t * dict, bin_mdef_t * mdef)
 {
     s3wid_t w;
     int32 pronlen;
@@ -383,7 +383,7 @@
 }
 
 ctxt_table_t *
-ctxt_table_init(dict_t * dict, mdef_t * mdef)
+ctxt_table_init(s3dict_t * dict, bin_mdef_t * mdef)
 {
     ctxt_table_t *ct;
     ct = (ctxt_table_t *) ckd_calloc(1, sizeof(ctxt_table_t));
@@ -433,7 +433,7 @@
 }
 
 s3cipid_t *
-get_rc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+get_rc_cimap(ctxt_table_t * ct, s3wid_t w, s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, lc;
@@ -451,7 +451,7 @@
 }
 
 s3cipid_t *
-get_lc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+get_lc_cimap(ctxt_table_t * ct, s3wid_t w, s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, rc;
@@ -471,7 +471,7 @@
 
 void
 get_rcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
-           dict_t * dict)
+           s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, lc;
@@ -488,7 +488,7 @@
 
 void
 get_lcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
-           dict_t * dict)
+           s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, rc;
@@ -504,7 +504,7 @@
 }
 
 int32
-ct_get_rc_nssid(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
+ct_get_rc_nssid(ctxt_table_t * ct, s3wid_t w, s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, lc;

Modified: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	2009-07-10 20:04:04 UTC (rev 9205)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	2009-07-10 20:49:06 UTC (rev 9206)
@@ -83,7 +83,7 @@
 
 #include "s3types.h"
 #include "bin_mdef.h"
-#include "s3dict.h"
+#include "s3_dict.h"
 
 
 #ifdef __cplusplus
@@ -380,7 +380,7 @@
  * Initialize a context table 
  */
 
-ctxt_table_t *ctxt_table_init(dict_t *dict,  /**< A dictionary*/
+ctxt_table_t *ctxt_table_init(s3dict_t *dict,  /**< A dictionary*/
 			      bin_mdef_t *mdef   /**< A model definition*/
     );
 
@@ -397,7 +397,7 @@
                 s3wid_t w,          /**< A word for query */
                 s3ssid_t **ssid,    /**< Out: An array of right context phone ID */
                 int32 *nssid,       /**< Out: Number of SSID */
-                dict_t *dict        /**< In: a dictionary */
+                s3dict_t *dict        /**< In: a dictionary */
     );
 
 /**
@@ -407,7 +407,7 @@
                 s3wid_t w,         /**< A word for query */
                 s3ssid_t **ssid,    /**< Out: An array of right context SSID */
                 int32 *nssid,      /**< Out: Number of SSID */
-                dict_t *dict       /**< In: a dictionary */
+                s3dict_t *dict       /**< In: a dictionary */
     );
 
 
@@ -418,7 +418,7 @@
  */
 s3cipid_t *get_rc_cimap(ctxt_table_t *ct, /**< A context table */
                         s3wid_t w, /**< A word for query*/
-                        dict_t *dict /**< A dictionary */
+                        s3dict_t *dict /**< A dictionary */
     );
 
 /**
@@ -428,7 +428,7 @@
  */
 s3cipid_t *get_lc_cimap(ctxt_table_t *ct, /**< A context table */
                         s3wid_t w, /**< A word for query*/
-                        dict_t *dict /**< A dictionary */
+                        s3dict_t *dict /**< A dictionary */
     );
 
 /**
@@ -438,7 +438,7 @@
  */
 int32 ct_get_rc_nssid(ctxt_table_t *ct,  /**< A context table */
                       s3wid_t w,          /**< Word for query. */
-                      dict_t *dict        /**< A dictionary */
+                      s3dict_t *dict        /**< A dictionary */
     );
 
 #ifdef __cplusplus


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9207
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9207&view=rev
Author:   dhdfu
Date:     2009-07-11 05:29:46 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Start converting this sucker - remove latticehist code as it is not used

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-10 20:49:06 UTC (rev 9206)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-11 05:29:46 UTC (rev 9207)
@@ -1437,738 +1437,3 @@
         E_INFO_NOFN("Viterbi history is (null)\n");
     }
 }
-
-latticehist_t *
-latticehist_init(int32 init_alloc_size, int32 num_frames)
-{
-    latticehist_t *lat;
-    lat = ckd_calloc(1, sizeof(latticehist_t));
-    /* Allocate output word lattice structure */
-    lat->lat_alloc = init_alloc_size;
-    lat->lattice =
-        (lattice_t *) ckd_calloc(lat->lat_alloc, sizeof(lattice_t));
-    lat->n_lat_entry = 0;
-    lat->n_cand = 0;            /*By default, we don't load in word candidate. */
-
-    /* Space for first lattice entry in each frame (+ terminating sentinel) */
-    lat->frm_latstart =
-        (s3latid_t *) ckd_calloc(num_frames, sizeof(s3latid_t));
-    lat->n_frms_alloc = num_frames;
-    lat->n_frm = 0;
-
-    return lat;
-}
-
-void
-latticehist_reset(latticehist_t * lathist)
-{
-    int32 l;
-    /* Free rcscores for each lattice entry */
-    for (l = 0; l < lathist->n_lat_entry; l++) {
-        if (lathist->lattice[l].rcscore) {
-            ckd_free(lathist->lattice[l].rcscore);
-            lathist->lattice[l].rcscore = NULL;
-        }
-    }
-    lathist->n_lat_entry = 0;
-
-}
-
-void
-latticehist_free(latticehist_t * lathist)
-{
-    if (lathist) {
-        latticehist_reset(lathist);
-
-        if (lathist->lattice)
-            ckd_free(lathist->lattice);
-
-        if (lathist->frm_latstart)
-            ckd_free(lathist->frm_latstart);
-
-        ckd_free(lathist);
-    }
-}
-
-
-void
-latticehist_dump(latticehist_t * lathist, FILE * fp, dict_t * dict,
-                 ctxt_table_t * ct, int32 dumpRC)
-{
-    int32 i;
-    s3cipid_t npid;
-    s3cipid_t rc;
-    lattice_t *lat;
-
-    lat = lathist->lattice;
-
-    for (i = 0; i < lathist->n_lat_entry; i++) {
-        fprintf(fp, "%6d: %5d %6d %11d %s\n",
-                i,
-                lat[i].frm,
-                lat[i].history,
-                lat[i].score, dict_wordstr(dict, lat[i].wid));
-
-
-        if (lat[i].rcscore && dumpRC) {
-            npid = ct_get_rc_nssid(ct, lat[i].wid, dict);
-            for (rc = 0; rc < npid; rc++) {
-                fprintf(fp,
-                        "rc(Compacted) %d, rcscore %5d\n",
-                        rc, lat[i].rcscore[rc]);
-            }
-        }
-    }
-    fflush(fp);
-}
-
-
-
-
-/**
- * Record a word exit in word lattice.
- * NOTE: All exits from a single word in a given frame (for different right context
- * ciphones) must occur contiguously.
- */
-
-void
-lattice_entry(latticehist_t * lathist, s3wid_t w, int32 f, int32 score,
-              s3latid_t history, int32 rc, ctxt_table_t * ct,
-              dict_t * dict)
-{
-    s3cipid_t rc_ind, npid;
-
-
-    assert(lathist->lattice);
-    if ((lathist->n_lat_entry <= 0) ||
-        (lathist->lattice[lathist->n_lat_entry - 1].wid != w)
-        || (lathist->lattice[lathist->n_lat_entry - 1].frm != f)) {
-        /* New lattice entry */
-        if (lathist->n_lat_entry >= lathist->lat_alloc) {
-            E_INFO("\nLattice size(%d) exceeded; increasing to %d\n",
-                   lathist->lat_alloc,
-                   lathist->lat_alloc + LAT_ALLOC_INCR);
-            lathist->lat_alloc += LAT_ALLOC_INCR;
-            lathist->lattice =
-                ckd_realloc(lathist->lattice,
-                            lathist->lat_alloc * sizeof(*lathist->lattice));
-            memset(lathist->lattice + lathist->n_lat_entry,
-                   0, LAT_ALLOC_INCR * sizeof(*lathist->lattice));
-        }
-
-        lathist->lattice[lathist->n_lat_entry].wid = w;
-        lathist->lattice[lathist->n_lat_entry].frm = (s3frmid_t) f;
-        lathist->lattice[lathist->n_lat_entry].score = score;
-        lathist->lattice[lathist->n_lat_entry].history = history;
-
-        /* Allocate space for different right context scores */
-        npid = ct_get_rc_nssid(ct, w, dict);
-        assert(npid > 0);
-
-        lathist->lattice[lathist->n_lat_entry].rcscore =
-            (int32 *) ckd_calloc(npid, sizeof(int32));
-
-        for (rc_ind = 0; rc_ind < npid; rc_ind++)
-            lathist->lattice[lathist->n_lat_entry].rcscore[rc_ind] =
-                S3_LOGPROB_ZERO;
-
-        lathist->n_lat_entry++;
-    }
-
-    /* Slight BUG here: each rc can have its own history, but only the best retained!! */
-    if (lathist->lattice[lathist->n_lat_entry - 1].score < score) {
-        lathist->lattice[lathist->n_lat_entry - 1].score = score;
-        lathist->lattice[lathist->n_lat_entry - 1].history = history;
-    }
-
-    lathist->lattice[lathist->n_lat_entry - 1].rcscore[rc] = score;
-}
-
-int32
-lat_pscr_rc(latticehist_t * lathist, s3latid_t l, s3wid_t w_rc,
-            ctxt_table_t * ct, dict_t * dict)
-{
-    s3cipid_t *rcmap, rc;
-
-    if ((NOT_S3WID(w_rc)) || (!lathist->lattice[l].rcscore))
-        return lathist->lattice[l].score;
-
-    rcmap = get_rc_cimap(ct, lathist->lattice[l].wid, dict);
-    rc = dict->word[w_rc].ciphone[0];
-    return (lathist->lattice[l].rcscore[rcmap[rc]]);
-}
-
-/**
- * Get the last two non-filler, non-silence lattice words w0 and w1 (base word-ids),
- * starting from l.  w1 is later than w0.  At least w1 must exist; w0 may not.
- */
-void
-two_word_history(latticehist_t * lathist, s3latid_t l, s3wid_t * w0,
-                 s3wid_t * w1, dict_t * dict)
-{
-    s3latid_t l0, l1;
-    l0 = 0;
-
-    for (l1 = l; dict_filler_word(dict, lathist->lattice[l1].wid);
-         l1 = lathist->lattice[l1].history);
-
-    /* BHIKSHA HACK - PERMIT MULTIPLE PRONS FOR <s> */
-    if (l1 != -1)
-        for (l0 = lathist->lattice[l1].history; (IS_S3LATID(l0))
-             && (dict_filler_word(dict, lathist->lattice[l0].wid));
-             l0 = lathist->lattice[l0].history);
-
-    /* BHIKSHA HACK - PERMIT MULTIPLE PRONS FOR <s> */
-    if (l1 == -1)
-        *w1 = 0;
-    else
-        *w1 = dict_basewid(dict, lathist->lattice[l1].wid);
-    if (l1 == -1)
-        *w0 = BAD_S3WID;
-    else
-        *w0 =
-            (NOT_S3LATID(l0)) ? BAD_S3WID : dict_basewid(dict,
-                                                         lathist->
-                                                         lattice[l0].wid);
-}
-
-
-/**
- * Find LM score for transition into lattice entry l.
- */
-int32
-#ifdef OLD_LM_API
-lat_seg_lscr(latticehist_t * lathist, s3latid_t l, lm_t * lm,
-             dict_t * dict, ctxt_table_t * ct, fillpen_t * fpen,
-             int32 isCand)
-#else
-lat_seg_lscr(latticehist_t * lathist, s3latid_t l, ngram_model_t * lm,
-             dict_t * dict, ctxt_table_t * ct, fillpen_t * fpen,
-             int32 isCand)
-#endif
-{
-    s3wid_t bw0, bw1, bw2;
-#ifdef OLD_LM_API
-    s3lmwid32_t lw0;
-    int32 bowt;
-#else
-    int32 lw0;
-    int32 n_used;
-#endif
-    int32 lscr, bo_lscr;
-#ifdef OLD_LM_API
-    tg_t *tgptr;
-    bg_t *bgptr;
-
-    tg32_t *tgptr32;
-    bg32_t *bgptr32;
-    int is32bits;
-    is32bits = lm->is32bits;
-#endif
-    bw2 = dict_basewid(dict, lathist->lattice[l].wid);
-
-    if (dict_filler_word(dict, bw2))
-        return (fillpen(fpen, bw2));
-
-    if (NOT_S3LATID(lathist->lattice[l].history)) {
-        assert(bw2 == dict->startwid);
-        return 0;
-    }
-
-    two_word_history(lathist, lathist->lattice[l].history, &bw0, &bw1,
-                     dict);
-
-    /*    E_INFO("lathist->lattice[l].history %d , bw0 %d, bw1 %d. bw2 %d\n",lathist->lattice[l].history,bw0,bw1,bw2); */
-#ifdef OLD_LM_API
-    lw0 =
-        IS_S3WID(bw0) ? lm->
-        dict2lmwid[dict_basewid(dict, bw0)] : BAD_LMWID(lm);
-    lscr =
-        lm_tg_score(lm, lw0, lm->dict2lmwid[dict_basewid(dict, bw1)],
-                    lm->dict2lmwid[bw2], bw2);
-#else
-    lw0 = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw0)));
-    lscr = ngram_tg_score(lm, ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw2))), ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw1))), lw0, &n_used);
-#endif
-    if (isCand)
-        return lscr;
-
-    /* Correction for backoff cpase if that scores better (see word_trans) */
-    bo_lscr = 0;
-
-
-#ifdef OLD_LM_API
-    if (is32bits) {
-        if ((IS_S3WID(bw0)) && (lm_tg32list(lm,
-                                            lm->
-                                            dict2lmwid[dict_basewid
-                                                       (dict, bw0)],
-                                            lm->
-                                            dict2lmwid[dict_basewid
-                                                       (dict, bw1)],
-                                            &tgptr32, &bowt) > 0))
-            bo_lscr = bowt;
-        if (lm_bg32list
-            (lm, lm->dict2lmwid[dict_basewid(dict, bw1)], &bgptr32,
-             &bowt) > 0)
-            bo_lscr += bowt;
-    }
-    else {
-        if ((IS_S3WID(bw0)) && (lm_tglist(lm,
-                                          lm->
-                                          dict2lmwid[dict_basewid
-                                                     (dict, bw0)],
-                                          lm->
-                                          dict2lmwid[dict_basewid
-                                                     (dict, bw1)], &tgptr,
-                                          &bowt) > 0))
-            bo_lscr = bowt;
-        if (lm_bglist
-            (lm, lm->dict2lmwid[dict_basewid(dict, bw1)], &bgptr,
-             &bowt) > 0)
-            bo_lscr += bowt;
-
-    }
-    bo_lscr +=
-        lm_ug_score(lm, lm->dict2lmwid[dict_basewid(dict, bw2)],
-                    dict_basewid(dict, bw2));
-#else
-#warning Finish porting lat_seg_lscr
-    bo_lscr += ngram_ng_score(lm, ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, bw2))), NULL, 0, &n_used);
-#endif
-
-    return ((lscr > bo_lscr) ? lscr : bo_lscr);
-}
-
-
-
-/**
- * Find acoustic and LM score for segmentation corresponding to lattice entry l with
- * the given right context word.
- */
-void
-lat_seg_ascr_lscr(latticehist_t * lathist,
-                  s3latid_t l,
-                  s3wid_t w_rc,
-                  int32 * ascr,
-                  int32 * lscr,
-#ifdef OLD_LM_API
-                  lm_t * lm,
-#else
-                  ngram_model_t * lm,
-#endif
-                  dict_t * dict, ctxt_table_t * ct, fillpen_t * fillpen)
-{
-    int32 start_score, end_score;
-
-    /* Score with which l ended with right context = w_rc */
-    if ((end_score =
-         lat_pscr_rc(lathist, l, w_rc, ct, dict)) <= S3_LOGPROB_ZERO) {
-        *ascr = *lscr = S3_LOGPROB_ZERO;
-        return;
-    }
-
-    /* Score with which l was begun */
-    start_score = IS_S3LATID(lathist->lattice[l].history) ?
-        lat_pscr_rc(lathist, lathist->lattice[l].history,
-                    lathist->lattice[l].wid, ct, dict) : 0;
-
-    /* LM score for the transition into l */
-    *lscr =
-        lat_seg_lscr(lathist, l, lm, dict, ct, fillpen,
-                     (lathist->n_cand > 0));
-    *ascr = end_score - start_score - *lscr;
-}
-
-
-s3latid_t
-lat_final_entry(latticehist_t * lathist, dict_t * dict, int32 curfrm,
-                char *uttid)
-{
-    s3latid_t l, bestl;
-    int32 f, bestscore;
-
-    l = bestl = BAD_S3LATID;
-
-
-    /* Find lattice entry in last frame for FINISH_WORD */
-    for (l = lathist->frm_latstart[curfrm - 1];
-         l < lathist->n_lat_entry; l++) {
-        if (dict_basewid(dict, lathist->lattice[l].wid) ==
-            dict->finishwid)
-            break;
-    }
-
-    if (l < lathist->n_lat_entry) {
-        /* FINISH_WORD entry found; backtrack to obtain best Viterbi path */
-        return (l);
-    }
-
-    /* Find last available lattice entry with best ending score */
-    E_WARN
-        ("When %s is used as final word, %s: Search didn't end in %s\n",
-         dict_wordstr(dict, dict->finishwid), uttid, dict_wordstr(dict,
-                                                                  dict->
-                                                                  finishwid));
-
-    bestscore = S3_LOGPROB_ZERO;
-    for (f = curfrm - 1; (f >= 0) && (bestscore <= S3_LOGPROB_ZERO); --f) {
-        for (l = lathist->frm_latstart[f];
-             l < lathist->frm_latstart[f + 1]; l++) {
-            if ((lathist->lattice[l].wid != dict->startwid)
-                && (bestscore < lathist->lattice[l].score)) {
-                bestscore = lathist->lattice[l].score;
-                bestl = l;
-            }
-        }
-    }
-    assert(!NOT_S3LATID(l));
-    return ((f >= 0) ? bestl : BAD_S3LATID);
-}
-
-
-
-srch_hyp_t *
-lattice_backtrace(latticehist_t * lathist,
-                  s3latid_t l,
-                  s3wid_t w_rc,
-                  srch_hyp_t ** hyp,
-#ifdef OLD_LM_API
-                  lm_t * lm,
-#else
-                  ngram_model_t * lm,
-#endif
-                  dict_t * dict, ctxt_table_t * ct, fillpen_t * fillpen)
-{
-    srch_hyp_t *h, *prevh;
-
-    if (IS_S3LATID(l)) {
-        prevh =
-            lattice_backtrace(lathist, lathist->lattice[l].history,
-                              lathist->lattice[l].wid, hyp, lm, dict, ct,
-                              fillpen);
-
-        h = ckd_calloc(1, sizeof(srch_hyp_t));
-        if (!prevh)
-            *hyp = h;
-        else
-            prevh->next = h;
-        h->next = NULL;
-
-        h->id = lathist->lattice[l].wid;
-        h->word = dict_wordstr(dict, h->id);
-        h->sf = prevh ? prevh->ef + 1 : 0;
-        h->ef = lathist->lattice[l].frm;
-        h->pscr = lathist->lattice[l].score;
-        lat_seg_ascr_lscr(lathist, l, w_rc, &(h->ascr), &(h->lscr),
-                          lm, dict, ct, fillpen);
-        lathist->lattice[l].ascr = h->ascr;
-        lathist->lattice[l].lscr = h->lscr;
-
-        return h;
-    }
-    else {
-        return NULL;
-    }
-}
-
-/**
- * Build a DAG from the lattice: each unique <word-id,start-frame> is a node, i.e. with
- * a single start time but it can represent several end times.  Links are created
- * whenever nodes are adjacent in time.
- * dagnodes_list = linear list of DAG nodes allocated, ordered such that nodes earlier
- * in the list can follow nodes later in the list, but not vice versa:  Let two DAG
- * nodes d1 and d2 have start times sf1 and sf2, and end time ranges [fef1..lef1] and
- * [fef2..lef2] respectively.  If d1 appears later than d2 in dag.list, then
- * fef2 >= fef1, because d2 showed up later in the word lattice.  If there is a DAG
- * edge from d1 to d2, then sf1 > fef2.  But fef2 >= fef1, so sf1 > fef1.  Reductio ad
- * absurdum.
- */
-dag_t *
-latticehist_dag_build(latticehist_t * vh, glist_t hyp, dict_t * dict,
-#ifdef OLD_LM_API
-                      lm_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
-#else
-                      ngram_model_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
-#endif
-                      int32 endid, cmd_ln_t *config, logmath_t *logmath)
-{
-    glist_t *sfwid;             /* To maintain <start-frame, word-id> pair dagnodes */
-    lattice_t *ve, *ve2;
-    gnode_t *gn, *gn2, *gn3;
-    dagnode_t *dn, *dn2;
-    int32 min_ef_range;
-    int32 sf, ef, n_node;
-    int32 f, i, k;
-    srch_hyp_t *h;
-    dag_t *dag;
-
-    dag = ckd_calloc(1, sizeof(*dag));
-    dag_init(dag, config, logmath);
-    sfwid = (glist_t *) ckd_calloc(vh->n_frm, sizeof(glist_t));
-
-    /* Min. endframes value that a node must persist for it to be not ignored */
-    min_ef_range = cmd_ln_int32_r(config, "-min_endfr");
-
-    n_node = 0;
-    sf = 0;
-    for (i = 0; i < vh->n_lat_entry; i++) { /* This range includes the dummy <s> and </s> entries */
-        ve = &vh->lattice[i];
-        sf = LATID2SF(vh, i);
-        ef = ve->frm;
-
-        for (gn = sfwid[sf]; gn; gn = gnode_next(gn)) {
-            dn = (dagnode_t *) gnode_ptr(gn);
-            if (dn->wid == ve->wid)
-                break;
-        }
-        if (!gn) {
-            dn = listelem_malloc(dag->node_alloc);
-            dn->wid = ve->wid;
-
-            dn->node_ascr = ve->ascr;
-            dn->node_lscr = ve->lscr;
-
-            dn->sf = sf;
-            dn->fef = ef;
-            dn->lef = ef;
-            dn->seqid = -1;     /* Initially all invalid, selected ones validated below */
-            dn->hook = NULL;
-            dn->predlist = NULL;
-            dn->succlist = NULL;
-            dn->reachable = 0;
-            n_node++;
-
-            sfwid[sf] = glist_add_ptr(sfwid[sf], (void *) dn);
-        }
-        else {
-            dn->lef = ef;
-        }
-        ve->dagnode = dn;
-
-        if (i == endid)
-            dag->end = dn;
-
-        /*
-         * Check if an entry already exists under dn->velist (generated by a different
-         * LM context); retain only the best scoring one.
-         */
-        for (gn = (glist_t)dn->hook; gn; gn = gnode_next(gn)) {
-            ve2 = (lattice_t *) gnode_ptr(gn);
-            if (ve2->frm == ve->frm)
-                break;
-        }
-        if (gn) {
-            if (ve->score > ve2->score)
-                gnode_ptr(gn) = (void *) ve;
-        }
-        else
-            dn->hook = glist_add_ptr((glist_t)dn->hook, (void *) ve);
-    }
-
-    /*
-     * Validate segments with >=min_endfr end times.
-     * But keep segments in the original hypothesis, regardless; mark them first.
-     */
-    for (gn = hyp; gn; gn = gnode_next(gn)) {
-        h = (srch_hyp_t *) gnode_ptr(gn);
-        for (gn2 = sfwid[h->sf]; gn2; gn2 = gnode_next(gn2)) {
-            dn = (dagnode_t *) gnode_ptr(gn2);
-            if (h->id == dn->wid)
-                dn->seqid = 0;  /* Do not discard (prune) this dagnode */
-        }
-    }
-
-    /* Validate startwid and finishwid nodes */
-    dn = (dagnode_t *) gnode_ptr(sfwid[0]);
-    assert(dn->wid == dict_startwid(dict));
-    dn->seqid = 0;
-    dag->root = dn;
-    dag->entry.node = dn;
-    dag->entry.ascr = 0;
-    dag->entry.next = NULL;
-    dag->entry.pscr_valid = 0;
-    dag->entry.bypass = NULL;
-
-    /* The end word is a real (silence) word in flat forward search so
-     * it is not necessarily in the last frame (in fact it usually
-     * isn't). */
-    dag->end->seqid = 0;
-    dag->final.node = dag->end;
-    dag->final.ascr = 0;
-    dag->final.next = NULL;
-    dag->final.pscr_valid = 0;
-    dag->final.bypass = NULL;
-    /* Find the exit score for the end node. */
-    for (gn = (glist_t)dag->end->hook; gn; gn = gnode_next(gn)) {
-        ve2 = (lattice_t *) gnode_ptr(gn);
-        if (ve2->frm == vh->n_frm)
-            dag->final.ascr = ve2->ascr;
-    }
-
-    /* Now prune dagnodes with <min_endfr end frames if not validated above */
-    i = 0;
-    for (f = 0; f < vh->n_frm; ++f) {
-        for (gn = sfwid[f]; gn; gn = gnode_next(gn)) {
-            dn = (dagnode_t *) gnode_ptr(gn);
-            if ((dn->lef - dn->fef > min_ef_range) || (dn->seqid >= 0)) {
-                dn->seqid = i++;
-                dn->alloc_next = dag->list;
-                dag->list = dn;
-            }
-            else
-                dn->seqid = -1; /* Flag: discard */
-        }
-    }
-
-    for (f = 0; f < vh->n_frm - 1; ++f) {
-        for (gn = sfwid[f]; gn; gn = gnode_next(gn)) {
-            dn = (dagnode_t *) gnode_ptr(gn);
-            /* Look for transitions from this dagnode to later ones, if not discarded */
-            if (dn->seqid < 0)
-                continue;
-
-            for (gn2 = (glist_t) dn->hook; gn2; gn2 = gnode_next(gn2)) {
-                s3latid_t l;
-                ve = (lattice_t *) gnode_ptr(gn2);
-                /* Slight hack to get a lattice ID for lat_seg_ascr_lscr() */
-                l = ve - vh->lattice;
-                sf = ve->frm + 1;
-                if (sf >= vh->n_frm)
-                    continue;
-                for (gn3 = sfwid[sf]; gn3; gn3 = gnode_next(gn3)) {
-                    dn2 = (dagnode_t *) gnode_ptr(gn3);
-                    if (dn2->seqid >= 0) {
-                        /*
-                         * Find acoustic score for link from dn to dn2
-                         * (for lattice entry l=dn with dn2 as right
-                         * context).
-                         */
-                        lat_seg_ascr_lscr(vh, l, dn2->wid, &ve->ascr, &ve->lscr, lm,
-                                          dict, ctxt, fpen);
-                        if (ve->ascr > S3_LOGPROB_ZERO)
-                            dag_link(dag, dn, dn2, ve->ascr, ve->lscr, ve->frm, NULL);
-                    }
-                }
-            }
-        }
-    }
-
-    /* Free dagnodes structure */
-    for (f = 0; f < vh->n_frm; f++) {
-        for (gn = sfwid[f]; gn; gn = gnode_next(gn)) {
-            dn = (dagnode_t *) gnode_ptr(gn);
-            if (dn->seqid == -1) {
-                /* If pruned, free the node too */
-                listelem_free(dag->node_alloc, dn);
-                /* And unlink it from all lattice entries involving it. */
-                for (gn2 = (glist_t)dn->hook; gn2; gn2 = gnode_next(gn2)) {
-                    ve = (lattice_t *) gnode_ptr(gn2);
-                    if (ve->dagnode == dn)
-                        ve->dagnode = NULL;
-                }
-            }
-            glist_free((glist_t) dn->hook);
-            dn->hook = NULL;
-        }
-        glist_free(sfwid[f]);
-    }
-    ckd_free((void *) sfwid);
-
-    dag->filler_removed = 0;
-    dag->fudged = 0;
-    dag->nfrm = vh->n_frm;
-
-    dag->maxedge = cmd_ln_int32_r(config, "-maxedge");
-    /*
-     * Set limit on max LM ops allowed after which utterance is aborted.
-     * Limit is lesser of absolute max and per frame max.
-     */
-    dag->maxlmop = cmd_ln_int32_r(config, "-maxlmop");
-    k = cmd_ln_int32_r(config, "-maxlpf");
-    k *= dag->nfrm;
-    if (k > 0 && dag->maxlmop > k)
-        dag->maxlmop = k;
-    dag->lmop = 0;
-
-    return dag;
-}
-
-int32
-latticehist_dag_write(latticehist_t * lathist,
-                      const char *filename,
-                      dag_t * dag,
-#ifdef OLD_LM_API
-                      lm_t * lm,
-#else
-                      ngram_model_t * lm,
-#endif
-                      dict_t * dict,
-                      ctxt_table_t * ct, fillpen_t * fillpen)
-{
-
-    /* WARNING!!!! DO NOT INSERT a # in the format arbitrarily because the dag_reader is not very robust */
-    int32 i, n_valid_node;
-    dagnode_t *d, *initial, *final;
-    daglink_t *l;
-    FILE *fp;
-    int32 ascr, lscr;
-    int32 ispipe;
-
-    initial = dag->root;
-    final = dag->end;
-
-    E_INFO("Writing lattice file in Sphinx III format: %s\n", filename);
-    if ((fp = fopen_comp(filename, "w", &ispipe)) == NULL) {
-        E_ERROR("fopen_comp (%s,w) failed\n", filename);
-        return -1;
-    }
-
-    dag_write_header(fp, dag->config);
-
-    fprintf(fp, "Frames %d\n", dag->nfrm);
-    fprintf(fp, "#\n");
-
-    for (i = 0, d = dag->list; d; d = d->alloc_next, i++);
-    fprintf(fp,
-            "Nodes %d (NODEID WORD STARTFRAME FIRST-ENDFRAME LAST-ENDFRAME)\n",
-            i);
-    for (i = 0, d = dag->list; d; d = d->alloc_next, i++) {
-        d->seqid = i;
-        fprintf(fp, "%d %s %d %d %d\n", i, dict_wordstr(dict, d->wid),
-                d->sf, d->fef, d->lef);
-    }
-
-
-    fprintf(fp, "#\n");
-
-    fprintf(fp, "Initial %d\nFinal %d\n", initial->seqid, final->seqid);
-
-    /* Best score (i.e., regardless of Right Context) for word segments in word lattice */
-    n_valid_node = 0;
-    for (i = 0; i < lathist->n_lat_entry; i++) {
-        if (lathist->lattice[i].dagnode)
-            n_valid_node++;
-    }
-    fprintf(fp, "BestSegAscr %d (NODEID ENDFRAME ASCORE)\n", n_valid_node);
-    for (i = 0; i < lathist->n_lat_entry; i++) {
-        lat_seg_ascr_lscr(lathist, i, BAD_S3WID, &ascr, &lscr, lm,
-                          dict, ct, fillpen);
-        if (lathist->lattice[i].dagnode)
-            fprintf(fp, "%d %d %d\n", (lathist->lattice[i].dagnode)->seqid,
-                    lathist->lattice[i].frm, ascr);
-    }
-    fprintf(fp, "#\n");
-
-    fprintf(fp, "Edges (FROM-NODEID TO-NODEID ASCORE)\n");
-    for (d = dag->list; d; d = d->alloc_next) {
-        for (l = d->succlist; l; l = l->next)
-            fprintf(fp, "%d %d %d\n", d->seqid, l->node->seqid,
-                    l->ascr);
-    }
-    fprintf(fp, "End\n");
-
-    fclose_comp(fp, ispipe);
-
-    return 0;
-}

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-10 20:49:06 UTC (rev 9206)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-11 05:29:46 UTC (rev 9207)
@@ -126,31 +126,23 @@
 
 #include <stdio.h>
 
-#include <s3types.h>
+#include <ngram_model.h>
 #include <cmd_ln.h>
 #include <logmath.h>
 #include <glist.h>
-#include "kbcore.h"
-#include "search.h"
-#include "dict.h"
-#ifdef OLD_LM_API
-#include "lm.h"
-#else
-#include <ngram_model.h>
-#endif
-#include "fillpen.h"
 
-#include "dag.h"  
+#include "s3types.h"
+#include "s3_dict.h"
 #include "ctxt_table.h"
 
 /** \file vithist.h 
+ *
+ * \brief Viterbi history structures.  Mainly vithist_t, also its
+ * slightly older brother latticehist_t. They are respectively used by
+ * decode (mode 4 and 5) and decode_anytopo (mode 3).  The curent
+ * arrangement is temporary.
+ */
 
-\brief Viterbi history structures.  Mainly vithist_t, also its
-slightly older brother latticehist_t. They are respectively used
-by decode (mode 4 and 5) and decode_anytopo (mode 3).  The curent
-arrangement is temporary. 
-*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -445,239 +437,6 @@
 			   dict_t* dict  /**< In: If specified, the word string of lm IDs would also be translated */
     );
 
-
-/**
- * \struct lattice_t 
- * Word lattice for recording decoded hypotheses.
- * 
- * lattice[i] = entry for a word ending at a particular frame.  There can be at most one
- * entry for a word in a given frame.
- * NOTE: lattice array allocated statically.  Need a more graceful way to grow without
- * such an arbitrary internal limit.
- */
-typedef struct lattice_s {
-    s3wid_t   wid;	/**< Decoded word */
-    s3frmid_t frm;	/**< End frame for this entry */
-    s3latid_t history;	/**< Index of predecessor lattice_t entry */
-
-    int32 ascr;         /**< Acoustic score for this node */
-    int32 lscr;         /**< Language score for this node */
-
-    int32     score;	/**< Best path score upto the end of this entry */
-    int32    *rcscore;	/**< Individual path scores for different right context ciphones */
-    dagnode_t *dagnode;	/**< DAG node representing this entry */
-} lattice_t;
-
-
-#define LAT_ALLOC_INCR		32768
-
-#define LATID2SF(hist,l)	(IS_S3LATID(hist->lattice[l].history) ? \
-			 hist->lattice[hist->lattice[l].history].frm + 1 : 0)
-
-/** 
- * \struct latticehist_t 
- *
- * Encapsulation of all memory management of the lattice structure.
- * The name of lattice_t and latticehist_t is slighly confusing.
- * lattice_t is actually just one entry. One should also
- * differentiate the term "lattice" as a general graph-like
- * structure which either represent the search graph or as a
- * constraint of a search graph
- */
-
-/* FIXME, 1, Either replace all latticehist_t by vithist_t or 
-   2, there is no need to always put dict_t, ctxt_table_t , lm_t and fillpen_t as arguments 
-*/
-
-typedef struct {
-
-    lattice_t *lattice;  /**< An array of lattice entries. frm_lat_start[f] represnet the first entry for the frame f */
-    s3latid_t *frm_latstart;	/**< frm_latstart[f] = first lattice entry in frame f */
-
-    int32 lat_alloc;     /**< Number of allocated entries */
-    int32 n_lat_entry;   /**< Number of lattice entries */
-    int32 n_cand;        /**< If number of candidate is larger than
-                            zero, The then decoder is workin in
-                            "lattice-mode", which means using the
-                            candidate in the lattice to constrain the
-                            search? */
-    int32 n_frms_alloc;  /**< Number of frames allocated in frm_latstart */
-    int32 n_frm;         /**< Number of frames searched */
-
-} latticehist_t;
-
-
-#define latticehist_n_cand(hist)		((hist)->n_cand)
-#define latticehist_lat_alloc(hist)		((hist)->lat_alloc)
-#define latticehist_n_lat_entry(hist)		((hist)->n_lat_entry)
-
-  
-/**
- * Initialization of lattice history table 
- */
-  
-latticehist_t *latticehist_init(int32 init_alloc_size, /**<Initial allocation size */
-				int32 num_frames       /**<Number of frames in represented in the lattice*/
-    );
-
-/**
-   Free lattice history table 
-*/
-void latticehist_free(latticehist_t *lat /**< The latticie history table */
-    );
-
-/*
- * Reset a lattice history table 
- */
-   
-void latticehist_reset(latticehist_t *lat /**< The lattice history table*/
-    );
-
-/**
- * Dump the lattice history table
- */
-void latticehist_dump (latticehist_t *lathist,  /**< A table of lattice entries */
-		       FILE *fp,                /**< File pointer where one would want to dump the lattice */
-		       dict_t *dict,            /**< The dictionary*/
-		       ctxt_table_t *ct,        /**< Context table */
-		       int32 dumpRC             /**< Whether we whould dump all the scores and histories for right context */
-    );
-
-/**
- * Enter a entry into lattice 
- */
-void lattice_entry (latticehist_t *lathist, /**< A table of lattice entries */
-		    s3wid_t w,              /**< Word ID to enter. */
-		    int32 f,                /**< current frame number */
-		    int32 score,            /**< The score to enter, usually it is the score of the final state of hmm */
-		    s3latid_t history,      /**< The last lattice entry to enter, usually the entry of the final state of hmm is used. */
-		    int32 rc,                /**< Right context of the HMM*/ 
-		    ctxt_table_t *ct,       /**< A context table */
-		    dict_t *dict            /**< A dictionary */
-    );
-
-
-void two_word_history (latticehist_t *lathist, 
-		       s3latid_t l, s3wid_t *w0, s3wid_t *w1, dict_t *dict);
-
-/**
- * Find path score for lattice entry l for the given right context word.
- * If context word is BAD_S3WID it's a wild card; return the best path score.
- */
-
-int32 lat_pscr_rc (latticehist_t *lathist, /**< A table of lattice entries */
-		   s3latid_t l,            /**< lattice ID */
-		   s3wid_t w_rc,           /**< The right context word */
-		   ctxt_table_t *ct,       /**< Context table */
-		   dict_t *dict            /**< The dictionary */
-    );
-
-/**
- * Find path history for lattice entry l for the given right context word.
- * If context word is BAD_S3WID it's a wild card; return the phone history.
- */
-s3latid_t lat_pscr_rc_history (latticehist_t *lathist, /**< A table of lattice entries */
-			       s3latid_t l,  /**< lattice ID */
-			       s3wid_t w_rc,  /**< The right context word */
-			       ctxt_table_t *ct,  /**< Context table */
-			       dict_t *dict     /** The dictionary */
-    );
-
-int32 lat_seg_lscr (latticehist_t *lathist,
-		    s3latid_t l,
-#ifdef OLD_LM_API
-		    lm_t *lm,
-#else
-		    ngram_model_t *lm,
-#endif
-		    dict_t *dict,
-		    ctxt_table_t *ct,
-		    fillpen_t *fillpen,
-		    int32 isCand);
-
-
-/**
- * Find LM score for transition into lattice entry l.
- */
-
-void lat_seg_ascr_lscr (latticehist_t *lathist, /**< A table of lattice entries */
-			s3latid_t l,  /**< lattice ID */
-			s3wid_t w_rc, /**< The right context word */
-			int32 *ascr,  /**< Out: Acoustic score */
-			int32 *lscr,  /**< Out: language score */
-#ifdef OLD_LM_API
-			lm_t *lm,     /**< LM */
-#else
-			ngram_model_t *lm,
-#endif
-			dict_t *dict,  /**< Dictionary */
-			ctxt_table_t *ct,  /** Context table */
-			fillpen_t *fillpen /**< filler penalty */
-    );
-
-
-/**
-   Get the final entry of the lattice
-*/
-s3latid_t lat_final_entry ( latticehist_t* lathist, /**< A table of lattice entries */
-			    dict_t* dict, /** The dictioanry */
-			    int32 curfrm, /**< The current  frame */
-			    char* uttid /** Utterance ID */
-    );
-			      
-/**
- * Backtrace the lattice and get back a search hypothesis. 
- */
-srch_hyp_t *lattice_backtrace (latticehist_t *lathist, /**< A table of lattice entries */
-			       s3latid_t l,   /**< The lattice ID */
-			       s3wid_t w_rc,   /**< The word on the right */
-			       srch_hyp_t **hyp, /**< Output: final hypothesis */ 
-#ifdef OLD_LM_API
-			       lm_t *lm,       /**< LM */
-#else
-			       ngram_model_t *lm,
-#endif
-			       dict_t *dict,   /**< Dictionary */
-			       ctxt_table_t *ct,  /**< Context table */
-			       fillpen_t *fillpen /**< filler penalty struct */
-    );
-
-/**
- * Build a DAG from the lattice: each unique <word-id,start-frame> is a node, i.e. with
- * a single start time but it can represent several end times.  Links are created
- * whenever nodes are adjacent in time.
- * dagnodes_list = linear list of DAG nodes allocated, ordered such that nodes earlier
- * in the list can follow nodes later in the list, but not vice versa:  Let two DAG
- * nodes d1 and d2 have start times sf1 and sf2, and end time ranges [fef1..lef1] and
- * [fef2..lef2] respectively.  If d1 appears later than d2 in dag.list, then
- * fef2 >= fef1, because d2 showed up later in the word lattice.  If there is a DAG
- * edge from d1 to d2, then sf1 > fef2.  But fef2 >= fef1, so sf1 > fef1.  Reductio ad
- * absurdum.
- */
-dag_t * latticehist_dag_build(latticehist_t * vh, glist_t hyp, dict_t * dict,
-#ifdef OLD_LM_API
-                              lm_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
-#else
-                              ngram_model_t *lm, ctxt_table_t *ctxt, fillpen_t *fpen,
-#endif
-                              int32 endid, cmd_ln_t *config, logmath_t *logmath);
-
-/** 
- * Write a dag from latticehist_t
- */
-int32 latticehist_dag_write (latticehist_t *lathist,  /**< A table off lattice entries */
-                             const char *filename,
-			     dag_t *dag,
-#ifdef OLD_LM_API
-			     lm_t *lm,
-#else
-			     ngram_model_t *lm,
-#endif
-			     dict_t *dict, 
-			     ctxt_table_t *ct, 
-			     fillpen_t *fillpen
-    );
-
 #if 0
 { /* Stop indent from complaining */
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9209
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9209&view=rev
Author:   dhdfu
Date:     2009-07-11 06:53:03 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Building blocks for Sphinx3 search mostly compiling now

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/lextree.h
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-11 06:53:03 UTC (rev 9209)
@@ -10,6 +10,7 @@
 	blkarray_list.c				\
 	ctxt_table.c				\
 	dict.c					\
+	dict2pid.c				\
 	fsg_history.c				\
 	fsg_lextree.c				\
 	fsg_search.c				\
@@ -32,6 +33,7 @@
 	tmat.c					\
 	tst_search.c				\
 	vector.c				\
+	vithist.c				\
 	pocketsphinx.c
 
 noinst_HEADERS =				\
@@ -42,6 +44,7 @@
 	blkarray_list.h				\
 	ctxt_table.h				\
 	dict.h					\
+	dict2pid.h				\
 	fsg_history.h				\
 	fsg_lextree.h				\
 	fsg_search_internal.h			\
@@ -63,7 +66,8 @@
 	s3_dict.h				\
 	tmat.h					\
 	tst_search.h				\
-	vector.h
+	vector.h				\
+	vithist.h
 
 INCLUDES = -I$(top_srcdir)/include \
            -I$(top_builddir)/include 

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-11 06:53:03 UTC (rev 9209)
@@ -93,7 +93,6 @@
 #include <string.h>
 
 #include "dict2pid.h"
-#include "logs3.h"
 
 
 /** \file dict2pid.c
@@ -110,7 +109,7 @@
  * Return the generated glist.
  */
 static glist_t
-ldiph_comsseq(mdef_t * mdef,                /**< a model definition*/
+ldiph_comsseq(bin_mdef_t * mdef,                /**< a model definition*/
               int32 b,                  /**< base phone */
               int32 r                   /**< right context */
     )
@@ -119,13 +118,13 @@
     glist_t g;
 
     g = NULL;
-    for (l = 0; l < mdef_n_ciphone(mdef); l++) {
-        p = mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
+    for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
+        p = bin_mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
                           (s3cipid_t) r, WORD_POSN_BEGIN);
 
         if (IS_S3PID(p)) {
             gnode_t *gn;
-            ssid = mdef_pid2ssid(mdef, p);
+            ssid = bin_mdef_pid2ssid(mdef, p);
             for (gn = g; gn; gn = gnode_next(gn))
                 if (gnode_int32(gn) == ssid)
                     break;
@@ -134,7 +133,7 @@
         }
     }
     if (!g)
-        g = glist_add_int32(g, mdef_pid2ssid(mdef, b));
+        g = glist_add_int32(g, bin_mdef_pid2ssid(mdef, b));
 
     return g;
 }
@@ -146,19 +145,19 @@
  * Return the generated glist.
  */
 static glist_t
-rdiph_comsseq(mdef_t * mdef, int32 b, int32 l)
+rdiph_comsseq(bin_mdef_t * mdef, int32 b, int32 l)
 {
     int32 r, p, ssid;
     glist_t g;
 
     g = NULL;
-    for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-        p = mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
+    for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+        p = bin_mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
                           (s3cipid_t) r, WORD_POSN_END);
 
         if (IS_S3PID(p)) {
             gnode_t *gn;
-            ssid = mdef_pid2ssid(mdef, p);
+            ssid = bin_mdef_pid2ssid(mdef, p);
             for (gn = g; gn; gn = gnode_next(gn))
                 if (gnode_int32(gn) == ssid)
                     break;
@@ -167,7 +166,7 @@
         }
     }
     if (!g)
-        g = glist_add_int32(g, mdef_pid2ssid(mdef, b));
+        g = glist_add_int32(g, bin_mdef_pid2ssid(mdef, b));
 
     return g;
 }
@@ -179,20 +178,20 @@
  * Return the generated glist.
  */
 static glist_t
-single_comsseq(mdef_t * mdef, int32 b)
+single_comsseq(bin_mdef_t * mdef, int32 b)
 {
     int32 l, r, p, ssid;
     glist_t g;
 
     g = NULL;
-    for (l = 0; l < mdef_n_ciphone(mdef); l++) {
-        for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-            p = mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
+    for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
+        for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+            p = bin_mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
                               (s3cipid_t) r, WORD_POSN_SINGLE);
 
             if (IS_S3PID(p)) {
                 gnode_t *gn;
-                ssid = mdef_pid2ssid(mdef, p);
+                ssid = bin_mdef_pid2ssid(mdef, p);
                 for (gn = g; gn; gn = gnode_next(gn))
                     if (gnode_int32(gn) == ssid)
                         break;
@@ -202,7 +201,7 @@
         }
     }
     if (!g)
-        g = glist_add_int32(g, mdef_pid2ssid(mdef, b));
+        g = glist_add_int32(g, bin_mdef_pid2ssid(mdef, b));
 
     return g;
 }
@@ -214,19 +213,19 @@
  * for basephone b.  Return the generated glist.
  */
 static glist_t
-single_lc_comsseq(mdef_t * mdef, int32 b, int32 l)
+single_lc_comsseq(bin_mdef_t * mdef, int32 b, int32 l)
 {
     int32 r, p, ssid;
     glist_t g;
 
     g = NULL;
-    for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-        p = mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
+    for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+        p = bin_mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
                           (s3cipid_t) r, WORD_POSN_SINGLE);
 
         if (IS_S3PID(p)) {
             gnode_t *gn;
-            ssid = mdef_pid2ssid(mdef, p);
+            ssid = bin_mdef_pid2ssid(mdef, p);
             for (gn = g; gn; gn = gnode_next(gn))
                 if (gnode_int32(gn) == ssid)
                     break;
@@ -235,7 +234,7 @@
         }
     }
     if (!g)
-        g = glist_add_int32(g, mdef_pid2ssid(mdef, b));
+        g = glist_add_int32(g, bin_mdef_pid2ssid(mdef, b));
 
     return g;
 }
@@ -250,19 +249,19 @@
  */
 
 static glist_t
-single_rc_comsseq(mdef_t * mdef, int32 b, int32 r)
+single_rc_comsseq(bin_mdef_t * mdef, int32 b, int32 r)
 {
     int32 l, p, ssid;
     glist_t g;
 
     g = NULL;
-    for (l = 0; l < mdef_n_ciphone(mdef); l++) {
-        p = mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
+    for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
+        p = bin_mdef_phone_id(mdef, (s3cipid_t) b, (s3cipid_t) l,
                           (s3cipid_t) r, WORD_POSN_SINGLE);
 
         if (IS_S3PID(p)) {
             gnode_t *gn;
-            ssid = mdef_pid2ssid(mdef, p);
+            ssid = bin_mdef_pid2ssid(mdef, p);
             for (gn = g; gn; gn = gnode_next(gn))
                 if (gnode_int32(gn) == ssid)
                     break;
@@ -271,7 +270,7 @@
         }
     }
     if (!g)
-        g = glist_add_int32(g, mdef_pid2ssid(mdef, b));
+        g = glist_add_int32(g, bin_mdef_pid2ssid(mdef, b));
 
     return g;
 }
@@ -282,7 +281,7 @@
  * Convert the glist of ssids to a composite sseq id.  Return the composite ID.
  */
 static s3ssid_t
-ssidlist2comsseq(glist_t g, mdef_t * mdef, dict2pid_t * dict2pid,
+ssidlist2comsseq(glist_t g, bin_mdef_t * mdef, dict2pid_t * dict2pid,
                  hash_table_t * hs, /* For composite states */
                  hash_table_t * hp) /* For composite senone seq */
 {                
@@ -297,15 +296,15 @@
 
     /* Space for list of senones for each state, derived from the given glist */
     sen =
-        (s3senid_t **) ckd_calloc(mdef_n_emit_state(mdef),
+        (s3senid_t **) ckd_calloc(bin_mdef_n_emit_state(mdef),
                                   sizeof(s3senid_t *));
-    for (i = 0; i < mdef_n_emit_state(mdef); i++) {
+    for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
         sen[i] = (s3senid_t *) ckd_calloc(n + 1, sizeof(s3senid_t));
         sen[i][0] = BAD_S3SENID;        /* Sentinel */
     }
     /* Space for composite senone ID for each state position */
     comsenid =
-        (s3senid_t *) ckd_calloc(mdef_n_emit_state(mdef),
+        (s3senid_t *) ckd_calloc(bin_mdef_n_emit_state(mdef),
                                  sizeof(s3senid_t));
 
     /* Expand g into an array of arrays of unique senone IDs, one for
@@ -314,7 +313,7 @@
         ssid = gnode_int32(gn);
 
         /* Expand ssid into individual states (senones); insert in sen[][] if not present */
-        for (i = 0; i < mdef_n_emit_state(mdef); i++) {
+        for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
             s = mdef->sseq[ssid][i];
 
             for (j = 0; (IS_S3SENID(sen[i][j])) && (sen[i][j] != s); j++);
@@ -326,7 +325,7 @@
     }
 
     /* Convert senones list for each state position into composite state */
-    for (i = 0; i < mdef_n_emit_state(mdef); i++) {
+    for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
         /* Count number of unique senones for this state. */
         for (j = 0; IS_S3SENID(sen[i][j]); j++);
         assert(j > 0);
@@ -397,7 +396,7 @@
 
 
 static void
-compress_right_context_tree(mdef_t * mdef, dict2pid_t * d2p)
+compress_right_context_tree(bin_mdef_t * mdef, dict2pid_t * d2p)
 {
     int32 n_ci;
     int32 b, l, r;
@@ -455,7 +454,7 @@
 }
 
 static void
-compress_left_right_context_tree(mdef_t * mdef, dict2pid_t * d2p)
+compress_left_right_context_tree(bin_mdef_t * mdef, dict2pid_t * d2p)
 {
     int32 n_ci;
     int32 b, l, r;
@@ -516,7 +515,7 @@
    because the compressed map has not been checked. 
 */
 int32
-get_rc_nssid(dict2pid_t * d2p, s3wid_t w, dict_t * dict)
+get_rc_nssid(dict2pid_t * d2p, s3wid_t w, s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, lc;
@@ -540,7 +539,7 @@
 }
 
 s3cipid_t *
-dict2pid_get_rcmap(dict2pid_t * d2p, s3wid_t w, dict_t * dict)
+dict2pid_get_rcmap(dict2pid_t * d2p, s3wid_t w, s3dict_t * dict)
 {
     int32 pronlen;
     s3cipid_t b, lc;
@@ -583,7 +582,7 @@
 
 /* RAH 4.16.01 This code has several leaks that must be fixed */
 dict2pid_t *
-dict2pid_build(mdef_t * mdef, dict_t * dict, int32 is_composite, logmath_t *logmath)
+dict2pid_build(bin_mdef_t * mdef, s3dict_t * dict, int32 is_composite, logmath_t *logmath)
 {
     dict2pid_t *dict2pid;
     s3ssid_t *internal, **ldiph, **rdiph, *single;
@@ -603,9 +602,9 @@
 
     dict2pid = (dict2pid_t *) ckd_calloc(1, sizeof(dict2pid_t));
 
-    dict2pid->n_dictsize = dict_size(dict);
+    dict2pid->n_dictsize = s3dict_size(dict);
     dict2pid->internal =
-        (s3ssid_t **) ckd_calloc(dict_size(dict), sizeof(s3ssid_t *));
+        (s3ssid_t **) ckd_calloc(s3dict_size(dict), sizeof(s3ssid_t *));
     dict2pid->ldiph_lc =
         (s3ssid_t ***) ckd_calloc_3d(mdef->n_ciphone, mdef->n_ciphone,
                                      mdef->n_ciphone, sizeof(s3ssid_t));
@@ -649,11 +648,11 @@
 			HASH_CASE_YES);
     hp = hash_table_new(mdef->n_ciphone * mdef->n_ciphone, HASH_CASE_YES);
 
-    for (w = 0, n = 0; w < dict_size(dict); w++) {
-        pronlen = dict_pronlen(dict, w);
+    for (w = 0, n = 0; w < s3dict_size(dict); w++) {
+        pronlen = s3dict_pronlen(dict, w);
         if (pronlen < 0)
             E_FATAL("Pronunciation-length(%s)= %d\n",
-                    dict_wordstr(dict, w), pronlen);
+                    s3dict_wordstr(dict, w), pronlen);
         n += pronlen;
     }
 
@@ -686,9 +685,9 @@
         single[b] = BAD_S3SSID;
     }
 
-    for (w = 0; w < dict_size(dict); w++) {
+    for (w = 0; w < s3dict_size(dict); w++) {
         dict2pid->internal[w] = internal;
-        pronlen = dict_pronlen(dict, w);
+        pronlen = s3dict_pronlen(dict, w);
 
         if (pronlen >= 2) {
 
@@ -697,8 +696,8 @@
 	    */
 
             /* Find or create a composite senone sequence for b(?,r) */
-            b = dict_pron(dict, w, 0);
-            r = dict_pron(dict, w, 1);
+            b = s3dict_pron(dict, w, 0);
+            r = s3dict_pron(dict, w, 1);
             if (NOT_S3SSID(ldiph[b][r])) {
 
                 if (dict2pid->is_composite) {
@@ -711,11 +710,11 @@
                 }
 
                 /* Record all possible ssids for b(?,r) */
-                for (l = 0; l < mdef_n_ciphone(mdef); l++) {
-                    p = mdef_phone_id_nearest(mdef, (s3cipid_t) b,
+                for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
+                    p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                               (s3cipid_t) l, (s3cipid_t) r,
                                               WORD_POSN_BEGIN);
-                    dict2pid->ldiph_lc[b][r][l] = mdef_pid2ssid(mdef, p);
+                    dict2pid->ldiph_lc[b][r][l] = bin_mdef_pid2ssid(mdef, p);
                 }
             }
 
@@ -730,12 +729,12 @@
             for (i = 1; i < pronlen - 1; i++) {
                 l = b;
                 b = r;
-                r = dict_pron(dict, w, i + 1);
+                r = s3dict_pron(dict, w, i + 1);
 
-                p = mdef_phone_id_nearest(mdef, (s3cipid_t) b,
+                p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                           (s3cipid_t) l, (s3cipid_t) r,
                                           WORD_POSN_INTERNAL);
-                internal[i] = mdef_pid2ssid(mdef, p);
+                internal[i] = bin_mdef_pid2ssid(mdef, p);
             }
 
             /** This part will take care of the initialization of 
@@ -753,11 +752,11 @@
                     glist_free(g);
                 }
 
-                for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-                    p = mdef_phone_id_nearest(mdef, (s3cipid_t) b,
+                for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+                    p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                               (s3cipid_t) l, (s3cipid_t) r,
                                               WORD_POSN_BEGIN);
-                    dict2pid->rdiph_rc[b][l][r] = mdef_pid2ssid(mdef, p);
+                    dict2pid->rdiph_rc[b][l][r] = bin_mdef_pid2ssid(mdef, p);
                 }
             }
 
@@ -769,7 +768,7 @@
         }
         else if (pronlen == 1) {
 
-            b = dict_pron(dict, w, 0);
+            b = s3dict_pron(dict, w, 0);
 
             if (dict2pid->is_composite) {
                 assert(dict2pid->single_lc);
@@ -783,7 +782,7 @@
                     glist_free(g);
 
                     /* Record all possible *composite* ssids for b(?,?) */
-                    for (l = 0; l < mdef_n_ciphone(mdef); l++) {
+                    for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
                         g = single_lc_comsseq(mdef, b, l);
                         dict2pid->single_lc[b][l] =
                             ssidlist2comsseq(g, mdef, dict2pid, hs, hp);
@@ -795,14 +794,14 @@
             else {
                 /* Don't compress but build table directly */
                 if (NOT_S3SSID(single[b])) {
-                    for (l = 0; l < mdef_n_ciphone(mdef); l++) {
-                        for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-                            p = mdef_phone_id_nearest(mdef, (s3cipid_t) b,
+                    for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
+                        for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+                            p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                                       (s3cipid_t) l,
                                                       (s3cipid_t) r,
                                                       WORD_POSN_SINGLE);
                             dict2pid->lrdiph_rc[b][l][r] =
-                                mdef_pid2ssid(mdef, p);
+                                bin_mdef_pid2ssid(mdef, p);
                         }
                     }
                 }
@@ -910,13 +909,8 @@
             sen = dict2pid->comstate[i];
 
             for (j = 0; IS_S3SENID(sen[j]); j++);
-#if 0
-            /* if comstate i has N states, its weight= (1/N^2) (Major Hack!!) */
-            dict2pid->comwt[i] = -(logs3(logmath, (float64) j) << 1);
-#else
             /* if comstate i has N states, its weight= 1/N */
-            dict2pid->comwt[i] = -logs3(logmath, (float64) j);
-#endif
+            dict2pid->comwt[i] = -logmath_log(logmath, (float64) j);
         }
     }
 
@@ -1051,7 +1045,7 @@
  * Mark senones active based on a set of active composite senones.
  */
 void
-dict2pid_comsseq2sen_active(dict2pid_t * d2p, mdef_t * mdef,
+dict2pid_comsseq2sen_active(dict2pid_t * d2p, bin_mdef_t * mdef,
                             uint8 * comssid, uint8 * sen)
 {
     int32 ss, cs, i, j;
@@ -1061,7 +1055,7 @@
         if (comssid[ss]) {
             csp = d2p->comsseq[ss];
 
-            for (i = 0; i < mdef_n_emit_state(mdef); i++) {
+            for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
                 cs = csp[i];
                 sp = d2p->comstate[cs];
 
@@ -1074,16 +1068,16 @@
 
 
 void
-dict2pid_dump(FILE * fp, dict2pid_t * d2p, mdef_t * mdef, dict_t * dict)
+dict2pid_dump(FILE * fp, dict2pid_t * d2p, bin_mdef_t * mdef, s3dict_t * dict)
 {
     int32 w, p, pronlen;
     int32 i, j, b, l, r;
 
     fprintf(fp, "# INTERNAL (wd comssid ssid ssid ... ssid comssid)\n");
-    for (w = 0; w < dict_size(dict); w++) {
-        fprintf(fp, "%30s ", dict_wordstr(dict, w));
+    for (w = 0; w < s3dict_size(dict); w++) {
+        fprintf(fp, "%30s ", s3dict_wordstr(dict, w));
 
-        pronlen = dict_pronlen(dict, w);
+        pronlen = s3dict_pronlen(dict, w);
         for (p = 0; p < pronlen; p++)
             fprintf(fp, " %5d", d2p->internal[w][p]);
         fprintf(fp, "\n");
@@ -1091,21 +1085,21 @@
     fprintf(fp, "#\n");
 
     fprintf(fp, "# LDIPH_LC (b r l ssid)\n");
-    for (b = 0; b < mdef_n_ciphone(mdef); b++) {
-        for (r = 0; r < mdef_n_ciphone(mdef); r++) {
-            for (l = 0; l < mdef_n_ciphone(mdef); l++) {
+    for (b = 0; b < bin_mdef_n_ciphone(mdef); b++) {
+        for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
+            for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
                 if (IS_S3SSID(d2p->ldiph_lc[b][r][l]))
-                    fprintf(fp, "%6s %6s %6s %5d\n", mdef_ciphone_str(mdef, (s3cipid_t) b), mdef_ciphone_str(mdef, (s3cipid_t) r), mdef_ciphone_str(mdef, (s3cipid_t) l), d2p->ldiph_lc[b][r][l]);      /* RAH, ldiph_lc is returning an int32, %d expects an int16 */
+                    fprintf(fp, "%6s %6s %6s %5d\n", bin_mdef_ciphone_str(mdef, (s3cipid_t) b), bin_mdef_ciphone_str(mdef, (s3cipid_t) r), bin_mdef_ciphone_str(mdef, (s3cipid_t) l), d2p->ldiph_lc[b][r][l]);      /* RAH, ldiph_lc is returning an int32, %d expects an int16 */
             }
         }
     }
     fprintf(fp, "#\n");
 
     fprintf(fp, "# SINGLE_LC (b l comssid)\n");
-    for (b = 0; b < mdef_n_ciphone(mdef); b++) {
-        for (l = 0; l < mdef_n_ciphone(mdef); l++) {
+    for (b = 0; b < bin_mdef_n_ciphone(mdef); b++) {
+        for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
             if (IS_S3SSID(d2p->single_lc[b][l]))
-                fprintf(fp, "%6s %6s %5d\n", mdef_ciphone_str(mdef, (s3cipid_t) b), mdef_ciphone_str(mdef, (s3cipid_t) l), d2p->single_lc[b][l]);       /* RAH, single_lc is returning an int32, %d expects an int16 */
+                fprintf(fp, "%6s %6s %5d\n", bin_mdef_ciphone_str(mdef, (s3cipid_t) b), bin_mdef_ciphone_str(mdef, (s3cipid_t) l), d2p->single_lc[b][l]);       /* RAH, single_lc is returning an int32, %d expects an int16 */
         }
     }
     fprintf(fp, "#\n");
@@ -1113,7 +1107,7 @@
     fprintf(fp, "# SSEQ %d (senid senid ...)\n", mdef->n_sseq);
     for (i = 0; i < mdef->n_sseq; i++) {
         fprintf(fp, "%5d ", i);
-        for (j = 0; j < mdef_n_emit_state(mdef); j++)
+        for (j = 0; j < bin_mdef_n_emit_state(mdef); j++)
             fprintf(fp, " %5d", mdef->sseq[i][j]);
         fprintf(fp, "\n");
     }
@@ -1122,7 +1116,7 @@
     fprintf(fp, "# COMSSEQ %d (comstate comstate ...)\n", d2p->n_comsseq);
     for (i = 0; i < d2p->n_comsseq; i++) {
         fprintf(fp, "%5d ", i);
-        for (j = 0; j < mdef_n_emit_state(mdef); j++)
+        for (j = 0; j < bin_mdef_n_emit_state(mdef); j++)
             fprintf(fp, " %5d", d2p->comsseq[i][j]);
         fprintf(fp, "\n");
     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-11 06:53:03 UTC (rev 9209)
@@ -106,7 +106,7 @@
 
 #include "s3types.h"
 #include "bin_mdef.h"
-#include "s3dict.h"
+#include "s3_dict.h"
 #include "ctxt_table.h"
 
 /** \file dict2pid.h
@@ -240,7 +240,7 @@
 
 /** Build the dict2pid structure for the given model/dictionary */
 dict2pid_t *dict2pid_build(bin_mdef_t *mdef,   /**< A  model definition*/
-                           dict_t *dict,       /**< An initialized dictionary */
+                           s3dict_t *dict,       /**< An initialized dictionary */
                            int32 is_composite, /**< Whether composite triphones will be built */
                            logmath_t *logmath
     );
@@ -271,7 +271,7 @@
 void dict2pid_dump(FILE *fp,        /**< In: a file pointer */
                    dict2pid_t *d2p, /**< In: a dict2pid_t structure */
                    bin_mdef_t *mdef,    /**< In: a bin_mdef_t structure*/
-                   dict_t *dict     /**< In: a dictionary structure */
+                   s3dict_t *dict     /**< In: a dictionary structure */
     );
 
 /** Report a dict2pid data structure */
@@ -283,7 +283,7 @@
 */
 int32 get_rc_nssid(dict2pid_t *d2p,  /**< In: a dict2pid */
 		   s3wid_t w,        /**< In: a wid */
-		   dict_t *dict      /**< In: a dictionary */
+		   s3dict_t *dict      /**< In: a dictionary */
     );
 
 /**
@@ -291,7 +291,7 @@
 */
 s3cipid_t* dict2pid_get_rcmap(dict2pid_t *d2p,  /**< In: a dict2pid */
 			      s3wid_t w,        /**< In: a wid */
-			      dict_t *dict      /**< In: a dictionary */
+			      s3dict_t *dict      /**< In: a dictionary */
     );
 
 #if 0

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-11 06:53:03 UTC (rev 9209)
@@ -114,20 +114,14 @@
 #include <stdio.h>
 
 #include <bitvec.h>
-#include <s3types.h>
+#include <ngram_model.h>
 #include <glist.h>
-#include "kbcore.h"
+
+#include "s3types.h"
 #include "hmm.h"
 #include "vithist.h"
-#include "ascr.h"
-#include "fast_algo_struct.h"
 #include "dict.h"
 #include "mdef.h"
-#ifdef OLD_LM_API
-#include "lm.h"
-#else
-#include <ngram_model.h>
-#include "wid.h"
 
 #endif
 #ifdef __cplusplus
@@ -279,11 +273,7 @@
  */
 lextree_t* lextree_init(
     kbcore_t *kbcore, /**< In: Initialized kbcore */
-#ifdef OLD_LM_API
-    lm_t* lm,         /**< In: LM, to decide which set of word list is used */
-#else
     ngram_model_t* lm,
-#endif
     const char *lmname,     /**< In: LM name */
     int32 istreeUgProb, /**< In: Decide whether LM factoring is used or not */
     int32 bReport,     /**< In: Whether to report the progress so far. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-11 06:53:03 UTC (rev 9209)
@@ -129,10 +129,9 @@
 #include <heap.h>
 
 #include "vithist.h"
-#include "lextree.h"
 
 void
-vh_lmstate_display(vh_lmstate_t * vhl, dict_t * dict)
+vh_lmstate_display(vh_lmstate_t * vhl, s3dict_t * dict)
 {
     /* TODO: Also translate wid to string if dict is not NULL */
     E_INFO("lwid[0] %d\n", vhl->lm3g.lwid[0]);
@@ -141,7 +140,7 @@
 }
 
 void
-vithist_entry_display(vithist_entry_t * ve, dict_t * dict)
+vithist_entry_display(vithist_entry_t * ve, s3dict_t * dict)
 {
     E_INFO("Word ID %d \n", ve->wid);
     E_INFO("Sf %d Ef %d \n", ve->sf, ve->ef);
@@ -154,16 +153,9 @@
 
 
 vithist_t *
-vithist_init(kbcore_t * kbc, int32 wbeam, int32 bghist, int32 report)
+vithist_init(int32 nword, int32 n_ci, int32 wbeam, int32 bghist, int32 report)
 {
     vithist_t *vh;
-#ifdef OLD_LM_API
-    lmset_t *lmset;
-    int i;
-#else
-    ngram_model_t *lmset;
-#endif
-    dict_t *dict;
 
     int max = -1;
 
@@ -187,23 +179,10 @@
     vh->wbeam = wbeam;
     vh->bghist = bghist;
 
-    lmset = kbcore_lmset(kbc);
-    dict = kbcore_dict(kbc);
-
-#ifdef OLD_LM_API
-    for (i = 0; i < kbc->lmset->n_lm; i++) {
-        if (lm_n_ug(lmset->lmarray[i]) > max) {
-            max = lm_n_ug(lmset->lmarray[i]);
-        }
-    }
-#else
-    max = ngram_model_get_counts(lmset)[0];
-#endif
-
     E_INFO("Allocation for Viterbi history, lmset-final size: %d\n", max);
     vh->lms2vh_root =
-        (vh_lms2vh_t **) ckd_calloc(max, sizeof(vh_lms2vh_t *));
-    vh->n_ci = mdef_n_ciphone(kbc->mdef);
+        (vh_lms2vh_t **) ckd_calloc(nword, sizeof(vh_lms2vh_t *));
+    vh->n_ci = n_ci;
 
     vh->lwidlist = NULL;
 
@@ -303,17 +282,10 @@
 
 
 int32
-vithist_utt_begin(vithist_t * vh, kbcore_t * kbc)
+vithist_utt_begin(vithist_t * vh, int32 startwid)
 {
     vithist_entry_t *ve;
-    dict_t *dict;
-#ifdef OLD_LM_API
-    lm_t *lm;
 
-    lm = kbcore_lm(kbc);
-#endif
-    dict = kbcore_dict(kbc);
-
     assert(vh->n_entry == 0);
     assert(vh->entry[0] == NULL);
     assert(vh->lwidlist == NULL);
@@ -321,7 +293,7 @@
     /* Create an initial dummy <s> entry.  This is the root for the utterance */
     ve = vithist_entry_alloc(vh);
 
-    ve->wid = dict_startwid(dict);
+    ve->wid = startwid;
     ve->sf = -1;
     ve->ef = -1;
     ve->ascr = 0;
@@ -330,13 +302,8 @@
     ve->path.pred = -1;
     ve->type = 0;
     ve->valid = 1;
-#ifdef OLD_LM_API
-    ve->lmstate.lm3g.lwid[0] = lm_startwid(lm);
-    ve->lmstate.lm3g.lwid[1] = BAD_LMWID(lm);
-#else
-    ve->lmstate.lm3g.lwid[0] = ngram_wid(kbcore_lm(kbc), S3_START_WORD);
+    ve->lmstate.lm3g.lwid[0] = startwid;
     ve->lmstate.lm3g.lwid[1] = NGRAM_INVALID_WID;
-#endif
     vh->n_frm = 0;
     vh->frame_start[0] = 1;
     vh->bestscore[0] = MAX_NEG_INT32;
@@ -408,7 +375,8 @@
  */
 void
 vithist_enter(vithist_t * vh,              /**< The history table */
-              kbcore_t * kbc,              /**< a KB core */
+              s3dict_t *dict,              /**< Dictionary */
+              dict2pid_t *dict2pid,        /**< Context table mapping thing */
               vithist_entry_t * tve,       /**< an input vithist element */
               int32 comp_rc                /**< a compressed rc. If it is the actual rc, it won't work. */
     )
@@ -416,11 +384,9 @@
     vithist_entry_t *ve;
     int32 vhid;
     int32 n_ci;
-    dict_t *d;
     int32 n_rc_info;
     int32 old_n_rc_info;
 
-    d = kbc->dict;
     n_ci = vh->n_ci;
     /* Check if an entry with this LM state already exists in current frame */
     vhid = vh_lmstate_find(vh, &(tve->lmstate));
@@ -443,7 +409,7 @@
         if (comp_rc != -1) {
             if (ve->rc == NULL) {
                 ve->n_rc =
-                    get_rc_nssid(kbc->dict2pid, ve->wid, kbc->dict);
+                    get_rc_nssid(dict2pid, ve->wid, dict);
                 /* Always allocate n_ci for rc_info */
                 ve->rc = ckd_calloc(vh->n_ci, sizeof(*ve->rc));
                 clean_up_rc_info(ve->rc, ve->n_rc);
@@ -502,16 +468,13 @@
 
 
 void
-vithist_rescore(vithist_t * vh, kbcore_t * kbc,
+vithist_rescore(vithist_t * vh, ngram_model_t *lm,
+                s3dict_t *dict, dict2pid_t *dict2pid,
                 s3wid_t wid, int32 ef, int32 score,
                 int32 pred, int32 type, int32 rc)
 {
     vithist_entry_t *pve, tve;
-#ifdef OLD_LM_API
-    s3lmwid32_t lwid;
-#else
     int32 lwid;
-#endif
     int32 se, fe;
     int32 i;
 
@@ -540,21 +503,18 @@
     tve.n_rc = 0;
 
 
-    if (dict_filler_word(kbcore_dict(kbc), wid)) {
+    if (s3dict_filler_word(dict, wid)) {
 
         tve.path.score = score;
-        tve.lscr = fillpen(kbcore_fillpen(kbc), wid);
+        /* FIXME: not sure what to do about filler penalty thing yet. */
+        /*tve.lscr = fillpen(kbcore_fillpen(kbc), wid); */
         tve.path.score += tve.lscr;
 
         tve.path.pred = pred;
         tve.lmstate.lm3g = pve->lmstate.lm3g;
-        vithist_enter(vh, kbc, &tve, rc);
+        vithist_enter(vh, dict, dict2pid, &tve, rc);
     }
     else {
-#ifndef OLD_LM_API
-        int32 n_used;
-#endif
-
         if (pred == 0) {            /* Special case for the initial <s> entry */
             se = 0;
             fe = 1;
@@ -568,11 +528,8 @@
            So  pve becomes the w_{n-2}. 
          */
 
-#ifdef OLD_LM_API
-        lwid = kbc->lmset->cur_lm->dict2lmwid[wid];
-#else
-        lwid = ngram_wid(kbcore_lm(kbc), dict_wordstr(kbcore_dict(kbc), dict_basewid(kbcore_dict(kbc), wid)));
-#endif
+        lwid = ngram_wid(lm, s3dict_wordstr(dict,
+                                            s3dict_basewid(dict, wid)));
 
         tve.lmstate.lm3g.lwid[0] = lwid;
 
@@ -580,21 +537,16 @@
             pve = vithist_id2entry(vh, i);
 
             if (pve->valid) {
+                int n_used;
                 tve.path.score = pve->path.score + tve.ascr;
-#ifdef OLD_LM_API
-                tve.lscr = lm_tg_score(kbcore_lm(kbc),
-                                       pve->lmstate.lm3g.lwid[1],
-                                       pve->lmstate.lm3g.lwid[0],
-                                       lwid, wid);
-#else
-                tve.lscr = ngram_tg_score(kbcore_lm(kbc), lwid, pve->lmstate.lm3g.lwid[0], pve->lmstate.lm3g.lwid[1], &n_used);
-#endif
+                tve.lscr = ngram_tg_score(lm, lwid, pve->lmstate.lm3g.lwid[0],
+                                          pve->lmstate.lm3g.lwid[1], &n_used);
                 tve.path.score += tve.lscr;
                 if ((tve.path.score - vh->wbeam) >= vh->bestscore[vh->n_frm]) {
                     tve.path.pred = i;
                     tve.lmstate.lm3g.lwid[1] = pve->lmstate.lm3g.lwid[0];
 
-                    vithist_enter(vh, kbc, &tve, rc);
+                    vithist_enter(vh, dict, dict2pid, &tve, rc);
                 }
             }
         }
@@ -673,7 +625,7 @@
 
 
 void
-vithist_prune(vithist_t * vh, dict_t * dict, int32 frm,
+vithist_prune(vithist_t * vh, s3dict_t * dict, int32 frm,
               int32 maxwpf, int32 maxhist, int32 beam)
 {
     int32 se, fe, filler_done, th;
@@ -705,7 +657,7 @@
            && ve->path.score >= th /* the score (or the cw scores) is above threshold */
            && maxhist > 0)        /* Number of history is larger than 0 */
     {
-        if (dict_filler_word(dict, ve->wid)) {
+        if (s3dict_filler_word(dict, ve->wid)) {
             /* Major HACK!!  Keep only one best filler word entry per frame */
             if (filler_done)
                 continue;
@@ -768,7 +720,8 @@
 
 
 void
-vithist_frame_windup(vithist_t * vh, int32 frm, FILE * fp, kbcore_t * kbc)
+vithist_frame_windup(vithist_t * vh, int32 frm, FILE * fp,
+                     ngram_model_t *lm, s3dict_t *dict)
 {
     assert(vh->n_frm == frm);
 
@@ -776,7 +729,7 @@
     vh->frame_start[vh->n_frm] = vh->n_entry;
 
     if (fp)
-        vithist_dump(vh, frm, kbc, fp);
+        vithist_dump(vh, frm, lm, dict, fp);
 
     vithist_lmstate_reset(vh);
 
@@ -786,19 +739,12 @@
 
 
 int32
-vithist_utt_end(vithist_t * vh, kbcore_t * kbc)
+vithist_utt_end(vithist_t * vh, ngram_model_t *lm, s3dict_t *dict, dict2pid_t *dict2pid)
 {
     int32 f, i;
     int32 sv, nsv, scr, bestscore, bestvh, vhid;
     vithist_entry_t *ve, *bestve = 0;
-#ifdef OLD_LM_API
-    s3lmwid32_t endwid = BAD_S3LMWID32;
-    lm_t *lm;
-#else
     int32 endwid = NGRAM_INVALID_WID;
-    ngram_model_t *lm;
-#endif
-    dict_t *dict;
 
     bestscore = MAX_NEG_INT32;
     bestvh = -1;
@@ -821,30 +767,14 @@
                vh->n_frm - 1, f);
 
     /* Terminate in a final </s> node (make this optional?) */
-    lm = kbcore_lm(kbc);
-    dict = kbcore_dict(kbc);
-
-#ifdef OLD_LM_API
-    endwid = lm_finishwid(lm);
-#else
     endwid = ngram_wid(lm, S3_FINISH_WORD);
-#endif
 
     for (i = sv; i < nsv; i++) {
-#ifndef OLD_LM_API
-        int32 n_used;
-#endif
+        int n_used;
         ve = vithist_id2entry(vh, i);
         scr = ve->path.score;
-#ifdef OLD_LM_API
-        scr +=
-            lm_tg_score(lm, ve->lmstate.lm3g.lwid[1],
-                        ve->lmstate.lm3g.lwid[0], endwid,
-                        dict_finishwid(dict));
-#else
-        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0], ve->lmstate.lm3g.lwid[1], &n_used);
-#endif
-
+        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0],
+                              ve->lmstate.lm3g.lwid[1], &n_used);
         if (bestscore < scr) {
             bestscore = scr;
             bestvh = i;
@@ -862,19 +792,20 @@
         assert(vh->frame_start[vh->n_frm - 1] ==
                vh->frame_start[vh->n_frm]);
         vh->n_frm -= 1;
-        vithist_rescore(vh, kbc, dict_silwid(dict), vh->n_frm,
+        vithist_rescore(vh, lm, dict, dict2pid,
+                        s3dict_silwid(dict), vh->n_frm,
                         bestve->path.score, bestvh, -1, -1);
         vh->n_frm += 1;
         vh->frame_start[vh->n_frm] = vh->n_entry;
 
-        return vithist_utt_end(vh, kbc);
+        return vithist_utt_end(vh, lm, dict, dict2pid);
     }
 
     /*    vithist_dump(vh,-1,kbc,stdout); */
     /* Create an </s> entry */
     ve = vithist_entry_alloc(vh);
 
-    ve->wid = dict_finishwid(dict);
+    ve->wid = s3dict_finishwid(dict);
     ve->sf = (bestve->ef == BAD_S3FRMID) ? 0 : bestve->ef + 1;
     ve->ef = vh->n_frm;
     ve->ascr = 0;
@@ -897,19 +828,12 @@
 
 
 int32
-vithist_partialutt_end(vithist_t * vh, kbcore_t * kbc)
+vithist_partialutt_end(vithist_t * vh, ngram_model_t *lm, s3dict_t *dict)
 {
     int32 f, i;
     int32 sv, nsv, scr, bestscore, bestvh;
     vithist_entry_t *ve, *bestve;
-#ifdef OLD_LM_API
-    s3lmwid32_t endwid;
-    lm_t *lm;
-#else
-    ngram_model_t *lm;
     int32 endwid;
-#endif
-    dict_t *dict;
 
     /* Find last frame with entries in vithist table */
     for (f = vh->n_frm - 1; f >= 0; --f) {
@@ -929,33 +853,18 @@
     }
 
     /* Terminate in a final </s> node (make this optional?) */
-    lm = kbcore_lm(kbc);
-    dict = kbcore_dict(kbc);
-
-#ifdef OLD_LM_API
-    endwid = lm_finishwid(lm);
-#else
     endwid = ngram_wid(lm, S3_FINISH_WORD);
-#endif
 
     bestscore = MAX_NEG_INT32;
     bestvh = -1;
 
     for (i = sv; i < nsv; i++) {
-#ifndef OLD_LM_API
-        int32 n_used;
-#endif
+        int n_used;
         ve = vithist_id2entry(vh, i);
 
         scr = ve->path.score;
-#ifdef OLD_LM_API
-        scr +=
-            lm_tg_score(lm, ve->lmstate.lm3g.lwid[1],
-                        ve->lmstate.lm3g.lwid[0], endwid,
-                        dict_finishwid(dict));
-#else
-        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0], ve->lmstate.lm3g.lwid[1], &n_used);
-#endif
+        scr += ngram_tg_score(lm, endwid, ve->lmstate.lm3g.lwid[0],
+                              ve->lmstate.lm3g.lwid[1], &n_used);
 
         if (bestscore < scr) {
             bestscore = scr;
@@ -992,104 +901,13 @@
     vh->bestvh[0] = -1;
 }
 
-
-#if 0
-static void
-vithist_lmstate_subtree_dump(vithist_t * vh, kbcore_t * kbc,
-                             vh_lmstate2vithist_t * lms2vh, int32 level,
-                             FILE * fp)
-{
-    gnode_t *gn;
-    vh_lmstate2vithist_t *child;
-    int32 i;
-#ifdef OLD_LM_API
-    lm_t *lm;
-#else
-    ngram_model_t *lm;
-#endif
-
-    lm = kbcore_lm(kbc);
-
-    for (gn = lms2vh->children; gn; gn = gnode_next(gn)) {
-        child = (vh_lmstate2vithist_t *) gnode_ptr(gn);
-
-        for (i = 0; i < level; i++)
-            fprintf(fp, "\t");
-#ifdef OLD_LM_API
-        fprintf(fp, "\t%s -> %d\n", lm_wordstr(lm, child->state),
-                child->vhid);
-#else
-        fprintf(fp, "\t%s -> %d\n", ngram_word(lm, child->state),
-                child->vhid);
-#endif
-
-        vithist_lmstate_subtree_dump(vh, kbc, child, level + 1, fp);
-    }
-}
-
-
-static void
-vithist_lmstate_dump(vithist_t * vh, kbcore_t * kbc, FILE * fp)
-{
-    glist_t gl;
-    gnode_t *lgn, *gn;
-    int32 i;
-    vh_lmstate2vithist_t *lms2vh;
-    mdef_t *mdef;
-#ifdef OLD_LM_API
-    lm_t *lm;
-#else
-    ngram_model_t *lm;
-#endif
-
-    mdef = kbcore_mdef(kbc);
-    lm = kbcore_lm(kbc);
-
-    fprintf(fp, "LMSTATE\n");
-    for (lgn = vh->lwidlist; lgn; lgn = gnode_next(lgn)) {
-        i = (int32) gnode_int32(lgn);
-
-        gl = vh->lmstate_root[i];
-        assert(gl);
-
-        for (gn = gl; gn; gn = gnode_next(gn)) {
-            lms2vh = (vh_lmstate2vithist_t *) gnode_ptr(gn);
-
-            fprintf(fp, "\t%s.%s -> %d\n",
-#ifdef OLD_LM_API
-                    lm_wordstr(lm, i), mdef_ciphone_str(mdef,
-#else
-                    ngram_word(lm, i), mdef_ciphone_str(mdef,
-#endif
-                                                        lms2vh->state),
-                    lms2vh->vhid);
-            vithist_lmstate_subtree_dump(vh, kbc, lms2vh, 1, fp);
-        }
-    }
-    fprintf(fp, "END_LMSTATE\n");
-    fflush(fp);
-}
-#endif
-
-
 void
-vithist_dump(vithist_t * vh, int32 frm, kbcore_t * kbc, FILE * fp)
+vithist_dump(vithist_t * vh, int32 frm, ngram_model_t *lm, s3dict_t *dict, FILE * fp)
 {
     int32 i, j;
-    dict_t *dict;
     vithist_entry_t *ve;
-#ifdef OLD_LM_API
-    lm_t *lm;
-    s3lmwid32_t lwid;
-#else
-    ngram_model_t *lm;
-    int32 lwid;
-#endif
     int32 sf, ef;
 
-    dict = kbcore_dict(kbc);
-    lm = kbcore_lm(kbc);
-
     if (frm >= 0) {
         sf = frm;
         ef = frm;
@@ -1113,23 +931,17 @@
                 vh->bestvh[i]);
 
         for (j = vh->frame_start[i]; j < vh->frame_start[i + 1]; j++) {
+            int32 lwid;
             ve = vithist_id2entry(vh, j);
 
             fprintf(fp, "\t%c%6d %5d %5d %11d %9d %8d %7d %4d %s",
                     (ve->valid ? ' ' : '*'), j,
                     ve->sf, ve->ef, ve->path.score, ve->ascr, ve->lscr,
-                    ve->path.pred, ve->type, dict_wordstr(dict, ve->wid));
+                    ve->path.pred, ve->type, s3dict_wordstr(dict, ve->wid));
 
-#ifdef OLD_LM_API
-            fprintf(fp, " (%s", lm_wordstr(lm, ve->lmstate.lm3g.lwid[0]));
-            lwid = ve->lmstate.lm3g.lwid[1];
-            if (IS_LMWID(lm, lwid))
-                fprintf(fp, ", %s", lm_wordstr(lm, lwid));
-#else
             fprintf(fp, " (%s", ngram_word(lm, ve->lmstate.lm3g.lwid[0]));
             lwid = ve->lmstate.lm3g.lwid[1];
             fprintf(fp, ", %s", ngram_word(lm, lwid));
-#endif
             fprintf(fp, ")\n");
         }
 
@@ -1137,17 +949,14 @@
             fprintf(fp, "\n");
     }
 
-#if 0
-    if (vh->lwidlist)
-        vithist_lmstate_dump(vh, kbc, fp);
-#endif
-
     fprintf(fp, "END_VITHIST\n");
     fflush(fp);
 }
 
+/* These functions are quite Sphinx3-specific so disable them for now. */
+#if 0
 glist_t
-vithist_backtrace(vithist_t * vh, int32 id, dict_t * dict)
+vithist_backtrace(vithist_t * vh, int32 id, s3dict_t * dict)
 {
     vithist_entry_t *ve;
     glist_t hyp;
@@ -1182,7 +991,7 @@
 }
 
 dag_t *
-vithist_dag_build(vithist_t * vh, glist_t hyp, dict_t * dict, int32 endid, cmd_ln_t *config, logmath_t *logmath)
+vithist_dag_build(vithist_t * vh, glist_t hyp, s3dict_t * dict, int32 endid, cmd_ln_t *config, logmath_t *logmath)
 {
     glist_t *sfwid;             /* To maintain <start-frame, word-id> pair dagnodes */
     vithist_entry_t *ve, *ve2;
@@ -1295,7 +1104,7 @@
 
     /* Validate startwid and finishwid nodes */
     dn = (dagnode_t *) gnode_ptr(sfwid[0]);
-    assert(dn->wid == dict_startwid(dict));
+    assert(dn->wid == s3dict_startwid(dict));
     dn->seqid = 0;
     dag->root = dn;
     dag->entry.node = dn;
@@ -1305,7 +1114,7 @@
     dag->entry.bypass = NULL;
 
     dn = (dagnode_t *) gnode_ptr(sfwid[vh->n_frm]);
-    assert(dn->wid == dict_finishwid(dict));
+    assert(dn->wid == s3dict_finishwid(dict));
     dn->seqid = 0;
     /* If for some reason the final node is not the same as the end
      * node, make sure it exists and is also marked valid. */
@@ -1391,6 +1200,7 @@
 
     return dag;
 }
+#endif
 
 
 /* 

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-11 05:39:21 UTC (rev 9208)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.h	2009-07-11 06:53:03 UTC (rev 9209)
@@ -133,7 +133,7 @@
 
 #include "s3types.h"
 #include "s3_dict.h"
-#include "ctxt_table.h"
+#include "dict2pid.h"
 
 /** \file vithist.h 
  *
@@ -289,7 +289,8 @@
  * @return An initialized vithist_t
  */
 
-vithist_t *vithist_init(kbcore_t *kbc,  /**< Core search data structure */
+vithist_t *vithist_init(int32 nword,    /**< Maximum number of words */
+                        int32 n_ci,     /**< Number of CI phones */
                         int32 wbeam,    /**< Word exit beam width */
                         int32 bghist,   /**< If only bigram history is used */
                         int32 report    /**< Whether to report the progress  */
@@ -300,8 +301,8 @@
  * Invoked at the beginning of each utterance; vithist initialized with a root <s> entry.
  * @return Vithist ID of the root <s> entry.
  */
-int32 vithist_utt_begin(vithist_t *vh, /**< In: a Viterbi history data structure*/
-                        kbcore_t *kbc  /**< In: a KBcore */
+int32 vithist_utt_begin(vithist_t *vh, /**< In: a Viterbi history data structure */
+                        int32 startwid /**< In: ID of start word */
     );
 
 
@@ -311,7 +312,9 @@
  * Return the ID of the appended entry if successful, -ve if error (empty utterance).
  */
 int32 vithist_utt_end(vithist_t *vh, /**< In: a Viterbi history data structure*/
-                      kbcore_t *kbc  /**< In: a KBcore */
+                      ngram_model_t *lm,
+                      s3dict_t *dict,
+                      dict2pid_t *dict2pid
     );
 
 
@@ -320,7 +323,8 @@
  * Returns viterbi histories of partial decodes
  */
 int32 vithist_partialutt_end(vithist_t *vh, /**< In: a Viterbi history data structure*/
-                             kbcore_t *kbc  /**< In: a KBcore */
+                             ngram_model_t *lm,
+                             s3dict_t *dict
     );
 
 /* Invoked at the end of each utterance to clear up and deallocate space */
@@ -334,7 +338,7 @@
  */
 glist_t vithist_backtrace(vithist_t *vh,       /**< In: a Viterbi history data structure*/
                           int32 id,		/**< ID from which to begin backtrace */
-                          dict_t *dict         /**< a dictionary for look up the ci phone of a word*/
+                          s3dict_t *dict         /**< a dictionary for look up the ci phone of a word*/
     );
 
 
@@ -343,9 +347,11 @@
  * entry having the same LM state will be replaced with the one given.
  */
 void vithist_enter(vithist_t * vh,              /**< The history table */
-                   kbcore_t * kbc,              /**< a KB core */
+                   s3dict_t *dict,              /**< Dictionary */
+                   dict2pid_t *dict2pid,        /**< Context table mapping thing */
                    vithist_entry_t * tve,       /**< an input vithist element */
-                   int32 comp_rc                /**< a compressed rc. If it is the actual rc, it won't work. FIXME: WHAT DOES THIS MEAN?!!?!? */
+                   int32 comp_rc                /**< a compressed rc. If it is the actual rc,
+                                                   it won't work. FIXME: WHAT DOES THIS MEAN?!!?!? */
     );
 
 /**
@@ -356,7 +362,9 @@
  * ARCHAN: Precisely speaking, it is a full trigram rescoring. 
  */
 void vithist_rescore(vithist_t *vh,    /**< In: a Viterbi history data structure*/
-                     kbcore_t *kbc,    /**< In: a kb core. */
+                     ngram_model_t *lm,  /**< In: Language model */
+                     s3dict_t *dict,     /**< In: Dictionary */
+                     dict2pid_t *dict2pid,        /**< Context table mapping thing */
                      s3wid_t wid,      /**< In: a word ID */
                      int32 ef,		/**< In: End frame for this word instance */
                      int32 score,	/**< In: Does not include LM score for this entry */
@@ -371,8 +379,8 @@
                           int32 frm,		/**< In: Frame in which being invoked */
                           FILE *fp,		/**< In: If not NULL, dump vithist entries
 						   this frame to the file (for debugging) */
-                          kbcore_t *kbc	/**< In: Used only for dumping to fp, for
-                                           debugging */
+                          ngram_model_t *lm,  /**< In: Language model */
+                          s3dict_t *dict      /**< In: Dictionary */
     );
 
 /**
@@ -380,7 +388,7 @@
  * and the remaining as invalid.
  */
 void vithist_prune(vithist_t *vh,      /**< In: a Viterbi history data structure*/
-                   dict_t *dict,	/**< In: Dictionary, for distinguishing filler words */
+                   s3dict_t *dict,	/**< In: Dictionary, for distinguishing filler words */
                    int32 frm,		/**< In: Frame in which being invoked */
                    int32 maxwpf,	/**< In: Max unique words per frame to be kept valid */
                    int32 maxhist,	/**< In: Max histories to maintain per frame */
@@ -390,18 +398,21 @@
 /**
  * Dump the Viterbi history data to the given file (for debugging/diagnostics).
  */
-void vithist_dump(vithist_t *vh,     /**< In: a Viterbi history data structure */
-                  int32 frm,		/**< In: If >= 0, print only entries made in this frame,
-					   otherwise print all entries */
-                  kbcore_t *kbc,       /**< In: a KBcore */
-                  FILE *fp             /**< Out: File to be written */
+void vithist_dump(vithist_t *vh,      /**< In: a Viterbi history data structure */
+                  int32 frm,	      /**< In: If >= 0, print only entries made in this frame,
+                                         otherwise print all entries */
+                  ngram_model_t *lm,  /**< In: Language model */
+                  s3dict_t *dict,     /**< In: Dictionary */
+                  FILE *fp            /**< Out: File to be written */
     );
 
+#if 0
 /**
  * Build a word graph (DAG) from Viterbi history.
  */
-dag_t *vithist_dag_build(vithist_t * vh, glist_t hyp, dict_t * dict, int32 endid,
+dag_t *vithist_dag_build(vithist_t * vh, glist_t hyp, s3dict_t * dict, int32 endid,
                          cmd_ln_t *config, logmath_t *logmath);
+#endif
 
 /** 
  * Free a Viterbi history data structure 
@@ -423,14 +434,14 @@
  */
 
 void vh_lmstate_display(vh_lmstate_t *vhl, /**< In: An lmstate data structure */
-			dict_t *dict /**< In: If specified, the word string of lm IDs would also be translated */
+			s3dict_t *dict /**< In: If specified, the word string of lm IDs would also be translated */
     );
 
 /**
  * Display the vithist_entry structure. 
  */
 void vithist_entry_display(vithist_entry_t *ve, /**< In: An entry of vithist */
-			   dict_t* dict  /**< In: If specified, the word string of lm IDs would also be translated */
+			   s3dict_t* dict  /**< In: If specified, the word string of lm IDs would also be translated */
     );
 
 #if 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9217
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9217&view=rev
Author:   dhdfu
Date:     2009-07-15 16:35:25 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Sphinx3 time-switch search compiles, does nothing.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/lextree.h
    trunk/pocketsphinx/src/libpocketsphinx/s3types.h

Added Paths:
-----------
    trunk/pocketsphinx/src/libpocketsphinx/fillpen.c
    trunk/pocketsphinx/src/libpocketsphinx/fillpen.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-13 20:31:22 UTC (rev 9216)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2009-07-15 16:35:25 UTC (rev 9217)
@@ -11,11 +11,13 @@
 	ctxt_table.c				\
 	dict.c					\
 	dict2pid.c				\
+	fillpen.c				\
 	fsg_history.c				\
 	fsg_lextree.c				\
 	fsg_search.c				\
 	hmm.c					\
 	kdtree.c				\
+	lextree.c				\
 	lts.c					\
 	cmu6_lts_rules.c			\
 	mdef.c					\
@@ -45,11 +47,13 @@
 	ctxt_table.h				\
 	dict.h					\
 	dict2pid.h				\
+	fillpen.h				\
 	fsg_history.h				\
 	fsg_lextree.h				\
 	fsg_search_internal.h			\
 	hmm.h					\
 	kdtree.h				\
+	lextree.h				\
 	lts.h					\
 	cmu6_lts_rules.h			\
 	mdef.h					\

Added: trunk/pocketsphinx/src/libpocketsphinx/fillpen.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fillpen.c	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/fillpen.c	2009-07-15 16:35:25 UTC (rev 9217)
@@ -0,0 +1,184 @@
+/* ====================================================================
+ * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This work was supported in part by funding from the Defense Advanced 
+ * Research Projects Agency and the National Science Foundation of the 
+ * United States of America, and the CMU Sphinx Speech Consortium.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ */
+/*
+ * fillpen.c -- Filler penalties (penalties for words that do not show up in
+ * the main LM.
+ * 
+ * **********************************************
+ * CMU ARPA Speech Project
+ *
+ * Copyright (c) 1996 Carnegie Mellon University.
+ * ALL RIGHTS RESERVED.
+ * **********************************************
+ * 
+ * HISTORY
+ * $Log$
+ * Revision 1.6  2006/02/23  04:11:13  arthchan2003
+ * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: Added silprob and fillprob. Added fillpen_report.
+ * 
+ * Revision 1.5.4.1  2005/06/28 06:59:04  arthchan2003
+ * Add silence probability and filler probability as members of fillpen_t, add reporting functions.
+ *
+ * Revision 1.5  2005/06/21 21:09:22  arthchan2003
+ * 1, Fixed doxygen documentation. 2, Added  keyword.
+ *
+ * Revision 1.3  2005/03/30 01:22:46  archan
+ * Fixed mistakes in last updates. Add
+ *
+ * 20-Apr-2001  Ricky Houghton (ricky.houghton@... or rhoughton@...)
+ *              Added fillpen_free to free memory allocated by fillpen_init
+ * 
+ * 30-Dec-2000  Rita Singh (rsingh@...) at Carnegie Mellon University
+ *		Removed language weight application to wip. To maintain
+ *		comparability between s3decode and current decoder. Does
+ *		not affect decoding performance.
+ *
+ * 24-Feb-2000	M K Ravishankar (rkm@...) at Carnegie Mellon University
+ * 		Bugfix: Applied language weight to word insertion penalty.
+ * 
+ * 11-Oct-96	M K Ravishankar (rkm@...) at Carnegie Mellon University
+ * 		Created.
+ */
+
+
+#include "fillpen.h"
+
+fillpen_t *
+fillpen_init(s3dict_t * dict, const char *file, float64 silprob, float64 fillprob,
+             float64 lw, float64 wip, logmath_t *logmath)
+{
+    s3wid_t w, bw;
+    float64 prob;
+    FILE *fp;
+    char line[1024], wd[1024];
+    int32 k;
+    fillpen_t *_fillpen;
+
+    _fillpen = (fillpen_t *) ckd_calloc(1, sizeof(fillpen_t));
+
+    _fillpen->dict = dict;
+    _fillpen->lw = lw;
+    _fillpen->wip = wip;
+    _fillpen->silprob = silprob;
+    _fillpen->fillerprob = fillprob;
+    if (dict->filler_end >= dict->filler_start)
+        _fillpen->prob =
+            (int32 *) ckd_calloc(dict->filler_end - dict->filler_start + 1,
+                                 sizeof(int32));
+    else
+        _fillpen->prob = NULL;
+
+    /* Initialize all words with filler penalty (HACK!! backward compatibility) */
+    prob = fillprob;
+    for (w = dict->filler_start; w <= dict->filler_end; w++)
+    _fillpen->prob[w - dict->filler_start] =
+        (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
+
+    /* Overwrite silence penalty (HACK!! backward compatibility) */
+    w = s3dict_wordid(dict, S3_SILENCE_WORD);
+    if (NOT_S3WID(w) || (w < dict->filler_start) || (w > dict->filler_end))
+        E_FATAL("%s not a filler word in the given dictionary\n",
+                S3_SILENCE_WORD);
+    prob = silprob;
+    _fillpen->prob[w - dict->filler_start] =
+        (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
+
+    /* Overwrite with filler prob input file, if specified */
+    if (!file)
+        return _fillpen;
+
+    E_INFO("Reading filler penalty file: %s\n", file);
+    if ((fp = fopen(file, "r")) == NULL)
+        E_FATAL("fopen(%s,r) failed\n", file);
+    while (fgets(line, sizeof(line), fp) != NULL) {
+        if (line[0] == '#')     /* Skip comment lines */
+            continue;
+
+        k = sscanf(line, "%s %lf", wd, &prob);
+        if ((k != 0) && (k != 2))
+            E_FATAL("Bad input line: %s\n", line);
+        w = s3dict_wordid(dict, wd);
+        if (NOT_S3WID(w) || (w < dict->filler_start)
+            || (w > dict->filler_end))
+            E_FATAL("%s not a filler word in the given dictionary\n",
+                    S3_SILENCE_WORD);
+
+        _fillpen->prob[w - dict->filler_start] =
+            (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
+    }
+    fclose(fp);
+
+    /* Replicate fillpen values for alternative pronunciations */
+    for (w = dict->filler_start; w <= dict->filler_end; w++) {
+        bw = s3dict_basewid(dict, w);
+        if (bw != w)
+            _fillpen->prob[w - dict->filler_start] =
+                _fillpen->prob[bw - dict->filler_start];
+    }
+
+    return _fillpen;
+}
+
+void
+fillpen_report(fillpen_t * f)
+{
+    E_INFO_NOFN("Initialization of fillpen_t, report:\n");
+    E_INFO_NOFN("Language weight =%f \n", f->lw);
+    E_INFO_NOFN("Word Insertion Penalty =%f \n", f->wip);
+    E_INFO_NOFN("Silence probability =%f \n", f->silprob);
+    E_INFO_NOFN("Filler probability =%f \n", f->fillerprob);
+    E_INFO_NOFN("\n");
+
+}
+
+int32
+fillpen(fillpen_t * f, s3wid_t w)
+{
+    assert((w >= f->dict->filler_start) && (w <= f->dict->filler_end));
+    return (f->prob[w - f->dict->filler_start]);
+}
+
+
+/* RAH, free memory allocated above */
+void
+fillpen_free(fillpen_t * f)
+{
+    if (f) {
+        if (f->prob)
+            ckd_free((void *) f->prob);
+        ckd_free((void *) f);
+    }
+}


Property changes on: trunk/pocketsphinx/src/libpocketsphinx/fillpen.c
___________________________________________________________________
Added: svn:mime-type
   + text/x-csrc
Added: svn:eol-style
   + native

Added: trunk/pocketsphinx/src/libpocketsphinx/fillpen.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fillpen.h	                        (rev 0)
+++ trunk/pocketsphinx/src/libpocketsphinx/fillpen.h	2009-07-15 16:35:25 UTC (rev 9217)
@@ -0,0 +1,159 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* ====================================================================
+ * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * This work was supported in part by funding from the Defense Advanced 
+ * Research Projects Agency and the National Science Foundation of the 
+ * United States of America, and the CMU Sphinx Speech Consortium.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ */
+/*
+ * fillpen.c -- Filler penalties (penalties for words that do not show up in
+ * the main LM.
+ * 
+ * **********************************************
+ * CMU ARPA Speech Project
+ *
+ * Copyright (c) 1996 Carnegie Mellon University.
+ * ALL RIGHTS RESERVED.
+ * **********************************************
+ * 
+ * HISTORY
+ * $Log$
+ * Revision 1.1  2006/04/05  20:27:30  dhdfu
+ * A Great Reorganzation of header files and executables
+ * 
+ * Revision 1.11  2006/02/23 04:11:13  arthchan2003
+ * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: Added silprob and fillprob. Added fillpen_report.
+ *
+ * Revision 1.10.4.2  2005/06/28 19:09:04  arthchan2003
+ * Add declaration for fillpen_report.
+ *
+ * Revision 1.10.4.1  2005/06/28 06:59:04  arthchan2003
+ * Add silence probability and filler probability as members of fillpen_t, add reporting functions.
+ *
+ * Revision 1.10  2005/06/21 21:09:22  arthchan2003
+ * 1, Fixed doxygen documentation. 2, Added  keyword.
+ *
+ * Revision 1.4  2005/06/13 04:02:58  archan
+ * Fixed most doxygen-style documentation under libs3decoder.
+ *
+ * Revision 1.3  2005/03/30 01:22:46  archan
+ * Fixed mistakes in last updates. Add
+ *
+ * 
+ * 11-Oct-96	M K Ravishankar (rkm@...) at Carnegie Mellon University
+ * 		Created.
+ */
+
+
+#ifndef _S3_FILLPEN_H_
+#define _S3_FILLPEN_H_
+
+#include <logmath.h>
+
+#include "s3types.h"
+#include "s3_dict.h"
+
+
+/** \file fillpen.h
+    \brief Filler penalties, penalties for words that do not show up in
+    * the main LM.
+    */
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if 0
+} /* Fool Emacs into not indenting things. */
+#endif
+
+
+typedef struct {
+    s3dict_t *dict;	/** Reference dictionary for which the filler word probabilities
+			    are maintained in this structure */
+    int32 *prob;	/** Filler word probability (in logs3 space, after
+			    langwt and inspen application) */
+    float64 lw;		/** Language weight */
+    float64 wip;	/** Word insertion penalty */
+
+    float64 silprob;      /** Probability of silence */
+    float64 fillerprob;      /** Probability of filler */
+} fillpen_t;
+
+
+/**
+ * Initialize filler probabilities (penalties, whatever) module and return a pointer to the
+ * structure created.  Filler word probabilities are simple unigram probabilities.  Here is an
+ * example of such a file (one entry per line; a word and a probability):
+ *   <sil>  0.10792
+ *   <uh>   0.00866
+ *   <um>   0.00147
+ * If the first character in a line is a '#', the line is treated as a comment and ignored.
+ * If no filler probabilities file is provided, the silence word gets silprob, and all other
+ * filler words get fillprob.  As with the trigram LM, the resulting log-probabilities are
+ * multiplied by a language weight and finally a word insertion penalty is tacked on.
+ */
+fillpen_t *fillpen_init (s3dict_t *dict,	/**< In: Dictionary containing filler words */
+			 const char *file,	/**< In: Filler word probabilities file, if any */
+			 float64 silprob,	/**< In: Default probability for silence word */
+			 float64 fillprob,	/**< In: Default probability for non-silence filler
+						   words */
+			 float64 lw,		/**< In: Language weight (see lm.h) */
+			 float64 wip,		/**< In: Word insertion penalty (see lm.h) */
+			 logmath_t *logmath
+    );
+
+/**
+ * Return the filler word probability for the given dictionary word-ID.
+ */
+int32 fillpen(fillpen_t *f,	/**< In: Filler word probabilities structure */
+              s3wid_t w		/**< In: Dictionary word-ID of filler word */
+    );
+
+/**
+   Report the fillpen_t structure 
+*/
+void fillpen_report(fillpen_t *f        /**< In: Filler word probabilities structure */
+    );
+
+/* RAH 
+   free memory allocated by fillpen_init
+*/
+void fillpen_free (fillpen_t *f /**< A filler penalty structure */
+    );
+
+#if 0
+{ /* Stop indent from complaining */
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif


Property changes on: trunk/pocketsphinx/src/libpocketsphinx/fillpen.h
___________________________________________________________________
Added: svn:mime-type
   + text/x-chdr
Added: svn:eol-style
   + native

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-13 20:31:22 UTC (rev 9216)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-15 16:35:25 UTC (rev 9217)
@@ -132,10 +132,8 @@
  * 		Started.
  */
 
-
-
 #include "lextree.h"
-#include "wid.h"
+#include "fillpen.h"
 
 /*
  * Lextree nodes, and the HMMs contained within, are cleared upon creation, and whenever
@@ -144,7 +142,24 @@
  * be cleaned up.
  */
 
+/**
+ * Build a lexical tree for the set of words specified in wordprob[] (with their
+ * associated LM probabilities).  wordprob[] must contain EXACTLY the set of words for
+ * which the lextree is to be built, i.e, including alternatives and excluding OOVs.
+ * Return value: Pointer to lextree_t structure representing entire lextree.
+ */
+static lextree_t * lextree_build(bin_mdef_t *mdef,
+                                 tmat_t *tmat,
+                                 s3dict_t *dict,
+                                 dict2pid_t *dict2pid,
+                                 wordprob_t *wordprob,	/**< In: Words in the tree and their (LM) probabilities */
+                                 int32 n_word,		/**< In: Size of the wordprob[] array */
+                                 s3cipid_t *lc,		/**< In: BAD_S3CIPID terminated array of left context
+                                                           CIphones, or NULL if no specific left context */
+                                 int32 type              /**< In: Type of lextree */
+    );
 
+
 static lextree_node_t *
 lextree_node_alloc(lextree_t *lextree, int32 wid, int32 prob,
                    int32 comp, int32 ssid, s3cipid_t ci, s3cipid_t rc,
@@ -176,13 +191,9 @@
 }
 
 lextree_t *
-#ifdef OLD_LM_API
-lextree_init(kbcore_t * kbc, lm_t * lm, const char *lmname, int32 istreeUgProb,
+lextree_init(bin_mdef_t *mdef, tmat_t *tmat, s3dict_t *dict, dict2pid_t *dict2pid,
+             ngram_model_t * lm, const char *lmname, int32 istreeUgProb,
              int32 bReport, int32 type)
-#else
-lextree_init(kbcore_t * kbc, ngram_model_t * lm, const char *lmname, int32 istreeUgProb,
-             int32 bReport, int32 type)
-#endif
 {
     s3cipid_t *lc;
     s3cipid_t ci;
@@ -191,33 +202,23 @@
     int32 n, n_lc;
     int32 i, j;
     wordprob_t *wp;
-    mdef_t *mdef;
-    dict_t *dict;
     lextree_t *ltree;
 
-    assert(kbc);
-    assert(lm);
-    assert(kbc->mdef);
-    assert(kbc->dict);
-
-    mdef = kbc->mdef;
-    dict = kbc->dict;
-
     /* Build set of all possible left contexts */
-    lc = (s3cipid_t *) ckd_calloc(mdef_n_ciphone(mdef) + 1,
+    lc = (s3cipid_t *) ckd_calloc(bin_mdef_n_ciphone(mdef) + 1,
                                   sizeof(s3cipid_t));
-    lc_active = bitvec_alloc(mdef_n_ciphone(mdef));
-    wp = (wordprob_t *) ckd_calloc(dict_size(dict), sizeof(wordprob_t));
+    lc_active = bitvec_alloc(bin_mdef_n_ciphone(mdef));
+    wp = (wordprob_t *) ckd_calloc(s3dict_size(dict), sizeof(wordprob_t));
 
-    for (w = 0; w < dict_size(dict); w++) {
-        ci = dict_pron(dict, w, dict_pronlen(dict, w) - 1);
-        if (!mdef_is_fillerphone(mdef, (int) ci))
+    for (w = 0; w < s3dict_size(dict); w++) {
+        ci = s3dict_pron(dict, w, s3dict_pronlen(dict, w) - 1);
+        if (!bin_mdef_is_fillerphone(mdef, (int) ci))
             bitvec_set(lc_active, ci);
     }
-    ci = mdef_silphone(mdef);
+    ci = bin_mdef_silphone(mdef);
     bitvec_set(lc_active, ci);
 
-    for (ci = 0, n_lc = 0; ci < mdef_n_ciphone(mdef); ci++) {
+    for (ci = 0, n_lc = 0; ci < bin_mdef_n_ciphone(mdef); ci++) {
         if (bitvec_is_set(lc_active, ci))
             lc[n_lc++] = ci;
     }
@@ -230,32 +231,19 @@
 
     n = 0;
     /*try to be very careful again */
-    for (j = 0; j < dict_size(dict); j++) {
+    for (j = 0; j < s3dict_size(dict); j++) {
         wp[j].wid = -1;
         wp[j].prob = -1;
     }
-#ifdef OLD_LM_API
-    n = lm_ug_wordprob(lm, dict, MAX_NEG_INT32, wp);
-
-    if (bReport)
-        E_INFO("Size of word table after unigram + words in class: %d.\n",
-               n);
-
-    if (n < 1)
-        E_FATAL("%d active words in %s\n", n, lmname);
-
-    n = wid_wordprob2alt(dict, wp, n);
-
-    if (bReport)
-        E_INFO("Size of word table after adding alternative prons: %d.\n",
-               n);
-#else
-    j = dict_size(dict);
+    j = s3dict_size(dict);
     for (i = 0, n = 0; i < j; ++i) {
         int32 lmwid;
-        if (dict_basewid(dict, i) != i || dict_startwid(dict) == i || dict_finishwid(dict) == i)
+        if (s3dict_basewid(dict, i) != i || s3dict_startwid(dict) == i
+            || s3dict_finishwid(dict) == i)
             continue;
-        if ((lmwid = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, i)))) == NGRAM_INVALID_WID) {
+        if (lm == NULL
+            || ((lmwid = ngram_wid(lm, s3dict_wordstr(dict, s3dict_basewid(dict, i))))
+                == NGRAM_INVALID_WID)) {
             continue;
         }
         wp[n].prob = ngram_ng_score(lm, lmwid, NULL, 0, &n_lc);
@@ -264,22 +252,30 @@
     }
     for (i = 0; i < j; ++i) {
         int32 lmwid;
-        if (dict_basewid(dict, i) == i || dict_startwid(dict) == i || dict_finishwid(dict) == i)
+        if (s3dict_basewid(dict, i) == i || s3dict_startwid(dict) == i
+            || s3dict_finishwid(dict) == i)
             continue;
-        if ((lmwid = ngram_wid(lm, dict_wordstr(dict, dict_basewid(dict, i)))) == NGRAM_INVALID_WID) {
+        if (lm == NULL
+            || ((lmwid = ngram_wid(lm, s3dict_wordstr(dict, s3dict_basewid(dict, i))))
+                == NGRAM_INVALID_WID)) {
             continue;
         }
         wp[n].prob = ngram_ng_score(lm, lmwid, NULL, 0, &n_lc);
         wp[n].wid = i;
         ++n;
     }
-#endif
     if (istreeUgProb == 0) {
         for (i = 0; i < n; i++) {
             wp[i].prob = -1;    /* Flatten all initial probabilities */
         }
     }
-    ltree = lextree_build(kbc, wp, n, lc, type);
+    ltree = lextree_build(mdef, tmat, dict, dict2pid,
+                          wp, n, lc, type);
+    ltree->dict = dict;
+    ltree->mdef = mdef;
+    ltree->tmat = tmat;
+    ltree->dict2pid = dict2pid;
+    ltree->lm = ngram_model_retain(lm);
 
     ckd_free((void *) wp);
     ckd_free((void *) lc);
@@ -290,32 +286,27 @@
 }
 
 lextree_t *
-fillertree_init(kbcore_t * kbc)
+fillertree_init(bin_mdef_t *mdef, tmat_t *tmat, s3dict_t *dict,
+                dict2pid_t *dict2pid, fillpen_t *fp)
 {
     int32 n;
     int32 i;
-    dict_t *dict;
     wordprob_t *wp;
     lextree_t *ltree;
 
-    assert(kbc);
-    assert(kbc->dict);
-
-    dict = kbc->dict;
-
     n = 0;
 
-    wp = (wordprob_t *) ckd_calloc(dict_size(dict), sizeof(wordprob_t));
+    wp = (wordprob_t *) ckd_calloc(s3dict_size(dict), sizeof(wordprob_t));
 
-    for (i = dict_filler_start(dict); i <= dict_filler_end(dict); i++) {
-        if (dict_filler_word(dict, i)) {
+    for (i = s3dict_filler_start(dict); i <= s3dict_filler_end(dict); i++) {
+        if (s3dict_filler_word(dict, i)) {
             wp[n].wid = i;
-            wp[n].prob = fillpen(kbc->fillpen, i);
+            wp[n].prob = fillpen(fp, i);
             n++;
         }
     }
 
-    ltree = lextree_build(kbc, wp, n, NULL, LEXTREE_TYPE_FILLER);
+    ltree = lextree_build(mdef, tmat, dict, dict2pid, wp, n, NULL, LEXTREE_TYPE_FILLER);
 
     ckd_free(wp);
     return ltree;
@@ -384,13 +375,11 @@
 
 
 lextree_t *
-lextree_build(kbcore_t * kbc, wordprob_t * wordprob, int32 n_word,
+lextree_build(bin_mdef_t *mdef, tmat_t *tmat,
+              s3dict_t *dict, dict2pid_t *d2p,
+              wordprob_t * wordprob, int32 n_word,
               s3cipid_t * lc, int32 type)
 {
-    mdef_t *mdef;
-    dict_t *dict;
-    tmat_t *tmat;
-    dict2pid_t *d2p;
     s3ssid_t *ldiph_lc;
     lextree_t *lextree;
     lextree_lcroot_t *lcroot;
@@ -401,13 +390,9 @@
     bitvec_t **ssid_lc;
     int32 i, j, k, p;
 
-    mdef = kbc->mdef;
-    dict = kbc->dict;
-    tmat = kbc->tmat;
-    d2p = kbc->dict2pid;
-    n_ci = mdef_n_ciphone(mdef);
-    n_sseq = mdef_n_sseq(mdef);
-    n_st = mdef_n_emit_state(mdef);
+    n_ci = bin_mdef_n_ciphone(mdef);
+    n_sseq = bin_mdef_n_sseq(mdef);
+    n_st = bin_mdef_n_emit_state(mdef);
 
     lextree = (lextree_t *) ckd_calloc(1, sizeof(lextree_t));
     lextree->root = NULL;
@@ -484,23 +469,23 @@
         wid = wordprob[i].wid;
         prob = wordprob[i].prob;
 
-        pronlen = dict_pronlen(dict, wid);
+        pronlen = s3dict_pronlen(dict, wid);
 
         if (pronlen == 1) {
             /* Single phone word; node(s) not shared with any other word */
-            ci = dict_pron(dict, wid, 0);
+            ci = s3dict_pron(dict, wid, 0);
             if (!lc) {
 
                 if (d2p->is_composite)
                     ssid = d2p->internal[wid][0];
                 else            /* MAJOR HACK! use the phone filler tree */
-                    ssid = mdef_pid2ssid(mdef, ci);
+                    ssid = bin_mdef_pid2ssid(mdef, ci);
 
                 ln = lextree_node_alloc(lextree,
                                         wid, prob, d2p->is_composite, ssid,
-                                        dict_pron(dict, wid, 0),
+                                        s3dict_pron(dict, wid, 0),
                                         BAD_S3CIPID,
-                                        mdef_pid2tmatid(mdef, ci));
+                                        bin_mdef_pid2tmatid(mdef, ci));
 
                 lextree->root = glist_add_ptr(lextree->root, (void *) ln);
                 n_node++;
@@ -513,7 +498,7 @@
                         ssid = d2p->single_lc[ci][(int) lc[j]]; /* This is a composite triphone */
                     }
                     else {      /* Use approximation to get the SSID */
-                        ssid = d2p->lrdiph_rc[ci][(int) lc[j]][mdef_ciphone_id(mdef, "sil")];   /* HACK, always assume right context is silence */
+                        ssid = d2p->lrdiph_rc[ci][(int) lc[j]][bin_mdef_ciphone_id(mdef, "sil")];   /* HACK, always assume right context is silence */
                     }
 
                     /* Check if this ssid already allocated for another lc */
@@ -525,7 +510,7 @@
                                                 wid, prob,
                                                 d2p->is_composite, ssid,
                                                 ci, BAD_S3CIPID,
-                                                mdef_pid2tmatid(mdef, ci));
+                                                bin_mdef_pid2tmatid(mdef, ci));
 
                         lextree->root =
                             glist_add_ptr(lextree->root, (void *) ln);
@@ -549,7 +534,7 @@
             /* Multi-phone word; allocate root node(s) first, if not already present */
             if (!lc) {
                 ssid = d2p->internal[wid][0];
-                ci = dict_pron(dict, wid, 0);
+                ci = s3dict_pron(dict, wid, 0);
 
                 /* Check if this ssid already allocated for another word */
                 for (gn = lextree->root; gn; gn = gnode_next(gn)) {
@@ -561,7 +546,7 @@
                 if (!gn) {
                     ln = lextree_node_alloc(lextree, BAD_S3WID, prob,
                                             d2p->is_composite, ssid, ci, BAD_S3CIPID,
-                                            mdef_pid2tmatid(mdef, ci));
+                                            bin_mdef_pid2tmatid(mdef, ci));
 
                     lextree->root =
                         glist_add_ptr(lextree->root, (void *) ln);
@@ -575,8 +560,8 @@
                 np = 1;
             }
             else {
-                ci = dict_pron(dict, wid, 0);
-                rc = dict_pron(dict, wid, 1);
+                ci = s3dict_pron(dict, wid, 0);
+                rc = s3dict_pron(dict, wid, 1);
                 ldiph_lc = d2p->ldiph_lc[ci][rc];
 
                 np = 0;
@@ -590,7 +575,7 @@
                                                 BAD_S3WID, prob,
                                                 NOT_COMPOSITE, ssid,
                                                 ci, BAD_S3CIPID,
-                                                mdef_pid2tmatid(mdef, ci));
+                                                bin_mdef_pid2tmatid(mdef, ci));
                         lextree->root =
                             glist_add_ptr(lextree->root, (void *) ln);
                         n_node++;
@@ -618,7 +603,7 @@
             /* Rest of the pronunciation except the final one */
             for (p = 1; p < pronlen - 1; p++) {
                 ssid = d2p->internal[wid][p];
-                ci = dict_pron(dict, wid, p);
+                ci = s3dict_pron(dict, wid, p);
 
                 /* Check for ssid under each parent (#parents(np) > 1 only when p==1) */
                 for (j = 0; j < np; j++) {
@@ -638,7 +623,7 @@
                     ln = lextree_node_alloc(lextree, BAD_S3WID,
                                             prob, NOT_COMPOSITE,
                                             ssid, ci, BAD_S3CIPID,
-                                            mdef_pid2tmatid(mdef, ci));
+                                            bin_mdef_pid2tmatid(mdef, ci));
 
                     for (j = 0; j < np; j++)
                         parent[j]->children =
@@ -677,11 +662,11 @@
 
             /* Final (leaf) node, no sharing */
             ssid = d2p->internal[wid][p];
-            ci = dict_pron(dict, wid, p);
+            ci = s3dict_pron(dict, wid, p);
             ln = lextree_node_alloc(lextree, wid, prob,
                                     d2p->is_composite, ssid,
                                     ci, BAD_S3CIPID,
-                                    mdef_pid2tmatid(mdef, ci));
+                                    bin_mdef_pid2tmatid(mdef, ci));
 
             for (j = 0; j < np; j++)
                 parent[j]->children =
@@ -699,15 +684,15 @@
        worst case, for a time moment, that can be a possibility for 8
        allocations. 
      */
-    lextree->n_alloc_blk_sz = ((n_word * mdef_n_ciphone(mdef)) >> 3);
+    lextree->n_alloc_blk_sz = ((n_word * bin_mdef_n_ciphone(mdef)) >> 3);
 
     lextree->active =
         (lextree_node_t **) ckd_calloc(n_node +
-                                       n_word * mdef_n_ciphone(mdef),
+                                       n_word * bin_mdef_n_ciphone(mdef),
                                        sizeof(lextree_node_t *));
     lextree->next_active =
         (lextree_node_t **) ckd_calloc(n_node +
-                                       n_word * mdef_n_ciphone(mdef),
+                                       n_word * bin_mdef_n_ciphone(mdef),
                                        sizeof(lextree_node_t *));
 
     /*    lextree->active = (lextree_node_t **) ckd_calloc (n_node, sizeof(lextree_node_t *));
@@ -773,13 +758,6 @@
         /* If it is a node with WID and have bad senone sequence */
 
         if (ln->children != NULL) {
-
-#if 0
-            E_INFO
-                ("Free Cross word is carried out  for wid %d, ln->children %d\n",
-                 ln->wid, ln->children);
-#endif
-
             for (gn = ln->children; gn; gn = gnode_next(gn)) {
                 ln2 = (lextree_node_t *) gnode_ptr(gn);
                 /*      E_INFO("I am freeing something! WID, %d, rc %d\n",ln->wid,ln2->rc); */
@@ -829,12 +807,6 @@
 
                     if (IS_S3WID(ln->wid) && ln->children != NULL) {
 
-#if 0
-                        E_INFO
-                            ("Tree %d, lc %d, Free Cross word is carried out  for wid %d, ln->children %d\n",
-                             lextree, lextree->lcroot[i].lc, ln->wid,
-                             ln->children);
-#endif
                         for (cwgn = ln->children; cwgn;
                              cwgn = gnode_next(cwgn)) {
                             cwln = (lextree_node_t *) gnode_ptr(cwgn);
@@ -907,9 +879,10 @@
                 lextree->n_node, k);
 
     hmm_context_free(lextree->ctx);
-
     hmm_context_free(lextree->comctx);
 
+    ngram_model_free(lextree->lm);
+
     ckd_free(lextree);
 }
 
@@ -956,14 +929,11 @@
 
 
 void
-lextree_utt_end(lextree_t * l, kbcore_t * kbc)
+lextree_utt_end(lextree_t * l)
 {
-    mdef_t *mdef;
     lextree_node_t *ln;
     int32 i;
 
-    mdef = kbcore_mdef(kbc);
-
     for (i = 0; i < l->n_active; i++) { /* The inactive ones should already be reset */
         ln = l->active[i];
         hmm_clear((hmm_t *)ln);
@@ -978,26 +948,26 @@
        of the utterance */
 
 
-    if (!dict2pid_is_composite(kbc->dict2pid)) {
+    if (!dict2pid_is_composite(l->dict2pid)) {
         lextree_shrub_cw_leaves(l);
     }
 }
 
 
 static void
-lextree_node_print(lextree_node_t * ln, dict_t * dict, FILE * fp)
+lextree_node_print(lextree_node_t * ln, s3dict_t * dict, FILE * fp)
 {
     fprintf(fp, "wid(%d)pr(%d)com(%d)ss(%d)rc(%d)", ln->wid, ln->prob,
             ln->composite, ln->ssid, ln->rc);
     if (IS_S3WID(ln->wid))
-        fprintf(fp, "%s", dict_wordstr(dict, ln->wid));
+        fprintf(fp, "%s", s3dict_wordstr(dict, ln->wid));
     fprintf(fp, "\n");
 }
 
 
 
 static void
-lextree_subtree_print(lextree_node_t * ln, int32 level, dict_t * dict,
+lextree_subtree_print(lextree_node_t * ln, int32 level, s3dict_t * dict,
                       FILE * fp)
 {
     int32 i;
@@ -1014,19 +984,19 @@
 }
 
 static void
-lextree_subtree_print_dot(lextree_node_t * ln, int32 level, dict_t * dict,
-                          mdef_t * mdef, FILE * fp)
+lextree_subtree_print_dot(lextree_node_t * ln, int32 level, s3dict_t * dict,
+                          bin_mdef_t * mdef, FILE * fp)
 {
     gnode_t *gn;
 
 
     if (IS_S3WID(ln->wid)) {
-        fprintf(fp, "\"%s\";\n", dict_wordstr(dict, ln->wid));
+        fprintf(fp, "\"%s\";\n", s3dict_wordstr(dict, ln->wid));
     }
     else {
         for (gn = ln->children; gn; gn = gnode_next(gn)) {
             ln = (lextree_node_t *) gnode_ptr(gn);
-            fprintf(fp, " \"%s\" -> ", mdef_ciphone_str(mdef, ln->ci));
+            fprintf(fp, " \"%s\" -> ", bin_mdef_ciphone_str(mdef, ln->ci));
             lextree_subtree_print_dot(ln, level + 1, dict, mdef, fp);
         }
     }
@@ -1036,8 +1006,7 @@
 #define GRAPH_DOTFMT 2
 
 void
-lextree_dump(lextree_t * lextree, dict_t * dict, mdef_t * mdef, FILE * fp,
-             int32 fmt)
+lextree_dump(lextree_t * lextree, FILE * fp, int32 fmt)
 {
     gnode_t *gn;
     lextree_node_t *ln;
@@ -1048,7 +1017,7 @@
     if (fmt == GRAPH_RAVIFMT) { /*Ravi's format */
         for (gn = lextree->root; gn; gn = gnode_next(gn)) {
             ln = (lextree_node_t *) gnode_ptr(gn);
-            lextree_subtree_print(ln, 0, dict, fp);
+            lextree_subtree_print(ln, 0, lextree->dict, fp);
         }
 
         if (lextree->n_lc > 0) {
@@ -1057,7 +1026,7 @@
                 fprintf(fp, "lcroot %d\n", lextree->lcroot[i].lc);
                 for (gn = lextree->lcroot[i].root; gn; gn = gnode_next(gn)) {
                     ln = (lextree_node_t *) gnode_ptr(gn);
-                    lextree_node_print(ln, dict, fp);
+                    lextree_node_print(ln, lextree->dict, fp);
                 }
             }
         }
@@ -1068,9 +1037,9 @@
         for (gn = lextree->root; gn; gn = gnode_next(gn)) {
             ln = (lextree_node_t *) gnode_ptr(gn);
 
-            fprintf(fp, " \"%s\" -> ", mdef_ciphone_str(mdef, ln->ci));
+            fprintf(fp, " \"%s\" -> ", bin_mdef_ciphone_str(lextree->mdef, ln->ci));
 
-            lextree_subtree_print_dot(ln, 0, dict, mdef, fp);
+            lextree_subtree_print_dot(ln, 0, lextree->dict, lextree->mdef, fp);
         }
         fprintf(fp, "}\n");
     }
@@ -1110,7 +1079,7 @@
 
 void
 lextree_enter(lextree_t * lextree, s3cipid_t lc, int32 cf,
-              int32 inscore, int32 inhist, int32 thresh, kbcore_t * kbc)
+              int32 inscore, int32 inhist, int32 thresh)
 {
     glist_t root;
     gnode_t *gn, *cwgn;
@@ -1125,9 +1094,9 @@
 
     nf = cf + 1;
 
-    n_ci = mdef_n_ciphone(kbc->mdef);
-    n_st = mdef_n_emit_state(kbc->mdef);
-    tmat = kbc->tmat;
+    n_ci = bin_mdef_n_ciphone(lextree->mdef);
+    n_st = bin_mdef_n_emit_state(lextree->mdef);
+    tmat = lextree->tmat;
     rc = 0;
 
     assert(lextree);
@@ -1153,15 +1122,16 @@
         ln = (lextree_node_t *) gnode_ptr(gn);
 
         if (NOT_S3WID(ln->wid) ||       /* If the first node we see it a non leave */
-            (IS_S3WID(ln->wid) && dict2pid_is_composite(kbc->dict2pid)) /* Or it is a leave but we are using composite triphone */
+            (IS_S3WID(ln->wid)
+             && dict2pid_is_composite(lextree->dict2pid)) /* Or it is a leave but we are using composite triphone */
             ) {
             scr = inscore + ln->prob;
-            if ((scr >= thresh) && (hmm_in_score(ln) < scr)) {
-                hmm_in_score(ln) = scr;
-                hmm_in_history(ln) = inhist;
+            if ((scr >= thresh) && (hmm_in_score(&ln->hmm) < scr)) {
+                hmm_in_score(&ln->hmm) = scr;
+                hmm_in_history(&ln->hmm) = inhist;
 
-                if (hmm_frame(ln) != nf) {
-                    hmm_frame(ln) = nf;
+                if (hmm_frame(&ln->hmm) != nf) {
+                    hmm_frame(&ln->hmm) = nf;
                     lextree->next_active[n++] = ln;
                 }
             }                   /* else it is activated separately */
@@ -1173,42 +1143,19 @@
 
             assert(IS_S3WID(ln->wid));
             if (ln->children == NULL) {
-#if 0
-                E_INFO
-                    ("Tree %d, lc %d, Cross word expansion is carried out at cf %d for wid %d, wstr %s, ln->children %d\n",
-                     lextree, lc, cf, ln->wid, dict_wordstr(kbc->dict,
-                                                            ln->wid),
-                     ln->children);
-#endif
+                n_ci = bin_mdef_n_ciphone(lextree->mdef);
+                rmap = lextree->dict2pid->lrssid[ln->ci][0].ssid;
+                n_rc = get_rc_nssid(lextree->dict2pid, ln->wid, lextree->dict);
 
-                n_ci = mdef_n_ciphone(kbc->mdef);
-                /* HACK, assuming the left context is sil */
+                if (!s3dict_filler_word(lextree->dict, ln->wid)) {
 
-                /*      if(lc==-1)
-                   tmp_lc=0;
-                   else
-                   tmp_lc=lc; */
-
-                rmap = kbc->dict2pid->lrssid[ln->ci][0].ssid;
-                n_rc = get_rc_nssid(kbc->dict2pid, ln->wid, kbc->dict);
-
-                /*      n_rc = kbc->dict2pid->lrssid[ln->ci][tmp_lc].n_ssid; */
-
-                /*      E_INFO("I am here\n");
-                   E_INFO("lrssid n_rc %d, get_nssid %d\n", n_rc, get_rc_nssid(kbc->dict2pid,ln->wid,kbc->dict));
-                 */
-
-
-
-                if (!dict_filler_word(kbc->dict, ln->wid)) {
-
                     for (rc = 0; rc < n_rc; rc++) {
                         cwln =
                             lextree_node_alloc(lextree,
                                                ln->wid, ln->prob,
                                                NOT_COMPOSITE, rmap[rc],
                                                ln->ci, rc,
-                                               mdef_pid2tmatid(kbc->mdef, ln->ci));
+                                               bin_mdef_pid2tmatid(lextree->mdef, ln->ci));
                         ln->children =
                             glist_add_ptr(ln->children, (void *) cwln);
                     }
@@ -1223,7 +1170,7 @@
                                            ln->wid, ln->prob,
                                            NOT_COMPOSITE, rmap[0],
                                            ln->ci, 0,
-                                           mdef_pid2tmatid(kbc->mdef, ln->ci));
+                                           bin_mdef_pid2tmatid(lextree->mdef, ln->ci));
                     lextree_n_node(lextree) += 1;
 
                     ln->children =
@@ -1236,12 +1183,12 @@
             for (cwgn = ln->children; cwgn; cwgn = gnode_next(cwgn)) {
                 cwln = (lextree_node_t *) gnode_ptr(cwgn);
                 scr = inscore + cwln->prob;
-                if ((scr >= thresh) && (hmm_in_score(cwln) < scr)) {
-                    hmm_in_score(cwln) = scr;
-                    hmm_in_history(cwln) = inhist;
+                if ((scr >= thresh) && (hmm_in_score(&cwln->hmm) < scr)) {
+                    hmm_in_score(&cwln->hmm) = scr;
+                    hmm_in_history(&cwln->hmm) = inhist;
 
-                    if (hmm_frame(cwln) != nf) {
-                        hmm_frame(cwln) = nf;
+                    if (hmm_frame(&cwln->hmm) != nf) {
+                        hmm_frame(&cwln->hmm) = nf;
                         lextree->next_active[n++] = cwln;
                     }
                 }
@@ -1267,38 +1214,37 @@
 
 
 int32
-lextree_hmm_eval(lextree_t * lextree, kbcore_t * kbc, ascr_t * ascr,
-                 int32 frm, FILE * fp)
+lextree_hmm_eval(lextree_t * lextree, int16 *senscr, int16 *comsen, int32 frm, FILE * fp)
 {
     int32 best, wbest, n_st;
     int32 i, k;
     lextree_node_t **list, *ln;
-    mdef_t *mdef;
+    bin_mdef_t *mdef;
     dict2pid_t *d2p;
 
-    mdef = kbc->mdef;
-    d2p = kbc->dict2pid;
-    n_st = mdef_n_emit_state(mdef);
+    mdef = lextree->mdef;
+    d2p = lextree->dict2pid;
+    n_st = bin_mdef_n_emit_state(mdef);
 
     list = lextree->active;
     best = MAX_NEG_INT32;
     wbest = MAX_NEG_INT32;
 
-    hmm_context_set_senscore(lextree->ctx, ascr->senscr);
-    hmm_context_set_senscore(lextree->comctx, ascr->comsen);
+    hmm_context_set_senscore(lextree->ctx, senscr);
+    hmm_context_set_senscore(lextree->comctx, comsen);
 
     for (i = 0; i < lextree->n_active; i++) {
         ln = list[i];
 
         if (IS_S3WID(ln->wid)) {
-            /*      E_INFO("Frm %d, Is WID %d, wdstr %s, ln->ssid %d\n",frm, ln->wid,dict_wordstr(kbc->dict,ln->wid), ln->ssid); */
+            /*      E_INFO("Frm %d, Is WID %d, wdstr %s, ln->ssid %d\n",frm, ln->wid,s3dict_wordstr(dict,ln->wid), ln->ssid); */
         }
 
-        assert(hmm_frame(ln) == frm);
+        assert(hmm_frame(&ln->hmm) == frm);
         assert(ln->ssid >= 0);
 
         if (fp) {
-            /*      lextree_node_print (ln, kbc->dict, fp); */
+            /*      lextree_node_print (ln, dict, fp); */
             hmm_dump((hmm_t *)ln, fp);
         }
 
@@ -1351,7 +1297,7 @@
            E_INFO("Is WID\n");
            } */
 
-        k = (bestscr - hmm_bestscore(ln)) / bw;
+        k = (bestscr - hmm_bestscore(&ln->hmm)) / bw;
         if (k >= nbin)
             k = nbin - 1;
         assert(k >= 0);
@@ -1379,42 +1325,32 @@
 
 
 int32
-lextree_hmm_propagate_non_leaves(lextree_t * lextree, kbcore_t * kbc,
-                                 int32 cf, int32 th, int32 pth, int32 wth,
-                                 pl_t * pl)
+lextree_hmm_propagate_non_leaves(lextree_t * lextree,
+                                 int32 cf, int32 th, int32 pth, int32 wth)
 {
-    mdef_t *mdef;
+    bin_mdef_t *mdef;
     dict2pid_t *d2p;
-    dict_t *dict;
-    int32 nf, newscore, newHeurScore;
+    s3dict_t *dict;
+    int32 nf, newscore;
     lextree_node_t **list, *ln, *ln2;
     lextree_node_t *cwln;
     tmat_t *tmat;
     gnode_t *gn, *gn2;
-    int32 i, n;
+    int32 i, n, lastfrm;
     int32 hth;
-    int32 *phn_heur_list;
-    int32 heur_beam;
-    int32 heur_type;
     int32 rc;
     int32 n_ci, n_st, n_rc;
     s3ssid_t *rmap;
 
-    /* Code for heursitic score */
-    kbc->maxNewHeurScore = MAX_NEG_INT32;
-    kbc->lastfrm = -1;
+    lastfrm = -1;
     hth = 0;
-    mdef = kbcore_mdef(kbc);
-    n_ci = mdef_n_ciphone(mdef);
-    n_st = mdef_n_emit_state(mdef);
-    d2p = kbc->dict2pid;
-    dict = kbc->dict;
-    tmat = kbc->tmat;
+    mdef = lextree->mdef;
+    n_ci = bin_mdef_n_ciphone(mdef);
+    n_st = bin_mdef_n_emit_state(mdef);
+    d2p = lextree->dict2pid;
+    dict = lextree->dict;
+    tmat = lextree->tmat;
 
-    phn_heur_list = pl->phn_heur_list;
-    heur_beam = pl->pl_beam;
-    heur_type = pl->pheurtype;
-
     nf = cf + 1;
 
     list = lextree->active;
@@ -1436,9 +1372,9 @@
 
 
         /* This if will activate nodes */
-        if (hmm_frame(ln) < nf) {
-            if (hmm_bestscore(ln) >= th) { /* Active in next frm */
-                hmm_frame(ln) = nf;
+        if (hmm_frame(&ln->hmm) < nf) {
+            if (hmm_bestscore(&ln->hmm) >= th) { /* Active in next frm */
+                hmm_frame(&ln->hmm) = nf;
                 lextree->next_active[n++] = ln;
             }
             else {              /* Deactivate */
@@ -1447,28 +1383,8 @@
         }
 
         if (NOT_S3WID(ln->wid)) {       /* Not a leaf node */
-            if (hmm_out_score(ln) < pth)
+            if (hmm_out_score(&ln->hmm) < pth)
                 continue;       /* HMM exit score not good enough */
-
-            if (heur_type > 0) {        /* In full expansion, this part is not
-                                           really correct */
-                if (cf != kbc->lastfrm) {
-                    kbc->lastfrm = cf;
-                    kbc->maxNewHeurScore = MAX_NEG_INT32;
-                }
-
-                for (gn = ln->children; gn; gn = gnode_next(gn)) {
-                    ln2 = gnode_ptr(gn);
-
-                    newHeurScore =
-                        hmm_out_score(ln) + (ln2->prob - ln->prob) +
-                        phn_heur_list[(int32) ln2->ci];
-                    if (kbc->maxNewHeurScore < newHeurScore)
-                        kbc->maxNewHeurScore = newHeurScore;
-                }
-                hth = kbc->maxNewHeurScore + heur_beam;
-            }
-
             /* Transition to each child */
             for (gn = ln->children; gn; gn = gnode_next(gn)) {
 
@@ -1477,30 +1393,22 @@
                    If not, it could run on. 
                  */
                 if (dict2pid_is_composite(d2p) ||
-                    (!dict2pid_is_composite(d2p) && NOT_S3WID(ln2->wid))
-                    ) {         /* If we use composite triphone mode. Or If we are 
-                                   not using composite triphone mode but the next node
-                                   is not a leave node .
-                                   Just enter like it is a simple triphone. 
-                                 */
-                    newscore = hmm_out_score(ln) + (ln2->prob - ln->prob);
-                    newHeurScore =
-                        newscore + phn_heur_list[(int32) ln2->ci];
+                    (!dict2pid_is_composite(d2p) && NOT_S3WID(ln2->wid))) {
+                    /* If we use composite triphone mode. Or If we are 
+                       not using composite triphone mode but the next node
+                       is not a leave node .
+                       Just enter like it is a simple triphone. 
+                    */
+                    newscore = hmm_out_score(&ln->hmm) + (ln2->prob - ln->prob);
 
-                    if (((heur_type == 0) ||    /*If the heuristic type is 0, 
-                                                   by-pass heuristic score OR */
-                         (heur_type > 0 && newHeurScore >= hth)) &&     /*If the heuristic type is other 
-                                                                           and if the heur score is within threshold */
-                        (newscore >= th) &&     /*If the score is smaller than the
+                    if ((newscore >= th) &&     /*If the score is smaller than the
                                                    phone score, prune away */
-                        (hmm_in_score(ln2) < newscore)
-                        /*Just the Viterbi Update */
-                        ) {
-                        hmm_in_score(ln2) = newscore;
-                        hmm_in_history(ln2) = hmm_out_history(ln);
+                        (hmm_in_score(&ln2->hmm) < newscore)) {
+                        hmm_in_score(&ln2->hmm) = newscore;
+                        hmm_in_history(&ln2->hmm) = hmm_out_history(&ln->hmm);
 
-                        if (hmm_frame(ln2) != nf) {
-                            hmm_frame(ln2) = nf;
+                        if (hmm_frame(&ln2->hmm) != nf) {
+                            hmm_frame(&ln2->hmm) = nf;
                             /*                  lextree_realloc_active_list(lextree,n+1); */
                             lextree->next_active[n++] = ln2;
                         }
@@ -1514,28 +1422,19 @@
 
                     /* If the node doens't has children */
                     if (ln2->children == NULL) {        /*Is children not allocated, then allocate it first. */
-                        assert(dict_pronlen(dict, ln2->wid) > 1);       /* Because word enter should have already taken care 
+                        assert(s3dict_pronlen(dict, ln2->wid) > 1);       /* Because word enter should have already taken care 
                                                                            expansion of single word case. 
                                                                          */
                         assert(ln2->ssid == BAD_S3SSID);        /*First timer of being expanded */
-                        n_ci = mdef_n_ciphone(mdef);
+                        n_ci = bin_mdef_n_ciphone(mdef);
 
-
-#if 0
-                        E_INFO
-                            ("Tree %d, Cross word expansion is carried out at cf %d for wid %d, wstr %s, ln->children %d\n",
-                             lextree, cf, ln2->wid, dict_wordstr(kbc->dict,
-                                                                 ln2->wid),
-                             ln2->children);
-#endif
-
-                        rmap = kbc->dict2pid->rssid[ln2->ci][ln->ci].ssid;
+                        rmap = d2p->rssid[ln2->ci][ln->ci].ssid;
                         n_rc =
-                            kbc->dict2pid->rssid[ln2->ci][ln->ci].n_ssid;
+                            d2p->rssid[ln2->ci][ln->ci].n_ssid;
 
                         assert(n_rc ==
-                               get_rc_nssid(kbc->dict2pid, ln2->wid,
-                                            kbc->dict));
+                               get_rc_nssid(d2p, ln2->wid,
+                                            dict));
 
                         for (rc = 0; rc < n_rc; rc++) {
                             cwln =
@@ -1543,7 +1442,7 @@
                                                    ln2->wid, ln2->prob,
                                                    NOT_COMPOSITE, rmap[rc],
                                                    ln2->ci, rc,
-                                                   mdef_pid2tmatid(mdef, ln2->ci));
+                                                   bin_mdef_pid2tmatid(mdef, ln2->ci));
                             lextree_n_node(lextree) += 1;
 
                             ln2->children =
@@ -1559,27 +1458,18 @@
                            that one might want to use different lookahead probability for different
                            cw triphone */
 
-                        newscore = hmm_out_score(ln)
+                        newscore = hmm_out_score(&ln->hmm)
                             + (cwln->prob - ln->prob);    /*< This is correct! because ln->prob
                                                             is directly
                                                             feed into the cross word */
-                        newHeurScore =
-                            newscore + phn_heur_list[(int32) cwln->ci];
-
-                        if (((heur_type == 0) ||        /*If the heuristic type is 0, 
-                                                           by-pass heuristic score OR */
-                             (heur_type > 0 && newHeurScore >= hth)) && /*If the heuristic type is other 
-                                                                           and if the heur score is within threshold */
-                            (newscore >= th) && /*If the score is smaller than the
+                        if ((newscore >= th) && /*If the score is smaller than the
                                                    phone score, prune away */
-                            (hmm_in_score(cwln) < newscore)
-                            /*Just the Viterbi Update */
-                            ) {
-                            hmm_in_score(cwln) = newscore;
-                            hmm_in_history(cwln) = hmm_out_history(ln);
+                            (hmm_in_score(&cwln->hmm) < newscore)) {
+                            hmm_in_score(&cwln->hmm) = newscore;
+                            hmm_in_history(&cwln->hmm) = hmm_out_history(&ln->hmm);
 
-                            if (hmm_frame(cwln) != nf) {
-                                hmm_frame(cwln) = nf;
+                            if (hmm_frame(&cwln->hmm) != nf) {
+                                hmm_frame(&cwln->hmm) = nf;
                                 /*                        lextree_realloc_active_list(lextree,n+1); */
                                 lextree->next_active[n++] = cwln;
                             }
@@ -1593,29 +1483,16 @@
     }
 
     lextree->n_next_active = n;
-#if 0
-    E_INFO("Debugging.\n");
-    for (i = 0; i < lextree->n_next_active; i++) {
-        ln = lextree->next_active[i];
-
-        E_INFO(" ln->wid %d, str %s, ln->ssid %d, ln->rc %d,\n", ln->wid,
-               dict_wordstr(dict, ln->wid), ln->ssid, ln->rc);
-    }
-#endif
-    /*    E_INFO("lextree->n_next_active %d\n",    lextree->n_next_active); */
     return LEXTREE_OPERATION_SUCCESS;
 }
 
 int32
-lextree_hmm_propagate_leaves(lextree_t * lextree, kbcore_t * kbc,
+lextree_hmm_propagate_leaves(lextree_t * lextree,
                              vithist_t * vh, int32 cf, int32 wth)
 {
 
     lextree_node_t **list, *ln;
     int32 i;
-#if 0
-    int32 active_word_end = 0;
-#endif
 
     /* Code for heursitic score */
     list = lextree->active;
@@ -1625,10 +1502,10 @@
 
         if (IS_S3WID(ln->wid)) {        /* Leaf node; word exit */
 
-            if (hmm_out_score(ln) < wth)
+            if (hmm_out_score(&ln->hmm) < wth)
                 continue;       /* Word exit score not good enough */
 
-            if (hmm_out_history(ln) == -1) { /* This is a case where continue
+            if (hmm_out_history(&ln->hmm) == -1) { /* This is a case where continue
                                                              subsituting out.history into
                                                              vithist_rescore will cause
                                                              core-dump */
@@ -1639,29 +1516,23 @@
 
             /* Rescore the LM prob for this word wrt all possible predecessors */
 
-            if (dict2pid_is_composite(kbc->dict2pid)) {
-                vithist_rescore(vh, kbc, ln->wid, cf,
-                                hmm_out_score(ln) - ln->prob,
-                                hmm_out_history(ln), lextree->type, -1);
+            if (dict2pid_is_composite(lextree->dict2pid)) {
+                vithist_rescore(vh, lextree->lm, lextree->dict,
+                                lextree->dict2pid, ln->wid, cf,
+                                hmm_out_score(&ln->hmm) - ln->prob,
+                                hmm_out_history(&ln->hmm), lextree->type, -1);
             }
             else {
-                /*              lextree_node_print(ln,kbc->dict,stdout); */
+                /*              lextree_node_print(ln,dict,stdout); */
                 assert(ln->ssid != BAD_S3SSID); /*This make we are not using the mother of cross-word triphone */
                 assert(ln->rc != BAD_S3CIPID);
 
-                vithist_rescore(vh, kbc, ln->wid, cf,
-                                hmm_out_score(ln) - ln->prob,
-                                hmm_out_history(ln), lextree->type, ln->rc);
+                vithist_rescore(vh, lextree->lm, lextree->dict,
+                                lextree->dict2pid, ln->wid, cf,
+                                hmm_out_score(&ln->hmm) - ln->prob,
+                                hmm_out_history(&ln->hmm), lextree->type, ln->rc);
 
             }
-
-
-#if 0
-            active_word_end++;
-
-            /*      E_INFO("What is the hmm_out_score(ln) %d wth %d\n", hmm_out_score(ln),wth);
-               E_INFO("\nActive word end id %d, word end %s\n", ln->wid, dict_wordstr(kbc->dict,dict_basewid(kbc->dict,ln->wid))); */
-#endif
         }
     }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-13 20:31:22 UTC (rev 9216)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-15 16:35:25 UTC (rev 9217)
@@ -119,11 +119,12 @@
 
 #include "s3types.h"
 #include "hmm.h"
+#include "tmat.h"
 #include "vithist.h"
-#include "dict.h"
-#include "mdef.h"
+#include "s3_dict.h"
+#include "bin_mdef.h"
+#include "fillpen.h"
 
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -171,6 +172,7 @@
  * expanded, the code loop for all CI index. This is because dict2pid,
  * unlike ctxt_table, doesn't provide a list of triphones 
  * 2, for all active node, the code has iterate two times. Rather than once, because of separation 
+
  * of prop_non_leaves and prop_leaves. 
  */
 
@@ -240,6 +242,12 @@
     int32 n_alloc_node;   /**< Total No. of nodes in this lextree which is allocated dynamically */
     int32 n_alloc_blk_sz;   /**< Block size of each allocation */
 
+    bin_mdef_t *mdef;     /**< Model definition (not owned by this structure) */
+    s3dict_t *dict;     /**< Dictionary (not owned by this structure) */
+    dict2pid_t *dict2pid;     /**< Dictionary mapping (not owned by this structure) */
+    ngram_model_t *lm;  /**< Language model */
+    tmat_t *tmat;       /**< Transition matrices */
+
     hmm_context_t *ctx;     /**< HMM context for non-composite triphones. */
     hmm_context_t *comctx; /**< HMM context for composite triphones. */
 
@@ -272,7 +280,10 @@
  * unigram look-ahead is supported. 
  */
 lextree_t* lextree_init(
-    kbcore_t *kbcore, /**< In: Initialized kbcore */
+    bin_mdef_t *mdef,
+    tmat_t *tmat,
+    s3dict_t *dict,
+    dict2pid_t *dict2pid,
     ngram_model_t* lm,
     const char *lmname,     /**< In: LM name */
     int32 istreeUgProb, /**< In: Decide whether LM factoring is used or not */
@@ -282,9 +293,8 @@
 
 /** Initialize a filler tree.
  */
-lextree_t* fillertree_init(
-    kbcore_t *kbcore /**< In: Initialized kbcore */
-    );
+lextree_t* fillertree_init(bin_mdef_t *mdef, tmat_t *tmat, s3dict_t *dict,
+                           dict2pid_t *dict2pid, fillpen_t *fillpen);
 
 
 /** Report the lextree data structure. 
@@ -293,30 +303,22 @@
     lextree_t *ltree /**< In: Report a lexical tree*/
     );
 
-/**
- * Build a lexical tree for the set of words specified in wordprob[] (with their
- * associated LM probabilities).  wordprob[] must contain EXACTLY the set of words for
- * which the lextree is to be built, i.e, including alternatives and excluding OOVs.
- * Return value: Pointer to lextree_t structure representing entire lextree.
- */
-lextree_t *
-lextree_build (kbcore_t *kbc,		/**< In: All the necessary knowledge bases */
-	       wordprob_t *wordprob,	/**< In: Words in the tree and their (LM) probabilities */
-	       int32 n_word,		/**< In: Size of the wordprob[] array */
-	       s3cipid_t *lc,		/**< In: BAD_S3CIPID terminated array of left context
-					   CIphones, or NULL if no specific left context */
-               int32 type              /**< In: Type of lextree */
-    );
+/** \struct wordprob_t
+    \brief Generic structure that could be used at any n-gram level 
+*/
+typedef struct {
+    s3wid_t wid;	/**< NOTE: dictionary wid; may be BAD_S3WID if not available */
+    int32 prob;         /**< The probability */
+} wordprob_t;
 
-/* Free a lextree that was created by lextree_build */
+/* Free a lextree that was created by lextree_init */
 void lextree_free (lextree_t *lextree);
 
-
 /**
  * Reset the entire lextree (to the inactive state).  I.e., mark each HMM node as inactive,
  * (with lextree_node_t.frame = -1), and the active list size to 0.
  */
-void lextree_utt_end (lextree_t *l, kbcore_t *kbc);
+void lextree_utt_end (lextree_t *l);
 
 
 /**
@@ -327,9 +329,8 @@
 		    int32 frame,	/**< In: Frame from which being activated (for the next) */
 		    int32 inscore,	/**< In: Incoming score */
 		    int32 inhist,	/**< In: Incoming history */
-		    int32 thresh,	/**< In: Pruning threshold; incoming scores below this
+		    int32 thresh	/**< In: Pruning threshold; incoming scores below this
 					   threshold will not enter successfully */
-		    kbcore_t *kbc       /**< In: a kbcore, that provided stuffs such as dict and dict2pid */
     );
 
 /**
@@ -362,12 +363,12 @@
 /**
  * Evaluate the active HMMs in the given lextree, using the current frame senone scores.
  * Return value: The best HMM state score as a result.
- * Note that the current
  */
 int32 lextree_hmm_eval (lextree_t *lextree,	/**< In/Out: Lextree with HMMs to be evaluated */
-			kbcore_t *kbc,	/**< In: */
-			ascr_t *ascr,	/**< In: Senone scores (primary and composite) */
-			int32 f,	/**< In: Frame in which being invoked */
+
+                        int16 *senscr,  /**< In: Primary senone scores */
+                        int16 *comsen,  /**< In: Composite senone scores */
+                        int32 f,	/**< In: Frame in which being invoked */
 			FILE *fp	/**< In: If not-NULL, dump HMM state (for debugging) */
     );
 
@@ -403,12 +404,10 @@
  */
 int32 lextree_hmm_propagate_non_leaves (lextree_t *lextree,	/**< In/Out: Propagate scores across HMMs in
 								   this lextree */
-					kbcore_t *kbc,	/**< In: Core knowledge bases */
 					int32 cf,		/**< In: Current frame index. */
 					int32 th,		/**< In: General (HMM survival) pruning thresh */
 					int32 pth,		/**< In: Phone transition pruning threshold */
-					int32 wth,		/**< In: Word exit pruning threshold */
-					pl_t* pl            /**< In: Phoneme lookahead struct*/
+					int32 wth		/**< In: Word exit pruning threshold */
     ); 
 
 
@@ -424,7 +423,6 @@
 
 int32 lextree_hmm_propagate_leaves (lextree_t *lextree,	/**< In/Out: Propagate scores across HMMs in
 							   this lextree */
-				    kbcore_t *kbc,	/**< In: Core knowledge bases */
 				    vithist_t *vh,	/**< In/Out: Viterbi history structure to be
 							   updated with word exits */
 				    int32 cf,            /**< In: Current frame index */
@@ -448,8 +446,6 @@
 
 /** For debugging, dump the whole lexical tree*/
 void lextree_dump (lextree_t *lextree,  /**< In: A lexical tree*/
-		   dict_t *dict,       /**< In: a dictionary */
-		   mdef_t *mdef,       /**< In: a model definition */
 		   FILE *fp,           /**< A file pointer */
 		   int32 fmt           /**< fmt=1, Ravi's format, fmt=2, Dot's format*/ 
     );

Modified: trunk/pocketsphinx/src/libpocketsphinx/s3types.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s3types.h	2009-07-13 20:31:22 UTC (rev 9216)
+++ trunk/pocketsphinx/src/libpocketsphinx/s3types.h	2009-07-15 16:35:25 UTC (rev 9217)
@@ -174,8 +174,8 @@
 #define IS_S3FRMID(f)	((f)>=0)
 #define MAX_S3FRMID	((int32)0x7ffe)
 
-typedef int16   	s3senid_t;	/** Senone id */
-#define BAD_S3SENID	((s3senid_t) -1)
+typedef uint16   	s3senid_t;	/** Senone id */
+#define BAD_S3SENID	((s3senid_t) 0xffff)
 #define NOT_S3SENID(s)	((s)<0)
 #define IS_S3SENID(s)	((s)>=0)
 #define MAX_S3SENID	((int16)0x7ffe)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9226
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9226&view=rev
Author:   dhdfu
Date:     2009-07-24 06:38:17 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
Get everything relevant for tst_search_step() to compile...

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/lextree.h
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.h

Removed Paths:
-------------
    trunk/pocketsphinx/src/libpocketsphinx/srch_time_switch_tree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-24 06:38:17 UTC (rev 9226)
@@ -1046,13 +1046,13 @@
  */
 void
 dict2pid_comsseq2sen_active(dict2pid_t * d2p, bin_mdef_t * mdef,
-                            uint8 * comssid, uint8 * sen)
+                            bitvec_t * comssid, bitvec_t * sen)
 {
     int32 ss, cs, i, j;
     s3senid_t *csp, *sp;        /* Composite state pointer */
 
     for (ss = 0; ss < d2p->n_comsseq; ss++) {
-        if (comssid[ss]) {
+        if (bitvec_is_set(comssid,ss)) {
             csp = d2p->comsseq[ss];
 
             for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
@@ -1060,7 +1060,7 @@
                 sp = d2p->comstate[cs];
 
                 for (j = 0; IS_S3SENID(sp[j]); j++)
-                    sen[sp[j]] = 1;
+                    bitvec_set(sen, sp[j]);
             }
         }
     }

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-24 06:38:17 UTC (rev 9226)
@@ -103,6 +103,7 @@
 #include <stdio.h>
 
 #include <logmath.h>
+#include <bitvec.h>
 
 #include "s3types.h"
 #include "bin_mdef.h"
@@ -263,10 +264,11 @@
  */
 void dict2pid_comsseq2sen_active(dict2pid_t *d2p,      /**< In: a dict2pid_t structure */
                                  bin_mdef_t *mdef,         /**< In: a bin_mdef_t structure */
-                                 uint8 *comssid,	/**< In: Active flag for each comssid */
-                                 uint8 *sen		/**< In/Out: Active flags set for senones
+                                 bitvec_t *comssid,	/**< In: Active flag for each comssid */
+                                 bitvec_t *sen		/**< In/Out: Active flags set for senones
 							   indicated by the active comssid */
     );
+
 /** For debugging */
 void dict2pid_dump(FILE *fp,        /**< In: a file pointer */
                    dict2pid_t *d2p, /**< In: a dict2pid_t structure */

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-24 06:38:17 UTC (rev 9226)
@@ -903,7 +903,7 @@
 
 
 void
-lextree_ssid_active(lextree_t * lextree, uint8 * ssid, uint8 * comssid)
+lextree_ssid_active(lextree_t * lextree, bitvec_t * ssid, bitvec_t * comssid)
 {
     lextree_node_t **list, *ln;
     int32 i;
@@ -921,9 +921,9 @@
            } */
 
         if (ln->composite)
-            comssid[ln->ssid] = 1;
+            bitvec_set(comssid, ln->ssid);
         else
-            ssid[ln->ssid] = 1;
+            bitvec_set(ssid, ln->ssid);
     }
 }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.h	2009-07-24 06:38:17 UTC (rev 9226)
@@ -347,9 +347,9 @@
  * and comssid[].  Caller also responsible for clearing them before calling this function.
  */
 void lextree_ssid_active (lextree_t *lextree,	/**< In: lextree->active is scanned */
-			  uint8 *ssid,		/**< In/Out: ssid[s] is set to non-0 if senone
+			  bitvec_t *ssid,	/**< In/Out: ssid[s] is set to non-0 if senone
 						   sequence ID s is active */
-			  uint8 *comssid	/**< In/Out: comssid[s] is set to non-0 if
+			  bitvec_t *comssid	/**< In/Out: comssid[s] is set to non-0 if
 						   composite senone sequence ID s is active */
     );
 

Deleted: trunk/pocketsphinx/src/libpocketsphinx/srch_time_switch_tree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/srch_time_switch_tree.c	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/srch_time_switch_tree.c	2009-07-24 06:38:17 UTC (rev 9226)
@@ -1,1525 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-
-/* srch_time_switch_tree.c
- * HISTORY
- * 
- * $Log$
- * Revision 1.5  2006/04/17  20:14:12  dhdfu
- * Fix a class-based LM segfault
- * 
- * Revision 1.4  2006/04/05 20:27:34  dhdfu
- * A Great Reorganzation of header files and executables
- *
- * Revision 1.3  2006/02/23 16:46:50  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH:
- * 1, Used the corresponding lextree interface.
- * 2, 2nd-stage search logic are all commented.
- *
- * Revision 1.2.4.16  2006/01/16 20:14:02  arthchan2003
- * Remove the unlink silences part because that could affect the performance of the 1st pass search when -bestpath is specified.
- *
- * Revision 1.2.4.15  2005/11/17 06:43:25  arthchan2003
- * Removed senone scale in lextree_hmm_propagate.
- *
- * Revision 1.2.4.14  2005/10/17 04:54:49  arthchan2003
- * Freed the tree set correctly.
- *
- * Revision 1.2.4.13  2005/10/07 20:04:50  arthchan2003
- * When rescoring in full triphone expansion, the code should use the score for the word end with corret right context.
- *
- * Revision 1.2.4.12  2005/09/25 19:32:11  arthchan2003
- * (Change for comments) Allow lexical tree to be dumped optionally.
- *
- * Revision 1.2.4.11  2005/09/25 19:23:55  arthchan2003
- * 1, Added arguments for turning on/off LTS rules. 2, Added arguments for turning on/off composite triphones. 3, Moved dict2pid deallocation back to dict2pid. 4, Tidying up the clean up code.
- *
- * Revision 1.2.4.10  2005/09/18 01:46:20  arthchan2003
- * Moved unlinkSilences to mode 4 and mode 5 search-specific implementation.
- *
- * Revision 1.2.4.9  2005/09/11 03:01:01  arthchan2003
- * Bug fix on the size of hmmpf and histpf
- *
- * Revision 1.2.4.8  2005/08/03 18:54:32  dhdfu
- * Fix the support for multi-stream / semi-continuous models.  It is
- * still kind of a hack, but it now works.
- *
- * Revision 1.2.4.7  2005/07/27 23:19:59  arthchan2003
- * Added assert for make sure lmname is valid.
- *
- * Revision 1.2.4.6  2005/07/24 01:41:52  arthchan2003
- * Use ascr provided clearing function instead of directly clearing the array.
- *
- * Revision 1.2.4.5  2005/07/13 02:00:33  arthchan2003
- * Add ptmr_init for lexical tree timer. The program will not cause invalid write on the timer structure.
- *
- * Revision 1.2.4.4  2005/07/07 02:38:35  arthchan2003
- * 1, Remove -lminsearch, 2 Remove rescoring interface in the header.
- *
- * Revision 1.2.4.3  2005/07/04 07:20:48  arthchan2003
- * 1, Ignored -lmsearch, 2, cleaned up memory, 3 added documentation of TST search.
- *
- * Revision 1.2.4.2  2005/07/03 23:19:16  arthchan2003
- * Added free code for srch_time_switch_tree.c
- *
- * Revision 1.2.4.1  2005/06/28 07:03:37  arthchan2003
- * Set lmset correctly in srch_time_switch_tree.
- *
- * Revision 1.2  2005/06/22 02:45:52  arthchan2003
- * Log. Implementation of word-switching tree. Currently only work for a
- * very small test case and it's deliberately fend-off from users. Detail
- * omitted.
- *
- * Revision 1.15  2005/06/17 23:44:40  archan
- * Sphinx3 to s3.generic, 1, Support -lmname in decode and livepretend.  2, Wrap up the initialization of dict2lmwid to lm initialization. 3, add Dave's trick in LM switching in mode 4 of the search.
- *
- * Revision 1.14  2005/06/16 04:59:10  archan
- * Sphinx3 to s3.generic, a gentle-refactored version of Dave's change in senone scale.
- *
- * Revision 1.13  2005/06/11 06:58:35  archan
- * In both mode 4 and mode 5 searches, fixed a serious bug that cause the beam computation screwed up.
- *
- * Revision 1.12  2005/06/03 05:22:52  archan
- * Commented variables after refactor both mode 4 and mode 5 search to use reg_result_dump.
- *
- * Revision 1.11  2005/05/11 06:10:39  archan
- * Code for lattice and back track pointer table dumping is now wrapped in reg_result_dump.  The function is shared across mode 4 and mode 5.  Possibly later for mode 3 and mode 6 as well.
- *
- * Revision 1.10  2005/05/04 04:02:25  archan
- * Implementation of lm addition, deletion in (mode 4) time-switching tree implementation of search.  Not yet tested. Just want to keep up my own momentum.
- *
- * Revision 1.9  2005/05/03 06:57:44  archan
- * Finally. The word switching tree code is completed. Of course, the reporting routine largely duplicate with time switching tree code.  Also, there has to be some bugs in the filler treatment.  But, hey! These stuffs we can work on it.
- *
- * Revision 1.8  2005/05/03 04:09:10  archan
- * Implemented the heart of word copy search. For every ci-phone, every word end, a tree will be allocated to preserve its pathscore.  This is different from 3.5 or below, only the best score for a particular ci-phone, regardless of the word-ends will be preserved at every frame.  The graph propagation will not collect unused word tree at this point. srch_WST_propagate_wd_lv2 is also as the most stupid in the century.  But well, after all, everything needs a start.  I will then really get the results from the search and see how it looks.
- *
- * Revision 1.7  2005/04/25 23:53:35  archan
- * 1, Some minor modification of vithist_t, vithist_rescore can now support optional LM rescoring, vithist also has its own reporting routine. A new argument -lmrescore is also added in decode and livepretend.  This can switch on and off the rescoring procedure. 2, I am reaching the final difficulty of mode 5 implementation.  That is, to implement an algorithm which dynamically decide which tree copies should be entered.  However, stuffs like score propagation in the leave nodes and non-leaves nodes are already done. 3, As briefly mentioned in 2, implementation of rescoring , which used to happened at leave nodes are now separated. The current implementation is not the most clever one. Wish I have time to change it before check-in to the canonical.
- *
- * Revision 1.6  2005/04/25 19:22:48  archan
- * Refactor out the code of rescoring from lexical tree. Potentially we want to turn off the rescoring if we need.
- *
- * 17-Mar-2005 A. Chan (archan@...) at Carnegie Mellon University
- *             Started. This replaced utt.c starting from Sphinx 3.6. 
- */
-
-#include "srch.h"
-#include "gmm_wrap.h"
-#include "astar.h"
-#include "dict.h"
-#include "cmd_ln.h"
-#include "corpus.h"
-
-#define REPORT_SRCH_TST 1
-
-#include "s3types.h"
-#include "kb.h"
-#include "lextree.h"
-#include "lm.h"
-#include "vithist.h"
-
-/** 
-    \file srch_time_switch_tree.h 
-    \brief implementation of Sphinx 3.5 search (aka s3 fast). 
-
-    ARCHAN 20050324: The time condition tree search structure.  The
-    structure is reserved for legacy reason and it is explained as
-    follows. During the development of Sphinx 2 (pre-1994), we (folks
-    in CMU) already realized that using single unigram lexical tree
-    will cause so called word segmentation error.  I.e. In bigram
-    search, words with different word begins will be collected and
-    treated as one.
-
-    At the time of Sphinx 3.1 (~1998-1999) (the first attempt to build
-    a fast CDHMM decoder in CMU Sphinx group), Ravi Mosur considered
-    this problem and would like to solve this by introducing copies of
-    tree.  The standard method to do it was to introduce
-    word-conditioned tree copies which probably first introduced by
-    the RWTH group. Without careful adjustment of the allocation of
-    tree, this implementation method will requires (w+1) * lexical
-    trees in search for a bigram implementation.  Where w is the
-    number of words in the search architecture.
-
-    Therefore, he decided to use an interesting way to deal with the
-    word segmentation problem (and I personally feel that it is very
-    innovative).  What he did was instead of making word-conditioned
-    tree copies.  He used time-conditioned tree copies. That is to
-    say, at every certain frame, he will switch lexical tree in the
-    search.  This results in higher survival chance of tokens with an
-    early low score and allows Ravi to create a recognizer which has a
-    difference only relatively 10% from the s3.0 decode_anytopo. 
-
-    I usually refer this method as "lucky wheel" search because 1)
-    there is no principled reason why the switching of tree should be
-    done in this way. 2) The switching is done without considering the
-    maximum scores. 3) It might well be possible that some word ends
-    are active but they are just not "lucky" enough to enter next
-    tree.  So, it might amaze you that this search was used and it only
-    give 10% relative degradation from s3 slow. 
-
-    To understand why this search works, one could think in this
-    way. (i.e.  this is my opinion.).  When it boils down to the
-    highest scoring paths in a search. People observed that the time
-    information and word information each gives a relative good guess
-    to tell whether a path should be preserved or not.  This is
-    probably the reason in one version of IBM stack decoder, they
-    actually rescoring the priority queue by considering whether a
-    word has earlier word-begin.  RWTH's group also has one journal
-    paper on making use of the time information.  
-
-    The "lucky wheel" search is one type of search that tries to
-    tackling word segmentation problem using time information. It did
-    a reasonably good job. Of course, it will still be limited by the
-    fact time information is still poorer than the word information as 
-    a heuristic measure. 
-
-    This method is remained in sphinx 3.6 for three reasons.  First, I
-    personally think that there might be ways to trade-off his method
-    and conventional tree copies method. This could result in a better
-    memory/accuracy/speed trade-off. Second, I actually don't know
-    whether mode 5 (word copies searrch ) will work well in
-    general. Last but not least, I preserved the search because of my
-    respect to Ravi. :-)
-*/
-
-/**
-   A note by ARCHAN at 20050703
-
-   In general, what made a LVCSR search to be unique has three major
-   factors.  They are 1) how high level knowledge source (LM, FSG) is
-   applied, 2) how the lexicon is organized, 3, how cross word
-   triphones is realized and implemented.  It is important to realize
-   the interplay between these 3 components to realize how a search
-   actually really works. 
-   
-*/
-
-typedef struct {
-
-    /**
-     * There can be several unigram lextrees.  If we're at the end of frame f, we can only
-     * transition into the roots of lextree[(f+1) % n_lextree]; same for fillertree[].  This
-     * alleviates the problem of excessive Viterbi pruning in lextrees.
-     */
-
-    int32 n_lextree;		/**< Number of lexical tree for time switching: n_lextree */
-    lextree_t **curugtree;        /**< The current unigram tree that used in the search for this utterance. */
-
-    lextree_t **ugtree;           /**< The pool of trees that stores all word trees. */
-    lextree_t **fillertree;       /**< The pool of trees that stores all filler trees. */
-    int32 n_lextrans;		/**< #Transitions to lextree (root) made so far */
-    int32 epl ;                   /**< The number of entry per lexical tree */
-
-    lmset_t* lmset;               /**< The LM set */
-    int32 isLMLA;  /**< Is LM lookahead used?*/
-
-    histprune_t *histprune; /**< Structure that wraps up parameters related to  */
-  
-    vithist_t *vithist;     /**< Viterbi history (backpointer) table */
-
-} srch_TST_graph_t ;
-
-int
-srch_TST_init(kb_t * kb, void *srch)
-{
-
-    int32 n_ltree;
-    kbcore_t *kbc;
-    srch_TST_graph_t *tstg;
-    int32 i, j;
-    srch_t *s;
-    ptmr_t tm_build;
-
-    kbc = kb->kbcore;
-    s = (srch_t *) srch;
-
-    ptmr_init(&(tm_build));
-
-    if (kbc->lmset == NULL) {
-        E_ERROR("TST search requires a language model, please specify one with -lm or -lmctl\n");
-        return SRCH_FAILURE;
-    }
-
-    /* Unlink silences */
-    for (i = 0; i < kbc->lmset->n_lm; i++)
-        unlinksilences(kbc->lmset->lmarray[i], kbc, kbc->dict);
-
-    if (cmd_ln_int32_r(kbcore_config(kbc), "-Nstalextree"))
-        E_WARN("-Nstalextree is omitted in TST search.\n");
-
-
-  /** STRUCTURE : allocation of the srch graphs */
-    tstg = ckd_calloc(1, sizeof(srch_TST_graph_t));
-
-    tstg->epl = cmd_ln_int32_r(kbcore_config(kbc), "-epl");
-    tstg->n_lextree = cmd_ln_int32_r(kbcore_config(kbc), "-Nlextree");
-    tstg->isLMLA = cmd_ln_int32_r(kbcore_config(kbc), "-treeugprob");
-
-    /* CHECK: make sure the number of lexical tree is at least one. */
-
-    if (tstg->n_lextree < 1) {
-        E_WARN("No. of ugtrees specified: %d; will instantiate 1 ugtree\n",
-               tstg->n_lextree);
-        tstg->n_lextree = 1;
-    }
-
-    n_ltree = tstg->n_lextree;
-
-    /* STRUCTURE and REPORT: Initialize lexical tree. Filler tree's
-       initialization is followed.  */
-
-    tstg->ugtree =
-        (lextree_t **) ckd_calloc(kbc->lmset->n_lm * n_ltree,
-                                  sizeof(lextree_t *));
-
-    /* curugtree is a pointer pointing the current unigram tree which
-       were being used. */
-
-    tstg->curugtree =
-        (lextree_t **) ckd_calloc(n_ltree, sizeof(lextree_t *));
-
-    /* Just allocate pointers */
-
-    ptmr_reset(&(tm_build));
-    for (i = 0; i < kbc->lmset->n_lm; i++) {
-        for (j = 0; j < n_ltree; j++) {
-            /*     ptmr_reset(&(tm_build)); */
-            ptmr_start(&tm_build);
-
-            tstg->ugtree[i * n_ltree + j] =
-                lextree_init(kbc, kbc->lmset->lmarray[i],
-                             lmset_idx_to_name(kbc->lmset, i),
-                             tstg->isLMLA, REPORT_SRCH_TST,
-                             LEXTREE_TYPE_UNIGRAM);
-
-            ptmr_stop(&tm_build);
-
-            /* Just report the lexical tree parameters for the first tree */
-            lextree_report(tstg->ugtree[0]);
-
-            if (tstg->ugtree[i * n_ltree + j] == NULL) {
-                E_INFO
-                    ("Fail to allocate lexical tree for lm %d and lextree %d\n",
-                     i, j);
-                return SRCH_FAILURE;
-            }
-
-            if (REPORT_SRCH_TST) {
-                E_INFO
-                    ("Lextrees (%d) for lm %d, its name is %s, it has %d nodes(ug)\n",
-                     j, i, lmset_idx_to_name(kbc->lmset, i),
-                     lextree_n_node(tstg->ugtree[i * n_ltree + j]));
-            }
-        }
-    }
-    E_INFO("Time for building trees, %4.4f CPU %4.4f Clk\n",
-           tm_build.t_cpu, tm_build.t_elapsed);
-
-
-
-    /* By default, curugtree will be pointed to the first sets of tree */
-    for (j = 0; j < n_ltree; j++)
-        tstg->curugtree[j] = tstg->ugtree[j];
-
-
-    /* STRUCTURE: Create filler lextrees */
-    /* ARCHAN : only one filler tree is supposed to be built even for dynamic LMs */
-    /* Get the number of lexical tree */
-    tstg->fillertree =
-        (lextree_t **) ckd_calloc(n_ltree, sizeof(lextree_t *));
-
-    for (i = 0; i < n_ltree; i++) {
-        if ((tstg->fillertree[i] = fillertree_init(kbc)) == NULL) {
-            E_INFO("Fail to allocate filler tree  %d\n", i);
-            return SRCH_FAILURE;
-        }
-        if (REPORT_SRCH_TST) {
-            E_INFO("Lextrees(%d), %d nodes(filler)\n",
-                   i, lextree_n_node(tstg->fillertree[0]));
-        }
-    }
-
-    if (cmd_ln_int32_r(kbcore_config(kbc), "-lextreedump")) {
-        for (i = 0; i < kbc->lmset->n_lm; i++) {
-            for (j = 0; j < n_ltree; j++) {
-                E_INFO("LM %d name %s UGTREE %d\n", i,
-                        lmset_idx_to_name(kbc->lmset, i), j);
-                lextree_dump(tstg->ugtree[i * n_ltree + j], kbc->dict,
-                             kbc->mdef, stderr,
-                             cmd_ln_int32_r(kbcore_config(kbc), "-lextreedump"));
-            }
-        }
-        for (i = 0; i < n_ltree; i++) {
-            E_INFO("FILLERTREE %d\n", i);
-            lextree_dump(tstg->fillertree[i], kbc->dict, kbc->mdef, stderr,
-                         cmd_ln_int32_r(kbcore_config(kbc), "-lextreedump"));
-        }
-    }
-
-    tstg->histprune = histprune_init(cmd_ln_int32_r(kbcore_config(kbc), "-maxhmmpf"),
-                                     cmd_ln_int32_r(kbcore_config(kbc), "-maxhistpf"),
-                                     cmd_ln_int32_r(kbcore_config(kbc), "-maxwpf"),
-                                     cmd_ln_int32_r(kbcore_config(kbc), "-hmmhistbinsize"),
-                                     (tstg->curugtree[0]->n_node +
-                                      tstg->fillertree[0]->n_node) *
-                                     tstg->n_lextree);
-
-    /* Viterbi history structure */
-    tstg->vithist = vithist_init(kb->kbcore, kb->beam->word,
-                                 cmd_ln_int32_r(kbcore_config(kbc), "-bghist"), TRUE);
-
-
-    /* Glue the graph structure */
-    s->grh->graph_struct = tstg;
-    s->grh->graph_type = GRAPH_STRUCT_TST;
-
-
-    tstg->lmset = kbc->lmset;
-
-    return SRCH_SUCCESS;
-
-}
-
-int
-srch_TST_uninit(void *srch)
-{
-    srch_TST_graph_t *tstg;
-    srch_t *s;
-    int32 i, j;
-    kbcore_t *kbc;
-
-    s = (srch_t *) srch;
-    kbc = s->kbc;
-
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    for (i = 0; i < kbc->lmset->n_lm; i++) {
-        for (j = 0; j < tstg->n_lextree; j++) {
-            lextree_free(tstg->ugtree[i * tstg->n_lextree + j]);
-            lextree_free(tstg->fillertree[i * tstg->n_lextree + j]);
-        }
-    }
-
-    ckd_free(tstg->ugtree);
-    ckd_free(tstg->curugtree);
-    ckd_free(tstg->fillertree);
-
-    if (tstg->vithist)
-	vithist_free(tstg->vithist);
-
-    if (tstg->histprune != NULL) {
-        histprune_free((void *) tstg->histprune);
-    }
-
-    ckd_free(tstg);
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_begin(void *srch)
-{
-    kbcore_t *kbc;
-    int32 n, pred;
-    int32 i;
-    mgau_model_t *g;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-
-    s = (srch_t *) srch;
-    assert(s);
-    assert(s->op_mode == 4);
-    assert(s->grh);
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    assert(tstg);
-
-    kbc = s->kbc;
-    g = kbc->mgau;
-
-    /* Clean up any previous viterbi history */
-    vithist_utt_reset(tstg->vithist);
-    histprune_zero_histbin(tstg->histprune);
-
-    /* Insert initial <s> into vithist structure */
-    pred = vithist_utt_begin(tstg->vithist, kbc);
-    assert(pred == 0);          /* Vithist entry ID for <s> */
-
-    /* This reinitialize the cont_mgau routine in a GMM.  */
-    if (g) {
-        for (i = 0; i < g->n_mgau; i++) {
-            g->mgau[i].bstidx = NO_BSTIDX;
-            g->mgau[i].updatetime = NOT_UPDATED;
-        }
-    }
-
-    /* Enter into unigram lextree[0] */
-    n = lextree_n_next_active(tstg->curugtree[0]);
-    assert(n == 0);
-    lextree_enter(tstg->curugtree[0], mdef_silphone(kbc->mdef), -1, 0,
-                  pred, s->beam->hmm, s->kbc);
-
-    /* Enter into filler lextree */
-    n = lextree_n_next_active(tstg->fillertree[0]);
-    assert(n == 0);
-    lextree_enter(tstg->fillertree[0], BAD_S3CIPID, -1, 0, pred,
-                  s->beam->hmm, s->kbc);
-
-    tstg->n_lextrans = 1;
-
-    for (i = 0; i < tstg->n_lextree; i++) {
-        lextree_active_swap(tstg->curugtree[i]);
-        lextree_active_swap(tstg->fillertree[i]);
-    }
-
-    return SRCH_SUCCESS;
-}
-
-
-int
-srch_TST_end(void *srch)
-{
-    int32 i;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    stat_t *st;
-
-    s = (srch_t *) srch;
-    assert(s);
-    assert(s->op_mode == 4);
-    assert(s->grh);
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    assert(tstg);
-
-    st = s->stat;
-
-    /* Find the exit word and wrap up Viterbi history (but don't reset
-     * it yet!) */
-    s->exit_id = vithist_utt_end(tstg->vithist, s->kbc);
-
-    /* Statistics update/report */
-    st->utt_wd_exit = vithist_n_entry(tstg->vithist);
-    histprune_showhistbin(tstg->histprune, st->nfr, s->uttid);
-
-    for (i = 0; i < tstg->n_lextree; i++) {
-        lextree_utt_end(tstg->curugtree[i], s->kbc);
-        lextree_utt_end(tstg->fillertree[i], s->kbc);
-    }
-
-    lm_cache_stats_dump(kbcore_lm(s->kbc));
-    lm_cache_reset(kbcore_lm(s->kbc));
-
-    if (s->exit_id >= 0)
-        return SRCH_SUCCESS;
-    else
-        return SRCH_FAILURE;
-}
-
-int
-srch_TST_add_lm(void *srch, lm_t * lm, const char *lmname)
-{
-    lmset_t *lms;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    kbcore_t *kbc;
-    int32 n_ltree;
-    int32 j;
-    int32 idx;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    kbc = s->kbc;
-    lms = kbc->lmset;
-
-    n_ltree = tstg->n_lextree;
-
-    /* 1, Add a new LM */
-    lmset_add_lm(lms, lm, lmname);      /* No. of lm will be increased by 1 */
-
-    /* 2, Create a new set of trees for this LM. */
-
-    tstg->ugtree =
-        (lextree_t **) ckd_realloc(tstg->ugtree,
-                                   (lms->n_lm * n_ltree) *
-                                   sizeof(lextree_t *));
-
-    idx = lms->n_lm - 1;
-    for (j = 0; j < n_ltree; j++) {
-        tstg->ugtree[(idx) * n_ltree + j] = lextree_init(kbc,
-                                                         lms->lmarray[idx],
-                                                         lmset_idx_to_name
-                                                         (lms, idx),
-                                                         tstg->isLMLA,
-                                                         REPORT_SRCH_TST,
-                                                         LEXTREE_TYPE_UNIGRAM);
-
-        if (tstg->ugtree[idx * n_ltree + j] == NULL) {
-            E_INFO
-                ("Fail to allocate lexical tree for lm %d and lextree %d\n",
-                 idx, j);
-            return SRCH_FAILURE;
-        }
-
-        if (REPORT_SRCH_TST) {
-            E_INFO
-                ("Lextrees (%d) for lm %d, its name is %s, it has %d nodes(ug)\n",
-                 j, idx, lmset_idx_to_name(kbc->lmset, idx),
-                 lextree_n_node(tstg->ugtree[idx * n_ltree + j]));
-        }
-    }
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_delete_lm(void *srch, const char *lmname)
-{
-    lmset_t *lms;
-    kbcore_t *kbc = NULL;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    int32 lmidx;
-    int32 n_ltree;
-    int i, j;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbc = s->kbc;
-    lms = kbc->lmset;
-    n_ltree = tstg->n_lextree;
-
-    /* Get the index of a the lm name */
-    lmidx = lmset_name_to_idx(lms, lmname);
-
-    /* Free the n_ltree copies of tree */
-    for (j = 0; j < n_ltree; j++) {
-        lextree_free(tstg->curugtree[lmidx * n_ltree + j]);
-        tstg->curugtree[lmidx * n_ltree + j] = NULL;
-    }
-
-    /* Shift the pointer by one in the trees */
-    for (i = lmidx; i < kbc->lmset->n_lm; i++) {
-        for (j = 0; j < n_ltree; j++) {
-            tstg->curugtree[i * n_ltree + j] =
-                tstg->curugtree[(i + 1) * n_ltree + j];
-        }
-    }
-    /* Tree is handled, now also handled the lmset */
-
-    /* Delete the LM */
-    /* Remember that the n_lm is minus by 1 at this point */
-    lmset_delete_lm(lms, lmname);
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_set_lm(void *srch, const char *lmname)
-{
-    lmset_t *lms;
-    lm_t *lm;
-    kbcore_t *kbc = NULL;
-    int j;
-    int idx;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-
-    /*  s3wid_t dictid; */
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbc = s->kbc;
-    lms = kbc->lmset;
-
-    kbc->lmset->cur_lm = NULL;
-
-    for (j = 0; j < tstg->n_lextree; j++) {
-        tstg->curugtree[j] = NULL;
-    }
-
-    assert(lms != NULL);
-    assert(lms->lmarray != NULL);
-    assert(lmname != NULL);
-
-    idx = lmset_name_to_idx(lms, lmname);
-
-    if (idx == LM_NOT_FOUND) {
-        E_ERROR("LM name %s cannot be found, use the first language model",
-                lmname);
-        idx = 0;
-    }
-
-    /* Don't switch LM if we are already using this one. */
-    if (lms->cur_lm == lms->lmarray[idx]) {     /* What if idx=0 and the first LM is not initialized? The previous assert safe-guard this. */
-        return SRCH_SUCCESS;
-    }
-
-    lmset_set_curlm_widx(lms, idx);
-
-    for (j = 0; j < tstg->n_lextree; j++) {
-        tstg->curugtree[j] = tstg->ugtree[idx * tstg->n_lextree + j];
-    }
-
-    lm = kbc->lmset->cur_lm;
-
-    if ((tstg->vithist->lms2vh_root =
-         (vh_lms2vh_t **) ckd_realloc(tstg->vithist->lms2vh_root,
-                                      lm_n_ug(lm) * sizeof(vh_lms2vh_t *)
-         )) == NULL) {
-        E_FATAL("failed to allocate memory for vithist\n");
-    }
-    memset(tstg->vithist->lms2vh_root, 0,
-           lm_n_ug(lm) * sizeof(vh_lms2vh_t *));
-
-    histprune_update_histbinsize(tstg->histprune,
-                                 tstg->histprune->hmm_hist_binsize,
-                                 ((tstg->curugtree[0]->n_node) +
-                                  (tstg->fillertree[0]->n_node)) *
-                                 tstg->n_lextree);
-
-
-    if (REPORT_SRCH_TST) {
-        E_INFO("Current LM name %s\n", lmset_idx_to_name(kbc->lmset, idx));
-        E_INFO("LM ug size %d\n", lm->n_ug);
-        E_INFO("LM bg size %d\n", lm->n_bg);
-        E_INFO("LM tg size %d\n", lm->n_tg);
-        E_INFO("HMM history bin size %d\n",
-               tstg->histprune->hmm_hist_bins + 1);
-
-        for (j = 0; j < tstg->n_lextree; j++) {
-            E_INFO("Lextrees(%d), %d nodes(ug)\n",
-                   j, lextree_n_node(tstg->curugtree[j]));
-        }
-    }
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_eval_beams_lv1(void *srch)
-{
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_eval_beams_lv2(void *srch)
-{
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_hmm_compute_lv1(void *srch)
-{
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_compute_heuristic(void *srch, int32 win_efv)
-{
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    pl_t *pl;
-    ascr_t *ascr;
-    mdef_t *mdef;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    mdef = kbcore_mdef(s->kbc);
-
-    ascr = s->ascr;
-    pl = s->pl;
-
-    if (pl->pheurtype != 0)
-        pl_computePhnHeur(mdef, ascr, pl, pl->pheurtype, s->cache_win_strt,
-                          win_efv);
-
-    return SRCH_SUCCESS;
-}
-
-
-int
-srch_TST_hmm_compute_lv2(void *srch, int32 frmno)
-{
-    /* This is local to this codebase */
-
-    int32 i, j;
-    lextree_t *lextree;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    kbcore_t *kbcore;
-    beam_t *bm;
-    ascr_t *ascr;
-    histprune_t *hp;
-    stat_t *st;
-    pl_t *pl;
-
-    int32 besthmmscr, bestwordscr;
-    int32 frm_nhmm, hb, pb, wb;
-    int32 n_ltree;              /* Local version of number of lexical trees used */
-    int32 maxwpf;               /* Local version of Max words per frame, don't expect it to change */
-    int32 maxhistpf;            /* Local version of Max histories per frame, don't expect it to change */
-    int32 maxhmmpf;             /* Local version of Max active HMMs per frame, don't expect it to change  */
-    int32 histbinsize;          /* Local version of histogram bin size, don't expect it to change */
-    int32 numhistbins;          /* Local version of number of histogram bins, don't expect it to change */
-    int32 hmmbeam;              /* Local version of hmm beam, don't expect it to change. */
-    int32 pbeam;                /* Local version of phone beam, don't expect it to change. */
-    int32 wbeam;                /* Local version of word beam , don't expect it to change */
-    int32 *hmm_hist;            /* local version of histogram bins. */
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    n_ltree = tstg->n_lextree;
-    kbcore = s->kbc;
-    hp = tstg->histprune;
-    bm = s->beam;
-    ascr = s->ascr;
-    hmm_hist = hp->hmm_hist;
-    st = s->stat;
-    pl = s->pl;
-
-
-    maxwpf = hp->maxwpf;
-    maxhistpf = hp->maxhistpf;
-    maxhmmpf = hp->maxhmmpf;
-    histbinsize = hp->hmm_hist_binsize;
-    numhistbins = hp->hmm_hist_bins;
-    hmmbeam = s->beam->hmm;
-    pbeam = s->beam->ptrans;
-    wbeam = s->beam->word;
-
-    /* Evaluate active HMMs in each lextree; note best HMM state score */
-    besthmmscr = MAX_NEG_INT32;
-    bestwordscr = MAX_NEG_INT32;
-    frm_nhmm = 0;
-
-    for (i = 0; i < (n_ltree << 1); i++) {
-        lextree =
-            (i <
-             n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i - n_ltree];
-        if (s->hmmdumpfp != NULL)
-            fprintf(s->hmmdumpfp, "Fr %d Lextree %d #HMM %d\n", frmno, i,
-                    lextree->n_active);
-        lextree_hmm_eval(lextree, kbcore, ascr, frmno, s->hmmdumpfp);
-
-        if (besthmmscr < lextree->best)
-            besthmmscr = lextree->best;
-        if (bestwordscr < lextree->wbest)
-            bestwordscr = lextree->wbest;
-
-        st->utt_hmm_eval += lextree->n_active;
-        frm_nhmm += lextree->n_active;
-    }
-    if (besthmmscr > 0) {
-        E_ERROR
-            ("***ERROR*** Fr %d, best HMM score > 0 (%d); int32 wraparound?\n",
-             frmno, besthmmscr);
-    }
-
-
-    /* Hack! similar to the one in mode 5. The reason though is because
-       dynamic allocation of node cause the histroyt array need to be
-       allocated too.  I skipped this step by just making simple
-       assumption here.
-     */
-    if (frm_nhmm / histbinsize > hp->hmm_hist_bins - 1)
-        hmm_hist[hp->hmm_hist_bins - 1]++;
-    else
-        hmm_hist[frm_nhmm / histbinsize]++;
-
-    /* Set pruning threshold depending on whether number of active HMMs 
-     * is within limit 
-     */
-    /* ARCHAN: MAGIC */
-    if (frm_nhmm > (maxhmmpf + (maxhmmpf >> 1))) {
-        int32 *bin, nbin, bw;
-
-        /* Use histogram pruning */
-        nbin = 1000;
-        bw = -(hmmbeam) / nbin;
-        bin = (int32 *) ckd_calloc(nbin, sizeof(int32));
-
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree = (i < n_ltree) ?
-                tstg->curugtree[i] : tstg->fillertree[i - n_ltree];
-
-            lextree_hmm_histbin(lextree, besthmmscr, bin, nbin, bw);
-        }
-
-        for (i = 0, j = 0; (i < nbin) && (j < maxhmmpf); i++, j += bin[i]);
-        ckd_free((void *) bin);
-
-        /* Determine hmm, phone, word beams */
-        hb = -(i * bw);
-        pb = (hb > pbeam) ? hb : pbeam;
-        wb = (hb > wbeam) ? hb : wbeam;
-    }
-    else {
-        hb = hmmbeam;
-        pb = pbeam;
-        wb = wbeam;
-    }
-
-    bm->bestscore = besthmmscr;
-    bm->bestwordscore = bestwordscr;
-
-    bm->thres = bm->bestscore + hb;     /* HMM survival threshold */
-    bm->phone_thres = bm->bestscore + pb;       /* Cross-HMM transition threshold */
-    bm->word_thres = bm->bestwordscore + wb;    /* Word exit threshold */
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_propagate_graph_ph_lv1(void *srch)
-{
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_propagate_graph_wd_lv1(void *srch)
-{
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_propagate_graph_ph_lv2(void *srch, int32 frmno)
-{
-    int32 i;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    int32 n_ltree;              /* Local version of number of lexical trees used */
-    int32 ptranskip;            /* intervals at which wbeam is used for phone transitions, don't expect it to change */
-    int32 pheurtype;            /* Local version of pheurtype, don't expect it to change */
-
-    lextree_t *lextree;
-    kbcore_t *kbcore;
-    pl_t *pl;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbcore = s->kbc;
-    pl = s->pl;
-    pheurtype = pl->pheurtype;
-
-    n_ltree = tstg->n_lextree;
-    ptranskip = s->beam->ptranskip;
-
-    /*  This stupid is the legacy when we try to make the intel compiler happy. */
-    if (ptranskip == 0) {
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree =
-                (i <
-                 n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i -
-                                                                  tstg->
-                                                                  n_lextree];
-
-            if (lextree_hmm_propagate_non_leaves(lextree, kbcore, frmno,
-                                                 s->beam->thres,
-                                                 s->beam->phone_thres,
-                                                 s->beam->word_thres,
-                                                 pl) !=
-                LEXTREE_OPERATION_SUCCESS) {
-                E_ERROR
-                    ("Propagation Failed for lextree_hmm_propagate_non_leave at tree %d\n",
-                     i);
-                lextree_utt_end(lextree, kbcore);
-                return SRCH_FAILURE;
-            }
-
-        }
-    }
-    else {
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree =
-                (i <
-                 n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i -
-                                                                  n_ltree];
-
-            if ((frmno % ptranskip) != 0) {
-                if (lextree_hmm_propagate_non_leaves
-                    (lextree, kbcore, frmno, s->beam->thres,
-                     s->beam->phone_thres, s->beam->word_thres,
-                     pl) != LEXTREE_OPERATION_SUCCESS) {
-                    E_ERROR
-                        ("Propagation Failed for lextree_hmm_propagate_non_leave at tree %d\n",
-                         i);
-                    lextree_utt_end(lextree, kbcore);
-                    return SRCH_FAILURE;
-                }
-
-            }
-            else {
-
-                if (lextree_hmm_propagate_non_leaves
-                    (lextree, kbcore, frmno, s->beam->thres,
-                     s->beam->word_thres, s->beam->word_thres,
-                     pl) != LEXTREE_OPERATION_SUCCESS) {
-                    E_ERROR
-                        ("Propagation Failed for lextree_hmm_propagate_non_leave at tree %d\n",
-                         i);
-                    lextree_utt_end(lextree, kbcore);
-                    return SRCH_FAILURE;
-                }
-            }
-        }
-    }
-
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_rescoring(void *srch, int32 frmno)
-{
-    int32 i;
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    int32 n_ltree;              /* Local version of number of lexical trees used */
-    int32 ptranskip;            /* intervals at which wbeam is used for phone transitions, don't expect it to change */
-    lextree_t *lextree;
-    kbcore_t *kbcore;
-    vithist_t *vh;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbcore = s->kbc;
-    vh = tstg->vithist;
-
-    n_ltree = tstg->n_lextree;
-    ptranskip = s->beam->ptranskip;
-
-    if (ptranskip == 0) {
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree =
-                (i <
-                 n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i -
-                                                                  tstg->
-                                                                  n_lextree];
-            if (lextree_hmm_propagate_leaves
-                (lextree, kbcore, vh, frmno,
-                 s->beam->word_thres) != LEXTREE_OPERATION_SUCCESS) {
-                E_ERROR
-                    ("Propagation Failed for lextree_hmm_propagate_leave at tree %d\n",
-                     i);
-                lextree_utt_end(lextree, kbcore);
-                return SRCH_FAILURE;
-            }
-
-        }
-    }
-    else {
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree =
-                (i <
-                 n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i -
-                                                                  n_ltree];
-
-            if ((frmno % ptranskip) != 0) {
-                if (lextree_hmm_propagate_leaves
-                    (lextree, kbcore, vh, frmno,
-                     s->beam->word_thres) != LEXTREE_OPERATION_SUCCESS) {
-                    E_ERROR
-                        ("Propagation Failed for lextree_hmm_propagate_leave at tree %d\n",
-                         i);
-                    lextree_utt_end(lextree, kbcore);
-                    return SRCH_FAILURE;
-                }
-
-            }
-            else {
-                if (lextree_hmm_propagate_leaves
-                    (lextree, kbcore, vh, frmno,
-                     s->beam->word_thres) != LEXTREE_OPERATION_SUCCESS) {
-                    E_ERROR
-                        ("Propagation Failed for lextree_hmm_propagate_leave at tree %d\n",
-                         i);
-                    lextree_utt_end(lextree, kbcore);
-                    lextree_utt_end(lextree, kbcore);
-                    return SRCH_FAILURE;
-                }
-            }
-        }
-    }
-
-    return SRCH_SUCCESS;
-}
-
-
-static void
-srch_utt_word_trans(srch_t * s, int32 cf)
-{
-    int32 k, th;
-    vithist_t *vh;
-    vithist_entry_t *ve;
-    int32 vhid, le, n_ci, score;
-    int32 maxpscore;
-    int32 *bs = NULL, *bv = NULL, epl;
-    beam_t *bm;
-    s3wid_t wid;
-    int32 p;
-    dict_t *dict;
-    mdef_t *mdef;
-    srch_TST_graph_t *tstg;
-
-
-    /* Call the rescoring routines at all word end */
-
-
-
-
-    maxpscore = MAX_NEG_INT32;
-    bm = s->beam;
-
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    vh = tstg->vithist;
-    th = bm->bestscore + bm->hmm;       /* Pruning threshold */
-
-    if (vh->bestvh[cf] < 0)
-        return;
-
-    dict = kbcore_dict(s->kbc);
-    mdef = kbcore_mdef(s->kbc);
-    n_ci = mdef_n_ciphone(mdef);
-
-    /* Initialize best exit for each distinct word-final CI phone to NONE */
-
-    bs = bm->wordbestscores;
-    bv = bm->wordbestexits;
-    epl = tstg->epl;
-
-    for (p = 0; p < n_ci; p++) {
-        bs[p] = MAX_NEG_INT32;
-        bv[p] = -1;
-    }
-
-    /* Find best word exit in this frame for each distinct word-final CI phone */
-    vhid = vithist_first_entry(vh, cf);
-    le = vithist_n_entry(vh) - 1;
-    for (; vhid <= le; vhid++) {
-        ve = vithist_id2entry(vh, vhid);
-        if (!vithist_entry_valid(ve))
-            continue;
-
-        wid = vithist_entry_wid(ve);
-        p = dict_last_phone(dict, wid);
-        if (mdef_is_fillerphone(mdef, p))
-            p = mdef_silphone(mdef);
-
-        score = vithist_entry_score(ve);
-        if (score > bs[p]) {
-            bs[p] = score;
-            bv[p] = vhid;
-            if (maxpscore < score) {
-                maxpscore = score;
-                /*    E_INFO("maxscore = %d\n", maxpscore); */
-            }
-        }
-    }
-
-    /* Find lextree instance to be entered */
-    k = tstg->n_lextrans++;
-    k = (k % (tstg->n_lextree * epl)) / epl;
-
-    /* Transition to unigram lextrees */
-    for (p = 0; p < n_ci; p++) {
-        if (bv[p] >= 0) {
-            if (s->beam->wordend == 0
-                || bs[p] > s->beam->wordend + maxpscore) {
-                /* RAH, typecast p to (s3cipid_t) to make compiler happy */
-                lextree_enter(tstg->curugtree[k], (s3cipid_t) p, cf, bs[p],
-                              bv[p], th, s->kbc);
-            }
-        }
-
-    }
-
-    /* Transition to filler lextrees */
-    lextree_enter(tstg->fillertree[k], BAD_S3CIPID, cf, vh->bestscore[cf],
-                  vh->bestvh[cf], th, s->kbc);
-}
-
-int
-srch_TST_propagate_graph_wd_lv2(void *srch, int32 frmno)
-{
-    dict_t *dict;
-    vithist_t *vh;
-    histprune_t *hp;
-    kbcore_t *kbcore;
-
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    int32 maxwpf;               /* Local version of Max words per frame, don't expect it to change */
-    int32 maxhistpf;            /* Local version of Max histories per frame, don't expect it to change */
-    int32 maxhmmpf;             /* Local version of Max active HMMs per frame, don't expect it to change  */
-
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbcore = s->kbc;
-
-    hp = tstg->histprune;
-    vh = tstg->vithist;
-    dict = kbcore_dict(kbcore);
-
-    maxwpf = hp->maxwpf;
-    maxhistpf = hp->maxhistpf;
-    maxhmmpf = hp->maxhmmpf;
-
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    srch_TST_rescoring((void *) s, frmno);
-
-    vithist_prune(vh, dict, frmno, maxwpf, maxhistpf,
-                  s->beam->word_thres - s->beam->bestwordscore);
-
-    srch_utt_word_trans(s, frmno);
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_frame_windup(void *srch, int32 frmno)
-{
-    vithist_t *vh;
-    kbcore_t *kbcore;
-    int32 i;
-
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbcore = s->kbc;
-
-    vh = tstg->vithist;
-
-    /* Wind up this frame */
-    vithist_frame_windup(vh, frmno, NULL, kbcore);
-
-
-    for (i = 0; i < tstg->n_lextree; i++) {
-        lextree_active_swap(tstg->curugtree[i]);
-        lextree_active_swap(tstg->fillertree[i]);
-    }
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_shift_one_cache_frame(void *srch, int32 win_efv)
-{
-    ascr_t *ascr;
-    srch_t *s;
-
-    s = (srch_t *) srch;
-
-    ascr = s->ascr;
-
-    ascr_shift_one_cache_frame(ascr, win_efv);
-    return SRCH_SUCCESS;
-}
-
-int
-srch_TST_select_active_gmm(void *srch)
-{
-
-    ascr_t *ascr;
-    int32 n_ltree;              /* Local version of number of lexical trees used */
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    dict2pid_t *d2p;
-    mdef_t *mdef;
-    fast_gmm_t *fgmm;
-    lextree_t *lextree;
-    pl_t *pl;
-    stat_t *st;
-    mgau_model_t *mgau;
-
-    kbcore_t *kbcore;
-    int32 i;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    kbcore = s->kbc;
-
-    ascr = s->ascr;
-    n_ltree = tstg->n_lextree;
-
-    mdef = kbcore_mdef(kbcore);
-    d2p = kbcore_dict2pid(kbcore);
-    mgau = kbcore_mgau(kbcore);
-    pl = s->pl;
-    fgmm = s->fastgmm;
-    st = s->stat;
-
-    if (ascr->sen_active) {
-        /*    E_INFO("Decide whether senone is active\n"); */
-
-
-        ascr_clear_ssid_active(ascr);
-        ascr_clear_comssid_active(ascr);
-
-
-        /* Find active senone-sequence IDs (including composite ones) */
-        for (i = 0; i < (n_ltree << 1); i++) {
-            lextree = (i < n_ltree) ? tstg->curugtree[i] :
-                tstg->fillertree[i - n_ltree];
-            lextree_ssid_active(lextree, ascr->ssid_active,
-                                ascr->comssid_active);
-        }
-
-        /* Find active senones from active senone-sequences */
-
-        ascr_clear_sen_active(ascr);
-
-
-        mdef_sseq2sen_active(mdef, ascr->ssid_active, ascr->sen_active);
-
-        /* Add in senones needed for active composite senone-sequences */
-        dict2pid_comsseq2sen_active(d2p, mdef, ascr->comssid_active,
-                                    ascr->sen_active);
-    }
-
-    return SRCH_SUCCESS;
-}
-
-glist_t
-srch_TST_gen_hyp(void *srch)
-{
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    int32 id;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    assert(tstg->vithist);
-
-    if (s->exit_id == -1) /* Search not finished */
-	id = vithist_partialutt_end(tstg->vithist, s->kbc);
-    else
-        id = s->exit_id;
-
-    if (id < 0) {
-        E_WARN("Failed to retrieve viterbi history.\n");
-        return NULL;
-    }
-
-    return vithist_backtrace(tstg->vithist, id, kbcore_dict(s->kbc));
-}
-
-int
-srch_TST_dump_vithist(void *srch)
-{
-    srch_t *s;
-    srch_TST_graph_t *tstg;
-    FILE *bptfp;
-    char *file;
-
-    s = (srch_t *) srch;
-    tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-    assert(tstg->vithist);
-
-    file = ckd_calloc(strlen(cmd_ln_str_r(kbcore_config(s->kbc), "-bptbldir")) + strlen(s->uttid) + 5, 1);
-    sprintf(file, "%s/%s.bpt", cmd_ln_str_r(kbcore_config(s->kbc), "-bptbldir"), s->uttid);
-
-    if ((bptfp = fopen(file, "w")) == NULL) {
-        E_ERROR("fopen(%s,w) failed; using stdout\n", file);
-        bptfp = stdout;
-    }
-    ckd_free(file);
-
-    vithist_dump(tstg->vithist, -1, s->kbc, bptfp);
-
-    if (bptfp != stdout)
-        fclose(bptfp);
-
-    return SRCH_SUCCESS;
-}
-
-
-dag_t *
-srch_TST_gen_dag(void *srch,         /**< a pointer of srch_t */
-                 glist_t hyp)
-{
-    srch_t *s = (srch_t *)srch;
-    srch_TST_graph_t *tstg = (srch_TST_graph_t *) s->grh->graph_struct;
-
-    return vithist_dag_build(tstg->vithist, hyp, kbcore_dict(s->kbc),
-                             s->exit_id, kbcore_config(s->kbc), kbcore_logmath(s->kbc));
-}
-
-glist_t
-srch_TST_bestpath_impl(void *srch,          /**< A void pointer to a search structure */
-                       dag_t * dag)
-{
-    glist_t ghyp, rhyp;
-    float32 bestpathlw;
-    float64 lwf;
-    srch_hyp_t *tmph, *bph;
-    srch_t *s = (srch_t *) srch;
-
-    bestpathlw = cmd_ln_float32_r(kbcore_config(s->kbc), "-bestpathlw");
-    lwf = bestpathlw ? (bestpathlw / cmd_ln_float32_r(kbcore_config(s->kbc), "-lw")) : 1.0;
-
-    /* Bypass filler nodes */
-    if (!dag->filler_removed) {
-        /* If Viterbi search terminated in filler word coerce final DAG node to FINISH_WORD */
-        if (dict_filler_word(s->kbc->dict, dag->end->wid))
-            dag->end->wid = s->kbc->dict->finishwid;
-        if (dag_bypass_filler_nodes(dag, lwf, s->kbc->dict, s->kbc->fillpen) < 0)
-            E_ERROR("maxedge limit (%d) exceeded\n", dag->maxedge);
-        else
-            dag->filler_removed = 1;
-    }
-
-    /* FIXME: This is some bogus crap to do with the different
-     * treatment of <s> and </s> in the flat vs. the tree decoder.  If
-     * we don't do this then bestpath search will fail because
-     * trigrams ending in </s> can't be scored. */
-    linksilences(kbcore_lm(s->kbc), s->kbc, kbcore_dict(s->kbc));
-    bph = dag_search(dag, s->uttid,
-                     lwf,
-                     dag->end,
-                     kbcore_dict(s->kbc),
-                     kbcore_lm(s->kbc), kbcore_fillpen(s->kbc)
-        );
-    unlinksilences(kbcore_lm(s->kbc), s->kbc, kbcore_dict(s->kbc));
-
-    if (bph != NULL) {
-        ghyp = NULL;
-        for (tmph = bph; tmph; tmph = tmph->next)
-            ghyp = glist_add_ptr(ghyp, (void *) tmph);
-
-        rhyp = glist_reverse(ghyp);
-        return rhyp;
-    }
-    else {
-        return NULL;
-    }
-
-}
-
-glist_t
-srch_TST_nbest_impl(void *srch,          /**< A void pointer to a search structure */
-                    dag_t * dag)
-{
-    float32 bestpathlw;
-    float64 lwf;
-    srch_t *s = (srch_t *) srch;
-    char str[2000];
-
-    if (!(cmd_ln_exists_r(kbcore_config(s->kbc), "-nbestdir") && cmd_ln_str_r(kbcore_config(s->kbc), "-nbestdir")))
-        return NULL;
-    ctl_outfile(str, cmd_ln_str_r(kbcore_config(s->kbc), "-nbestdir"), cmd_ln_str_r(kbcore_config(s->kbc), "-nbestext"),
-                (s->uttfile ? s->uttfile : s->uttid), s->uttid);
-
-    bestpathlw = cmd_ln_float32_r(kbcore_config(s->kbc), "-bestpathlw");
-    lwf = bestpathlw ? (bestpathlw / cmd_ln_float32_r(kbcore_config(s->kbc), "-lw")) : 1.0;
-
-    /* FIXME: This is some bogus crap to do with the different
-     * treatment of <s> and </s> in the flat vs. the tree decoder.  If
-     * we don't do this then bestpath search will fail because
-     * trigrams ending in </s> can't be scored. */
-    linksilences(kbcore_lm(s->kbc), s->kbc, kbcore_dict(s->kbc));
-
-    /* Bypass filler nodes */
-    if (!dag->filler_removed) {
-        /* If Viterbi search terminated in filler word coerce final DAG node to FINISH_WORD */
-        if (dict_filler_word(s->kbc->dict, dag->end->wid))
-            dag->end->wid = s->kbc->dict->finishwid;
-        dag_remove_unreachable(dag);
-        if (dag_bypass_filler_nodes(dag, lwf, s->kbc->dict, s->kbc->fillpen) < 0) {
-            E_ERROR("maxedge limit (%d) exceeded\n", dag->maxedge);
-            return NULL;
-        }
-    }
-
-    dag_compute_hscr(dag, kbcore_dict(s->kbc), kbcore_lm(s->kbc), lwf);
-    dag_remove_bypass_links(dag);
-    dag->filler_removed = 0;
-
-    nbest_search(dag, str, s->uttid, lwf,
-                 kbcore_dict(s->kbc),
-                 kbcore_lm(s->kbc), kbcore_fillpen(s->kbc)
-        );
-    unlinksilences(kbcore_lm(s->kbc), s->kbc, kbcore_dict(s->kbc));
-
-    return NULL;
-}
-
-/* Pointers to all functions */
-srch_funcs_t srch_TST_funcs = {
-	/* init */			srch_TST_init,
-	/* uninit */			srch_TST_uninit,
-	/* utt_begin */ 		srch_TST_begin,
-	/* utt_end */   		srch_TST_end,
-	/* decode */			NULL,
-	/* set_lm */			srch_TST_set_lm,
-	/* add_lm */			srch_TST_add_lm,
-	/* delete_lm */ 		srch_TST_delete_lm,
-
-	/* gmm_compute_lv1 */		approx_ci_gmm_compute,
-	/* one_srch_frame_lv1 */	NULL,
-	/* hmm_compute_lv1 */		srch_debug_hmm_compute_lv1,
-	/* eval_beams_lv1 */		srch_debug_eval_beams_lv1,
-	/* propagate_graph_ph_lv1 */	srch_debug_propagate_graph_ph_lv1,
-	/* propagate_graph_wd_lv1 */	srch_debug_propagate_graph_wd_lv1,
-
-	/* gmm_compute_lv2 */		s3_cd_gmm_compute_sen_comp,
-	/* one_srch_frame_lv2 */	NULL,
-	/* hmm_compute_lv2 */		srch_TST_hmm_compute_lv2,
-	/* eval_beams_lv2 */		srch_debug_eval_beams_lv2,
-	/* propagate_graph_ph_lv2 */	srch_TST_propagate_graph_ph_lv2,
-	/* propagate_graph_wd_lv2 */	srch_TST_propagate_graph_wd_lv2,
-
-	/* rescoring */			NULL,
-	/* frame_windup */		srch_TST_frame_windup,
-	/* compute_heuristic */		srch_TST_compute_heuristic,
-	/* shift_one_cache_frame */	srch_TST_shift_one_cache_frame,
-	/* select_active_gmm */		srch_TST_select_active_gmm,
-
-	/* gen_hyp */			srch_TST_gen_hyp,
-	/* gen_dag */			srch_TST_gen_dag,
-	/* dump_vithist */		srch_TST_dump_vithist,
-	/* bestpath_impl */		srch_TST_bestpath_impl,
-	/* dag_dump */			NULL,
-	/* nbest_impl */		srch_TST_nbest_impl,
-	NULL
-};

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-24 06:38:17 UTC (rev 9226)
@@ -274,6 +274,23 @@
     return lextree;
 }
 
+static void
+tst_search_update_widmap(tst_search_t *tstg)
+{
+    const char **words;
+    int32 i, n_words;
+
+    /* It's okay to include fillers since they won't be in the LM */
+    n_words = s3dict_size(tstg->dict);
+    words = ckd_calloc(n_words, sizeof(*words));
+    /* This will include alternates, again, that's okay since they aren't in the LM */
+    for (i = 0; i < n_words; ++i)
+        words[i] = (const char *)s3dict_wordstr(tstg->dict, i);
+    ngram_model_set_map_words(tstg->lmset, words, n_words);
+    ckd_free(words);
+}
+
+
 ps_search_t *
 tst_search_init(cmd_ln_t *config,
                 acmod_t *acmod,
@@ -313,6 +330,11 @@
                            acmod->lmath);
     beam_report(tstg->beam);
 
+    tstg->ssid_active = bitvec_alloc(bin_mdef_n_sseq(acmod->mdef));
+    tstg->comssid_active = bitvec_alloc(dict2pid_n_comsseq(tstg->dict2pid));
+    tstg->composite_senone_scores = ckd_calloc(bin_mdef_n_sen(acmod->mdef),
+                                               sizeof(*tstg->composite_senone_scores));
+
     ptmr_init(&(tm_build));
 
     tstg->epl = cmd_ln_int32_r(config, "-epl");
@@ -350,6 +372,7 @@
             goto error_out;
         }
     }
+    tst_search_update_widmap(tstg);
 
     /* Unlink silences (FIXME: wtf) */
 #if 0
@@ -447,54 +470,538 @@
 void
 tst_search_free(ps_search_t *search)
 {
-    ckd_free(search);
+    tst_search_t *tstg = (tst_search_t *)search;
+
+    if (tstg == NULL)
+        return;
+
+    if (tstg->ugtree) {
+        hash_iter_t *hiter = hash_table_iter(tstg->ugtree);
+        if (hiter)
+            do {
+                lextree_t **lextree = (lextree_t**)hash_entry_val(hiter->ent);
+                if (lextree) {
+                    int j;
+                    for (j = 0; j < tstg->n_lextree; ++j)
+                        lextree_free(lextree[j]);
+                }
+            } while ((hiter = hash_table_iter_next(hiter)));
+        hash_table_free(tstg->ugtree);
+    }
+
+    ckd_free(tstg->curugtree);
+    if (tstg->fillertree) {
+        int32 j;
+        for (j = 0; j < tstg->n_lextree; ++j)
+            lextree_free(tstg->fillertree[j]);
+        ckd_free(tstg->fillertree);
+    }
+
+    if (tstg->vithist)
+        vithist_free(tstg->vithist);
+    if (tstg->histprune)
+        histprune_free(tstg->histprune);
+    if (tstg->dict)
+        s3dict_free(tstg->dict);
+    if (tstg->dict2pid)
+        dict2pid_free(tstg->dict2pid);
+    if (tstg->fillpen)
+        fillpen_free(tstg->fillpen);
+    if (tstg->beam)
+        beam_free(tstg->beam);
+    bitvec_free(tstg->ssid_active);
+    bitvec_free(tstg->comssid_active);
+    ckd_free(tstg->composite_senone_scores);
+
+    ckd_free(tstg);
 }
 
 static int
 tst_search_start(ps_search_t *search)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+    int32 n, pred;
+    int32 i;
 
+    /* Clean up any previous viterbi history */
+    vithist_utt_reset(tstg->vithist);
+    histprune_zero_histbin(tstg->histprune);
+
+    /* Insert initial <s> into vithist structure */
+    pred = vithist_utt_begin(tstg->vithist, s3dict_startwid(tstg->dict));
+    assert(pred == 0);          /* Vithist entry ID for <s> */
+
+    /* Need to reinitialize GMMs, things like that? */
+
+    /* Enter into unigram lextree[0] */
+    n = lextree_n_next_active(tstg->curugtree[0]);
+    assert(n == 0);
+    lextree_enter(tstg->curugtree[0], bin_mdef_silphone(ps_search_acmod(tstg)->mdef),
+                  -1, 0, pred, tstg->beam->hmm);
+
+    /* Enter into filler lextree */
+    n = lextree_n_next_active(tstg->fillertree[0]);
+    assert(n == 0);
+    lextree_enter(tstg->fillertree[0], BAD_S3CIPID, -1, 0, pred, tstg->beam->hmm);
+
+    tstg->n_lextrans = 1;
+
+    for (i = 0; i < tstg->n_lextree; i++) {
+        lextree_active_swap(tstg->curugtree[i]);
+        lextree_active_swap(tstg->fillertree[i]);
+    }
+
     return 0;
 }
 
 static int
-tst_search_step(ps_search_t *search, int frame_idx)
+tst_search_finish(ps_search_t *search)
 {
-    return -1;
+    tst_search_t *tstg = (tst_search_t *)search;
+    int32 i, exit_id;
+
+    /* Find the exit word and wrap up Viterbi history (but don't reset
+     * it yet!) */
+    exit_id = vithist_utt_end(tstg->vithist,
+                              tstg->lmset, tstg->dict, tstg->dict2pid);
+
+    /* Statistics update/report */
+    /* st->utt_wd_exit = vithist_n_entry(tstg->vithist); */
+    /* Not sure hwo to get the uttid. */
+    /* histprune_showhistbin(tstg->histprune, st->nfr, s->uttid); */
+
+    for (i = 0; i < tstg->n_lextree; i++) {
+        lextree_utt_end(tstg->curugtree[i]);
+        lextree_utt_end(tstg->fillertree[i]);
+    }
+
+    if (exit_id >= 0)
+        return 0;
+    else
+        return -1;
 }
 
 static int
-tst_search_finish(ps_search_t *search)
+srch_TST_hmm_compute_lv2(tst_search_t *tstg, int32 frmno)
 {
-    return -1;
+    /* This is local to this codebase */
+
+    int32 i, j;
+    lextree_t *lextree;
+    beam_t *bm;
+    histprune_t *hp;
+
+    int32 besthmmscr, bestwordscr;
+    int32 frm_nhmm, hb, pb, wb;
+    int32 n_ltree;              /* Local version of number of lexical trees used */
+    int32 maxwpf;               /* Local version of Max words per frame, don't expect it to change */
+    int32 maxhistpf;            /* Local version of Max histories per frame, don't expect it to change */
+    int32 maxhmmpf;             /* Local version of Max active HMMs per frame, don't expect it to change  */
+    int32 histbinsize;          /* Local version of histogram bin size, don't expect it to change */
+    int32 numhistbins;          /* Local version of number of histogram bins, don't expect it to change */
+    int32 hmmbeam;              /* Local version of hmm beam, don't expect it to change. */
+    int32 pbeam;                /* Local version of phone beam, don't expect it to change. */
+    int32 wbeam;                /* Local version of word beam , don't expect it to change */
+    int32 *hmm_hist;            /* local version of histogram bins. */
+
+    n_ltree = tstg->n_lextree;
+    hp = tstg->histprune;
+    bm = tstg->beam;
+    hmm_hist = hp->hmm_hist;
+
+    maxwpf = hp->maxwpf;
+    maxhistpf = hp->maxhistpf;
+    maxhmmpf = hp->maxhmmpf;
+    histbinsize = hp->hmm_hist_binsize;
+    numhistbins = hp->hmm_hist_bins;
+
+    hmmbeam = bm->hmm;
+    pbeam = bm->ptrans;
+    wbeam = bm->word;
+
+    /* Evaluate active HMMs in each lextree; note best HMM state score */
+    besthmmscr = MAX_NEG_INT32;
+    bestwordscr = MAX_NEG_INT32;
+    frm_nhmm = 0;
+
+    for (i = 0; i < (n_ltree << 1); i++) {
+        lextree =
+            (i < n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i - n_ltree];
+        if (tstg->hmmdumpfp != NULL)
+            fprintf(tstg->hmmdumpfp, "Fr %d Lextree %d #HMM %d\n", frmno, i,
+                    lextree->n_active);
+        lextree_hmm_eval(lextree,
+                         ps_search_acmod(tstg)->senone_scores,
+                         tstg->composite_senone_scores,
+                         frmno, tstg->hmmdumpfp);
+
+        if (besthmmscr < lextree->best)
+            besthmmscr = lextree->best;
+        if (bestwordscr < lextree->wbest)
+            bestwordscr = lextree->wbest;
+
+        /* st->utt_hmm_eval += lextree->n_active; */
+        frm_nhmm += lextree->n_active;
+    }
+    if (besthmmscr > 0) {
+        E_ERROR
+            ("***ERROR*** Fr %d, best HMM score > 0 (%d); int32 wraparound?\n",
+             frmno, besthmmscr);
+    }
+
+
+    /* Hack! similar to the one in mode 5. The reason though is because
+       dynamic allocation of node cause the histroyt array need to be
+       allocated too.  I skipped this step by just making simple
+       assumption here.
+     */
+    if (frm_nhmm / histbinsize > hp->hmm_hist_bins - 1)
+        hmm_hist[hp->hmm_hist_bins - 1]++;
+    else
+        hmm_hist[frm_nhmm / histbinsize]++;
+
+    /* Set pruning threshold depending on whether number of active HMMs 
+     * is within limit 
+     */
+    /* ARCHAN: MAGIC */
+    if (frm_nhmm > (maxhmmpf + (maxhmmpf >> 1))) {
+        int32 *bin, nbin, bw;
+
+        /* Use histogram pruning */
+        nbin = 1000;
+        bw = -(hmmbeam) / nbin;
+        bin = (int32 *) ckd_calloc(nbin, sizeof(int32));
+
+        for (i = 0; i < (n_ltree << 1); i++) {
+            lextree = (i < n_ltree) ?
+                tstg->curugtree[i] : tstg->fillertree[i - n_ltree];
+
+            lextree_hmm_histbin(lextree, besthmmscr, bin, nbin, bw);
+        }
+
+        for (i = 0, j = 0; (i < nbin) && (j < maxhmmpf); i++, j += bin[i]);
+        ckd_free((void *) bin);
+
+        /* Determine hmm, phone, word beams */
+        hb = -(i * bw);
+        pb = (hb > pbeam) ? hb : pbeam;
+        wb = (hb > wbeam) ? hb : wbeam;
+    }
+    else {
+        hb = hmmbeam;
+        pb = pbeam;
+        wb = wbeam;
+    }
+
+    bm->bestscore = besthmmscr;
+    bm->bestwordscore = bestwordscr;
+
+    bm->thres = bm->bestscore + hb;     /* HMM survival threshold */
+    bm->phone_thres = bm->bestscore + pb;       /* Cross-HMM transition threshold */
+    bm->word_thres = bm->bestwordscore + wb;    /* Word exit threshold */
+
+    return 0;
 }
 
 static int
+srch_TST_propagate_graph_ph_lv2(tst_search_t *tstg, int32 frmno)
+{
+    int32 i;
+    int32 n_ltree;              /* Local version of number of lexical trees used */
+
+    lextree_t *lextree;
+
+    n_ltree = tstg->n_lextree;
+
+    for (i = 0; i < (n_ltree << 1); i++) {
+        lextree =
+            (i <
+             n_ltree) ? tstg->curugtree[i] : tstg->fillertree[i -
+                                                              tstg->
+                                                              n_lextree];
+
+        if (lextree_hmm_propagate_non_leaves(lextree, frmno,
+                                             tstg->beam->thres,
+                                             tstg->beam->phone_thres,
+                                             tstg->beam->word_thres)
+            != LEXTREE_OPERATION_SUCCESS) {
+            E_ERROR
+                ("Propagation Failed for lextree_hmm_propagate_non_leave at tree %d\n",
+                 i);
+            lextree_utt_end(lextree);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static void
+mdef_sseq2sen_active(bin_mdef_t * mdef, bitvec_t * sseq, bitvec_t * sen)
+{
+    int32 ss, i;
+    s3senid_t *sp;
+
+    for (ss = 0; ss < bin_mdef_n_sseq(mdef); ss++) {
+        if (bitvec_is_set(sseq,ss)) {
+            sp = mdef->sseq[ss];
+            for (i = 0; i < mdef_n_emit_state(mdef); i++)
+                bitvec_set(sen, sp[i]);
+        }
+    }
+}
+
+static int
+srch_TST_select_active_gmm(tst_search_t *tstg)
+{
+    int32 n_ltree;              /* Local version of number of lexical trees used */
+    dict2pid_t *d2p;
+    bin_mdef_t *mdef;
+    lextree_t *lextree;
+    int32 i;
+
+    n_ltree = tstg->n_lextree;
+    mdef = ps_search_acmod(tstg)->mdef;
+    d2p = tstg->dict2pid;
+
+    /* Find active senone-sequence IDs (including composite ones) */
+    for (i = 0; i < (n_ltree << 1); i++) {
+        lextree = (i < n_ltree) ? tstg->curugtree[i] :
+            tstg->fillertree[i - n_ltree];
+        lextree_ssid_active(lextree, tstg->ssid_active,
+                            tstg->comssid_active);
+    }
+
+    /* Find active senones from active senone-sequences */
+    acmod_clear_active(ps_search_acmod(tstg));
+    memset(tstg->composite_senone_scores, 0,
+           bin_mdef_n_sen(mdef) * sizeof(*tstg->composite_senone_scores));
+
+    mdef_sseq2sen_active(mdef, tstg->ssid_active,
+                         ps_search_acmod(tstg)->senone_active_vec);
+
+    /* Add in senones needed for active composite senone-sequences */
+    dict2pid_comsseq2sen_active(d2p, mdef, tstg->comssid_active,
+                                ps_search_acmod(tstg)->senone_active_vec);
+
+    return 0;
+}
+
+static int
+srch_TST_rescoring(tst_search_t *tstg, int32 frmno)
+{
+    int32 i;
+    int32 n_ltree;              /* Local version of number of lexical trees used */
+    lextree_t *lextree;
+    vithist_t *vh;
+
+    vh = tstg->vithist;
+
+    n_ltree = tstg->n_lextree;
+
+    for (i = 0; i < (n_ltree << 1); i++) {
+        lextree = (i < n_ltree)
+            ? tstg->curugtree[i]
+            : tstg->fillertree[i - tstg->n_lextree];
+        if (lextree_hmm_propagate_leaves
+            (lextree, vh, frmno,
+             tstg->beam->word_thres) != LEXTREE_OPERATION_SUCCESS) {
+            E_ERROR
+                ("Propagation Failed for lextree_hmm_propagate_leave at tree %d\n",
+                 i);
+            lextree_utt_end(lextree);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static void
+srch_utt_word_trans(tst_search_t * tstg, int32 cf)
+{
+    int32 k, th;
+    vithist_t *vh;
+    vithist_entry_t *ve;
+    int32 vhid, le, n_ci, score;
+    int32 maxpscore;
+    int32 *bs = NULL, *bv = NULL, epl;
+    beam_t *bm;
+    s3wid_t wid;
+    int32 p;
+    s3dict_t *dict;
+    bin_mdef_t *mdef;
+
+    /* Call the rescoring routines at all word end */
+    maxpscore = MAX_NEG_INT32;
+    bm = tstg->beam;
+    vh = tstg->vithist;
+    th = bm->bestscore + bm->hmm;       /* Pruning threshold */
+
+    if (vh->bestvh[cf] < 0)
+        return;
+
+    dict = tstg->dict;
+    mdef = ps_search_acmod(tstg)->mdef;
+    n_ci = bin_mdef_n_ciphone(mdef);
+
+    /* Initialize best exit for each distinct word-final CI phone to NONE */
+
+    bs = bm->wordbestscores;
+    bv = bm->wordbestexits;
+    epl = tstg->epl;
+
+    for (p = 0; p < n_ci; p++) {
+        bs[p] = MAX_NEG_INT32;
+        bv[p] = -1;
+    }
+
+    /* Find best word exit in this frame for each distinct word-final CI phone */
+    vhid = vithist_first_entry(vh, cf);
+    le = vithist_n_entry(vh) - 1;
+    for (; vhid <= le; vhid++) {
+        ve = vithist_id2entry(vh, vhid);
+        if (!vithist_entry_valid(ve))
+            continue;
+
+        wid = vithist_entry_wid(ve);
+        p = s3dict_last_phone(dict, wid);
+        if (bin_mdef_is_fillerphone(mdef, p))
+            p = bin_mdef_silphone(mdef);
+
+        score = vithist_entry_score(ve);
+        if (score > bs[p]) {
+            bs[p] = score;
+            bv[p] = vhid;
+            if (maxpscore < score) {
+                maxpscore = score;
+                /*    E_INFO("maxscore = %d\n", maxpscore); */
+            }
+        }
+    }
+
+    /* Find lextree instance to be entered */
+    k = tstg->n_lextrans++;
+    k = (k % (tstg->n_lextree * epl)) / epl;
+
+    /* Transition to unigram lextrees */
+    for (p = 0; p < n_ci; p++) {
+        if (bv[p] >= 0) {
+            if (tstg->beam->wordend == 0
+                || bs[p] > tstg->beam->wordend + maxpscore) {
+                /* RAH, typecast p to (s3cipid_t) to make compiler happy */
+                lextree_enter(tstg->curugtree[k], (s3cipid_t) p, cf, bs[p],
+                              bv[p], th);
+            }
+        }
+
+    }
+
+    /* Transition to filler lextrees */
+    lextree_enter(tstg->fillertree[k], BAD_S3CIPID, cf, vh->bestscore[cf],
+                  vh->bestvh[cf], th);
+}
+
+static int
+srch_TST_propagate_graph_wd_lv2(tst_search_t *tstg, int32 frmno)
+{
+    s3dict_t *dict;
+    vithist_t *vh;
+    histprune_t *hp;
+    int32 maxwpf;               /* Local version of Max words per frame, don't expect it to change */
+    int32 maxhistpf;            /* Local version of Max histories per frame, don't expect it to change */
+    int32 maxhmmpf;             /* Local version of Max active HMMs per frame, don't expect it to change  */
+
+
+    hp = tstg->histprune;
+    vh = tstg->vithist;
+    dict = tstg->dict;
+
+    maxwpf = hp->maxwpf;
+    maxhistpf = hp->maxhistpf;
+    maxhmmpf = hp->maxhmmpf;
+
+    srch_TST_rescoring(tstg, frmno);
+
+    vithist_prune(vh, dict, frmno, maxwpf, maxhistpf,
+                  tstg->beam->word_thres - tstg->beam->bestwordscore);
+
+    srch_utt_word_trans(tstg, frmno);
+
+    return 0;
+}
+
+
+static int
+srch_TST_frame_windup(tst_search_t *tstg, int32 frmno)
+{
+    vithist_t *vh;
+    int32 i;
+
+    vh = tstg->vithist;
+
+    /* Wind up this frame */
+    vithist_frame_windup(vh, frmno, NULL, tstg->lmset, tstg->dict);
+
+    for (i = 0; i < tstg->n_lextree; i++) {
+        lextree_active_swap(tstg->curugtree[i]);
+        lextree_active_swap(tstg->fillertree[i]);
+    }
+    return 0;
+}
+
+static int
+tst_search_step(ps_search_t *search, int frame_idx)
+{
+    tst_search_t *tstg = (tst_search_t *)search;
+    
+    srch_TST_select_active_gmm(tstg);
+    srch_TST_hmm_compute_lv2(tstg, frame_idx);
+    srch_TST_propagate_graph_ph_lv2(tstg, frame_idx);
+    srch_TST_rescoring(tstg, frame_idx);
+    srch_TST_propagate_graph_wd_lv2(tstg, frame_idx);
+    srch_TST_frame_windup(tstg, frame_idx);
+
+    return 0;
+}
+
+static int
 tst_search_reinit(ps_search_t *search)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+
+    /* set_lm() code goes here. */
     return -1;
 }
 
 static ps_lattice_t *
 tst_search_lattice(ps_search_t *search)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+
     return NULL;
 }
 
 static char const *
 tst_search_hyp(ps_search_t *search, int32 *out_score)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+
     return NULL;
 }
 
 static int32
 tst_search_prob(ps_search_t *search)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+
     return 1;
 }
 
 static ps_seg_t *
 tst_search_seg_iter(ps_search_t *search, int32 *out_score)
 {
+    tst_search_t *tstg = (tst_search_t *)search;
+
     return NULL;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-23 22:48:05 UTC (rev 9225)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-24 06:38:17 UTC (rev 9226)
@@ -134,6 +134,12 @@
     histprune_t *histprune; /**< Structure that wraps up parameters related to absolute pruning. */
     beam_t *beam;           /**< Structure that wraps up beam pruning parameters. */
     vithist_t *vithist;     /**< Viterbi history (backpointer) table */
+
+    bitvec_t *ssid_active;    /**< Bitvector of active senone sequences. */
+    bitvec_t *comssid_active; /**< Bitvector of active composite senone sequences. */
+    int16 *composite_senone_scores; /**< Composite senone scores. */
+
+    FILE *hmmdumpfp; /**< File for dumping HMM debugging information. */
 };
 typedef struct tst_search_s tst_search_t;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9228
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9228&view=rev
Author:   dhdfu
Date:     2009-07-27 15:42:12 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Fix (maybe?) composite senone score computation.  Search still not actually working yet.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-27 04:17:28 UTC (rev 9227)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-27 15:42:12 UTC (rev 9228)
@@ -93,6 +93,7 @@
 #include <string.h>
 
 #include "dict2pid.h"
+#include "hmm.h"
 
 
 /** \file dict2pid.c
@@ -912,13 +913,14 @@
          * combined into a single composite score, the less relevant
          * that score will be. */
         dict2pid->comwt =
-            (int32 *) ckd_calloc(dict2pid->n_comstate, sizeof(int32));
+            (int16 *) ckd_calloc(dict2pid->n_comstate, sizeof(int16));
         for (i = 0; i < dict2pid->n_comstate; i++) {
             sen = dict2pid->comstate[i];
 
             for (j = 0; IS_S3SENID(sen[j]); j++);
             /* if comstate i has N states, its weight= 1/N */
-            dict2pid->comwt[i] = -logmath_log(logmath, (float64) j);
+            /* NOTE: scaled/negated. */
+            dict2pid->comwt[i] = -(-logmath_log(logmath, (float64) j)) >> SENSCR_SHIFT;
         }
     }
 
@@ -1027,7 +1029,7 @@
  * scores, scaled down by the number of component senones.
  */
 void
-dict2pid_comsenscr(dict2pid_t * d2p, int32 * senscr, int32 * comsenscr)
+dict2pid_comsenscr(dict2pid_t * d2p, int16 const * senscr, int16 * comsenscr)
 {
     int32 i, j;
     int32 best;
@@ -1041,7 +1043,7 @@
             k = comstate[j];
             if (NOT_S3SENID(k))
                 break;
-            if (best < senscr[k])
+            if (best > senscr[k]) /* NOTE: greater than, because these are still scaled/negated. */
                 best = senscr[k];
         }
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-27 04:17:28 UTC (rev 9227)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2009-07-27 15:42:12 UTC (rev 9228)
@@ -221,8 +221,11 @@
 				   the i-th composite state */
     s3senid_t **comsseq;	/**< comsseq[i] = sequence of composite state IDs in i-th
 				   composite phone (composite sseq). */
-    int32 *comwt;		/**< Weight associated with each composite state (logs3 value).
-				   Final composite state score weighted by this amount */
+    int16 *comwt;		/**< Weight associated with each
+				   composite state (scaled, negated
+				   logs3 value).  Final composite
+				   state score weighted by this
+				   amount */
     int32 n_comstate;		/**< #Composite states */
     int32 n_comsseq;		/**< #Composite senone sequences */
     int32 n_ci;   /**< Number of CI phone in */
@@ -254,8 +257,8 @@
  * Compute composite senone scores from ordinary senone scores (max of component senones)
  */
 void dict2pid_comsenscr(dict2pid_t *d2p,        /**< In: a dict2pid_t structure */
-                        int32 *senscr,		/**< In: Ordinary senone scores */
-                        int32 *comsenscr	/**< Out: Composite senone scores */
+                        int16 const *senscr,	/**< In: Ordinary senone scores */
+                        int16 *comsenscr	/**< Out: Composite senone scores */
     );
 
 /** 

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-27 04:17:28 UTC (rev 9227)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-27 15:42:12 UTC (rev 9228)
@@ -468,6 +468,7 @@
                                  tstg->beam->word,
                                  cmd_ln_int32_r(config, "-bghist"), TRUE);
 
+    tstg->hmmdumpfp = stdout;
     return (ps_search_t *)tstg;
 
 error_out:
@@ -568,7 +569,7 @@
 tst_search_finish(ps_search_t *search)
 {
     tst_search_t *tstg = (tst_search_t *)search;
-    int32 i, exit_id;
+    int32 i;
 
     /* Find the exit word and wrap up Viterbi history (but don't reset
      * it yet!) */
@@ -785,9 +786,6 @@
 
     /* Find active senones from active senone-sequences */
     acmod_clear_active(ps_search_acmod(tstg));
-    memset(tstg->composite_senone_scores, 0,
-           bin_mdef_n_sen(mdef) * sizeof(*tstg->composite_senone_scores));
-
     mdef_sseq2sen_active(mdef, tstg->ssid_active,
                          ps_search_acmod(tstg)->senone_active_vec);
 
@@ -965,15 +963,31 @@
 tst_search_step(ps_search_t *search, int frame_idx)
 {
     tst_search_t *tstg = (tst_search_t *)search;
-    
+    int16 const *senscr;
+
+    /* Select active senones for the current frame. */
     srch_TST_select_active_gmm(tstg);
+
+    /* Compute GMM scores for the current frame. */
+    if ((senscr = acmod_score(ps_search_acmod(search), &frame_idx)) == NULL)
+        return 0;
+    /* Evaluate composite senone scores from senone scores */
+    memset(tstg->composite_senone_scores, 0,
+           bin_mdef_n_sen(ps_search_acmod(search)->mdef)
+           * sizeof(*tstg->composite_senone_scores));
+    dict2pid_comsenscr(tstg->dict2pid, senscr, tstg->composite_senone_scores);
+
+    /* Compute HMMs, propagate phone and word exits, etc, etc. */
     srch_TST_hmm_compute_lv2(tstg, frame_idx);
     srch_TST_propagate_graph_ph_lv2(tstg, frame_idx);
     srch_TST_rescoring(tstg, frame_idx);
     srch_TST_propagate_graph_wd_lv2(tstg, frame_idx);
     srch_TST_frame_windup(tstg, frame_idx);
 
-    return 0;
+    /* FIXME: Renormalization? */
+
+    /* Return the number of frames processed. */
+    return 1;
 }
 
 static ps_lattice_t *
@@ -1029,6 +1043,8 @@
             *c = ' ';
         }
     }
+
+    return base->hyp_str;
 }
 
 static int32


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9235
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9235&view=rev
Author:   dhdfu
Date:     2009-07-28 17:30:45 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
Remove some differences from real Sphinx3

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-28 15:49:59 UTC (rev 9234)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-28 17:30:45 UTC (rev 9235)
@@ -195,10 +195,12 @@
                     int32 th, wordprob_t * wp)
 {
     int32 i, j, n;
-    int32 unk;
+    int32 unk, startwid, endwid;
 
     n = s3dict_size(dict);
     unk = ngram_unknown_wid(lm);
+    startwid = ngram_wid(lm, S3_START_WORD);
+    endwid = ngram_wid(lm, S3_FINISH_WORD);
 
     /* Iterate over dictionary words rather than LM words since we
      * don't have a reverse mapping.  (FIXME: might change this
@@ -210,7 +212,7 @@
         if (s3dict_basewid(dict, i) != i)
             continue;
         lmwid = ngram_wid(lm, s3dict_wordstr(dict, s3dict_basewid(dict, i)));
-        if (lmwid == unk)
+        if (lmwid == unk || lmwid == startwid || lmwid == endwid)
             continue;
         wp[j].prob = ngram_ng_score(lm, lmwid, NULL, 0, &nbo);
         wp[j].wid = i;
@@ -336,6 +338,8 @@
 
     for (i = s3dict_filler_start(dict); i <= s3dict_filler_end(dict); i++) {
         if (s3dict_filler_word(dict, i)) {
+            E_DEBUG(1,("Filler word %s prob %d\n",
+                       s3dict_wordstr(dict, i), fillpen(fp, i)));
             wp[n].wid = i;
             wp[n].prob = fillpen(fp, i);
             n++;
@@ -1556,7 +1560,9 @@
 
 
             /* Rescore the LM prob for this word wrt all possible predecessors */
-
+            E_DEBUG(1,("Rescoring exit %s with score %d\n",
+                       s3dict_wordstr(lextree->dict, ln->wid),
+                       hmm_out_score(&ln->hmm) - ln->prob));
             if (dict2pid_is_composite(lextree->dict2pid)) {
                 vithist_rescore(vh, lextree->lm, lextree->dict,
                                 lextree->dict2pid, lextree->fp, ln->wid, cf,

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-07-28 15:49:59 UTC (rev 9234)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-07-28 17:30:45 UTC (rev 9235)
@@ -190,10 +190,6 @@
         && cmd_ln_boolean_r(ps->config, "-fwdtree"))
         acmod_set_grow(ps->acmod, TRUE);
 
-    /* Dictionary and triphone mappings (depends on acmod). */
-    if ((ps->dict = dict_init(ps->config, ps->acmod->mdef)) == NULL)
-        return -1;
-
     if ((ps->pl_window = cmd_ln_int32_r(ps->config, "-pl_window"))) {
         /* Initialize an auxiliary phone loop search, which will run in
          * "parallel" with FSG or N-Gram search. */
@@ -207,6 +203,10 @@
     if (cmd_ln_str_r(ps->config, "-fsg") || cmd_ln_str_r(ps->config, "-jsgf")) {
         ps_search_t *fsgs;
 
+        /* Dictionary and triphone mappings (depends on acmod). */
+        if ((ps->dict = dict_init(ps->config, ps->acmod->mdef)) == NULL)
+            return -1;
+
         if ((fsgs = fsg_search_init(ps->config, ps->acmod, ps->dict)) == NULL)
             return -1;
         fsgs->pls = ps->phone_loop;
@@ -216,6 +216,8 @@
     else if (cmd_ln_str_r(ps->config, "-tst")) {
         ps_search_t *tstg;
 
+        /* No dict_t for TST search... */
+
         if ((tstg = tst_search_init(ps->config, ps->acmod, ps->dict)) == NULL)
             return -1;
         ps->searches = glist_add_ptr(ps->searches, tstg);
@@ -225,6 +227,10 @@
              || (lmctl = cmd_ln_str_r(ps->config, "-lmctl"))) {
         ps_search_t *ngs;
 
+        /* Dictionary and triphone mappings (depends on acmod). */
+        if ((ps->dict = dict_init(ps->config, ps->acmod->mdef)) == NULL)
+            return -1;
+
         if ((ngs = ngram_search_init(ps->config, ps->acmod, ps->dict)) == NULL)
             return -1;
         ngs->pls = ps->phone_loop;

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-28 15:49:59 UTC (rev 9234)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-28 17:30:45 UTC (rev 9235)
@@ -526,8 +526,8 @@
            So  pve becomes the w_{n-2}. 
          */
 
-        lwid = ngram_wid(lm, s3dict_wordstr(dict,
-                                            s3dict_basewid(dict, wid)));
+        /* FIXME: SLOW */
+        lwid = ngram_wid(lm, s3dict_wordstr(dict, s3dict_basewid(dict, wid)));
 
         tve.lmstate.lm3g.lwid[0] = lwid;
 
@@ -571,7 +571,7 @@
 
     bs = MAX_NEG_INT32;
     bv = -1;
-    E_DEBUG(1,("GC in frame %d, scanning vithist entries from %d to %d\n",
+    E_DEBUG(2,("GC in frame %d, scanning vithist entries from %d to %d\n",
                frm, se, fe));
     for (i = se; i <= fe; i++) {
         ve = vithist_id2entry(vh, i);
@@ -591,9 +591,8 @@
             te++;
         }
     }
+    E_DEBUG(2,("GC bs %d vh->bestscore[frm] %d\n", bs, vh->bestscore[frm]));
 
-    E_DEBUG(1,("frm %d, bs %d vh->bestscore[frm] %d\n",frm, bs, vh->bestscore[frm]));
-
     /* Can't assert this any more because history pruning could actually make the 
        best token go away 
 
@@ -631,7 +630,7 @@
     int32 se, fe, filler_done, th;
     vithist_entry_t *ve;
     heap_t h;
-    s3wid_t *wid = NULL;
+    s3wid_t *wid;
     int32 i, nwf, nhf;
 
     if (maxwpf == -1 && maxhist == -1)
@@ -646,11 +645,10 @@
     th = vh->bestscore[frm] + beam;
 
     h = heap_new();
-    if (maxwpf > 0) {
-        wid = (s3wid_t *) ckd_calloc(maxwpf + 1, sizeof(s3wid_t));
-        wid[0] = BAD_S3WID;
-    }
+    wid = (s3wid_t *) ckd_calloc(maxwpf + 1, sizeof(s3wid_t));
+    wid[0] = BAD_S3WID;
 
+    E_DEBUG(1, ("vithist_prune frame %d has %d entries\n", frm, fe-se+1));
     for (i = se; i <= fe; i++) {
         ve = vithist_id2entry(vh, i);
         heap_insert(h, (void *) ve, -(ve->path.score));
@@ -671,8 +669,8 @@
         }
 
         /* Check if this word already valid (e.g., under a different history) */
-        for (i = 0; wid && IS_S3WID(wid[i]) && (wid[i] != ve->wid); i++);
-        if (wid == NULL || NOT_S3WID(wid[i])) {
+        for (i = 0; IS_S3WID(wid[i]) && (wid[i] != ve->wid); i++);
+        if (NOT_S3WID(wid[i])) {
             /* New word; keep only if <maxwpf words already entered, even if >= thresh */
             if (nwf < maxwpf || maxwpf == -1) {
                 if (wid) {
@@ -694,6 +692,7 @@
     ckd_free((void *) wid);
     heap_destroy(h);
 
+    E_DEBUG(1, ("vithist_prune frame %d retained %d entries\n", frm, nhf));
     /* Garbage collect invalid entries */
     vithist_frame_gc(vh, frm);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9237
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9237&view=rev
Author:   dhdfu
Date:     2009-07-28 21:49:43 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
Report statistics ... something is very wacky with beams or something
as we're evaluating about twice as many words as Sphinx3 here.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
    trunk/pocketsphinx/src/libpocketsphinx/tst_search.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-07-28 20:36:35 UTC (rev 9236)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2009-07-28 21:49:43 UTC (rev 9237)
@@ -954,5 +954,7 @@
     }
 
     acmod->n_senone_active = n;
+    E_DEBUG(1, ("acmod_flags2list: %d active in frame %d\n",
+                acmod->n_senone_active, acmod->output_frame));
     return n;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-28 20:36:35 UTC (rev 9236)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.c	2009-07-28 21:49:43 UTC (rev 9237)
@@ -116,24 +116,7 @@
 
 }
 
-
 static void
-histprune_update_histbinsize(histprune_t * h,
-                             int32 hmmhistbinsize, int32 numNodes)
-{
-    int32 n;
-    h->hmm_hist_binsize = hmmhistbinsize;
-    n = numNodes;
-    n /= h->hmm_hist_binsize;
-
-    h->hmm_hist_bins = n + 1;
-
-    h->hmm_hist =
-        (int32 *) ckd_realloc(h->hmm_hist,
-                              h->hmm_hist_bins * sizeof(int32));
-}
-
-static void
 histprune_free(histprune_t * h)
 {
     if (h != NULL) {
@@ -275,22 +258,6 @@
     return lextree;
 }
 
-static void
-tst_search_update_widmap(tst_search_t *tstg)
-{
-    const char **words;
-    int32 i, n_words;
-
-    /* It's okay to include fillers since they won't be in the LM */
-    n_words = s3dict_size(tstg->dict);
-    words = ckd_calloc(n_words, sizeof(*words));
-    /* This will include alternates, again, that's okay since they aren't in the LM */
-    for (i = 0; i < n_words; ++i)
-        words[i] = (const char *)s3dict_wordstr(tstg->dict, i);
-    ngram_model_set_map_words(tstg->lmset, words, n_words);
-    ckd_free(words);
-}
-
 static int
 tst_search_reinit(ps_search_t *search)
 {
@@ -452,6 +419,7 @@
                                      cmd_ln_int32_r(config, "-hmmhistbinsize"),
                                      (tstg->curugtree[0]->n_node + tstg->fillertree[0]->n_node) *
                                      tstg->n_lextree);
+    histprune_report(tstg->histprune);
 
     /* Viterbi history structure */
     tstg->vithist = vithist_init(ngram_model_get_counts(tstg->lmset)[0],
@@ -527,6 +495,9 @@
     vithist_utt_reset(tstg->vithist);
     histprune_zero_histbin(tstg->histprune);
 
+    /* Reset statistics */
+    memset(&tstg->st, 0, sizeof(tstg->st));
+
     /* Insert initial <s> into vithist structure */
     pred = vithist_utt_begin(tstg->vithist,
                              s3dict_startwid(tstg->dict),
@@ -563,24 +534,36 @@
 tst_search_finish(ps_search_t *search)
 {
     tst_search_t *tstg = (tst_search_t *)search;
-    int32 i;
+    int32 i, cf;
 
+    /* This is the number of frames processed. */
+    cf = ps_search_acmod(search)->output_frame;
+
     /* Find the exit word and wrap up Viterbi history (but don't reset
      * it yet!) */
     tstg->exit_id = vithist_utt_end(tstg->vithist,
                                     tstg->lmset, tstg->dict,
                                     tstg->dict2pid, tstg->fillpen);
 
-    /* Statistics update/report */
-    /* st->utt_wd_exit = vithist_n_entry(tstg->vithist); */
     /* Not sure hwo to get the uttid. */
-    /* histprune_showhistbin(tstg->histprune, st->nfr, s->uttid); */
+    histprune_showhistbin(tstg->histprune, cf, "histbin");
 
     for (i = 0; i < tstg->n_lextree; i++) {
         lextree_utt_end(tstg->curugtree[i]);
         lextree_utt_end(tstg->fillertree[i]);
     }
 
+    /* Print out some statistics. */
+    if (cf > 0) {
+        E_INFO("%8d words recognized (%d/fr)\n",
+               vithist_n_entry(tstg->vithist),
+               (vithist_n_entry(tstg->vithist) + (cf >> 1)) / (cf + 1));
+        E_INFO("%8d senones evaluated (%d/fr)\n", tstg->st.n_senone_active_utt,
+               (tstg->st.n_senone_active_utt + (cf >> 1)) / (cf + 1));
+        E_INFO("%8d channels searched (%d/fr)\n",
+               tstg->st.n_hmm_eval, tstg->st.n_hmm_eval / (cf + 1));
+    }
+
     if (tstg->exit_id >= 0)
         return 0;
     else
@@ -646,7 +629,7 @@
         if (bestwordscr < lextree->wbest)
             bestwordscr = lextree->wbest;
 
-        /* st->utt_hmm_eval += lextree->n_active; */
+        tstg->st.n_hmm_eval += lextree->n_active;
         frm_nhmm += lextree->n_active;
     }
     if (besthmmscr > 0) {
@@ -966,6 +949,8 @@
     /* Compute GMM scores for the current frame. */
     if ((senscr = acmod_score(ps_search_acmod(search), &frame_idx)) == NULL)
         return 0;
+    tstg->st.n_senone_active_utt += ps_search_acmod(search)->n_senone_active;
+
     /* Evaluate composite senone scores from senone scores */
     memset(tstg->composite_senone_scores, 0,
            bin_mdef_n_sen(ps_search_acmod(search)->mdef)

Modified: trunk/pocketsphinx/src/libpocketsphinx/tst_search.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-28 20:36:35 UTC (rev 9236)
+++ trunk/pocketsphinx/src/libpocketsphinx/tst_search.h	2009-07-28 21:49:43 UTC (rev 9237)
@@ -106,6 +106,14 @@
 } beam_t;
 
 /**
+ * Various statistics for profiling.
+ */
+typedef struct tst_stats_s {
+    int32 n_hmm_eval;
+    int32 n_senone_active_utt;
+} tst_stats_t;
+
+/**
  * Time-switch tree search module structure.
  */
 struct tst_search_s {
@@ -142,6 +150,7 @@
     FILE *hmmdumpfp; /**< File for dumping HMM debugging information. */
 
     int exit_id;  /**< History ID of exit word (or -1 if not done). */
+    tst_stats_t st; /**< Statistics. */
 };
 typedef struct tst_search_s tst_search_t;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9241
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9241&view=rev
Author:   dhdfu
Date:     2009-07-29 23:05:30 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
more debugging output

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-29 23:04:47 UTC (rev 9240)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2009-07-29 23:05:30 UTC (rev 9241)
@@ -1064,14 +1064,16 @@
     for (ss = 0; ss < d2p->n_comsseq; ss++) {
         if (bitvec_is_set(comssid,ss)) {
             csp = d2p->comsseq[ss];
-
+            E_DEBUG(4,("comssid[%d] is active:",ss));
             for (i = 0; i < bin_mdef_n_emit_state(mdef); i++) {
                 cs = csp[i];
                 sp = d2p->comstate[cs];
+                E_DEBUGCONT(4,(" %d",cs));
 
                 for (j = 0; IS_S3SENID(sp[j]); j++)
                     bitvec_set(sen, sp[j]);
             }
+            E_DEBUGCONT(4,("\n"));
         }
     }
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-29 23:04:47 UTC (rev 9240)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-29 23:05:30 UTC (rev 9241)
@@ -191,8 +191,7 @@
 
 /* This create a mapping from either the unigram or words in a class*/
 static int32
-lextree_ug_wordprob(ngram_model_t * lm, s3dict_t * dict,
-                    int32 th, wordprob_t * wp)
+lextree_ug_wordprob(ngram_model_t * lm, s3dict_t * dict, wordprob_t * wp)
 {
     int32 i, j, n;
     int32 unk, startwid, endwid;
@@ -288,7 +287,7 @@
         wp[j].wid = -1;
         wp[j].prob = -1;
     }
-    n = lextree_ug_wordprob(lm, dict, MAX_NEG_INT32, wp);
+    n = lextree_ug_wordprob(lm, dict, wp);
 
     if (bReport)
         E_INFO("Size of word table after unigram + words in class: %d.\n",
@@ -513,6 +512,8 @@
     for (i = 0; i < n_word; i++) {
         wid = wordprob[i].wid;
         prob = wordprob[i].prob;
+        E_DEBUG(2,("%s wid %d prob %d\n",
+                   s3dict_wordstr(dict, wid), wid, prob));
 
         pronlen = s3dict_pronlen(dict, wid);
 
@@ -1185,6 +1186,8 @@
             ) {
             scr = inscore + ln->prob;
             if ((scr >= thresh) && (hmm_in_score(&ln->hmm) < scr)) {
+                E_DEBUG(4,("entering non-leaf root node with %d + %d >= (thresh %d score %d)\n",
+                           inscore, ln->prob, thresh, hmm_in_score(&ln->hmm)));
                 hmm_in_score(&ln->hmm) = scr;
                 hmm_in_history(&ln->hmm) = inhist;
 
@@ -1416,27 +1419,29 @@
     E_DEBUG(1, ("lextree_hmm_propagate_non_leaves: cf %d th %d pth %d wth %d\n",
                 cf, th, pth, wth)); 
     n = lextree->n_next_active;
-    E_DEBUG(1,("next active lextree: %d\n",n));
     assert(n == 0);
 
     E_DEBUG(1,("No. of active node within the lexical tree: %d\n",lextree->n_active));
 
     for (i = 0; i < lextree->n_active; i++) {
-        E_DEBUG(2,("%d, %d\n", i,  lextree->n_alloc_node));
+        E_DEBUG(3,("Looking at node %d of %d\n", i,  lextree->n_alloc_node));
         ln = list[i];
 
         if (IS_S3WID(ln->wid)) {
-            E_DEBUG(2,("Is WID %d, ln->rc %d, ln->ssid %d\n",ln->wid, ln->rc, ln->ssid));
+            E_DEBUG(3,("Is WID %d = %s, ln->rc %d, ln->ssid %d\n",
+                       ln->wid, s3dict_wordstr(dict, ln->wid), ln->rc, ln->ssid));
             assert(ln->ssid != BAD_S3SSID);
         }
 
         /* This if will activate nodes */
         if (hmm_frame(&ln->hmm) < nf) {
             if (hmm_bestscore(&ln->hmm) >= th) { /* Active in next frm */
+                E_DEBUG(4,("Activating (%d >= %d)\n", hmm_bestscore(&ln->hmm), th));
                 hmm_frame(&ln->hmm) = nf;
                 lextree->next_active[n++] = ln;
             }
             else {              /* Deactivate */
+                E_DEBUG(4,("Deactivating (%d < %d)\n", hmm_bestscore(&ln->hmm), th));
                 hmm_clear((hmm_t *)ln);
             }
         }
@@ -1444,6 +1449,7 @@
         if (NOT_S3WID(ln->wid)) {       /* Not a leaf node */
             if (hmm_out_score(&ln->hmm) < pth)
                 continue;       /* HMM exit score not good enough */
+            E_DEBUG(4,("Propagating (%d >= %d)\n", hmm_out_score(&ln->hmm), pth));
             /* Transition to each child */
             for (gn = ln->children; gn; gn = gnode_next(gn)) {
 
@@ -1460,6 +1466,8 @@
                     */
                     newscore = hmm_out_score(&ln->hmm) + (ln2->prob - ln->prob);
 
+                    E_DEBUG(4,("  newscore %d + %d - %d = %d\n",
+                               hmm_out_score(&ln->hmm), ln2->prob, ln->prob, newscore));
                     if ((newscore >= th) &&     /*If the score is smaller than the
                                                    phone score, prune away */
                         (hmm_in_score(&ln2->hmm) < newscore)) {
@@ -1467,6 +1475,7 @@
                         hmm_in_history(&ln2->hmm) = hmm_out_history(&ln->hmm);
 
                         if (hmm_frame(&ln2->hmm) != nf) {
+                            E_DEBUG(4,("  entering this node\n"));
                             hmm_frame(&ln2->hmm) = nf;
                             /*                  lextree_realloc_active_list(lextree,n+1); */
                             lextree->next_active[n++] = ln2;
@@ -1487,13 +1496,11 @@
                         assert(ln2->ssid == BAD_S3SSID);        /*First timer of being expanded */
                         n_ci = bin_mdef_n_ciphone(mdef);
 
-#if 0
-                        E_INFO
+
+                        E_DEBUG(3,
                             ("Tree %d, Cross word expansion is carried out at cf %d for wid %d, wstr %s, ln->children %d\n",
-                             lextree, cf, ln2->wid, dict_wordstr(kbc->dict,
-                                                                 ln2->wid),
-                             ln2->children);
-#endif
+                             lextree, cf, ln2->wid, s3dict_wordstr(lextree->dict, ln2->wid),
+                             ln2->children));
 
                         rmap = d2p->rssid[ln2->ci][ln->ci].ssid;
                         n_rc =
@@ -1550,16 +1557,16 @@
     }
 
     lextree->n_next_active = n;
-#if 0
-    E_INFO("Debugging.\n");
+#ifdef SPHINX_DEBUG
+    E_DEBUG(3,("Debugging.\n"));
     for (i = 0; i < lextree->n_next_active; i++) {
         ln = lextree->next_active[i];
 
-        E_INFO(" ln->wid %d, str %s, ln->ssid %d, ln->rc %d,\n", ln->wid,
-               dict_wordstr(dict, ln->wid), ln->ssid, ln->rc);
+        E_DEBUG(3,(" ln->wid %d, str %s, ln->ssid %d, ln->rc %d,\n", ln->wid,
+                   s3dict_wordstr(dict, ln->wid), ln->ssid, ln->rc));
     }
 #endif
-    /*    E_INFO("lextree->n_next_active %d\n",    lextree->n_next_active); */
+    E_DEBUG(1,("lextree->n_next_active %d\n",    lextree->n_next_active));
     return LEXTREE_OPERATION_SUCCESS;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9244
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9244&view=rev
Author:   dhdfu
Date:     2009-07-30 04:00:07 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
Add long, snarky comments about how horrible vithist_rescore() is and why sphinx3 is slow.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/vithist.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-30 02:23:10 UTC (rev 9243)
+++ trunk/pocketsphinx/src/libpocketsphinx/lextree.c	2009-07-30 04:00:07 UTC (rev 9244)
@@ -1576,6 +1576,9 @@
 {
 
     lextree_node_t **list, *ln;
+#ifdef SPHINX_DEBUG
+    int32 n_active_word_end;
+#endif
     int32 i;
 
     /* Code for heursitic score */
@@ -1600,7 +1603,7 @@
 
 
             /* Rescore the LM prob for this word wrt all possible predecessors */
-            E_DEBUG(1,("Rescoring exit %s with score %d\n",
+            E_DEBUG(2,("Rescoring exit %s with score %d\n",
                        s3dict_wordstr(lextree->dict, ln->wid),
                        hmm_out_score(&ln->hmm) - ln->prob));
             if (dict2pid_is_composite(lextree->dict2pid)) {
@@ -1622,15 +1625,12 @@
             }
 
 
-#if 0
-            active_word_end++;
-
-            /*      E_INFO("What is the hmm_out_score(ln) %d wth %d\n", hmm_out_score(ln),wth);
-               E_INFO("\nActive word end id %d, word end %s\n", ln->wid, dict_wordstr(kbc->dict,dict_basewid(kbc->dict,ln->wid))); */
+#ifdef SPHINX_DEBUG
+            n_active_word_end++;
 #endif
         }
     }
 
-    /*    E_INFO("No of active word end %d\n\n",active_word_end); */
+    E_DEBUG(1,("number of active leaf nodes %d\n",n_active_word_end));
     return LEXTREE_OPERATION_SUCCESS;
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/vithist.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-30 02:23:10 UTC (rev 9243)
+++ trunk/pocketsphinx/src/libpocketsphinx/vithist.c	2009-07-30 04:00:07 UTC (rev 9244)
@@ -501,16 +501,20 @@
     tve.rc = NULL;
     tve.n_rc = 0;
 
-
+    /* Filler words only have unigram language model scores, so not
+     * much special needs to be done for them.  vithist_prune() is
+     * going to prune out most of these later on, anyway. */
     if (s3dict_filler_word(dict, wid)) {
-
         tve.path.score = score;
         tve.lscr = fillpen(fp, wid);
         tve.path.score += tve.lscr;
-
-        tve.path.pred = pred;
-        tve.lmstate.lm3g = pve->lmstate.lm3g;
-        vithist_enter(vh, dict, dict2pid, &tve, rc);
+        if ((tve.path.score - vh->wbeam) >= vh->bestscore[vh->n_frm]) {
+            tve.path.pred = pred;
+            /* Note that they just propagate the same LM state since
+             * they are not in the LM. */
+            tve.lmstate.lm3g = pve->lmstate.lm3g;
+            vithist_enter(vh, dict, dict2pid, &tve, rc);
+        }
     }
     else {
         if (pred == 0) {            /* Special case for the initial <s> entry */
@@ -526,20 +530,45 @@
            So  pve becomes the w_{n-2}. 
          */
 
-        /* FIXME: SLOW */
         lwid = ngram_wid(lm, s3dict_wordstr(dict, s3dict_basewid(dict, wid)));
 
         tve.lmstate.lm3g.lwid[0] = lwid;
 
+        /* FIXME: This loop is completely awful.  For each entry in
+         * this frame, we scan every entry in the previous frame,
+         * potentially creating a new history entry.  This means that
+         * without pruning, the size of the vithist table (and thus
+         * the time taken here) is exponential in the number of
+         * frames! */
         for (i = se; i < fe; i++) {
             pve = vithist_id2entry(vh, i);
 
             if (pve->valid) {
                 int n_used;
                 tve.path.score = pve->path.score + tve.ascr;
+                /* Try at all costs to avoid calling ngram_tg_score()
+                 * because it is the main time consuming part here
+                 * (but as noted above... ugh...) See below as well. */
+                if ((tve.path.score - vh->wbeam) < vh->bestscore[vh->n_frm])
+                    continue;
+                /* The trigram cache is supposed to make this fast,
+                 * but due to the crazy number of times this could be
+                 * called, it's still slow compared to a hash
+                 * table. */
                 tve.lscr = ngram_tg_score(lm, lwid, pve->lmstate.lm3g.lwid[0],
                                           pve->lmstate.lm3g.lwid[1], &n_used);
                 tve.path.score += tve.lscr;
+                /* A secret second word exit threshold - we would have
+                 * to be inside the general word beam in order to get
+                 * here, now we apply a second word beam to the
+                 * *vithist entries* in this frame.  There can be an
+                 * ungodly number of them for reasons that aren't
+                 * entirely clear to me, so this is kind of a
+                 * pre-pruning.  NOTE: the "backwards" math here is
+                 * because vh->bestscore is frequently MAX_NEG_INT32.
+                 * ALSO NOTE: We can't precompute the threshold since
+                 * the best score will be updated by
+                 * vithist_enter(). */
                 if ((tve.path.score - vh->wbeam) >= vh->bestscore[vh->n_frm]) {
                     tve.path.pred = i;
                     tve.lmstate.lm3g.lwid[1] = pve->lmstate.lm3g.lwid[0];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9397
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9397&view=rev
Author:   dhdfu
Date:     2009-10-20 20:09:45 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Fix segfaults on some types of initialization errors

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
    trunk/pocketsphinx/src/libpocketsphinx/hmm.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2009-10-20 19:41:47 UTC (rev 9396)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_search.c	2009-10-20 20:09:45 UTC (rev 9397)
@@ -101,6 +101,10 @@
     /* Initialize HMM context. */
     fsgs->hmmctx = hmm_context_init(bin_mdef_n_emit_state(acmod->mdef),
                                     acmod->tmat->tp, NULL, acmod->mdef->sseq);
+    if (fsgs->hmmctx == NULL) {
+        ps_search_free(ps_search_base(fsgs));
+        return NULL;
+    }
 
     /* Intialize the search history object */
     fsgs->history = fsg_history_init(NULL, dict);

Modified: trunk/pocketsphinx/src/libpocketsphinx/hmm.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2009-10-20 19:41:47 UTC (rev 9396)
+++ trunk/pocketsphinx/src/libpocketsphinx/hmm.c	2009-10-20 20:09:45 UTC (rev 9397)
@@ -62,7 +62,7 @@
 
     assert(n_emit_state > 0);
     if (n_emit_state > HMM_MAX_NSTATE) {
-        E_ERROR("Number of emitting states must be <= 5\n");
+        E_ERROR("Number of emitting states must be <= %d\n", HMM_MAX_NSTATE);
         return NULL;
     }
 
@@ -79,6 +79,8 @@
 void
 hmm_context_free(hmm_context_t *ctx)
 {
+    if (ctx == NULL)
+        return;
     ckd_free(ctx->st_sen_scr);
     ckd_free(ctx);
 }

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-10-20 19:41:47 UTC (rev 9396)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2009-10-20 20:09:45 UTC (rev 9397)
@@ -148,6 +148,10 @@
     ps_search_init(&ngs->base, &ngram_funcs, config, acmod, dict, d2p);
     ngs->hmmctx = hmm_context_init(bin_mdef_n_emit_state(acmod->mdef),
                                    acmod->tmat->tp, NULL, acmod->mdef->sseq);
+    if (ngs->hmmctx == NULL) {
+        ps_search_free(ps_search_base(ngs));
+        return NULL;
+    }
     ngs->chan_alloc = listelem_alloc_init(sizeof(chan_t));
     ngs->root_chan_alloc = listelem_alloc_init(sizeof(root_chan_t));
     ngs->latnode_alloc = listelem_alloc_init(sizeof(ps_latnode_t));
@@ -290,7 +294,8 @@
     bitvec_free(ngs->word_active);
     ckd_free(ngs->bp_table);
     ckd_free(ngs->bscore_stack);
-    ckd_free(ngs->bp_table_idx - 1);
+    if (ngs->bp_table_idx != NULL)
+        ckd_free(ngs->bp_table_idx - 1);
     ckd_free_2d(ngs->active_word_list);
     ckd_free(ngs->last_ltrans);
     ckd_free(ngs);

Modified: trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-10-20 19:41:47 UTC (rev 9396)
+++ trunk/pocketsphinx/src/libpocketsphinx/phone_loop_search.c	2009-10-20 20:09:45 UTC (rev 9397)
@@ -78,6 +78,8 @@
         hmm_context_free(pls->hmmctx);
     pls->hmmctx = hmm_context_init(bin_mdef_n_emit_state(acmod->mdef),
                                    acmod->tmat->tp, NULL, acmod->mdef->sseq);
+    if (pls->hmmctx == NULL)
+        return -1;
 
     /* Initialize phone HMMs. */
     if (pls->phones) {

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-10-20 19:41:47 UTC (rev 9396)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2009-10-20 20:09:45 UTC (rev 9397)
@@ -425,19 +425,17 @@
     int rv;
 
     pron = ckd_salloc(phones);
-    /* FIXME: This no longer works. */
+    /* Add it to the dictionary. */
     if ((wid = s3dict_add_word(ps->dict, word, pron, strlen(pron))) == -1) {
         ckd_free(pron);
         return -1;
     }
+    /* Now we also have to add it to dict2pid, oh fun. */
+
+    /* No longer needed. */
     ckd_free(pron);
 
     if ((lmset = ps_get_lmset(ps)) != NULL) {
-        /* FIXME: There is a way more efficient way to do this, since all
-         * we did was replace a placeholder string with the new word
-         * string - therefore what we ought to do is add it directly to
-         * the current LM, then update the mapping without reallocating
-         * everything. */
         /* Add it to the LM set (meaning, the current LM).  In a perfect
          * world, this would result in the same WID, but because of the
          * weird way that word IDs are handled, it doesn't. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9585
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9585&view=rev
Author:   dhdfu
Date:     2010-01-02 02:58:54 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
remove lts rules which never actually worked here, something better is coming

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/s3dict.c
    trunk/pocketsphinx/src/libpocketsphinx/s3dict.h

Removed Paths:
-------------
    trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c
    trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.h
    trunk/pocketsphinx/src/libpocketsphinx/lts.c
    trunk/pocketsphinx/src/libpocketsphinx/lts.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2010-01-02 01:41:52 UTC (rev 9584)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2010-01-02 02:58:54 UTC (rev 9585)
@@ -14,8 +14,6 @@
 	fsg_search.c				\
 	hmm.c					\
 	kdtree.c				\
-	lts.c					\
-	cmu6_lts_rules.c			\
 	mdef.c					\
 	ms_gauden.c				\
 	ms_mgau.c				\
@@ -44,8 +42,6 @@
 	fsg_search_internal.h			\
 	hmm.h					\
 	kdtree.h				\
-	lts.h					\
-	cmu6_lts_rules.h			\
 	mdef.h					\
 	ms_gauden.h				\
 	ms_mgau.h				\

Deleted: trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c	2010-01-02 01:41:52 UTC (rev 9584)
+++ trunk/pocketsphinx/src/libpocketsphinx/cmu6_lts_rules.c	2010-01-02 02:58:54 UTC (rev 9585)
@@ -1,13307 +0,0 @@
-/*************************************************************************/
-/*                                                                       */
-/*                  Language Technologies Institute                      */
-/*                     Carnegie Mellon University                        */
-/*                        Copyright (c) 2001                             */
-/*                        All Rights Reserved.                           */
-/*                                                                       */
-/*  Permission is hereby granted, free of charge, to use and distribute  */
-/*  this software and its documentation without restriction, including   */
-/*  without limitation the rights to use, copy, modify, merge, publish,  */
-/*  distribute, sublicense, and/or sell copies of this work, and to      */
-/*  permit persons to whom this work is furnished to do so, subject to   */
-/*  the following conditions:                                            */
-/*   1. The code must retain the above copyright notice, this list of    */
-/*      conditions and the following disclaimer.                         */
-/*   2. Any modifications must be clearly marked as such.                */
-/*   3. Original authors' names are not deleted.                         */
-/*   4. The authors' names are not used to endorse or promote products   */
-/*      derived from this software without specific prior written        */
-/*      permission.                                                      */
-/*                                                                       */
-/*  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         */
-/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
-/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
-/*  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      */
-/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
-/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
-/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
-/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
-/*  THIS SOFTWARE.                                                       */
-/*                                                                       */
-/*************************************************************************/
-/*             Author:  Alan W Black (awb@...)                    */
-/*                      Kevin A. Lenzo (lenzo@...)                */
-/*               Date:  January 2001                                     */
-/*************************************************************************/
-/*                                                                       */
-/*  CMU(6) letter to sound rule decision graphs                          */
-/*                                                                       */
-/*************************************************************************/
-/*******************************************************/
-/**  Autogenerated llts rules (regex) for cmu6    */
-/**  from /home/awb/projects/lts/cmu6/regex    */
-/*******************************************************/
-
-/*
- * cmu6_lts_rules.c -- Letter to sound rule support 
- * 
- * $Log$
- * Revision 1.2  2006/02/22  20:42:51  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: As we have done in SphinxTrain and with the permission of flite developer. check in the LTS rule of flite. In dict.c, one will see detail comment on how it was used and how we avoid problematic conditions.
- * 
- * Revision 1.1.2.1  2005/09/25 19:07:52  arthchan2003
- * Added LTS rules and the module to use it.
- *
- *
- */
-
-
-#include <stdlib.h>
-#include "lts.h"
-#include "cmu6_lts_rules.h"
-
-static const cst_lts_model cmu6_lts_model[] = {
-   /** letter a **/
-    4, 'r', LTS_STATE_a_2, LTS_STATE_a_1,
-    6, '0', LTS_STATE_a_4, LTS_STATE_a_3,
-    3, 'e', LTS_STATE_a_6, LTS_STATE_a_5,
-    4, 'u', LTS_STATE_a_8, LTS_STATE_a_7,
-    4, 'y', LTS_STATE_a_10, LTS_STATE_a_9,
-    3, 'w', LTS_STATE_a_12, LTS_STATE_a_11,
-    5, 't', LTS_STATE_a_14, LTS_STATE_a_13,
-    3, 'e', LTS_STATE_a_16, LTS_STATE_a_15,
-    3, 'e', LTS_STATE_a_18, LTS_STATE_a_17,
-    4, '#', LTS_STATE_a_20, LTS_STATE_a_19,
-    3, 'w', LTS_STATE_a_22, LTS_STATE_a_21,
-    1, '0', LTS_STATE_a_24, LTS_STATE_a_23,
-    5, 'e', LTS_STATE_a_26, LTS_STATE_a_25,
-    5, 'n', LTS_STATE_a_28, LTS_STATE_a_27,
-    2, 'h', LTS_STATE_a_29, LTS_STATE_a_28,
-    5, 'e', LTS_STATE_a_31, LTS_STATE_a_30,
-    2, 'r', LTS_STATE_a_33, LTS_STATE_a_32,
-    5, 'e', LTS_STATE_a_35, LTS_STATE_a_34,
-    5, 't', LTS_STATE_a_28, LTS_STATE_a_36,
-    3, 'e', LTS_STATE_a_38, LTS_STATE_a_37,
-    3, 'e', LTS_STATE_a_40, LTS_STATE_a_39,
-    2, 'c', LTS_STATE_a_42, LTS_STATE_a_41,
-    2, 'a', LTS_STATE_a_43, LTS_STATE_a_42,
-    5, 'y', LTS_STATE_a_45, LTS_STATE_a_44,
-    5, 'r', LTS_STATE_a_47, LTS_STATE_a_46,
-    5, 'd', LTS_STATE_a_49, LTS_STATE_a_48,
-    255, 1, 0, 0, 0, 0,
-    5, 'm', LTS_STATE_a_52, LTS_STATE_a_51,
-    255, 0, 0, 0, 0, 0,
-    255, 2, 0, 0, 0, 0,
-    4, 'i', LTS_STATE_a_54, LTS_STATE_a_53,
-    4, 'g', LTS_STATE_a_56, LTS_STATE_a_55,
-    4, 'n', LTS_STATE_a_58, LTS_STATE_a_57,
-    1, '#', LTS_STATE_a_60, LTS_STATE_a_59,
-    5, 'g', LTS_STATE_a_62, LTS_STATE_a_61,
-    1, '0', LTS_STATE_a_64, LTS_STATE_a_63,
-    1, 'u', LTS_STATE_a_29, LTS_STATE_a_65,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_66,
-    4, 'u', LTS_STATE_a_68, LTS_STATE_a_67,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_69,
-    2, 'l', LTS_STATE_a_69, LTS_STATE_a_70,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_71,
-    255, 3, 0, 0, 0, 0,
-    1, 'l', LTS_STATE_a_73, LTS_STATE_a_72,
-    5, 'i', LTS_STATE_a_75, LTS_STATE_a_74,
-    3, 'n', LTS_STATE_a_26, LTS_STATE_a_76,
-    5, 'a', LTS_STATE_a_78, LTS_STATE_a_77,
-    2, '#', LTS_STATE_a_80, LTS_STATE_a_79,
-    5, 'i', LTS_STATE_a_26, LTS_STATE_a_81,
-    1, '0', LTS_STATE_a_83, LTS_STATE_a_82,
-    2, 'w', LTS_STATE_a_28, LTS_STATE_a_84,
-    2, 'r', LTS_STATE_a_29, LTS_STATE_a_85,
-    5, 'i', LTS_STATE_a_87, LTS_STATE_a_86,
-    5, 'r', LTS_STATE_a_89, LTS_STATE_a_88,
-    6, '#', LTS_STATE_a_91, LTS_STATE_a_90,
-    1, '0', LTS_STATE_a_93, LTS_STATE_a_92,
-    4, 'b', LTS_STATE_a_95, LTS_STATE_a_94,
-    1, '#', LTS_STATE_a_97, LTS_STATE_a_96,
-    4, 'k', LTS_STATE_a_99, LTS_STATE_a_98,
-    5, 't', LTS_STATE_a_101, LTS_STATE_a_100,
-    1, '0', LTS_STATE_a_103, LTS_STATE_a_102,
-    2, '#', LTS_STATE_a_105, LTS_STATE_a_104,
-    1, '#', LTS_STATE_a_64, LTS_STATE_a_106,
-    255, 4, 0, 0, 0, 0,
-    6, 'e', LTS_STATE_a_108, LTS_STATE_a_107,
-    4, 'w', LTS_STATE_a_110, LTS_STATE_a_109,
-    4, 'd', LTS_STATE_a_28, LTS_STATE_a_111,
-    1, 'o', LTS_STATE_a_112, LTS_STATE_a_108,
-    255, 5, 0, 0, 0, 0,
-    2, 'y', LTS_STATE_a_69, LTS_STATE_a_113,
-    2, 'p', LTS_STATE_a_42, LTS_STATE_a_114,
-    1, 't', LTS_STATE_a_73, LTS_STATE_a_42,
-    255, 6, 0, 0, 0, 0,
-    5, 'e', LTS_STATE_a_116, LTS_STATE_a_115,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_117,
-    2, 'c', LTS_STATE_a_26, LTS_STATE_a_118,
-    5, 'i', LTS_STATE_a_120, LTS_STATE_a_119,
-    3, 'p', LTS_STATE_a_26, LTS_STATE_a_121,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_28,
-    3, 'n', LTS_STATE_a_26, LTS_STATE_a_122,
-    1, '0', LTS_STATE_a_83, LTS_STATE_a_123,
-    1, '#', LTS_STATE_a_83, LTS_STATE_a_124,
-    255, 7, 0, 0, 0, 0,
-    1, 's', LTS_STATE_a_126, LTS_STATE_a_125,
-    1, '#', LTS_STATE_a_28, LTS_STATE_a_127,
-    4, 'y', LTS_STATE_a_129, LTS_STATE_a_128,
-    6, 'o', LTS_STATE_a_131, LTS_STATE_a_130,
-    5, 'n', LTS_STATE_a_133, LTS_STATE_a_132,
-    3, 'z', LTS_STATE_a_134, LTS_STATE_a_26,
-    3, 'w', LTS_STATE_a_136, LTS_STATE_a_135,
-    4, 't', LTS_STATE_a_138, LTS_STATE_a_137,
-    1, '#', LTS_STATE_a_140, LTS_STATE_a_139,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_141,
-    1, 'i', LTS_STATE_a_143, LTS_STATE_a_142,
-    1, '#', LTS_STATE_a_28, LTS_STATE_a_69,
-    1, 'c', LTS_STATE_a_28, LTS_STATE_a_144,
-    5, 'd', LTS_STATE_a_101, LTS_STATE_a_145,
-    4, 't', LTS_STATE_a_147, LTS_STATE_a_146,
-    1, 'b', LTS_STATE_a_42, LTS_STATE_a_28,
-    6, 'n', LTS_STATE_a_149, LTS_STATE_a_148,
-    255, 8, 0, 0, 0, 0,
-    1, '#', LTS_STATE_a_151, LTS_STATE_a_150,
-    3, 'c', LTS_STATE_a_153, LTS_STATE_a_152,
-    2, 'n', LTS_STATE_a_155, LTS_STATE_a_154,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_83,
-    255, 9, 0, 0, 0, 0,
-    1, 'o', LTS_STATE_a_112, LTS_STATE_a_156,
-    255, 10, 0, 0, 0, 0,
-    1, '#', LTS_STATE_a_158, LTS_STATE_a_157,
-    3, 'l', LTS_STATE_a_83, LTS_STATE_a_159,
-    4, 'n', LTS_STATE_a_161, LTS_STATE_a_160,
-    255, 11, 0, 0, 0, 0,
-    1, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
-    1, 'l', LTS_STATE_a_163, LTS_STATE_a_162,
-    5, 'r', LTS_STATE_a_165, LTS_STATE_a_164,
-    6, 'l', LTS_STATE_a_167, LTS_STATE_a_166,
-    6, 'z', LTS_STATE_a_28, LTS_STATE_a_168,
-    2, 'e', LTS_STATE_a_26, LTS_STATE_a_169,
-    5, 'e', LTS_STATE_a_171, LTS_STATE_a_170,
-    6, 's', LTS_STATE_a_173, LTS_STATE_a_172,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_174,
-    3, 'h', LTS_STATE_a_176, LTS_STATE_a_175,
-    5, '#', LTS_STATE_a_28, LTS_STATE_a_177,
-    1, 'r', LTS_STATE_a_83, LTS_STATE_a_28,
-    5, 'l', LTS_STATE_a_179, LTS_STATE_a_178,
-    6, '#', LTS_STATE_a_180, LTS_STATE_a_127,
-    255, 12, 0, 0, 0, 0,
-    2, '#', LTS_STATE_a_182, LTS_STATE_a_181,
-    5, 'a', LTS_STATE_a_184, LTS_STATE_a_183,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_185,
-    4, 't', LTS_STATE_a_187, LTS_STATE_a_186,
-    5, 'l', LTS_STATE_a_189, LTS_STATE_a_188,
-    3, 't', LTS_STATE_a_191, LTS_STATE_a_190,
-    255, 13, 0, 0, 0, 0,
-    6, 'd', LTS_STATE_a_193, LTS_STATE_a_192,
-    4, 't', LTS_STATE_a_195, LTS_STATE_a_194,
-    3, 'i', LTS_STATE_a_197, LTS_STATE_a_196,
-    3, 'u', LTS_STATE_a_199, LTS_STATE_a_198,
-    3, 'i', LTS_STATE_a_28, LTS_STATE_a_200,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_201,
-    6, 'r', LTS_STATE_a_42, LTS_STATE_a_202,
-    1, 't', LTS_STATE_a_204, LTS_STATE_a_203,
-    2, 'n', LTS_STATE_a_42, LTS_STATE_a_205,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_206,
-    2, 'd', LTS_STATE_a_101, LTS_STATE_a_28,
-    5, 'o', LTS_STATE_a_28, LTS_STATE_a_207,
-    1, 'c', LTS_STATE_a_42, LTS_STATE_a_208,
-    5, 'e', LTS_STATE_a_28, LTS_STATE_a_209,
-    4, 'g', LTS_STATE_a_42, LTS_STATE_a_28,
-    5, 'l', LTS_STATE_a_211, LTS_STATE_a_210,
-    3, 'h', LTS_STATE_a_83, LTS_STATE_a_212,
-    2, '#', LTS_STATE_a_214, LTS_STATE_a_213,
-    6, 'a', LTS_STATE_a_83, LTS_STATE_a_215,
-    1, '#', LTS_STATE_a_83, LTS_STATE_a_216,
-    255, 14, 0, 0, 0, 0,
-    2, 'b', LTS_STATE_a_218, LTS_STATE_a_217,
-    4, 'n', LTS_STATE_a_220, LTS_STATE_a_219,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_221,
-    1, 'e', LTS_STATE_a_155, LTS_STATE_a_83,
-    2, 'n', LTS_STATE_a_223, LTS_STATE_a_222,
-    1, 'c', LTS_STATE_a_28, LTS_STATE_a_224,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_225,
-    3, 'd', LTS_STATE_a_226, LTS_STATE_a_73,
-    5, 't', LTS_STATE_a_228, LTS_STATE_a_227,
-    2, 'q', LTS_STATE_a_83, LTS_STATE_a_229,
-    6, 't', LTS_STATE_a_28, LTS_STATE_a_230,
-    2, 'c', LTS_STATE_a_28, LTS_STATE_a_231,
-    6, 'o', LTS_STATE_a_233, LTS_STATE_a_232,
-    3, 'u', LTS_STATE_a_26, LTS_STATE_a_234,
-    5, 'o', LTS_STATE_a_236, LTS_STATE_a_235,
-    6, 'e', LTS_STATE_a_28, LTS_STATE_a_237,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_238,
-    2, '#', LTS_STATE_a_239, LTS_STATE_a_28,
-    6, 's', LTS_STATE_a_241, LTS_STATE_a_240,
-    6, 'y', LTS_STATE_a_26, LTS_STATE_a_242,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_243,
-    2, 'e', LTS_STATE_a_28, LTS_STATE_a_244,
-    2, 'b', LTS_STATE_a_246, LTS_STATE_a_245,
-    2, 'p', LTS_STATE_a_28, LTS_STATE_a_247,
-    2, 'h', LTS_STATE_a_248, LTS_STATE_a_28,
-    1, '#', LTS_STATE_a_250, LTS_STATE_a_249,
-    3, 'w', LTS_STATE_a_252, LTS_STATE_a_251,
-    5, 'o', LTS_STATE_a_254, LTS_STATE_a_253,
-    6, 's', LTS_STATE_a_231, LTS_STATE_a_255,
-    6, 'z', LTS_STATE_a_257, LTS_STATE_a_256,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_258,
-    1, '0', LTS_STATE_a_101, LTS_STATE_a_259,
-    6, '#', LTS_STATE_a_261, LTS_STATE_a_260,
-    3, 'm', LTS_STATE_a_262, LTS_STATE_a_42,
-    1, 'a', LTS_STATE_a_264, LTS_STATE_a_263,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_265,
-    6, 's', LTS_STATE_a_267, LTS_STATE_a_266,
-    4, 't', LTS_STATE_a_269, LTS_STATE_a_268,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_42,
-    2, 't', LTS_STATE_a_29, LTS_STATE_a_83,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_270,
-    4, 'l', LTS_STATE_a_29, LTS_STATE_a_101,
-    3, 't', LTS_STATE_a_42, LTS_STATE_a_271,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_272,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_273,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_274,
-    6, '#', LTS_STATE_a_42, LTS_STATE_a_275,
-    1, '#', LTS_STATE_a_28, LTS_STATE_a_276,
-    4, 't', LTS_STATE_a_277, LTS_STATE_a_28,
-    4, 's', LTS_STATE_a_28, LTS_STATE_a_278,
-    2, 'c', LTS_STATE_a_69, LTS_STATE_a_279,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_280,
-    1, 't', LTS_STATE_a_28, LTS_STATE_a_281,
-    5, 's', LTS_STATE_a_69, LTS_STATE_a_282,
-    6, '#', LTS_STATE_a_284, LTS_STATE_a_283,
-    3, 'n', LTS_STATE_a_108, LTS_STATE_a_285,
-    2, 'c', LTS_STATE_a_83, LTS_STATE_a_286,
-    5, 't', LTS_STATE_a_83, LTS_STATE_a_287,
-    5, 'n', LTS_STATE_a_83, LTS_STATE_a_288,
-    5, 's', LTS_STATE_a_29, LTS_STATE_a_289,
-    2, 'e', LTS_STATE_a_155, LTS_STATE_a_290,
-    1, 'e', LTS_STATE_a_112, LTS_STATE_a_108,
-    5, 'c', LTS_STATE_a_108, LTS_STATE_a_291,
-    4, 'l', LTS_STATE_a_293, LTS_STATE_a_292,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_294,
-    4, 'u', LTS_STATE_a_64, LTS_STATE_a_295,
-    1, 'a', LTS_STATE_a_28, LTS_STATE_a_296,
-    1, 'i', LTS_STATE_a_69, LTS_STATE_a_28,
-    1, '#', LTS_STATE_a_28, LTS_STATE_a_297,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_298,
-    2, 'i', LTS_STATE_a_73, LTS_STATE_a_42,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_299,
-    2, 'q', LTS_STATE_a_83, LTS_STATE_a_300,
-    1, 'r', LTS_STATE_a_26, LTS_STATE_a_301,
-    1, 'c', LTS_STATE_a_303, LTS_STATE_a_302,
-    255, 15, 0, 0, 0, 0,
-    6, 'a', LTS_STATE_a_26, LTS_STATE_a_304,
-    3, 's', LTS_STATE_a_29, LTS_STATE_a_305,
-    3, 'r', LTS_STATE_a_26, LTS_STATE_a_306,
-    5, 'y', LTS_STATE_a_308, LTS_STATE_a_307,
-    6, 'l', LTS_STATE_a_310, LTS_STATE_a_309,
-    2, '#', LTS_STATE_a_312, LTS_STATE_a_311,
-    3, 'v', LTS_STATE_a_314, LTS_STATE_a_313,
-    3, 'p', LTS_STATE_a_28, LTS_STATE_a_26,
-    6, 'b', LTS_STATE_a_101, LTS_STATE_a_315,
-    3, 'h', LTS_STATE_a_28, LTS_STATE_a_29,
-    6, 'i', LTS_STATE_a_317, LTS_STATE_a_316,
-    6, 'o', LTS_STATE_a_26, LTS_STATE_a_101,
-    1, '#', LTS_STATE_a_83, LTS_STATE_a_318,
-    5, 'c', LTS_STATE_a_28, LTS_STATE_a_319,
-    5, 'd', LTS_STATE_a_127, LTS_STATE_a_28,
-    1, '#', LTS_STATE_a_320, LTS_STATE_a_28,
-    255, 16, 0, 0, 0, 0,
-    5, 'o', LTS_STATE_a_322, LTS_STATE_a_321,
-    3, 'o', LTS_STATE_a_324, LTS_STATE_a_323,
-    4, 'w', LTS_STATE_a_326, LTS_STATE_a_325,
-    4, 'l', LTS_STATE_a_328, LTS_STATE_a_327,
-    5, 'r', LTS_STATE_a_329, LTS_STATE_a_42,
-    2, '#', LTS_STATE_a_42, LTS_STATE_a_330,
-    2, 'a', LTS_STATE_a_332, LTS_STATE_a_331,
-    6, 'n', LTS_STATE_a_334, LTS_STATE_a_333,
-    1, '0', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, '0', LTS_STATE_a_336, LTS_STATE_a_335,
-    3, 'n', LTS_STATE_a_338, LTS_STATE_a_337,
-    5, 'o', LTS_STATE_a_28, LTS_STATE_a_339,
-    5, 'a', LTS_STATE_a_29, LTS_STATE_a_42,
-    2, 'e', LTS_STATE_a_73, LTS_STATE_a_42,
-    6, 'g', LTS_STATE_a_29, LTS_STATE_a_340,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_341,
-    6, 'e', LTS_STATE_a_42, LTS_STATE_a_342,
-    4, 'k', LTS_STATE_a_344, LTS_STATE_a_343,
-    4, 't', LTS_STATE_a_346, LTS_STATE_a_345,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_347,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_42,
-    2, 'a', LTS_STATE_a_349, LTS_STATE_a_348,
-    2, 'i', LTS_STATE_a_351, LTS_STATE_a_350,
-    1, 'a', LTS_STATE_a_42, LTS_STATE_a_69,
-    6, 'r', LTS_STATE_a_353, LTS_STATE_a_352,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_69,
-    2, '#', LTS_STATE_a_355, LTS_STATE_a_354,
-    2, 'm', LTS_STATE_a_42, LTS_STATE_a_356,
-    5, 'r', LTS_STATE_a_101, LTS_STATE_a_69,
-    4, 'l', LTS_STATE_a_28, LTS_STATE_a_69,
-    2, 'g', LTS_STATE_a_69, LTS_STATE_a_357,
-    4, 'l', LTS_STATE_a_28, LTS_STATE_a_358,
-    5, 'h', LTS_STATE_a_28, LTS_STATE_a_359,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_360,
-    5, 's', LTS_STATE_a_362, LTS_STATE_a_361,
-    5, 'd', LTS_STATE_a_108, LTS_STATE_a_363,
-    3, 's', LTS_STATE_a_83, LTS_STATE_a_364,
-    6, 'e', LTS_STATE_a_366, LTS_STATE_a_365,
-    5, 'd', LTS_STATE_a_83, LTS_STATE_a_367,
-    5, 'r', LTS_STATE_a_369, LTS_STATE_a_368,
-    5, 'l', LTS_STATE_a_29, LTS_STATE_a_83,
-    2, 'o', LTS_STATE_a_155, LTS_STATE_a_370,
-    6, 'o', LTS_STATE_a_108, LTS_STATE_a_371,
-    4, 's', LTS_STATE_a_373, LTS_STATE_a_372,
-    3, 'h', LTS_STATE_a_374, LTS_STATE_a_69,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_375,
-    4, 'i', LTS_STATE_a_28, LTS_STATE_a_376,
-    4, 'k', LTS_STATE_a_28, LTS_STATE_a_377,
-    1, 'o', LTS_STATE_a_69, LTS_STATE_a_378,
-    1, 'c', LTS_STATE_a_42, LTS_STATE_a_379,
-    1, '#', LTS_STATE_a_381, LTS_STATE_a_380,
-    1, '#', LTS_STATE_a_29, LTS_STATE_a_382,
-    1, 'e', LTS_STATE_a_384, LTS_STATE_a_383,
-    6, '#', LTS_STATE_a_386, LTS_STATE_a_385,
-    3, 's', LTS_STATE_a_29, LTS_STATE_a_231,
-    6, 'c', LTS_STATE_a_388, LTS_STATE_a_387,
-    3, 'c', LTS_STATE_a_26, LTS_STATE_a_389,
-    2, 'i', LTS_STATE_a_26, LTS_STATE_a_390,
-    5, 'u', LTS_STATE_a_392, LTS_STATE_a_391,
-    6, '#', LTS_STATE_a_26, LTS_STATE_a_393,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_394,
-    3, 'p', LTS_STATE_a_28, LTS_STATE_a_395,
-    6, 'n', LTS_STATE_a_28, LTS_STATE_a_231,
-    3, 'm', LTS_STATE_a_231, LTS_STATE_a_396,
-    6, 't', LTS_STATE_a_26, LTS_STATE_a_397,
-    6, 'e', LTS_STATE_a_28, LTS_STATE_a_26,
-    2, '#', LTS_STATE_a_399, LTS_STATE_a_398,
-    3, 'm', LTS_STATE_a_401, LTS_STATE_a_400,
-    3, 'm', LTS_STATE_a_26, LTS_STATE_a_402,
-    2, 'h', LTS_STATE_a_83, LTS_STATE_a_403,
-    5, 's', LTS_STATE_a_405, LTS_STATE_a_404,
-    6, 'e', LTS_STATE_a_28, LTS_STATE_a_127,
-    5, 'l', LTS_STATE_a_407, LTS_STATE_a_406,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_408,
-    4, 'w', LTS_STATE_a_410, LTS_STATE_a_409,
-    2, 'j', LTS_STATE_a_29, LTS_STATE_a_28,
-    4, 'l', LTS_STATE_a_412, LTS_STATE_a_411,
-    5, 'a', LTS_STATE_a_414, LTS_STATE_a_413,
-    4, 'g', LTS_STATE_a_101, LTS_STATE_a_415,
-    6, 'o', LTS_STATE_a_289, LTS_STATE_a_83,
-    6, 'e', LTS_STATE_a_26, LTS_STATE_a_42,
-    6, '#', LTS_STATE_a_42, LTS_STATE_a_416,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_417,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_69,
-    6, 'a', LTS_STATE_a_419, LTS_STATE_a_418,
-    4, 't', LTS_STATE_a_421, LTS_STATE_a_420,
-    2, 't', LTS_STATE_a_101, LTS_STATE_a_422,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_423,
-    3, 'u', LTS_STATE_a_42, LTS_STATE_a_424,
-    2, 'i', LTS_STATE_a_42, LTS_STATE_a_425,
-    6, 'a', LTS_STATE_a_427, LTS_STATE_a_426,
-    2, 'a', LTS_STATE_a_26, LTS_STATE_a_428,
-    3, 'g', LTS_STATE_a_69, LTS_STATE_a_42,
-    1, 'u', LTS_STATE_a_69, LTS_STATE_a_429,
-    4, 'y', LTS_STATE_a_42, LTS_STATE_a_430,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_431,
-    4, 'w', LTS_STATE_a_83, LTS_STATE_a_432,
-    3, 'u', LTS_STATE_a_42, LTS_STATE_a_433,
-    4, 'w', LTS_STATE_a_83, LTS_STATE_a_434,
-    1, '0', LTS_STATE_a_42, LTS_STATE_a_435,
-    1, 'l', LTS_STATE_a_29, LTS_STATE_a_436,
-    3, 'n', LTS_STATE_a_438, LTS_STATE_a_437,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_439,
-    6, 'o', LTS_STATE_a_42, LTS_STATE_a_440,
-    2, 'l', LTS_STATE_a_248, LTS_STATE_a_441,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_42,
-    6, 'n', LTS_STATE_a_443, LTS_STATE_a_442,
-    1, 'a', LTS_STATE_a_445, LTS_STATE_a_444,
-    5, 's', LTS_STATE_a_69, LTS_STATE_a_28,
-    5, 't', LTS_STATE_a_446, LTS_STATE_a_28,
-    1, 'h', LTS_STATE_a_28, LTS_STATE_a_69,
-    4, 'f', LTS_STATE_a_69, LTS_STATE_a_447,
-    2, 's', LTS_STATE_a_28, LTS_STATE_a_448,
-    6, 't', LTS_STATE_a_83, LTS_STATE_a_449,
-    3, 'n', LTS_STATE_a_83, LTS_STATE_a_450,
-    6, 't', LTS_STATE_a_451, LTS_STATE_a_83,
-    5, 's', LTS_STATE_a_453, LTS_STATE_a_452,
-    5, 'b', LTS_STATE_a_64, LTS_STATE_a_454,
-    6, 't', LTS_STATE_a_456, LTS_STATE_a_455,
-    5, 'l', LTS_STATE_a_458, LTS_STATE_a_457,
-    3, 'l', LTS_STATE_a_83, LTS_STATE_a_459,
-    1, '0', LTS_STATE_a_461, LTS_STATE_a_460,
-    1, '#', LTS_STATE_a_112, LTS_STATE_a_108,
-    4, 'u', LTS_STATE_a_106, LTS_STATE_a_462,
-    3, 'a', LTS_STATE_a_231, LTS_STATE_a_463,
-    2, 't', LTS_STATE_a_464, LTS_STATE_a_69,
-    1, 'n', LTS_STATE_a_466, LTS_STATE_a_465,
-    4, 'o', LTS_STATE_a_28, LTS_STATE_a_467,
-    4, 't', LTS_STATE_a_28, LTS_STATE_a_468,
-    2, 'r', LTS_STATE_a_28, LTS_STATE_a_469,
-    1, 'e', LTS_STATE_a_42, LTS_STATE_a_470,
-    6, 'e', LTS_STATE_a_472, LTS_STATE_a_471,
-    5, 'a', LTS_STATE_a_474, LTS_STATE_a_473,
-    3, 'p', LTS_STATE_a_29, LTS_STATE_a_475,
-    2, 'c', LTS_STATE_a_477, LTS_STATE_a_476,
-    2, 'r', LTS_STATE_a_101, LTS_STATE_a_26,
-    3, 'v', LTS_STATE_a_29, LTS_STATE_a_478,
-    3, 'c', LTS_STATE_a_26, LTS_STATE_a_479,
-    1, 'i', LTS_STATE_a_26, LTS_STATE_a_480,
-    2, 'a', LTS_STATE_a_28, LTS_STATE_a_101,
-    3, 'l', LTS_STATE_a_29, LTS_STATE_a_26,
-    2, 's', LTS_STATE_a_26, LTS_STATE_a_481,
-    3, 'h', LTS_STATE_a_483, LTS_STATE_a_482,
-    6, 's', LTS_STATE_a_231, LTS_STATE_a_28,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_26,
-    6, 's', LTS_STATE_a_231, LTS_STATE_a_484,
-    3, 'c', LTS_STATE_a_26, LTS_STATE_a_485,
-    6, 'l', LTS_STATE_a_231, LTS_STATE_a_486,
-    6, 'b', LTS_STATE_a_101, LTS_STATE_a_487,
-    6, 'm', LTS_STATE_a_26, LTS_STATE_a_28,
-    3, 'n', LTS_STATE_a_231, LTS_STATE_a_488,
-    3, 'g', LTS_STATE_a_101, LTS_STATE_a_489,
-    6, 'o', LTS_STATE_a_231, LTS_STATE_a_29,
-    3, 'p', LTS_STATE_a_29, LTS_STATE_a_101,
-    5, 't', LTS_STATE_a_28, LTS_STATE_a_29,
-    5, 'r', LTS_STATE_a_28, LTS_STATE_a_490,
-    6, '#', LTS_STATE_a_127, LTS_STATE_a_28,
-    1, '0', LTS_STATE_a_492, LTS_STATE_a_491,
-    4, 'b', LTS_STATE_a_494, LTS_STATE_a_493,
-    4, 't', LTS_STATE_a_496, LTS_STATE_a_495,
-    4, 'l', LTS_STATE_a_498, LTS_STATE_a_497,
-    5, 'a', LTS_STATE_a_69, LTS_STATE_a_499,
-    5, 'a', LTS_STATE_a_501, LTS_STATE_a_500,
-    5, 'a', LTS_STATE_a_503, LTS_STATE_a_502,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_504,
-    3, 'k', LTS_STATE_a_29, LTS_STATE_a_69,
-    5, 't', LTS_STATE_a_506, LTS_STATE_a_505,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_73,
-    3, 'p', LTS_STATE_a_42, LTS_STATE_a_28,
-    6, 'v', LTS_STATE_a_508, LTS_STATE_a_507,
-    2, '#', LTS_STATE_a_510, LTS_STATE_a_509,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_511,
-    1, '0', LTS_STATE_a_513, LTS_STATE_a_512,
-    3, 'n', LTS_STATE_a_29, LTS_STATE_a_514,
-    4, 'v', LTS_STATE_a_42, LTS_STATE_a_515,
-    1, 'i', LTS_STATE_a_516, LTS_STATE_a_42,
-    1, 'e', LTS_STATE_a_101, LTS_STATE_a_517,
-    5, 's', LTS_STATE_a_519, LTS_STATE_a_518,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_520,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_521,
-    1, '0', LTS_STATE_a_42, LTS_STATE_a_522,
-    2, '#', LTS_STATE_a_524, LTS_STATE_a_523,
-    2, '#', LTS_STATE_a_526, LTS_STATE_a_525,
-    4, 'l', LTS_STATE_a_528, LTS_STATE_a_527,
-    1, 't', LTS_STATE_a_530, LTS_STATE_a_529,
-    4, 'x', LTS_STATE_a_101, LTS_STATE_a_531,
-    2, 'i', LTS_STATE_a_533, LTS_STATE_a_532,
-    4, 'l', LTS_STATE_a_29, LTS_STATE_a_534,
-    3, 'r', LTS_STATE_a_536, LTS_STATE_a_535,
-    2, 'e', LTS_STATE_a_42, LTS_STATE_a_537,
-    1, 'c', LTS_STATE_a_42, LTS_STATE_a_538,
-    2, 's', LTS_STATE_a_540, LTS_STATE_a_539,
-    3, 'l', LTS_STATE_a_73, LTS_STATE_a_541,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_542,
-    3, 'h', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'd', LTS_STATE_a_28, LTS_STATE_a_543,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_28,
-    1, 'b', LTS_STATE_a_28, LTS_STATE_a_101,
-    5, 'l', LTS_STATE_a_101, LTS_STATE_a_544,
-    6, 'h', LTS_STATE_a_106, LTS_STATE_a_545,
-    3, 'h', LTS_STATE_a_64, LTS_STATE_a_546,
-    3, 'b', LTS_STATE_a_64, LTS_STATE_a_547,
-    3, 'f', LTS_STATE_a_83, LTS_STATE_a_108,
-    5, 't', LTS_STATE_a_548, LTS_STATE_a_83,
-    2, 'k', LTS_STATE_a_64, LTS_STATE_a_83,
-    2, 'k', LTS_STATE_a_64, LTS_STATE_a_549,
-    5, 'r', LTS_STATE_a_83, LTS_STATE_a_550,
-    5, 's', LTS_STATE_a_83, LTS_STATE_a_499,
-    3, 'g', LTS_STATE_a_552, LTS_STATE_a_551,
-    6, 'i', LTS_STATE_a_83, LTS_STATE_a_553,
-    6, 'e', LTS_STATE_a_106, LTS_STATE_a_83,
-    2, 'c', LTS_STATE_a_83, LTS_STATE_a_554,
-    6, 'u', LTS_STATE_a_83, LTS_STATE_a_555,
-    4, 'i', LTS_STATE_a_557, LTS_STATE_a_556,
-    3, 'v', LTS_STATE_a_559, LTS_STATE_a_558,
-    1, 'n', LTS_STATE_a_29, LTS_STATE_a_83,
-    2, 's', LTS_STATE_a_561, LTS_STATE_a_560,
-    3, 'h', LTS_STATE_a_563, LTS_STATE_a_562,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_564,
-    1, 'e', LTS_STATE_a_69, LTS_STATE_a_565,
-    1, 'a', LTS_STATE_a_69, LTS_STATE_a_566,
-    1, 't', LTS_STATE_a_42, LTS_STATE_a_567,
-    3, 'l', LTS_STATE_a_569, LTS_STATE_a_568,
-    3, 'b', LTS_STATE_a_570, LTS_STATE_a_29,
-    5, 'o', LTS_STATE_a_572, LTS_STATE_a_571,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_573,
-    3, 'c', LTS_STATE_a_29, LTS_STATE_a_574,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_575,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_576,
-    3, 'p', LTS_STATE_a_26, LTS_STATE_a_577,
-    3, 'f', LTS_STATE_a_26, LTS_STATE_a_578,
-    3, 'l', LTS_STATE_a_580, LTS_STATE_a_579,
-    2, 'u', LTS_STATE_a_26, LTS_STATE_a_581,
-    5, 'k', LTS_STATE_a_29, LTS_STATE_a_582,
-    6, 'o', LTS_STATE_a_583, LTS_STATE_a_29,
-    6, 'u', LTS_STATE_a_28, LTS_STATE_a_584,
-    3, 'k', LTS_STATE_a_26, LTS_STATE_a_101,
-    6, '#', LTS_STATE_a_26, LTS_STATE_a_585,
-    6, 'e', LTS_STATE_a_26, LTS_STATE_a_586,
-    6, 'c', LTS_STATE_a_231, LTS_STATE_a_587,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_588,
-    2, 'l', LTS_STATE_a_590, LTS_STATE_a_589,
-    3, 'o', LTS_STATE_a_592, LTS_STATE_a_591,
-    4, 'l', LTS_STATE_a_594, LTS_STATE_a_593,
-    6, 'y', LTS_STATE_a_596, LTS_STATE_a_595,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_597,
-    6, 's', LTS_STATE_a_599, LTS_STATE_a_598,
-    6, 'r', LTS_STATE_a_601, LTS_STATE_a_600,
-    2, 't', LTS_STATE_a_603, LTS_STATE_a_602,
-    2, 's', LTS_STATE_a_605, LTS_STATE_a_604,
-    5, 'c', LTS_STATE_a_29, LTS_STATE_a_83,
-    5, 'o', LTS_STATE_a_607, LTS_STATE_a_606,
-    6, '#', LTS_STATE_a_609, LTS_STATE_a_608,
-    5, 'o', LTS_STATE_a_611, LTS_STATE_a_610,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_612,
-    5, 'h', LTS_STATE_a_83, LTS_STATE_a_613,
-    4, 'c', LTS_STATE_a_615, LTS_STATE_a_614,
-    4, 's', LTS_STATE_a_42, LTS_STATE_a_29,
-    6, 'e', LTS_STATE_a_617, LTS_STATE_a_616,
-    4, 't', LTS_STATE_a_619, LTS_STATE_a_618,
-    4, 'z', LTS_STATE_a_29, LTS_STATE_a_620,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_621,
-    4, 'g', LTS_STATE_a_623, LTS_STATE_a_622,
-    3, 'u', LTS_STATE_a_624, LTS_STATE_a_42,
-    3, 'l', LTS_STATE_a_231, LTS_STATE_a_42,
-    4, 'z', LTS_STATE_a_101, LTS_STATE_a_625,
-    2, '#', LTS_STATE_a_231, LTS_STATE_a_29,
-    2, 'r', LTS_STATE_a_626, LTS_STATE_a_42,
-    1, 'd', LTS_STATE_a_101, LTS_STATE_a_42,
-    5, 'a', LTS_STATE_a_28, LTS_STATE_a_627,
-    6, 't', LTS_STATE_a_29, LTS_STATE_a_628,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_629,
-    3, 'l', LTS_STATE_a_630, LTS_STATE_a_42,
-    6, 't', LTS_STATE_a_69, LTS_STATE_a_631,
-    1, '#', LTS_STATE_a_633, LTS_STATE_a_632,
-    6, 'k', LTS_STATE_a_635, LTS_STATE_a_634,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_636,
-    3, 't', LTS_STATE_a_42, LTS_STATE_a_637,
-    4, 'n', LTS_STATE_a_639, LTS_STATE_a_638,
-    1, '0', LTS_STATE_a_641, LTS_STATE_a_640,
-    3, 'g', LTS_STATE_a_643, LTS_STATE_a_642,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_42,
-    1, '0', LTS_STATE_a_645, LTS_STATE_a_644,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_646,
-    4, 'l', LTS_STATE_a_29, LTS_STATE_a_42,
-    4, 'c', LTS_STATE_a_29, LTS_STATE_a_647,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_648,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_649,
-    1, 'i', LTS_STATE_a_69, LTS_STATE_a_650,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_651,
-    1, 'e', LTS_STATE_a_653, LTS_STATE_a_652,
-    3, 's', LTS_STATE_a_332, LTS_STATE_a_42,
-    3, 'r', LTS_STATE_a_29, LTS_STATE_a_654,
-    3, 'p', LTS_STATE_a_101, LTS_STATE_a_42,
-    6, 'o', LTS_STATE_a_28, LTS_STATE_a_655,
-    6, 'g', LTS_STATE_a_69, LTS_STATE_a_656,
-    2, 'e', LTS_STATE_a_658, LTS_STATE_a_657,
-    3, 'r', LTS_STATE_a_64, LTS_STATE_a_83,
-    5, 's', LTS_STATE_a_660, LTS_STATE_a_659,
-    2, 't', LTS_STATE_a_64, LTS_STATE_a_83,
-    3, 'r', LTS_STATE_a_83, LTS_STATE_a_64,
-    5, 'b', LTS_STATE_a_83, LTS_STATE_a_661,
-    3, 's', LTS_STATE_a_663, LTS_STATE_a_662,
-    5, 'c', LTS_STATE_a_64, LTS_STATE_a_664,
-    6, 't', LTS_STATE_a_83, LTS_STATE_a_665,
-    1, 'o', LTS_STATE_a_155, LTS_STATE_a_666,
-    6, 'm', LTS_STATE_a_231, LTS_STATE_a_83,
-    4, 'o', LTS_STATE_a_668, LTS_STATE_a_667,
-    2, 'a', LTS_STATE_a_29, LTS_STATE_a_28,
-    3, 'j', LTS_STATE_a_231, LTS_STATE_a_69,
-    2, 'i', LTS_STATE_a_231, LTS_STATE_a_69,
-    3, 'h', LTS_STATE_a_670, LTS_STATE_a_669,
-    3, 's', LTS_STATE_a_69, LTS_STATE_a_671,
-    3, 'g', LTS_STATE_a_673, LTS_STATE_a_672,
-    255, 17, 0, 0, 0, 0,
-    3, 'u', LTS_STATE_a_29, LTS_STATE_a_674,
-    4, 'm', LTS_STATE_a_28, LTS_STATE_a_675,
-    1, 'e', LTS_STATE_a_28, LTS_STATE_a_69,
-    2, 'o', LTS_STATE_a_42, LTS_STATE_a_676,
-    3, 'p', LTS_STATE_a_678, LTS_STATE_a_677,
-    2, 'u', LTS_STATE_a_28, LTS_STATE_a_679,
-    1, 'e', LTS_STATE_a_231, LTS_STATE_a_29,
-    2, 's', LTS_STATE_a_681, LTS_STATE_a_680,
-    3, 'h', LTS_STATE_a_26, LTS_STATE_a_29,
-    3, 'h', LTS_STATE_a_683, LTS_STATE_a_682,
-    2, 'g', LTS_STATE_a_28, LTS_STATE_a_684,
-    6, '#', LTS_STATE_a_101, LTS_STATE_a_685,
-    6, 'e', LTS_STATE_a_26, LTS_STATE_a_101,
-    1, '#', LTS_STATE_a_687, LTS_STATE_a_686,
-    1, '#', LTS_STATE_a_26, LTS_STATE_a_688,
-    6, 'e', LTS_STATE_a_26, LTS_STATE_a_689,
-    6, 't', LTS_STATE_a_26, LTS_STATE_a_690,
-    3, 'i', LTS_STATE_a_28, LTS_STATE_a_691,
-    6, 's', LTS_STATE_a_29, LTS_STATE_a_692,
-    5, 'b', LTS_STATE_a_29, LTS_STATE_a_693,
-    3, 'm', LTS_STATE_a_28, LTS_STATE_a_694,
-    3, 'l', LTS_STATE_a_28, LTS_STATE_a_695,
-    6, 'c', LTS_STATE_a_101, LTS_STATE_a_696,
-    3, 'c', LTS_STATE_a_101, LTS_STATE_a_697,
-    6, 'e', LTS_STATE_a_699, LTS_STATE_a_698,
-    1, 'n', LTS_STATE_a_28, LTS_STATE_a_700,
-    1, 'c', LTS_STATE_a_127, LTS_STATE_a_701,
-    4, 'n', LTS_STATE_a_703, LTS_STATE_a_702,
-    5, 't', LTS_STATE_a_705, LTS_STATE_a_704,
-    4, 'e', LTS_STATE_a_28, LTS_STATE_a_706,
-    5, 'a', LTS_STATE_a_708, LTS_STATE_a_707,
-    4, 'l', LTS_STATE_a_710, LTS_STATE_a_709,
-    3, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
-    1, '0', LTS_STATE_a_42, LTS_STATE_a_69,
-    4, 'g', LTS_STATE_a_712, LTS_STATE_a_711,
-    4, 'g', LTS_STATE_a_231, LTS_STATE_a_713,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_714,
-    1, 'd', LTS_STATE_a_42, LTS_STATE_a_715,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_716,
-    5, 's', LTS_STATE_a_718, LTS_STATE_a_717,
-    6, '#', LTS_STATE_a_720, LTS_STATE_a_719,
-    3, 't', LTS_STATE_a_83, LTS_STATE_a_721,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_722,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_723,
-    3, 'v', LTS_STATE_a_725, LTS_STATE_a_724,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_29,
-    5, 'm', LTS_STATE_a_727, LTS_STATE_a_726,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_728,
-    3, 'b', LTS_STATE_a_101, LTS_STATE_a_729,
-    3, 'p', LTS_STATE_a_730, LTS_STATE_a_83,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_731,
-    5, 'h', LTS_STATE_a_83, LTS_STATE_a_101,
-    6, 'c', LTS_STATE_a_733, LTS_STATE_a_732,
-    4, 'n', LTS_STATE_a_735, LTS_STATE_a_734,
-    4, 's', LTS_STATE_a_42, LTS_STATE_a_736,
-    2, 'r', LTS_STATE_a_69, LTS_STATE_a_737,
-    3, 't', LTS_STATE_a_739, LTS_STATE_a_738,
-    3, 'm', LTS_STATE_a_741, LTS_STATE_a_740,
-    4, 'w', LTS_STATE_a_83, LTS_STATE_a_742,
-    2, 'i', LTS_STATE_a_101, LTS_STATE_a_743,
-    255, 18, 0, 0, 0, 0,
-    1, 'o', LTS_STATE_a_42, LTS_STATE_a_744,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_101,
-    6, 's', LTS_STATE_a_42, LTS_STATE_a_745,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_746,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_28,
-    2, 'p', LTS_STATE_a_42, LTS_STATE_a_747,
-    1, 'o', LTS_STATE_a_42, LTS_STATE_a_748,
-    1, '0', LTS_STATE_a_750, LTS_STATE_a_749,
-    6, 'r', LTS_STATE_a_752, LTS_STATE_a_751,
-    3, 'v', LTS_STATE_a_754, LTS_STATE_a_753,
-    4, 'c', LTS_STATE_a_29, LTS_STATE_a_755,
-    6, 'n', LTS_STATE_a_42, LTS_STATE_a_756,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_757,
-    4, 'x', LTS_STATE_a_101, LTS_STATE_a_758,
-    2, '0', LTS_STATE_a_101, LTS_STATE_a_759,
-    2, 'o', LTS_STATE_a_29, LTS_STATE_a_760,
-    2, '#', LTS_STATE_a_42, LTS_STATE_a_231,
-    2, 'c', LTS_STATE_a_42, LTS_STATE_a_761,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_42,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_762,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_763,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_764,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_741,
-    3, 'i', LTS_STATE_a_766, LTS_STATE_a_765,
-    2, 'u', LTS_STATE_a_69, LTS_STATE_a_767,
-    1, 't', LTS_STATE_a_69, LTS_STATE_a_42,
-    1, 't', LTS_STATE_a_42, LTS_STATE_a_768,
-    2, 'e', LTS_STATE_a_248, LTS_STATE_a_769,
-    3, 'g', LTS_STATE_a_42, LTS_STATE_a_248,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_248,
-    5, 'h', LTS_STATE_a_28, LTS_STATE_a_770,
-    6, 'u', LTS_STATE_a_69, LTS_STATE_a_28,
-    2, 't', LTS_STATE_a_106, LTS_STATE_a_771,
-    6, 'e', LTS_STATE_a_772, LTS_STATE_a_83,
-    3, 'h', LTS_STATE_a_108, LTS_STATE_a_773,
-    3, 'h', LTS_STATE_a_64, LTS_STATE_a_106,
-    6, 'i', LTS_STATE_a_64, LTS_STATE_a_774,
-    6, '#', LTS_STATE_a_83, LTS_STATE_a_775,
-    5, 't', LTS_STATE_a_155, LTS_STATE_a_83,
-    5, 'd', LTS_STATE_a_112, LTS_STATE_a_776,
-    6, 'e', LTS_STATE_a_83, LTS_STATE_a_777,
-    2, 'a', LTS_STATE_a_155, LTS_STATE_a_778,
-    4, 'e', LTS_STATE_a_629, LTS_STATE_a_779,
-    2, 'a', LTS_STATE_a_28, LTS_STATE_a_106,
-    3, 'w', LTS_STATE_a_781, LTS_STATE_a_780,
-    1, 'l', LTS_STATE_a_563, LTS_STATE_a_782,
-    3, 't', LTS_STATE_a_101, LTS_STATE_a_783,
-    2, 'a', LTS_STATE_a_101, LTS_STATE_a_69,
-    2, 'i', LTS_STATE_a_69, LTS_STATE_a_563,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_784,
-    1, '#', LTS_STATE_a_28, LTS_STATE_a_785,
-    3, 'l', LTS_STATE_a_787, LTS_STATE_a_786,
-    5, 'k', LTS_STATE_a_789, LTS_STATE_a_788,
-    5, 'a', LTS_STATE_a_791, LTS_STATE_a_790,
-    2, 'c', LTS_STATE_a_28, LTS_STATE_a_792,
-    3, 'h', LTS_STATE_a_29, LTS_STATE_a_793,
-    3, 'c', LTS_STATE_a_794, LTS_STATE_a_29,
-    2, 'g', LTS_STATE_a_26, LTS_STATE_a_28,
-    6, 'c', LTS_STATE_a_26, LTS_STATE_a_28,
-    6, 'y', LTS_STATE_a_29, LTS_STATE_a_795,
-    2, 'a', LTS_STATE_a_796, LTS_STATE_a_29,
-    1, 'e', LTS_STATE_a_26, LTS_STATE_a_797,
-    3, 'h', LTS_STATE_a_26, LTS_STATE_a_798,
-    3, 'm', LTS_STATE_a_26, LTS_STATE_a_799,
-    6, 'u', LTS_STATE_a_26, LTS_STATE_a_800,
-    1, '#', LTS_STATE_a_26, LTS_STATE_a_28,
-    1, 'a', LTS_STATE_a_28, LTS_STATE_a_801,
-    5, 'c', LTS_STATE_a_803, LTS_STATE_a_802,
-    5, 'p', LTS_STATE_a_231, LTS_STATE_a_29,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_804,
-    3, 'p', LTS_STATE_a_805, LTS_STATE_a_26,
-    3, 'c', LTS_STATE_a_231, LTS_STATE_a_806,
-    3, 't', LTS_STATE_a_231, LTS_STATE_a_807,
-    3, 'd', LTS_STATE_a_101, LTS_STATE_a_808,
-    3, 'f', LTS_STATE_a_26, LTS_STATE_a_809,
-    2, 't', LTS_STATE_a_28, LTS_STATE_a_810,
-    1, '#', LTS_STATE_a_127, LTS_STATE_a_28,
-    5, 'a', LTS_STATE_a_812, LTS_STATE_a_811,
-    5, 'g', LTS_STATE_a_814, LTS_STATE_a_813,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_28,
-    2, 'c', LTS_STATE_a_28, LTS_STATE_a_101,
-    4, 'n', LTS_STATE_a_816, LTS_STATE_a_815,
-    5, 't', LTS_STATE_a_818, LTS_STATE_a_817,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_819,
-    4, 'h', LTS_STATE_a_821, LTS_STATE_a_820,
-    6, '#', LTS_STATE_a_823, LTS_STATE_a_822,
-    2, 'a', LTS_STATE_a_825, LTS_STATE_a_824,
-    6, 'n', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, 'o', LTS_STATE_a_101, LTS_STATE_a_826,
-    2, 'u', LTS_STATE_a_69, LTS_STATE_a_827,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_828,
-    3, 'i', LTS_STATE_a_830, LTS_STATE_a_829,
-    5, 'a', LTS_STATE_a_231, LTS_STATE_a_831,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_832,
-    5, 't', LTS_STATE_a_83, LTS_STATE_a_833,
-    5, 'a', LTS_STATE_a_29, LTS_STATE_a_834,
-    3, 'm', LTS_STATE_a_83, LTS_STATE_a_835,
-    4, 'e', LTS_STATE_a_837, LTS_STATE_a_836,
-    6, 'r', LTS_STATE_a_839, LTS_STATE_a_838,
-    6, 'n', LTS_STATE_a_841, LTS_STATE_a_840,
-    4, 'c', LTS_STATE_a_73, LTS_STATE_a_842,
-    5, 'd', LTS_STATE_a_844, LTS_STATE_a_843,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_845,
-    6, 's', LTS_STATE_a_69, LTS_STATE_a_846,
-    6, 's', LTS_STATE_a_29, LTS_STATE_a_847,
-    5, 'l', LTS_STATE_a_231, LTS_STATE_a_83,
-    5, 'g', LTS_STATE_a_101, LTS_STATE_a_848,
-    6, 't', LTS_STATE_a_850, LTS_STATE_a_849,
-    4, 't', LTS_STATE_a_101, LTS_STATE_a_851,
-    1, '0', LTS_STATE_a_853, LTS_STATE_a_852,
-    1, '0', LTS_STATE_a_854, LTS_STATE_a_69,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_231,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_855,
-    4, 'n', LTS_STATE_a_857, LTS_STATE_a_856,
-    4, 'l', LTS_STATE_a_859, LTS_STATE_a_858,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_860,
-    4, 'n', LTS_STATE_a_42, LTS_STATE_a_29,
-    4, 'y', LTS_STATE_a_42, LTS_STATE_a_861,
-    1, '0', LTS_STATE_a_101, LTS_STATE_a_248,
-    4, 'c', LTS_STATE_a_42, LTS_STATE_a_862,
-    6, 'n', LTS_STATE_a_42, LTS_STATE_a_863,
-    3, 'n', LTS_STATE_a_42, LTS_STATE_a_864,
-    6, 'e', LTS_STATE_a_42, LTS_STATE_a_69,
-    6, 'i', LTS_STATE_a_42, LTS_STATE_a_865,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_866,
-    4, 'm', LTS_STATE_a_868, LTS_STATE_a_867,
-    2, 's', LTS_STATE_a_870, LTS_STATE_a_869,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_871,
-    6, 'l', LTS_STATE_a_873, LTS_STATE_a_872,
-    4, 'l', LTS_STATE_a_874, LTS_STATE_a_563,
-    4, 's', LTS_STATE_a_29, LTS_STATE_a_101,
-    3, 'b', LTS_STATE_a_42, LTS_STATE_a_69,
-    3, 'b', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'j', LTS_STATE_a_69, LTS_STATE_a_875,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_876,
-    1, '#', LTS_STATE_a_69, LTS_STATE_a_877,
-    3, 'l', LTS_STATE_a_879, LTS_STATE_a_878,
-    4, 'h', LTS_STATE_a_69, LTS_STATE_a_880,
-    4, 'l', LTS_STATE_a_101, LTS_STATE_a_881,
-    4, 'c', LTS_STATE_a_883, LTS_STATE_a_882,
-    2, 'e', LTS_STATE_a_42, LTS_STATE_a_884,
-    2, 'c', LTS_STATE_a_42, LTS_STATE_a_885,
-    1, 't', LTS_STATE_a_69, LTS_STATE_a_886,
-    1, 'd', LTS_STATE_a_42, LTS_STATE_a_887,
-    3, 'p', LTS_STATE_a_42, LTS_STATE_a_888,
-    1, 'u', LTS_STATE_a_28, LTS_STATE_a_889,
-    1, 'r', LTS_STATE_a_29, LTS_STATE_a_890,
-    3, 'l', LTS_STATE_a_106, LTS_STATE_a_83,
-    3, 'r', LTS_STATE_a_64, LTS_STATE_a_772,
-    5, 's', LTS_STATE_a_64, LTS_STATE_a_891,
-    5, 'm', LTS_STATE_a_64, LTS_STATE_a_892,
-    5, 't', LTS_STATE_a_83, LTS_STATE_a_64,
-    6, '#', LTS_STATE_a_83, LTS_STATE_a_893,
-    2, 'r', LTS_STATE_a_155, LTS_STATE_a_83,
-    4, 'k', LTS_STATE_a_895, LTS_STATE_a_894,
-    3, 'g', LTS_STATE_a_69, LTS_STATE_a_896,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_897,
-    1, 'u', LTS_STATE_a_69, LTS_STATE_a_898,
-    3, 'c', LTS_STATE_a_101, LTS_STATE_a_69,
-    3, 'w', LTS_STATE_a_29, LTS_STATE_a_899,
-    4, 'f', LTS_STATE_a_28, LTS_STATE_a_900,
-    1, 'u', LTS_STATE_a_902, LTS_STATE_a_901,
-    1, 'i', LTS_STATE_a_42, LTS_STATE_a_903,
-    5, 'a', LTS_STATE_a_905, LTS_STATE_a_904,
-    3, 'm', LTS_STATE_a_29, LTS_STATE_a_906,
-    2, 'p', LTS_STATE_a_28, LTS_STATE_a_907,
-    6, 'g', LTS_STATE_a_26, LTS_STATE_a_28,
-    1, 'o', LTS_STATE_a_28, LTS_STATE_a_908,
-    3, 'u', LTS_STATE_a_29, LTS_STATE_a_909,
-    6, 'e', LTS_STATE_a_29, LTS_STATE_a_910,
-    1, 'n', LTS_STATE_a_29, LTS_STATE_a_911,
-    3, 'v', LTS_STATE_a_28, LTS_STATE_a_231,
-    6, 's', LTS_STATE_a_29, LTS_STATE_a_28,
-    3, 'l', LTS_STATE_a_26, LTS_STATE_a_912,
-    2, 's', LTS_STATE_a_26, LTS_STATE_a_29,
-    6, 'l', LTS_STATE_a_26, LTS_STATE_a_913,
-    2, 'a', LTS_STATE_a_28, LTS_STATE_a_914,
-    6, 'a', LTS_STATE_a_916, LTS_STATE_a_915,
-    3, 'm', LTS_STATE_a_918, LTS_STATE_a_917,
-    6, 't', LTS_STATE_a_101, LTS_STATE_a_919,
-    6, 'n', LTS_STATE_a_28, LTS_STATE_a_26,
-    6, 'm', LTS_STATE_a_28, LTS_STATE_a_920,
-    6, 'h', LTS_STATE_a_101, LTS_STATE_a_921,
-    3, 'p', LTS_STATE_a_26, LTS_STATE_a_922,
-    3, 'c', LTS_STATE_a_231, LTS_STATE_a_923,
-    6, 'n', LTS_STATE_a_127, LTS_STATE_a_924,
-    4, 'l', LTS_STATE_a_926, LTS_STATE_a_925,
-    6, '#', LTS_STATE_a_928, LTS_STATE_a_927,
-    6, '#', LTS_STATE_a_930, LTS_STATE_a_929,
-    6, 'e', LTS_STATE_a_932, LTS_STATE_a_931,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_933,
-    5, 'y', LTS_STATE_a_26, LTS_STATE_a_934,
-    5, 'd', LTS_STATE_a_936, LTS_STATE_a_935,
-    6, 'e', LTS_STATE_a_83, LTS_STATE_a_937,
-    6, 'n', LTS_STATE_a_231, LTS_STATE_a_938,
-    4, 'e', LTS_STATE_a_940, LTS_STATE_a_939,
-    6, '#', LTS_STATE_a_941, LTS_STATE_a_29,
-    6, 's', LTS_STATE_a_83, LTS_STATE_a_942,
-    3, 'b', LTS_STATE_a_83, LTS_STATE_a_943,
-    1, '0', LTS_STATE_a_945, LTS_STATE_a_944,
-    1, 'p', LTS_STATE_a_69, LTS_STATE_a_946,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_947,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_948,
-    2, 'i', LTS_STATE_a_950, LTS_STATE_a_949,
-    4, 'e', LTS_STATE_a_952, LTS_STATE_a_951,
-    2, 'd', LTS_STATE_a_954, LTS_STATE_a_953,
-    5, 'o', LTS_STATE_a_29, LTS_STATE_a_955,
-    6, 'l', LTS_STATE_a_563, LTS_STATE_a_956,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_957,
-    5, 'l', LTS_STATE_a_83, LTS_STATE_a_69,
-    5, 'a', LTS_STATE_a_29, LTS_STATE_a_958,
-    4, 'h', LTS_STATE_a_960, LTS_STATE_a_959,
-    3, 'm', LTS_STATE_a_28, LTS_STATE_a_961,
-    6, 's', LTS_STATE_a_963, LTS_STATE_a_962,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_964,
-    6, 's', LTS_STATE_a_966, LTS_STATE_a_965,
-    3, 'p', LTS_STATE_a_231, LTS_STATE_a_967,
-    4, 'n', LTS_STATE_a_563, LTS_STATE_a_101,
-    5, 'v', LTS_STATE_a_969, LTS_STATE_a_968,
-    6, 'a', LTS_STATE_a_231, LTS_STATE_a_970,
-    3, 'c', LTS_STATE_a_29, LTS_STATE_a_971,
-    6, 'm', LTS_STATE_a_231, LTS_STATE_a_972,
-    3, 't', LTS_STATE_a_231, LTS_STATE_a_973,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_974,
-    1, '0', LTS_STATE_a_976, LTS_STATE_a_975,
-    2, 'q', LTS_STATE_a_29, LTS_STATE_a_977,
-    4, 's', LTS_STATE_a_757, LTS_STATE_a_978,
-    1, '#', LTS_STATE_a_980, LTS_STATE_a_979,
-    4, 'v', LTS_STATE_a_42, LTS_STATE_a_981,
-    3, 'd', LTS_STATE_a_101, LTS_STATE_a_563,
-    1, 'c', LTS_STATE_a_69, LTS_STATE_a_982,
-    2, 'o', LTS_STATE_a_29, LTS_STATE_a_983,
-    3, 'm', LTS_STATE_a_42, LTS_STATE_a_984,
-    2, 's', LTS_STATE_a_29, LTS_STATE_a_42,
-    1, 'r', LTS_STATE_a_101, LTS_STATE_a_29,
-    3, 'f', LTS_STATE_a_231, LTS_STATE_a_985,
-    4, 'k', LTS_STATE_a_42, LTS_STATE_a_986,
-    2, 'e', LTS_STATE_a_42, LTS_STATE_a_987,
-    3, 'b', LTS_STATE_a_28, LTS_STATE_a_988,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_989,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_990,
-    4, 'i', LTS_STATE_a_28, LTS_STATE_a_991,
-    4, 'd', LTS_STATE_a_101, LTS_STATE_a_992,
-    6, 'l', LTS_STATE_a_69, LTS_STATE_a_993,
-    3, 'r', LTS_STATE_a_995, LTS_STATE_a_994,
-    3, 'p', LTS_STATE_a_42, LTS_STATE_a_996,
-    3, 'x', LTS_STATE_a_101, LTS_STATE_a_997,
-    3, 'm', LTS_STATE_a_999, LTS_STATE_a_998,
-    3, 'l', LTS_STATE_a_1001, LTS_STATE_a_1000,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1002,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1003,
-    2, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
-    2, 'i', LTS_STATE_a_530, LTS_STATE_a_42,
-    1, 'm', LTS_STATE_a_42, LTS_STATE_a_1004,
-    4, 'm', LTS_STATE_a_1006, LTS_STATE_a_1005,
-    2, '#', LTS_STATE_a_42, LTS_STATE_a_69,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1007,
-    2, 'p', LTS_STATE_a_42, LTS_STATE_a_1008,
-    1, 'l', LTS_STATE_a_73, LTS_STATE_a_1009,
-    1, 'e', LTS_STATE_a_69, LTS_STATE_a_42,
-    1, 'd', LTS_STATE_a_69, LTS_STATE_a_42,
-    3, 'n', LTS_STATE_a_42, LTS_STATE_a_1010,
-    3, 'r', LTS_STATE_a_1012, LTS_STATE_a_1011,
-    2, 'n', LTS_STATE_a_1013, LTS_STATE_a_28,
-    5, 'd', LTS_STATE_a_83, LTS_STATE_a_1014,
-    6, 'e', LTS_STATE_a_64, LTS_STATE_a_83,
-    6, 'u', LTS_STATE_a_29, LTS_STATE_a_1015,
-    6, 'k', LTS_STATE_a_83, LTS_STATE_a_1016,
-    4, 'h', LTS_STATE_a_1018, LTS_STATE_a_1017,
-    3, 'i', LTS_STATE_a_563, LTS_STATE_a_1019,
-    3, 'f', LTS_STATE_a_101, LTS_STATE_a_1020,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_231,
-    1, 'e', LTS_STATE_a_69, LTS_STATE_a_1021,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1022,
-    4, 'l', LTS_STATE_a_28, LTS_STATE_a_1023,
-    2, 'r', LTS_STATE_a_42, LTS_STATE_a_1024,
-    2, 'r', LTS_STATE_a_28, LTS_STATE_a_42,
-    1, 'a', LTS_STATE_a_73, LTS_STATE_a_42,
-    5, 'o', LTS_STATE_a_1026, LTS_STATE_a_1025,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_1027,
-    2, 'm', LTS_STATE_a_29, LTS_STATE_a_231,
-    5, 'o', LTS_STATE_a_28, LTS_STATE_a_1028,
-    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1029,
-    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1030,
-    6, 'i', LTS_STATE_a_231, LTS_STATE_a_29,
-    2, 'i', LTS_STATE_a_231, LTS_STATE_a_1031,
-    6, 'd', LTS_STATE_a_26, LTS_STATE_a_28,
-    6, 't', LTS_STATE_a_1033, LTS_STATE_a_1032,
-    1, 'u', LTS_STATE_a_28, LTS_STATE_a_1034,
-    6, 'o', LTS_STATE_a_1036, LTS_STATE_a_1035,
-    5, 'j', LTS_STATE_a_29, LTS_STATE_a_1037,
-    3, 's', LTS_STATE_a_231, LTS_STATE_a_910,
-    6, 'e', LTS_STATE_a_231, LTS_STATE_a_1038,
-    3, 'g', LTS_STATE_a_231, LTS_STATE_a_1039,
-    6, 'z', LTS_STATE_a_28, LTS_STATE_a_1040,
-    3, 's', LTS_STATE_a_26, LTS_STATE_a_1041,
-    6, 'u', LTS_STATE_a_231, LTS_STATE_a_1042,
-    3, 'b', LTS_STATE_a_101, LTS_STATE_a_29,
-    6, '#', LTS_STATE_a_1043, LTS_STATE_a_127,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_1044,
-    5, 's', LTS_STATE_a_1046, LTS_STATE_a_1045,
-    6, 'b', LTS_STATE_a_1048, LTS_STATE_a_1047,
-    4, 'h', LTS_STATE_a_231, LTS_STATE_a_29,
-    5, 'c', LTS_STATE_a_1050, LTS_STATE_a_1049,
-    5, 'a', LTS_STATE_a_1052, LTS_STATE_a_1051,
-    6, '#', LTS_STATE_a_101, LTS_STATE_a_1053,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_1054,
-    4, 'm', LTS_STATE_a_1056, LTS_STATE_a_1055,
-    5, 't', LTS_STATE_a_1058, LTS_STATE_a_1057,
-    5, 'm', LTS_STATE_a_1060, LTS_STATE_a_1059,
-    6, 'e', LTS_STATE_a_83, LTS_STATE_a_1061,
-    6, 'a', LTS_STATE_a_83, LTS_STATE_a_1062,
-    6, 'm', LTS_STATE_a_101, LTS_STATE_a_69,
-    4, 'w', LTS_STATE_a_83, LTS_STATE_a_1063,
-    2, 'c', LTS_STATE_a_69, LTS_STATE_a_1064,
-    2, 'r', LTS_STATE_a_231, LTS_STATE_a_1065,
-    2, 'h', LTS_STATE_a_83, LTS_STATE_a_1066,
-    3, 'f', LTS_STATE_a_83, LTS_STATE_a_1067,
-    4, 'b', LTS_STATE_a_1069, LTS_STATE_a_1068,
-    6, 'i', LTS_STATE_a_1071, LTS_STATE_a_1070,
-    6, 't', LTS_STATE_a_231, LTS_STATE_a_1072,
-    4, 'd', LTS_STATE_a_29, LTS_STATE_a_1073,
-    1, 'o', LTS_STATE_a_69, LTS_STATE_a_1074,
-    3, 'l', LTS_STATE_a_1076, LTS_STATE_a_1075,
-    1, 'p', LTS_STATE_a_69, LTS_STATE_a_1077,
-    3, 'w', LTS_STATE_a_1079, LTS_STATE_a_1078,
-    3, 'r', LTS_STATE_a_28, LTS_STATE_a_1080,
-    2, 'c', LTS_STATE_a_83, LTS_STATE_a_1081,
-    6, 'n', LTS_STATE_a_1083, LTS_STATE_a_1082,
-    4, 'c', LTS_STATE_a_1085, LTS_STATE_a_1084,
-    6, 'c', LTS_STATE_a_563, LTS_STATE_a_1086,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1087,
-    3, 'c', LTS_STATE_a_1089, LTS_STATE_a_1088,
-    4, 'n', LTS_STATE_a_1091, LTS_STATE_a_1090,
-    6, 'a', LTS_STATE_a_1093, LTS_STATE_a_1092,
-    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1094,
-    6, 'o', LTS_STATE_a_1096, LTS_STATE_a_1095,
-    4, 'n', LTS_STATE_a_1098, LTS_STATE_a_1097,
-    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1099,
-    4, 't', LTS_STATE_a_1101, LTS_STATE_a_1100,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1102,
-    4, 'v', LTS_STATE_a_69, LTS_STATE_a_1103,
-    6, 'e', LTS_STATE_a_1105, LTS_STATE_a_1104,
-    3, 'm', LTS_STATE_a_29, LTS_STATE_a_1106,
-    3, 'v', LTS_STATE_a_231, LTS_STATE_a_1107,
-    3, 'b', LTS_STATE_a_29, LTS_STATE_a_1108,
-    3, 's', LTS_STATE_a_69, LTS_STATE_a_1109,
-    3, 's', LTS_STATE_a_101, LTS_STATE_a_1110,
-    4, 'n', LTS_STATE_a_29, LTS_STATE_a_1111,
-    6, 'u', LTS_STATE_a_42, LTS_STATE_a_1112,
-    6, 's', LTS_STATE_a_1114, LTS_STATE_a_1113,
-    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1115,
-    2, 't', LTS_STATE_a_69, LTS_STATE_a_1116,
-    4, 't', LTS_STATE_a_42, LTS_STATE_a_1117,
-    4, 'z', LTS_STATE_a_42, LTS_STATE_a_194,
-    4, 'l', LTS_STATE_a_1119, LTS_STATE_a_1118,
-    2, 'i', LTS_STATE_a_1121, LTS_STATE_a_1120,
-    2, 's', LTS_STATE_a_29, LTS_STATE_a_1122,
-    2, 'l', LTS_STATE_a_42, LTS_STATE_a_1123,
-    4, 'n', LTS_STATE_a_29, LTS_STATE_a_101,
-    1, '#', LTS_STATE_a_1125, LTS_STATE_a_1124,
-    2, 'b', LTS_STATE_a_29, LTS_STATE_a_1126,
-    3, 'n', LTS_STATE_a_42, LTS_STATE_a_1127,
-    1, '0', LTS_STATE_a_1128, LTS_STATE_a_42,
-    2, 'r', LTS_STATE_a_42, LTS_STATE_a_69,
-    6, 'z', LTS_STATE_a_29, LTS_STATE_a_1129,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1130,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_874,
-    6, 'n', LTS_STATE_a_1132, LTS_STATE_a_1131,
-    6, 'l', LTS_STATE_a_1134, LTS_STATE_a_1133,
-    4, 'd', LTS_STATE_a_101, LTS_STATE_a_1135,
-    2, 'd', LTS_STATE_a_42, LTS_STATE_a_1136,
-    6, 't', LTS_STATE_a_1138, LTS_STATE_a_1137,
-    6, 'y', LTS_STATE_a_42, LTS_STATE_a_1139,
-    3, 'h', LTS_STATE_a_1141, LTS_STATE_a_1140,
-    4, 'b', LTS_STATE_a_42, LTS_STATE_a_69,
-    2, '#', LTS_STATE_a_1143, LTS_STATE_a_1142,
-    1, '0', LTS_STATE_a_42, LTS_STATE_a_1144,
-    1, 'c', LTS_STATE_a_69, LTS_STATE_a_42,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1145,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_69,
-    4, 'l', LTS_STATE_a_1147, LTS_STATE_a_1146,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_1148,
-    3, 'g', LTS_STATE_a_1149, LTS_STATE_a_42,
-    3, 'g', LTS_STATE_a_42, LTS_STATE_a_1150,
-    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1151,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_1152,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_28,
-    5, 'r', LTS_STATE_a_83, LTS_STATE_a_1153,
-    6, 'i', LTS_STATE_a_83, LTS_STATE_a_1154,
-    6, 'l', LTS_STATE_a_83, LTS_STATE_a_1155,
-    4, 'm', LTS_STATE_a_1157, LTS_STATE_a_1156,
-    2, 'r', LTS_STATE_a_1158, LTS_STATE_a_69,
-    2, 'c', LTS_STATE_a_1160, LTS_STATE_a_1159,
-    3, 'l', LTS_STATE_a_69, LTS_STATE_a_1161,
-    2, 't', LTS_STATE_a_69, LTS_STATE_a_1162,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1163,
-    2, 'r', LTS_STATE_a_69, LTS_STATE_a_28,
-    3, 's', LTS_STATE_a_28, LTS_STATE_a_1164,
-    6, '#', LTS_STATE_a_1166, LTS_STATE_a_1165,
-    6, '#', LTS_STATE_a_1167, LTS_STATE_a_28,
-    3, 'h', LTS_STATE_a_1169, LTS_STATE_a_1168,
-    1, 'e', LTS_STATE_a_28, LTS_STATE_a_1170,
-    5, '#', LTS_STATE_a_28, LTS_STATE_a_1171,
-    3, 'i', LTS_STATE_a_28, LTS_STATE_a_1172,
-    1, 's', LTS_STATE_a_29, LTS_STATE_a_1173,
-    1, 'm', LTS_STATE_a_29, LTS_STATE_a_1174,
-    1, 'a', LTS_STATE_a_28, LTS_STATE_a_26,
-    3, 't', LTS_STATE_a_28, LTS_STATE_a_1175,
-    5, 'q', LTS_STATE_a_1177, LTS_STATE_a_1176,
-    5, 't', LTS_STATE_a_1179, LTS_STATE_a_1178,
-    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1180,
-    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1181,
-    6, 'c', LTS_STATE_a_28, LTS_STATE_a_1182,
-    2, '#', LTS_STATE_a_1183, LTS_STATE_a_101,
-    3, 'k', LTS_STATE_a_26, LTS_STATE_a_1184,
-    3, 'c', LTS_STATE_a_1186, LTS_STATE_a_1185,
-    5, 'y', LTS_STATE_a_127, LTS_STATE_a_28,
-    4, 'w', LTS_STATE_a_1188, LTS_STATE_a_1187,
-    3, 'w', LTS_STATE_a_1190, LTS_STATE_a_1189,
-    6, 'k', LTS_STATE_a_29, LTS_STATE_a_69,
-    3, 'b', LTS_STATE_a_712, LTS_STATE_a_1191,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_42,
-    6, 's', LTS_STATE_a_1193, LTS_STATE_a_1192,
-    6, 'e', LTS_STATE_a_1195, LTS_STATE_a_1194,
-    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1196,
-    2, 'u', LTS_STATE_a_29, LTS_STATE_a_1197,
-    6, 'i', LTS_STATE_a_42, LTS_STATE_a_1198,
-    3, 'r', LTS_STATE_a_1199, LTS_STATE_a_42,
-    5, 'r', LTS_STATE_a_1201, LTS_STATE_a_1200,
-    5, 'a', LTS_STATE_a_1203, LTS_STATE_a_1202,
-    5, 'n', LTS_STATE_a_1205, LTS_STATE_a_1204,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1206,
-    5, 'u', LTS_STATE_a_69, LTS_STATE_a_1207,
-    6, 'o', LTS_STATE_a_29, LTS_STATE_a_231,
-    6, 'r', LTS_STATE_a_83, LTS_STATE_a_29,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1208,
-    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1209,
-    1, 'a', LTS_STATE_a_134, LTS_STATE_a_42,
-    2, 'n', LTS_STATE_a_29, LTS_STATE_a_1210,
-    2, 's', LTS_STATE_a_1212, LTS_STATE_a_1211,
-    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1213,
-    3, 'h', LTS_STATE_a_1215, LTS_STATE_a_1214,
-    1, 'b', LTS_STATE_a_42, LTS_STATE_a_1216,
-    6, 'r', LTS_STATE_a_1218, LTS_STATE_a_1217,
-    4, 'l', LTS_STATE_a_231, LTS_STATE_a_69,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1219,
-    4, 'n', LTS_STATE_a_29, LTS_STATE_a_69,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_938,
-    1, 'n', LTS_STATE_a_42, LTS_STATE_a_1220,
-    1, 'g', LTS_STATE_a_73, LTS_STATE_a_42,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1221,
-    2, 'a', LTS_STATE_a_1223, LTS_STATE_a_1222,
-    5, 'g', LTS_STATE_a_101, LTS_STATE_a_1224,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_28,
-    2, 'g', LTS_STATE_a_1226, LTS_STATE_a_1225,
-    4, 'g', LTS_STATE_a_69, LTS_STATE_a_1227,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1228,
-    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1229,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1230,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1231,
-    5, 'l', LTS_STATE_a_1232, LTS_STATE_a_29,
-    5, 'p', LTS_STATE_a_101, LTS_STATE_a_1233,
-    3, 'o', LTS_STATE_a_28, LTS_STATE_a_1234,
-    5, 'g', LTS_STATE_a_1236, LTS_STATE_a_1235,
-    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1237,
-    5, 'r', LTS_STATE_a_28, LTS_STATE_a_29,
-    5, 'n', LTS_STATE_a_28, LTS_STATE_a_1238,
-    6, 'n', LTS_STATE_a_1240, LTS_STATE_a_1239,
-    4, 'b', LTS_STATE_a_563, LTS_STATE_a_1241,
-    3, 'l', LTS_STATE_a_69, LTS_STATE_a_29,
-    3, 'j', LTS_STATE_a_69, LTS_STATE_a_563,
-    4, 'b', LTS_STATE_a_1243, LTS_STATE_a_1242,
-    4, 'n', LTS_STATE_a_1245, LTS_STATE_a_1244,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1246,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_29,
-    4, 'h', LTS_STATE_a_69, LTS_STATE_a_1247,
-    6, '#', LTS_STATE_a_83, LTS_STATE_a_1248,
-    5, 't', LTS_STATE_a_83, LTS_STATE_a_1249,
-    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1250,
-    6, 'o', LTS_STATE_a_1252, LTS_STATE_a_1251,
-    6, 'e', LTS_STATE_a_231, LTS_STATE_a_1253,
-    6, 'g', LTS_STATE_a_101, LTS_STATE_a_1254,
-    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1255,
-    5, 'm', LTS_STATE_a_83, LTS_STATE_a_1256,
-    1, '#', LTS_STATE_a_1258, LTS_STATE_a_1257,
-    6, 'k', LTS_STATE_a_609, LTS_STATE_a_1259,
-    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1260,
-    3, 'b', LTS_STATE_a_69, LTS_STATE_a_1261,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1262,
-    3, 'v', LTS_STATE_a_231, LTS_STATE_a_69,
-    2, '#', LTS_STATE_a_1263, LTS_STATE_a_101,
-    2, '#', LTS_STATE_a_231, LTS_STATE_a_42,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1264,
-    3, 't', LTS_STATE_a_42, LTS_STATE_a_69,
-    2, 'g', LTS_STATE_a_1266, LTS_STATE_a_1265,
-    1, '#', LTS_STATE_a_29, LTS_STATE_a_1267,
-    2, '#', LTS_STATE_a_1269, LTS_STATE_a_1268,
-    3, 't', LTS_STATE_a_29, LTS_STATE_a_1270,
-    4, 's', LTS_STATE_a_29, LTS_STATE_a_42,
-    5, 'c', LTS_STATE_a_42, LTS_STATE_a_1271,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_1272,
-    6, 'o', LTS_STATE_a_1274, LTS_STATE_a_1273,
-    4, 'b', LTS_STATE_a_1276, LTS_STATE_a_1275,
-    4, 't', LTS_STATE_a_1278, LTS_STATE_a_1277,
-    2, 'p', LTS_STATE_a_231, LTS_STATE_a_1279,
-    2, 'g', LTS_STATE_a_42, LTS_STATE_a_1280,
-    4, 'v', LTS_STATE_a_1281, LTS_STATE_a_101,
-    3, 'h', LTS_STATE_a_42, LTS_STATE_a_1282,
-    2, 'f', LTS_STATE_a_42, LTS_STATE_a_1283,
-    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1284,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_1285,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_1286,
-    4, 'n', LTS_STATE_a_1288, LTS_STATE_a_1287,
-    4, 'z', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'k', LTS_STATE_a_42, LTS_STATE_a_1289,
-    3, 't', LTS_STATE_a_101, LTS_STATE_a_42,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_272,
-    4, 'y', LTS_STATE_a_42, LTS_STATE_a_1290,
-    3, 'g', LTS_STATE_a_42, LTS_STATE_a_1291,
-    1, 'e', LTS_STATE_a_42, LTS_STATE_a_1292,
-    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1097,
-    2, 'n', LTS_STATE_a_73, LTS_STATE_a_42,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_69,
-    1, 'i', LTS_STATE_a_248, LTS_STATE_a_1293,
-    1, 'o', LTS_STATE_a_248, LTS_STATE_a_332,
-    2, 'a', LTS_STATE_a_29, LTS_STATE_a_83,
-    3, 'f', LTS_STATE_a_1295, LTS_STATE_a_1294,
-    6, 's', LTS_STATE_a_83, LTS_STATE_a_1296,
-    4, 'a', LTS_STATE_a_28, LTS_STATE_a_1297,
-    2, 'g', LTS_STATE_a_101, LTS_STATE_a_1298,
-    1, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
-    3, 'y', LTS_STATE_a_563, LTS_STATE_a_1299,
-    3, 'h', LTS_STATE_a_69, LTS_STATE_a_563,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_1300,
-    2, 'o', LTS_STATE_a_231, LTS_STATE_a_1301,
-    2, 'i', LTS_STATE_a_29, LTS_STATE_a_1302,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_73,
-    5, '#', LTS_STATE_a_1304, LTS_STATE_a_1303,
-    3, 'y', LTS_STATE_a_29, LTS_STATE_a_1305,
-    2, 'i', LTS_STATE_a_231, LTS_STATE_a_29,
-    1, 'd', LTS_STATE_a_28, LTS_STATE_a_1306,
-    1, 's', LTS_STATE_a_101, LTS_STATE_a_28,
-    6, '#', LTS_STATE_a_28, LTS_STATE_a_1307,
-    1, 'h', LTS_STATE_a_28, LTS_STATE_a_1308,
-    2, 'a', LTS_STATE_a_1309, LTS_STATE_a_29,
-    2, 'e', LTS_STATE_a_231, LTS_STATE_a_1310,
-    3, 'u', LTS_STATE_a_231, LTS_STATE_a_1311,
-    1, 'e', LTS_STATE_a_26, LTS_STATE_a_28,
-    6, 'i', LTS_STATE_a_1313, LTS_STATE_a_1312,
-    3, 'm', LTS_STATE_a_29, LTS_STATE_a_231,
-    5, 'd', LTS_STATE_a_1315, LTS_STATE_a_1314,
-    3, 'm', LTS_STATE_a_231, LTS_STATE_a_1316,
-    5, 't', LTS_STATE_a_231, LTS_STATE_a_1317,
-    6, 'h', LTS_STATE_a_29, LTS_STATE_a_401,
-    6, 'm', LTS_STATE_a_28, LTS_STATE_a_1318,
-    6, 'n', LTS_STATE_a_1320, LTS_STATE_a_1319,
-    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1321,
-    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1322,
-    6, 'a', LTS_STATE_a_231, LTS_STATE_a_101,
-    5, 't', LTS_STATE_a_1324, LTS_STATE_a_1323,
-    6, 'k', LTS_STATE_a_29, LTS_STATE_a_83,
-    6, '#', LTS_STATE_a_1326, LTS_STATE_a_1325,
-    5, 'k', LTS_STATE_a_1328, LTS_STATE_a_1327,
-    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1329,
-    3, 'w', LTS_STATE_a_1331, LTS_STATE_a_1330,
-    5, 't', LTS_STATE_a_69, LTS_STATE_a_1332,
-    6, 'y', LTS_STATE_a_69, LTS_STATE_a_1333,
-    2, 'f', LTS_STATE_a_231, LTS_STATE_a_1334,
-    5, 'd', LTS_STATE_a_1336, LTS_STATE_a_1335,
-    1, 't', LTS_STATE_a_29, LTS_STATE_a_1337,
-    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1338,
-    1, 'a', LTS_STATE_a_42, LTS_STATE_a_1339,
-    4, 'w', LTS_STATE_a_1341, LTS_STATE_a_1340,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1342,
-    5, 'u', LTS_STATE_a_69, LTS_STATE_a_1343,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1344,
-    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1345,
-    6, 'o', LTS_STATE_a_69, LTS_STATE_a_101,
-    6, 'a', LTS_STATE_a_563, LTS_STATE_a_101,
-    5, 'p', LTS_STATE_a_101, LTS_STATE_a_1346,
-    6, 'i', LTS_STATE_a_29, LTS_STATE_a_101,
-    4, 'g', LTS_STATE_a_1348, LTS_STATE_a_1347,
-    3, 'd', LTS_STATE_a_29, LTS_STATE_a_231,
-    3, 'w', LTS_STATE_a_83, LTS_STATE_a_1349,
-    1, 'n', LTS_STATE_a_83, LTS_STATE_a_1350,
-    2, 'e', LTS_STATE_a_1352, LTS_STATE_a_1351,
-    4, 'v', LTS_STATE_a_1354, LTS_STATE_a_1353,
-    2, 's', LTS_STATE_a_101, LTS_STATE_a_1355,
-    1, 'o', LTS_STATE_a_101, LTS_STATE_a_69,
-    6, 'u', LTS_STATE_a_69, LTS_STATE_a_1356,
-    4, 'm', LTS_STATE_a_101, LTS_STATE_a_1227,
-    6, 'g', LTS_STATE_a_69, LTS_STATE_a_1357,
-    3, 'i', LTS_STATE_a_42, LTS_STATE_a_1358,
-    3, 't', LTS_STATE_a_42, LTS_STATE_a_1359,
-    3, 'u', LTS_STATE_a_1361, LTS_STATE_a_1360,
-    3, 'v', LTS_STATE_a_29, LTS_STATE_a_1362,
-    5, 'k', LTS_STATE_a_83, LTS_STATE_a_29,
-    4, 'n', LTS_STATE_a_1364, LTS_STATE_a_1363,
-    6, 'a', LTS_STATE_a_69, LTS_STATE_a_1365,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_69,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_29,
-    5, 't', LTS_STATE_a_101, LTS_STATE_a_1366,
-    6, 'm', LTS_STATE_a_563, LTS_STATE_a_1367,
-    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1368,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_29,
-    5, 'l', LTS_STATE_a_101, LTS_STATE_a_83,
-    4, 'o', LTS_STATE_a_1370, LTS_STATE_a_1369,
-    3, 'v', LTS_STATE_a_1372, LTS_STATE_a_1371,
-    6, 'e', LTS_STATE_a_1374, LTS_STATE_a_1373,
-    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1375,
-    5, 't', LTS_STATE_a_28, LTS_STATE_a_1376,
-    4, 'k', LTS_STATE_a_69, LTS_STATE_a_1377,
-    4, 'x', LTS_STATE_a_101, LTS_STATE_a_1378,
-    4, 'h', LTS_STATE_a_29, LTS_STATE_a_69,
-    3, 'l', LTS_STATE_a_231, LTS_STATE_a_1379,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'k', LTS_STATE_a_1381, LTS_STATE_a_1380,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1382,
-    3, 'f', LTS_STATE_a_42, LTS_STATE_a_1383,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1384,
-    5, 'u', LTS_STATE_a_1386, LTS_STATE_a_1385,
-    5, 'k', LTS_STATE_a_83, LTS_STATE_a_1387,
-    3, 's', LTS_STATE_a_1389, LTS_STATE_a_1388,
-    6, 'e', LTS_STATE_a_1390, LTS_STATE_a_83,
-    3, 'b', LTS_STATE_a_231, LTS_STATE_a_29,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1391,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1392,
-    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1393,
-    5, 'r', LTS_STATE_a_29, LTS_STATE_a_1394,
-    6, 's', LTS_STATE_a_1396, LTS_STATE_a_1395,
-    2, 'q', LTS_STATE_a_29, LTS_STATE_a_1397,
-    6, 'm', LTS_STATE_a_1399, LTS_STATE_a_1398,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1400,
-    4, 'l', LTS_STATE_a_1402, LTS_STATE_a_1401,
-    4, 'l', LTS_STATE_a_1404, LTS_STATE_a_1403,
-    4, 't', LTS_STATE_a_42, LTS_STATE_a_1405,
-    3, 'n', LTS_STATE_a_42, LTS_STATE_a_69,
-    4, 'l', LTS_STATE_a_1406, LTS_STATE_a_42,
-    4, 'c', LTS_STATE_a_42, LTS_STATE_a_101,
-    1, 'o', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'm', LTS_STATE_a_1408, LTS_STATE_a_1407,
-    3, 'm', LTS_STATE_a_1410, LTS_STATE_a_1409,
-    3, 'x', LTS_STATE_a_101, LTS_STATE_a_1411,
-    1, 't', LTS_STATE_a_42, LTS_STATE_a_1412,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1413,
-    4, 'm', LTS_STATE_a_1415, LTS_STATE_a_1414,
-    2, 'n', LTS_STATE_a_101, LTS_STATE_a_42,
-    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1416,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1417,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1418,
-    6, 'a', LTS_STATE_a_563, LTS_STATE_a_1419,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_42,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_1420,
-    2, 't', LTS_STATE_a_101, LTS_STATE_a_42,
-    6, 'n', LTS_STATE_a_101, LTS_STATE_a_42,
-    4, 't', LTS_STATE_a_42, LTS_STATE_a_1421,
-    6, 'y', LTS_STATE_a_1423, LTS_STATE_a_1422,
-    4, 'm', LTS_STATE_a_101, LTS_STATE_a_1424,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'm', LTS_STATE_a_1426, LTS_STATE_a_1425,
-    3, 'p', LTS_STATE_a_101, LTS_STATE_a_69,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1427,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_42,
-    4, 'k', LTS_STATE_a_42, LTS_STATE_a_1428,
-    3, 'g', LTS_STATE_a_29, LTS_STATE_a_1429,
-    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1430,
-    6, 'h', LTS_STATE_a_83, LTS_STATE_a_1431,
-    5, 's', LTS_STATE_a_83, LTS_STATE_a_64,
-    3, 'p', LTS_STATE_a_83, LTS_STATE_a_64,
-    4, 'z', LTS_STATE_a_231, LTS_STATE_a_1432,
-    3, 'h', LTS_STATE_a_672, LTS_STATE_a_1433,
-    1, 't', LTS_STATE_a_231, LTS_STATE_a_1434,
-    3, 'y', LTS_STATE_a_69, LTS_STATE_a_1435,
-    2, 'g', LTS_STATE_a_69, LTS_STATE_a_1436,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_1437,
-    6, 's', LTS_STATE_a_1439, LTS_STATE_a_1438,
-    3, 'g', LTS_STATE_a_28, LTS_STATE_a_1440,
-    3, 'c', LTS_STATE_a_29, LTS_STATE_a_1441,
-    1, 'm', LTS_STATE_a_29, LTS_STATE_a_1442,
-    5, '#', LTS_STATE_a_28, LTS_STATE_a_29,
-    2, 'l', LTS_STATE_a_28, LTS_STATE_a_1443,
-    5, '#', LTS_STATE_a_29, LTS_STATE_a_28,
-    1, 't', LTS_STATE_a_29, LTS_STATE_a_1444,
-    1, 'a', LTS_STATE_a_28, LTS_STATE_a_1445,
-    6, 'e', LTS_STATE_a_1446, LTS_STATE_a_29,
-    5, 't', LTS_STATE_a_29, LTS_STATE_a_1447,
-    3, 'k', LTS_STATE_a_29, LTS_STATE_a_1448,
-    3, 'c', LTS_STATE_a_231, LTS_STATE_a_29,
-    3, 'c', LTS_STATE_a_231, LTS_STATE_a_1252,
-    3, 'k', LTS_STATE_a_29, LTS_STATE_a_1449,
-    3, 'b', LTS_STATE_a_1451, LTS_STATE_a_1450,
-    3, 'p', LTS_STATE_a_28, LTS_STATE_a_1452,
-    3, 'm', LTS_STATE_a_28, LTS_STATE_a_26,
-    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1453,
-    3, 'b', LTS_STATE_a_1454, LTS_STATE_a_29,
-    3, 'b', LTS_STATE_a_1456, LTS_STATE_a_1455,
-    4, 't', LTS_STATE_a_1458, LTS_STATE_a_1457,
-    5, 'd', LTS_STATE_a_1460, LTS_STATE_a_1459,
-    5, 'd', LTS_STATE_a_69, LTS_STATE_a_1461,
-    5, 'd', LTS_STATE_a_1462, LTS_STATE_a_69,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_83,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_1463,
-    5, 'a', LTS_STATE_a_1465, LTS_STATE_a_1464,
-    5, 'd', LTS_STATE_a_29, LTS_STATE_a_83,
-    5, 'd', LTS_STATE_a_1467, LTS_STATE_a_1466,
-    6, 'i', LTS_STATE_a_1469, LTS_STATE_a_1468,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1470,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1471,
-    3, 'l', LTS_STATE_a_1473, LTS_STATE_a_1472,
-    3, 't', LTS_STATE_a_101, LTS_STATE_a_1474,
-    6, 'u', LTS_STATE_a_101, LTS_STATE_a_1475,
-    2, 't', LTS_STATE_a_42, LTS_STATE_a_73,
-    5, 'a', LTS_STATE_a_1477, LTS_STATE_a_1476,
-    5, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
-    6, 'i', LTS_STATE_a_1479, LTS_STATE_a_1478,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1480,
-    6, 'z', LTS_STATE_a_101, LTS_STATE_a_1481,
-    5, 'g', LTS_STATE_a_1483, LTS_STATE_a_1482,
-    6, 'i', LTS_STATE_a_1485, LTS_STATE_a_1484,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1486,
-    3, 't', LTS_STATE_a_563, LTS_STATE_a_1487,
-    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1488,
-    1, 'y', LTS_STATE_a_69, LTS_STATE_a_29,
-    3, 'd', LTS_STATE_a_69, LTS_STATE_a_1489,
-    3, 'r', LTS_STATE_a_83, LTS_STATE_a_1490,
-    3, 'r', LTS_STATE_a_1492, LTS_STATE_a_1491,
-    6, 'r', LTS_STATE_a_42, LTS_STATE_a_231,
-    2, 'c', LTS_STATE_a_28, LTS_STATE_a_69,
-    6, 'l', LTS_STATE_a_1494, LTS_STATE_a_1493,
-    6, 'm', LTS_STATE_a_69, LTS_STATE_a_1071,
-    2, 'o', LTS_STATE_a_1496, LTS_STATE_a_1495,
-    1, 't', LTS_STATE_a_1497, LTS_STATE_a_42,
-    2, 'u', LTS_STATE_a_1499, LTS_STATE_a_1498,
-    6, 'r', LTS_STATE_a_231, LTS_STATE_a_1500,
-    5, 'o', LTS_STATE_a_332, LTS_STATE_a_1501,
-    2, 'v', LTS_STATE_a_69, LTS_STATE_a_1502,
-    5, 'c', LTS_STATE_a_231, LTS_STATE_a_29,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1503,
-    6, 'e', LTS_STATE_a_42, LTS_STATE_a_101,
-    6, 'p', LTS_STATE_a_563, LTS_STATE_a_1504,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1505,
-    6, 'e', LTS_STATE_a_1507, LTS_STATE_a_1506,
-    6, 'i', LTS_STATE_a_1508, LTS_STATE_a_231,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1509,
-    5, 'd', LTS_STATE_a_101, LTS_STATE_a_1510,
-    6, 'i', LTS_STATE_a_1512, LTS_STATE_a_1511,
-    3, 't', LTS_STATE_a_101, LTS_STATE_a_1513,
-    5, 'r', LTS_STATE_a_29, LTS_STATE_a_1514,
-    3, 'b', LTS_STATE_a_28, LTS_STATE_a_1515,
-    3, 'c', LTS_STATE_a_1517, LTS_STATE_a_1516,
-    3, 'l', LTS_STATE_a_1519, LTS_STATE_a_1518,
-    4, 'p', LTS_STATE_a_231, LTS_STATE_a_1520,
-    6, 'l', LTS_STATE_a_1522, LTS_STATE_a_1521,
-    3, 'n', LTS_STATE_a_231, LTS_STATE_a_1523,
-    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1524,
-    3, 'c', LTS_STATE_a_101, LTS_STATE_a_1525,
-    3, 'b', LTS_STATE_a_42, LTS_STATE_a_1526,
-    3, 'm', LTS_STATE_a_1528, LTS_STATE_a_1527,
-    3, 'v', LTS_STATE_a_563, LTS_STATE_a_1529,
-    3, 'b', LTS_STATE_a_1531, LTS_STATE_a_1530,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1532,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_1533,
-    3, 'b', LTS_STATE_a_231, LTS_STATE_a_83,
-    6, 'i', LTS_STATE_a_83, LTS_STATE_a_101,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1534,
-    3, 'k', LTS_STATE_a_101, LTS_STATE_a_1535,
-    4, 'h', LTS_STATE_a_29, LTS_STATE_a_1536,
-    4, 'b', LTS_STATE_a_1538, LTS_STATE_a_1537,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1539,
-    3, 't', LTS_STATE_a_1541, LTS_STATE_a_1540,
-    6, 'f', LTS_STATE_a_101, LTS_STATE_a_1542,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1543,
-    4, 'l', LTS_STATE_a_101, LTS_STATE_a_1544,
-    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1545,
-    1, '0', LTS_STATE_a_69, LTS_STATE_a_1546,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1547,
-    1, '0', LTS_STATE_a_69, LTS_STATE_a_101,
-    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1548,
-    2, 'a', LTS_STATE_a_29, LTS_STATE_a_42,
-    3, 'r', LTS_STATE_a_1550, LTS_STATE_a_1549,
-    1, 'o', LTS_STATE_a_101, LTS_STATE_a_1551,
-    3, 'j', LTS_STATE_a_69, LTS_STATE_a_1552,
-    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1553,
-    2, 'c', LTS_STATE_a_1555, LTS_STATE_a_1554,
-    6, 'h', LTS_STATE_a_42, LTS_STATE_a_1556,
-    6, 'e', LTS_STATE_a_28, LTS_STATE_a_42,
-    6, 'r', LTS_STATE_a_1558, LTS_STATE_a_1557,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1559,
-    6, 'x', LTS_STATE_a_69, LTS_STATE_a_1560,
-    6, 'l', LTS_STATE_a_101, LTS_STATE_a_69,
-    6, 't', LTS_STATE_a_101, LTS_STATE_a_1561,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_29,
-    2, 'c', LTS_STATE_a_42, LTS_STATE_a_1562,
-    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1563,
-    4, 'p', LTS_STATE_a_42, LTS_STATE_a_1564,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_42,
-    4, 'c', LTS_STATE_a_101, LTS_STATE_a_69,
-    3, 'p', LTS_STATE_a_69, LTS_STATE_a_1565,
-    4, 'd', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_1566,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1567,
-    3, 'v', LTS_STATE_a_42, LTS_STATE_a_1568,
-    1, 'd', LTS_STATE_a_69, LTS_STATE_a_1569,
-    5, 't', LTS_STATE_a_1571, LTS_STATE_a_1570,
-    4, 'x', LTS_STATE_a_1573, LTS_STATE_a_1572,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1574,
-    1, 'b', LTS_STATE_a_69, LTS_STATE_a_1575,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1576,
-    2, 'a', LTS_STATE_a_1577, LTS_STATE_a_69,
-    3, 'y', LTS_STATE_a_69, LTS_STATE_a_101,
-    6, 'z', LTS_STATE_a_28, LTS_STATE_a_1578,
-    3, 'y', LTS_STATE_a_29, LTS_STATE_a_1579,
-    2, 's', LTS_STATE_a_1581, LTS_STATE_a_1580,
-    5, 'z', LTS_STATE_a_231, LTS_STATE_a_1582,
-    3, 'c', LTS_STATE_a_28, LTS_STATE_a_1583,
-    5, 'd', LTS_STATE_a_29, LTS_STATE_a_1584,
-    1, 'c', LTS_STATE_a_29, LTS_STATE_a_1585,
-    3, 'p', LTS_STATE_a_26, LTS_STATE_a_1586,
-    5, 'm', LTS_STATE_a_1588, LTS_STATE_a_1587,
-    5, 'p', LTS_STATE_a_231, LTS_STATE_a_1589,
-    3, 'g', LTS_STATE_a_29, LTS_STATE_a_1590,
-    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1591,
-    3, 'c', LTS_STATE_a_28, LTS_STATE_a_26,
-    6, 'n', LTS_STATE_a_101, LTS_STATE_a_28,
-    6, 'o', LTS_STATE_a_231, LTS_STATE_a_26,
-    3, 'm', LTS_STATE_a_28, LTS_STATE_a_1592,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_29,
-    4, 'e', LTS_STATE_a_1594, LTS_STATE_a_1593,
-    5, 'h', LTS_STATE_a_1596, LTS_STATE_a_1595,
-    2, 'a', LTS_STATE_a_1598, LTS_STATE_a_1597,
-    6, '#', LTS_STATE_a_69, LTS_STATE_a_1599,
-    5, 'y', LTS_STATE_a_69, LTS_STATE_a_1600,
-    2, 'e', LTS_STATE_a_69, LTS_STATE_a_1601,
-    5, 't', LTS_STATE_a_83, LTS_STATE_a_1602,
-    1, 'e', LTS_STATE_a_1604, LTS_STATE_a_1603,
-    2, 'd', LTS_STATE_a_83, LTS_STATE_a_1605,
-    5, 's', LTS_STATE_a_1607, LTS_STATE_a_1606,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1608,
-    3, 'b', LTS_STATE_a_101, LTS_STATE_a_1609,
-    1, 'r', LTS_STATE_a_101, LTS_STATE_a_1610,
-    2, 'r', LTS_STATE_a_29, LTS_STATE_a_1611,
-    1, 'f', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, 'f', LTS_STATE_a_101, LTS_STATE_a_1612,
-    5, 'y', LTS_STATE_a_1614, LTS_STATE_a_1613,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1615,
-    2, 'l', LTS_STATE_a_69, LTS_STATE_a_1616,
-    3, 'i', LTS_STATE_a_101, LTS_STATE_a_1617,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_29,
-    5, 'u', LTS_STATE_a_1619, LTS_STATE_a_1618,
-    6, 'l', LTS_STATE_a_231, LTS_STATE_a_1620,
-    6, 'e', LTS_STATE_a_1622, LTS_STATE_a_1621,
-    4, 'd', LTS_STATE_a_231, LTS_STATE_a_101,
-    5, 'm', LTS_STATE_a_101, LTS_STATE_a_1623,
-    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1624,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1625,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1626,
-    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1627,
-    5, 'b', LTS_STATE_a_231, LTS_STATE_a_1628,
-    4, 'd', LTS_STATE_a_101, LTS_STATE_a_1629,
-    6, 'i', LTS_STATE_a_29, LTS_STATE_a_69,
-    1, 'p', LTS_STATE_a_69, LTS_STATE_a_1630,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1631,
-    3, 'w', LTS_STATE_a_69, LTS_STATE_a_83,
-    4, 'n', LTS_STATE_a_1632, LTS_STATE_a_69,
-    2, 't', LTS_STATE_a_69, LTS_STATE_a_1633,
-    4, 'v', LTS_STATE_a_101, LTS_STATE_a_1634,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'r', LTS_STATE_a_1635, LTS_STATE_a_1121,
-    3, 'r', LTS_STATE_a_69, LTS_STATE_a_1290,
-    3, 'g', LTS_STATE_a_42, LTS_STATE_a_69,
-    5, 'a', LTS_STATE_a_1637, LTS_STATE_a_1636,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
-    4, 'd', LTS_STATE_a_29, LTS_STATE_a_1638,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1639,
-    4, 's', LTS_STATE_a_101, LTS_STATE_a_1102,
-    5, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
-    6, 'f', LTS_STATE_a_563, LTS_STATE_a_1640,
-    6, 's', LTS_STATE_a_29, LTS_STATE_a_1641,
-    5, 'y', LTS_STATE_a_1643, LTS_STATE_a_1642,
-    5, 'l', LTS_STATE_a_1645, LTS_STATE_a_1644,
-    5, 'l', LTS_STATE_a_231, LTS_STATE_a_73,
-    5, 't', LTS_STATE_a_1647, LTS_STATE_a_1646,
-    6, 'l', LTS_STATE_a_101, LTS_STATE_a_1648,
-    6, 'a', LTS_STATE_a_1512, LTS_STATE_a_101,
-    3, 'm', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1649,
-    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1650,
-    6, 'e', LTS_STATE_a_28, LTS_STATE_a_1651,
-    3, 'i', LTS_STATE_a_29, LTS_STATE_a_1652,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_1494,
-    4, 'n', LTS_STATE_a_101, LTS_STATE_a_1653,
-    4, 'm', LTS_STATE_a_231, LTS_STATE_a_1654,
-    3, 'c', LTS_STATE_a_69, LTS_STATE_a_530,
-    6, 'r', LTS_STATE_a_1656, LTS_STATE_a_1655,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1657,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_231,
-    3, 'f', LTS_STATE_a_69, LTS_STATE_a_1658,
-    3, 'n', LTS_STATE_a_231, LTS_STATE_a_1512,
-    3, 'l', LTS_STATE_a_231, LTS_STATE_a_1659,
-    5, 't', LTS_STATE_a_1661, LTS_STATE_a_1660,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_1662,
-    6, 't', LTS_STATE_a_69, LTS_STATE_a_101,
-    5, 'l', LTS_STATE_a_1664, LTS_STATE_a_1663,
-    5, 'l', LTS_STATE_a_101, LTS_STATE_a_42,
-    3, 'g', LTS_STATE_a_101, LTS_STATE_a_1186,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_231,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_101,
-    6, 'd', LTS_STATE_a_101, LTS_STATE_a_1665,
-    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1666,
-    2, 'q', LTS_STATE_a_29, LTS_STATE_a_1667,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_69,
-    3, 's', LTS_STATE_a_101, LTS_STATE_a_1668,
-    6, 'k', LTS_STATE_a_29, LTS_STATE_a_1669,
-    4, 'b', LTS_STATE_a_42, LTS_STATE_a_1670,
-    3, 'w', LTS_STATE_a_231, LTS_STATE_a_1671,
-    2, '#', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'n', LTS_STATE_a_29, LTS_STATE_a_1672,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1673,
-    2, 'c', LTS_STATE_a_69, LTS_STATE_a_101,
-    1, 'd', LTS_STATE_a_101, LTS_STATE_a_1674,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1675,
-    2, 'o', LTS_STATE_a_1677, LTS_STATE_a_1676,
-    2, 'g', LTS_STATE_a_42, LTS_STATE_a_1678,
-    1, 'e', LTS_STATE_a_101, LTS_STATE_a_69,
-    4, 'n', LTS_STATE_a_42, LTS_STATE_a_1679,
-    4, 'l', LTS_STATE_a_101, LTS_STATE_a_231,
-    2, 'g', LTS_STATE_a_69, LTS_STATE_a_1680,
-    4, 'v', LTS_STATE_a_42, LTS_STATE_a_101,
-    2, 'c', LTS_STATE_a_42, LTS_STATE_a_1681,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_1682,
-    4, 't', LTS_STATE_a_274, LTS_STATE_a_1683,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_1684,
-    4, 'v', LTS_STATE_a_1686, LTS_STATE_a_1685,
-    3, 'n', LTS_STATE_a_101, LTS_STATE_a_1687,
-    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1688,
-    2, 't', LTS_STATE_a_1689, LTS_STATE_a_42,
-    3, 'h', LTS_STATE_a_1691, LTS_STATE_a_1690,
-    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1692,
-    1, 'e', LTS_STATE_a_42, LTS_STATE_a_1693,
-    2, 'o', LTS_STATE_a_42, LTS_STATE_a_1694,
-    2, 'e', LTS_STATE_a_42, LTS_STATE_a_1695,
-    3, 'd', LTS_STATE_a_248, LTS_STATE_a_1696,
-    3, 't', LTS_STATE_a_64, LTS_STATE_a_1697,
-    6, 'z', LTS_STATE_a_83, LTS_STATE_a_64,
-    4, 'v', LTS_STATE_a_231, LTS_STATE_a_1698,
-    3, 'n', LTS_STATE_a_563, LTS_STATE_a_1699,
-    2, 't', LTS_STATE_a_69, LTS_STATE_a_1700,
-    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1701,
-    3, 'u', LTS_STATE_a_231, LTS_STATE_a_1702,
-    1, 'r', LTS_STATE_a_563, LTS_STATE_a_69,
-    2, 'a', LTS_STATE_a_1704, LTS_STATE_a_1703,
-    3, 'z', LTS_STATE_a_28, LTS_STATE_a_1705,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1706,
-    3, 's', LTS_STATE_a_28, LTS_STATE_a_29,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1707,
-    2, 'a', LTS_STATE_a_28, LTS_STATE_a_231,
-    1, 'm', LTS_STATE_a_28, LTS_STATE_a_29,
-    3, 't', LTS_STATE_a_29, LTS_STATE_a_1708,
-    2, 's', LTS_STATE_a_26, LTS_STATE_a_1709,
-    3, 'f', LTS_STATE_a_29, LTS_STATE_a_1710,
-    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1711,
-    3, 's', LTS_STATE_a_29, LTS_STATE_a_1712,
-    3, 't', LTS_STATE_a_29, LTS_STATE_a_1713,
-    5, 'l', LTS_STATE_a_29, LTS_STATE_a_1714,
-    6, 'n', LTS_STATE_a_28, LTS_STATE_a_1715,
-    2, 'a', LTS_STATE_a_1717, LTS_STATE_a_1716,
-    6, '#', LTS_STATE_a_42, LTS_STATE_a_28,
-    5, 'k', LTS_STATE_a_101, LTS_STATE_a_1718,
-    4, 'c', LTS_STATE_a_1720, LTS_STATE_a_1719,
-    4, 'c', LTS_STATE_a_1722, LTS_STATE_a_1721,
-    1, 'h', LTS_STATE_a_69, LTS_STATE_a_101,
-    2, 'a', LTS_STATE_a_29, LTS_STATE_a_1723,
-    5, 't', LTS_STATE_a_69, LTS_STATE_a_1724,
-    3, 'n', LTS_STATE_a_29, LTS_STATE_a_1725,
-    5, 'k', LTS_STATE_a_83, LTS_STATE_a_101,
-    2, 'e', LTS_STATE_a_155, LTS_STATE_a_69,
-    2, 'n', LTS_STATE_a_83, LTS_STATE_a_155,
-    2, 'a', LTS_STATE_a_1727, LTS_STATE_a_1726,
-    6, 'l', LTS_STATE_a_1729, LTS_STATE_a_1728,
-    6, 'k', LTS_STATE_a_101, LTS_STATE_a_1730,
-    6, 'r', LTS_STATE_a_231, LTS_STATE_a_1731,
-    5, 'n', LTS_STATE_a_69, LTS_STATE_a_1732,
-    2, 's', LTS_STATE_a_101, LTS_STATE_a_1733,
-    3, 'i', LTS_STATE_a_29, LTS_STATE_a_1734,
-    2, 'd', LTS_STATE_a_1736, LTS_STATE_a_1735,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1737,
-    2, 'l', LTS_STATE_a_42, LTS_STATE_a_69,
-    3, 'r', LTS_STATE_a_1739, LTS_STATE_a_1738,
-    1, 'g', LTS_STATE_a_69, LTS_STATE_a_1740,
-    1, 'i', LTS_STATE_a_29, LTS_STATE_a_101,
-    5, 'h', LTS_STATE_a_1742, LTS_STATE_a_1741,
-    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1743,
-    4, 'g', LTS_STATE_a_101, LTS_STATE_a_1744,
-    6, 'a', LTS_STATE_a_69, LTS_STATE_a_1745,
-    4, 'g', LTS_STATE_a_69, LTS_STATE_a_29,
-    5, 'b', LTS_STATE_a_1746, LTS_STATE_a_101,
-    6, 's', LTS_STATE_a_69, LTS_STATE_a_1747,
-    5, 'a', LTS_STATE_a_101, LTS_STATE_a_1748,
-    6, 'o', LTS_STATE_a_563, LTS_STATE_a_101,
-    6, 'e', LTS_STATE_a_1750, LTS_STATE_a_1749,
-    5, 'v', LTS_STATE_a_231, LTS_STATE_a_101,
-    4, 't', LTS_STATE_a_101, LTS_STATE_a_1751,
-    6, 'o', LTS_STATE_a_1753, LTS_STATE_a_1752,
-    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1754,
-    6, 'v', LTS_STATE_a_101, LTS_STATE_a_1755,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
-    4, 'd', LTS_STATE_a_69, LTS_STATE_a_1756,
-    2, 'e', LTS_STATE_a_42, LTS_STATE_a_69,
-    5, 'o', LTS_STATE_a_1758, LTS_STATE_a_1757,
-    6, '#', LTS_STATE_a_609, LTS_STATE_a_1759,
-    5, 't', LTS_STATE_a_29, LTS_STATE_a_1760,
-    4, 'p', LTS_STATE_a_101, LTS_STATE_a_1761,
-    6, 'g', LTS_STATE_a_563, LTS_STATE_a_1762,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_69,
-    5, 'u', LTS_STATE_a_1764, LTS_STATE_a_1763,
-    6, '#', LTS_STATE_a_42, LTS_STATE_a_1765,
-    3, 'c', LTS_STATE_a_1767, LTS_STATE_a_1766,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1768,
-    5, 'u', LTS_STATE_a_1770, LTS_STATE_a_1769,
-    3, 's', LTS_STATE_a_1771, LTS_STATE_a_101,
-    6, 'i', LTS_STATE_a_101, LTS_STATE_a_1772,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_626,
-    5, 'u', LTS_STATE_a_101, LTS_STATE_a_1773,
-    3, 'k', LTS_STATE_a_28, LTS_STATE_a_1774,
-    3, 'z', LTS_STATE_a_69, LTS_STATE_a_1775,
-    4, 'g', LTS_STATE_a_231, LTS_STATE_a_1776,
-    4, 'f', LTS_STATE_a_101, LTS_STATE_a_231,
-    3, 'c', LTS_STATE_a_1778, LTS_STATE_a_1777,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_1779,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1780,
-    3, 'p', LTS_STATE_a_101, LTS_STATE_a_1781,
-    4, 't', LTS_STATE_a_42, LTS_STATE_a_1782,
-    5, 'k', LTS_STATE_a_1784, LTS_STATE_a_1783,
-    3, 's', LTS_STATE_a_83, LTS_STATE_a_1785,
-    6, 'r', LTS_STATE_a_563, LTS_STATE_a_1786,
-    3, 'f', LTS_STATE_a_83, LTS_STATE_a_1787,
-    3, 'c', LTS_STATE_a_83, LTS_STATE_a_1788,
-    6, 'm', LTS_STATE_a_101, LTS_STATE_a_1789,
-    5, 'd', LTS_STATE_a_29, LTS_STATE_a_1790,
-    6, 'm', LTS_STATE_a_1792, LTS_STATE_a_1791,
-    4, 'k', LTS_STATE_a_29, LTS_STATE_a_1793,
-    6, 'l', LTS_STATE_a_1795, LTS_STATE_a_1794,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'd', LTS_STATE_a_1797, LTS_STATE_a_1796,
-    4, 't', LTS_STATE_a_101, LTS_STATE_a_1798,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1799,
-    1, '0', LTS_STATE_a_101, LTS_STATE_a_1800,
-    4, 'p', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'd', LTS_STATE_a_513, LTS_STATE_a_1801,
-    3, 'm', LTS_STATE_a_231, LTS_STATE_a_69,
-    1, 'p', LTS_STATE_a_42, LTS_STATE_a_1802,
-    3, 'r', LTS_STATE_a_1804, LTS_STATE_a_1803,
-    2, 'h', LTS_STATE_a_69, LTS_STATE_a_1805,
-    5, 'g', LTS_STATE_a_1807, LTS_STATE_a_1806,
-    6, 'k', LTS_STATE_a_1809, LTS_STATE_a_1808,
-    4, 'p', LTS_STATE_a_42, LTS_STATE_a_1810,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1811,
-    6, 't', LTS_STATE_a_69, LTS_STATE_a_1812,
-    6, 'n', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'c', LTS_STATE_a_69, LTS_STATE_a_1813,
-    2, 'd', LTS_STATE_a_69, LTS_STATE_a_1814,
-    4, 'v', LTS_STATE_a_101, LTS_STATE_a_42,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1815,
-    4, 'b', LTS_STATE_a_101, LTS_STATE_a_1816,
-    3, 'g', LTS_STATE_a_69, LTS_STATE_a_1817,
-    4, 'm', LTS_STATE_a_42, LTS_STATE_a_1818,
-    1, 'o', LTS_STATE_a_42, LTS_STATE_a_1819,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_29,
-    2, 'a', LTS_STATE_a_248, LTS_STATE_a_1820,
-    3, 'h', LTS_STATE_a_774, LTS_STATE_a_1821,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1822,
-    3, 'r', LTS_STATE_a_563, LTS_STATE_a_101,
-    3, 'd', LTS_STATE_a_69, LTS_STATE_a_1823,
-    2, 's', LTS_STATE_a_69, LTS_STATE_a_1824,
-    2, 't', LTS_STATE_a_1826, LTS_STATE_a_1825,
-    6, 'l', LTS_STATE_a_28, LTS_STATE_a_1827,
-    6, 'a', LTS_STATE_a_29, LTS_STATE_a_1828,
-    1, 'r', LTS_STATE_a_29, LTS_STATE_a_28,
-    3, 'n', LTS_STATE_a_1830, LTS_STATE_a_1829,
-    5, 'd', LTS_STATE_a_1832, LTS_STATE_a_1831,
-    2, 'l', LTS_STATE_a_29, LTS_STATE_a_1833,
-    2, 'e', LTS_STATE_a_28, LTS_STATE_a_1834,
-    3, 'l', LTS_STATE_a_29, LTS_STATE_a_1835,
-    2, '#', LTS_STATE_a_1315, LTS_STATE_a_231,
-    3, 'd', LTS_STATE_a_29, LTS_STATE_a_1836,
-    3, 'p', LTS_STATE_a_29, LTS_STATE_a_1837,
-    3, 'v', LTS_STATE_a_231, LTS_STATE_a_1838,
-    3, 'g', LTS_STATE_a_28, LTS_STATE_a_1839,
-    5, 'y', LTS_STATE_a_1841, LTS_STATE_a_1840,
-    4, 'o', LTS_STATE_a_28, LTS_STATE_a_1842,
-    4, 'b', LTS_STATE_a_29, LTS_STATE_a_1843,
-    6, '#', LTS_STATE_a_69, LTS_STATE_a_29,
-    1, 'e', LTS_STATE_a_1845, LTS_STATE_a_1844,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_1846,
-    2, 'm', LTS_STATE_a_1847, LTS_STATE_a_101,
-    6, 'a', LTS_STATE_a_29, LTS_STATE_a_101,
-    5, 'v', LTS_STATE_a_29, LTS_STATE_a_1848,
-    6, 'i', LTS_STATE_a_29, LTS_STATE_a_1060,
-    2, 'i', LTS_STATE_a_1850, LTS_STATE_a_1849,
-    6, 'n', LTS_STATE_a_1852, LTS_STATE_a_1851,
-    2, 'c', LTS_STATE_a_1854, LTS_STATE_a_1853,
-    5, 't', LTS_STATE_a_1855, LTS_STATE_a_101,
-    2, 'x', LTS_STATE_a_101, LTS_STATE_a_1856,
-    6, 'n', LTS_STATE_a_101, LTS_STATE_a_1857,
-    1, 'a', LTS_STATE_a_101, LTS_STATE_a_29,
-    1, 'e', LTS_STATE_a_101, LTS_STATE_a_1858,
-    1, 'n', LTS_STATE_a_101, LTS_STATE_a_1859,
-    1, 'n', LTS_STATE_a_69, LTS_STATE_a_1860,
-    3, 'v', LTS_STATE_a_101, LTS_STATE_a_69,
-    5, 't', LTS_STATE_a_1862, LTS_STATE_a_1861,
-    3, 'i', LTS_STATE_a_69, LTS_STATE_a_1863,
-    1, 'e', LTS_STATE_a_563, LTS_STATE_a_1864,
-    1, 'c', LTS_STATE_a_69, LTS_STATE_a_1865,
-    4, 's', LTS_STATE_a_1867, LTS_STATE_a_1866,
-    4, 's', LTS_STATE_a_101, LTS_STATE_a_1868,
-    6, 'l', LTS_STATE_a_69, LTS_STATE_a_1869,
-    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1870,
-    6, 'u', LTS_STATE_a_231, LTS_STATE_a_69,
-    6, 'i', LTS_STATE_a_563, LTS_STATE_a_1206,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1871,
-    5, 'c', LTS_STATE_a_1872, LTS_STATE_a_101,
-    6, 'a', LTS_STATE_a_1874, LTS_STATE_a_1873,
-    5, 'v', LTS_STATE_a_231, LTS_STATE_a_1875,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1876,
-    6, 'u', LTS_STATE_a_69, LTS_STATE_a_1877,
-    2, 'e', LTS_STATE_a_29, LTS_STATE_a_1878,
-    3, 'h', LTS_STATE_a_1880, LTS_STATE_a_1879,
-    1, 'r', LTS_STATE_a_231, LTS_STATE_a_69,
-    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1881,
-    3, 'a', LTS_STATE_a_29, LTS_STATE_a_1882,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_1883,
-    4, 'h', LTS_STATE_a_28, LTS_STATE_a_1884,
-    2, 'q', LTS_STATE_a_101, LTS_STATE_a_1885,
-    4, 'c', LTS_STATE_a_101, LTS_STATE_a_1886,
-    6, 'i', LTS_STATE_a_563, LTS_STATE_a_101,
-    6, 'a', LTS_STATE_a_1888, LTS_STATE_a_1887,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_1889,
-    4, 't', LTS_STATE_a_29, LTS_STATE_a_1890,
-    5, 'u', LTS_STATE_a_1892, LTS_STATE_a_1891,
-    5, 't', LTS_STATE_a_231, LTS_STATE_a_1893,
-    4, 'b', LTS_STATE_a_42, LTS_STATE_a_1894,
-    5, 'y', LTS_STATE_a_101, LTS_STATE_a_1895,
-    6, 's', LTS_STATE_a_42, LTS_STATE_a_1896,
-    6, 'o', LTS_STATE_a_231, LTS_STATE_a_1186,
-    5, 'n', LTS_STATE_a_563, LTS_STATE_a_1897,
-    3, 'm', LTS_STATE_a_101, LTS_STATE_a_1898,
-    6, '#', LTS_STATE_a_28, LTS_STATE_a_42,
-    6, 'b', LTS_STATE_a_101, LTS_STATE_a_1899,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_1900,
-    4, 'j', LTS_STATE_a_69, LTS_STATE_a_1901,
-    4, 'p', LTS_STATE_a_69, LTS_STATE_a_1902,
-    3, 'c', LTS_STATE_a_231, LTS_STATE_a_1903,
-    3, 'c', LTS_STATE_a_1905, LTS_STATE_a_1904,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_1906,
-    3, 'c', LTS_STATE_a_42, LTS_STATE_a_1907,
-    5, 'l', LTS_STATE_a_1909, LTS_STATE_a_1908,
-    6, 'o', LTS_STATE_a_101, LTS_STATE_a_1910,
-    6, 'o', LTS_STATE_a_29, LTS_STATE_a_1911,
-    6, 'u', LTS_STATE_a_563, LTS_STATE_a_101,
-    3, 's', LTS_STATE_a_42, LTS_STATE_a_101,
-    3, 'v', LTS_STATE_a_101, LTS_STATE_a_1912,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1686,
-    5, 'a', LTS_STATE_a_29, LTS_STATE_a_1913,
-    6, 'l', LTS_STATE_a_1915, LTS_STATE_a_1914,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_28,
-    2, 'r', LTS_STATE_a_69, LTS_STATE_a_1916,
-    2, 'd', LTS_STATE_a_69, LTS_STATE_a_1917,
-    3, 'r', LTS_STATE_a_1918, LTS_STATE_a_69,
-    3, 't', LTS_STATE_a_101, LTS_STATE_a_1919,
-    6, 'd', LTS_STATE_a_42, LTS_STATE_a_69,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_1555,
-    2, 'o', LTS_STATE_a_231, LTS_STATE_a_1920,
-    4, 'v', LTS_STATE_a_101, LTS_STATE_a_29,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1921,
-    4, 'f', LTS_STATE_a_231, LTS_STATE_a_1922,
-    3, 'k', LTS_STATE_a_1924, LTS_STATE_a_1923,
-    4, 'b', LTS_STATE_a_69, LTS_STATE_a_42,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_1925,
-    6, 'e', LTS_STATE_a_42, LTS_STATE_a_1926,
-    3, 'd', LTS_STATE_a_42, LTS_STATE_a_28,
-    6, 'l', LTS_STATE_a_1928, LTS_STATE_a_1927,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1929,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_1930,
-    3, 'h', LTS_STATE_a_69, LTS_STATE_a_101,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_1931,
-    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1932,
-    2, 'b', LTS_STATE_a_101, LTS_STATE_a_29,
-    4, 'c', LTS_STATE_a_1048, LTS_STATE_a_1933,
-    6, 'r', LTS_STATE_a_101, LTS_STATE_a_1282,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_1934,
-    4, 's', LTS_STATE_a_69, LTS_STATE_a_42,
-    2, 'p', LTS_STATE_a_42, LTS_STATE_a_1935,
-    1, 'r', LTS_STATE_a_248, LTS_STATE_a_1936,
-    3, 'b', LTS_STATE_a_64, LTS_STATE_a_1937,
-    3, 'c', LTS_STATE_a_101, LTS_STATE_a_1938,
-    2, 'l', LTS_STATE_a_69, LTS_STATE_a_1939,
-    3, 'l', LTS_STATE_a_69, LTS_STATE_a_1940,
-    3, 'p', LTS_STATE_a_101, LTS_STATE_a_1941,
-    3, 'r', LTS_STATE_a_101, LTS_STATE_a_69,
-    6, 't', LTS_STATE_a_1943, LTS_STATE_a_1942,
-    6, 'i', LTS_STATE_a_28, LTS_STATE_a_29,
-    2, 'l', LTS_STATE_a_1945, LTS_STATE_a_1944,
-    1, 'o', LTS_STATE_a_29, LTS_STATE_a_28,
-    5, 's', LTS_STATE_a_28, LTS_STATE_a_29,
-    3, 'i', LTS_STATE_a_28, LTS_STATE_a_1946,
-    6, 'e', LTS_STATE_a_29, LTS_STATE_a_1947,
-    3, 'h', LTS_STATE_a_28, LTS_STATE_a_1948,
-    3, 't', LTS_STATE_a_29, LTS_STATE_a_1949,
-    3, 'j', LTS_STATE_a_29, LTS_STATE_a_1950,
-    2, '#', LTS_STATE_a_1951, LTS_STATE_a_29,
-    3, 'c', LTS_STATE_a_29, LTS_STATE_a_1952,
-    3, 'l', LTS_STATE_a_101, LTS_STATE_a_231,
-    3, 'w', LTS_STATE_a_1954, LTS_STATE_a_1953,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_1955,
-    6, 'i', LTS_STATE_a_1957, LTS_STATE_a_1956,
-    4, 'g', LTS_STATE_a_101, LTS_STATE_a_1958,
-    2, 'r', LTS_STATE_a_231, LTS_STATE_a_1959,
-    2, 'n', LTS_STATE_a_231, LTS_STATE_a_1960,
-    6, 'a', LTS_STATE_a_1962, LTS_STATE_a_1961,
-    6, '#', LTS_STATE_a_563, LTS_STATE_a_101,
-    1, 'd', LTS_STATE_a_101, LTS_STATE_a_1963,
-    6, 'g', LTS_STATE_a_101, LTS_STATE_a_1964,
-    3, 'y', LTS_STATE_a_231, LTS_STATE_a_69,
-    6, 'k', LTS_STATE_a_231, LTS_STATE_a_1965,
-    3, 't', LTS_STATE_a_231, LTS_STATE_a_69,
-    1, 'r', LTS_STATE_a_101, LTS_STATE_a_1966,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_101,
-    1, 'i', LTS_STATE_a_101, LTS_STATE_a_69,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_1967,
-    6, 'h', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, 'o', LTS_STATE_a_101, LTS_STATE_a_1968,
-    3, 'r', LTS_STATE_a_29, LTS_STATE_a_1969,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_1970,
-    5, 's', LTS_STATE_a_69, LTS_STATE_a_101,
-    2, 'p', LTS_STATE_a_101, LTS_STATE_a_1971,
-    2, 'e', LTS_STATE_a_101, LTS_STATE_a_1972,
-    1, 's', LTS_STATE_a_69, LTS_STATE_a_1973,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1974,
-    6, 'r', LTS_STATE_a_1976, LTS_STATE_a_1975,
-    5, 's', LTS_STATE_a_69, LTS_STATE_a_1977,
-    6, 'i', LTS_STATE_a_69, LTS_STATE_a_1978,
-    6, 'n', LTS_STATE_a_69, LTS_STATE_a_1979,
-    4, 'b', LTS_STATE_a_69, LTS_STATE_a_1980,
-    6, 'd', LTS_STATE_a_231, LTS_STATE_a_101,
-    6, 'h', LTS_STATE_a_101, LTS_STATE_a_1981,
-    5, 'g', LTS_STATE_a_563, LTS_STATE_a_101,
-    5, 'v', LTS_STATE_a_101, LTS_STATE_a_1982,
-    5, 'g', LTS_STATE_a_101, LTS_STATE_a_1983,
-    4, 's', LTS_STATE_a_69, LTS_STATE_a_1984,
-    6, 'a', LTS_STATE_a_1986, LTS_STATE_a_1985,
-    1, '0', LTS_STATE_a_101, LTS_STATE_a_1987,
-    3, 'g', LTS_STATE_a_69, LTS_STATE_a_1988,
-    2, 's', LTS_STATE_a_69, LTS_STATE_a_1989,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_1990,
-    5, 'y', LTS_STATE_a_1992, LTS_STATE_a_1991,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_1993,
-    3, 'p', LTS_STATE_a_231, LTS_STATE_a_1994,
-    2, 'g', LTS_STATE_a_29, LTS_STATE_a_1995,
-    4, 's', LTS_STATE_a_1997, LTS_STATE_a_1996,
-    5, 'r', LTS_STATE_a_1999, LTS_STATE_a_1998,
-    4, 'j', LTS_STATE_a_2001, LTS_STATE_a_2000,
-    3, 'm', LTS_STATE_a_2003, LTS_STATE_a_2002,
-    3, 'b', LTS_STATE_a_42, LTS_STATE_a_2004,
-    5, 'h', LTS_STATE_a_2006, LTS_STATE_a_2005,
-    4, 'g', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'p', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'l', LTS_STATE_a_42, LTS_STATE_a_1675,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_2007,
-    6, 'e', LTS_STATE_a_231, LTS_STATE_a_101,
-    5, 'v', LTS_STATE_a_563, LTS_STATE_a_2008,
-    6, '#', LTS_STATE_a_101, LTS_STATE_a_29,
-    4, 'n', LTS_STATE_a_2010, LTS_STATE_a_2009,
-    4, 'm', LTS_STATE_a_69, LTS_STATE_a_2011,
-    6, 't', LTS_STATE_a_2013, LTS_STATE_a_2012,
-    4, 's', LTS_STATE_a_1871, LTS_STATE_a_69,
-    3, 'h', LTS_STATE_a_101, LTS_STATE_a_2014,
-    4, 'b', LTS_STATE_a_231, LTS_STATE_a_2015,
-    4, 'v', LTS_STATE_a_101, LTS_STATE_a_231,
-    3, 'k', LTS_STATE_a_101, LTS_STATE_a_2016,
-    3, 'h', LTS_STATE_a_42, LTS_STATE_a_2017,
-    5, 's', LTS_STATE_a_2019, LTS_STATE_a_2018,
-    6, 'a', LTS_STATE_a_101, LTS_STATE_a_2020,
-    3, 't', LTS_STATE_a_83, LTS_STATE_a_2021,
-    6, 'h', LTS_STATE_a_101, LTS_STATE_a_2022,
-    3, 'g', LTS_STATE_a_101, LTS_STATE_a_2023,
-    4, 'f', LTS_STATE_a_29, LTS_STATE_a_2024,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_2025,
-    3, 'f', LTS_STATE_a_101, LTS_STATE_a_69,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_2026,
-    6, 'r', LTS_STATE_a_69, LTS_STATE_a_2027,
-    4, 'z', LTS_STATE_a_69, LTS_STATE_a_101,
-    4, 's', LTS_STATE_a_2029, LTS_STATE_a_2028,
-    3, 'd', LTS_STATE_a_101, LTS_STATE_a_2030,
-    1, 'o', LTS_STATE_a_69, LTS_STATE_a_2031,
-    2, 'a', LTS_STATE_a_231, LTS_STATE_a_69,
-    4, 's', LTS_STATE_a_42, LTS_STATE_a_2032,
-    4, 'l', LTS_STATE_a_69, LTS_STATE_a_101,
-    2, 's', LTS_STATE_a_42, LTS_STATE_a_2033,
-    2, '#', LTS_STATE_a_2035, LTS_STATE_a_2034,
-    4, 'd', LTS_STATE_a_69, LTS_STATE_a_2036,
-    4, 'n', LTS_STATE_a_2038, LTS_STATE_a_2037,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_29,
-    3, 's', LTS_STATE_a_42, LTS_STATE_a_2039,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_2040,
-    2, 'c', LTS_STATE_a_69, LTS_STATE_a_2041,
-    4, 'x', LTS_STATE_a_101, LTS_STATE_a_2042,
-    3, 's', LTS_STATE_a_69, LTS_STATE_a_2043,
-    3, 's', LTS_STATE_a_42, LTS_STATE_a_2044,
-    1, 'a', LTS_STATE_a_2046, LTS_STATE_a_2045,
-    5, 'b', LTS_STATE_a_64, LTS_STATE_a_2047,
-    3, 't', LTS_STATE_a_2049, LTS_STATE_a_2048,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_2050,
-    1, 'p', LTS_STATE_a_69, LTS_STATE_a_2051,
-    3, 'b', LTS_STATE_a_69, LTS_STATE_a_2052,
-    2, 'c', LTS_STATE_a_29, LTS_STATE_a_2053,
-    3, 'h', LTS_STATE_a_2054, LTS_STATE_a_29,
-    2, 'h', LTS_STATE_a_28, LTS_STATE_a_2055,
-    1, 'a', LTS_STATE_a_231, LTS_STATE_a_28,
-    3, 'k', LTS_STATE_a_28, LTS_STATE_a_2056,
-    3, 'b', LTS_STATE_a_29, LTS_STATE_a_2057,
-    6, 'n', LTS_STATE_a_28, LTS_STATE_a_2058,
-    3, 'k', LTS_STATE_a_29, LTS_STATE_a_2059,
-    3, 't', LTS_STATE_a_29, LTS_STATE_a_2060,
-    3, 'c', LTS_STATE_a_29, LTS_STATE_a_2061,
-    5, 'b', LTS_STATE_a_29, LTS_STATE_a_2062,
-    5, 'u', LTS_STATE_a_2064, LTS_STATE_a_2063,
-    2, 'o', LTS_STATE_a_69, LTS_STATE_a_2065,
-    6, '#', LTS_STATE_a_2066, LTS_STATE_a_69,
-    4, 's', LTS_STATE_a_2068, LTS_STATE_a_2067,
-    1, 'p', LTS_STATE_a_42, LTS_STATE_a_2069,
-    2, 'm', LTS_STATE_a_101, LTS_STATE_a_2070,
-    1, 'i', LTS_STATE_a_29, LTS_STATE_a_2071,
-    2, 'r', LTS_STATE_a_29, LTS_STATE_a_231,
-    3, 'c', LTS_STATE_a_101, LTS_STATE_a_2072,
-    1, 'd', LTS_STATE_a_69, LTS_STATE_a_101,
-    6, 'a', LTS_STATE_a_2074, LTS_STATE_a_2073,
-    4, 'f', LTS_STATE_a_231, LTS_STATE_a_2075,
-    3, 'k', LTS_STATE_a_231, LTS_STATE_a_2076,
-    5, 'd', LTS_STATE_a_2078, LTS_STATE_a_2077,
-    2, 't', LTS_STATE_a_101, LTS_STATE_a_69,
-    3, 'l', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'l', LTS_STATE_a_2079, LTS_STATE_a_101,
-    3, 'd', LTS_STATE_a_69, LTS_STATE_a_2080,
-    2, 'u', LTS_STATE_a_69, LTS_STATE_a_2081,
-    1, 'o', LTS_STATE_a_69, LTS_STATE_a_1987,
-    2, 'b', LTS_STATE_a_101, LTS_STATE_a_69,
-    1, 's', LTS_STATE_a_101, LTS_STATE_a_1855,
-    4, 'h', LTS_STATE_a_29, LTS_STATE_a_2082,
-    4, 'g', LTS_STATE_a_69, LTS_STATE_a_2083,
-    5, 'y', LTS_STATE_a_42, LTS_STATE_a_2084,
-    4, 'c', LTS_STATE_a_101, LTS_STATE_a_2085,
-    4, 'c', LTS_STATE_a_69, LTS_STATE_a_2086,
-    6, 't', LTS_STATE_a_101, LTS_STATE_a_2087,
-    6, 'e', LTS_STATE_a_101, LTS_STATE_a_231,
-    5, 'b', LTS_STATE_a_101, LTS_STATE_a_2088,
-    5, 'b', LTS_STATE_a_101, LTS_STATE_a_563,
-    4, 'f', LTS_STATE_a_69, LTS_STATE_a_1286,
-    6, 'e', LTS_STATE_a_2090, LTS_STATE_a_2089,
-    1, 'a', LTS_STATE_a_101, LTS_STATE_a_1404,
-    2, 'i', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'w', LTS_STATE_a_83, LTS_STATE_a_2091,
-    2, 'c', LTS_STATE_a_69, LTS_STATE_a_83,
-    4, 'n', LTS_STATE_a_69, LTS_STATE_a_2092,
-    6, 'e', LTS_STATE_a_2094, LTS_STATE_a_2093,
-    6, '#', LTS_STATE_a_42, LTS_STATE_a_101,
-    4, 'v', LTS_STATE_a_2096, LTS_STATE_a_2095,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_2097,
-    6, '#', LTS_STATE_a_29, LTS_STATE_a_231,
-    3, 'r', LTS_STATE_a_69, LTS_STATE_a_2098,
-    3, 'n', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'm', LTS_STATE_a_2100, LTS_STATE_a_2099,
-    4, 't', LTS_STATE_a_2102, LTS_STATE_a_2101,
-    3, 'm', LTS_STATE_a_2104, LTS_STATE_a_2103,
-    255, 19, 0, 0, 0, 0,
-    4, 'k', LTS_STATE_a_69, LTS_STATE_a_2105,
-    4, 't', LTS_STATE_a_69, LTS_STATE_a_1918,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_101,
-    5, 'r', LTS_STATE_a_1787, LTS_STATE_a_2106,
-    3, 'f', LTS_STATE_a_29, LTS_STATE_a_2107,
-    6, 'o', LTS_STATE_a_2109, LTS_STATE_a_2108,
-    5, 'c', LTS_STATE_a_101, LTS_STATE_a_2110,
-    3, 'n', LTS_STATE_a_2029, LTS_STATE_a_2111,
-    3, 'j', LTS_STATE_a_69, LTS_STATE_a_101,
-    4, 'p', LTS_STATE_a_231, LTS_STATE_a_2112,
-    4, 'c', LTS_STATE_a_2114, LTS_STATE_a_2113,
-    4, 'b', LTS_STATE_a_29, LTS_STATE_a_1839,
-    4, 'h', LTS_STATE_a_29, LTS_STATE_a_2115,
-    4, 's', LTS_STATE_a_69, LTS_STATE_a_231,
-    3, 'b', LTS_STATE_a_69, LTS_STATE_a_101,
-    3, 'm', LTS_STATE_a_69, LTS_STATE_a_2116,
-    5, 'z', LTS_STATE_a_2118, LTS_STATE_a_2117,
-    3, 'f', LTS_STATE_a_83, LTS_STATE_a_2021,
-    6, 'u', LTS_STATE_a_2120, LTS_STATE_a_2119,
-    3, 'b', LTS_STATE_a_83, LTS_STATE_a_101,
-    3, 'b', LTS_STATE_a_101, LTS_STATE_a_83,
-    3, 't', LTS_STATE_a_83, LTS_STATE_a_101,
-    5, 'h', LTS_STATE_a_29, LTS_STATE_a_2121,
-    4, 'v', LTS_STATE_a_231, LTS_STATE_a_2122,
-    3, 't', LTS_STATE_a_1286, LTS_STATE_a_2123,
-    2, 's', LTS_STATE_a_231, LTS_STATE_a_101,
-    3, 'f', LTS_STATE_a_69, LTS_STATE_a_2124,
-    6, 'l', LTS_STATE_a_231, LTS_STATE_a_69,
-    2, '#', LTS_STATE_a_2126, LTS_STATE_a_2125,
-    2, 'a', LTS_STATE_a_69, LTS_STATE_a_2127,
-    3, 's', LTS_STATE_a_2129, LTS_STATE_a_2128,
-    2, 'b', LTS_STATE_a_42, LTS_STATE_a_2130,
-    1, '#', LTS_STATE_a_42, LTS_STATE_a_2131,
-    6, 'l', LTS_STATE_a_42, LTS_STATE_a_2132,
-    6, 'm', LTS_STATE_a_42, LTS_STATE_a_2133,
-    2, 'n', LTS_STATE_a_69, LTS_STATE_a_2134,
-    2, 'm', LTS_STATE_a_101, LTS_STATE_a_231,
-    4, 'v', LTS_STATE_a_231, LTS_STATE_a_2135,
-    6, 'r', LTS_STATE_a_29, LTS_STATE_a_69,
-    2, 'a', LTS_STATE_a_2137, LTS_STATE_a_2136,
-    3, 'c', LTS_STATE_a_2139, LTS_STATE_a_2138,
-    3, 'n', LTS_STATE_a_42, LTS_STATE_a_2140,
-    3, 'r', LTS_STATE_a_42, LTS_STATE_a_2141,
-    2, 'i', LTS_STATE_a_248, LTS_STATE_a_69,
-    2, 'n', LTS_STATE_a_248, LTS_STATE_a_2142,
-    6, 'c', LTS_STATE_a_64, LTS_STATE_a_2143,
-    2, 'a', LTS_STATE_a_2145, LTS_STATE_a_2144,
-    4, 'd', LTS_STATE_a_69, LTS_STATE_a_2146,
-    2, 'i', LTS_STATE_a_69, LTS_STATE_a_2147,
-    1, 'h', LTS_STATE_a_69, LTS_STATE_a_2148,
-    1, 'r', LTS_STATE_a_69, LTS_STATE_a_2149,
-    3, 'n', LTS_STATE_a_2151, LTS_STATE_a_2150,
-    1, 'e', LTS_STATE_a_231, LTS_STATE_a_2152,
-    3, 'y', LTS_STATE_a_29, LTS_STATE_a_2153,
-    1, 'r', LTS_STATE_a_2155, LTS_STATE_a_2154,
-    3, 'h', LTS_STATE_a_2157, LTS_STATE_a_2156,
-    3, 't', LTS_STATE_a_28, LTS_STATE_a_29,
-    3, 'm', LTS_STATE_a_2158, LTS_STATE_a_29,
-    3, 'f', LTS_STATE_a_29, LTS_STATE_a_2159,
-    5, 'g', LTS_STATE_a_231, LTS_STATE_a_29,
-    2, '#', LTS_STATE_a_29, LTS_STATE_a_2160,
-    1, 's', LTS_STATE_a_2162, LTS_STATE_a_2161,
-    6, 'l', LTS_STATE_a_2164, LTS_STATE_a_2163,
-    5, 'h', LTS_STATE_a_29, LTS_STATE_a_2165,
-    4, 'd', LTS_STATE_a_42, LTS_STATE_a_69,
-    6, 'e', LTS_STATE_a_69, LTS_STATE_a_2166,
-    6, '#', LTS_STATE_a_2168, LTS_STATE_a_2167,
-    4, 's', LTS_STATE_a_29, LTS_STATE_a_2169,
-    4, 's', LTS_STATE_a_69, LTS_STATE_a_101,
-    2, 'h', LTS_STATE_a_29, LTS_STATE_a_2170,
-    2, 'c', LTS_STATE_a_101, LTS_STATE_a_2171,
-    5, 'u', LTS_STATE_a_1736, LTS_STATE_a_2172,
-    5, 'c', LTS_STATE_a_231, LTS_STATE_a_101,
-    1, 's', LTS_STATE_a_29, LTS_STATE_a_2173,
-    6, 's', LTS_STATE_a_29, LTS_STATE_a_69,
-    2, 'i', LTS_STATE_a_101, LTS_STATE_a_2174,
-    3, 'l', LTS_STATE_a_2176, LTS_STATE_a_2175,
-    6, 'h', LTS_STATE_a_69, LTS_STATE_a_29,
-    1, 'm', LTS_STATE_a_2177, LTS_STATE_a_69,
-    3, 'n', LTS_STATE_a_69, LTS_STATE_a_2178,
-    4, 'p', LTS_STATE_a_2180, LTS_STATE_a_2179,

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9588
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9588&view=rev
Author:   dhdfu
Date:     2010-01-02 06:15:26 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
Don't allocate space for first and last phones in "internal" arrays

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-02 05:57:50 UTC (rev 9587)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-02 06:15:26 UTC (rev 9588)
@@ -293,12 +293,13 @@
                                                        sizeof
                                                        (s3ssid_t));
 
+    /* Count number of word-internal phones. */
     for (w = 0, n = 0; w < dict_size(dict); w++) {
         pronlen = dict_pronlen(dict, w);
         if (pronlen < 0)
             E_FATAL("Pronunciation-length(%s)= %d\n",
                     dict_wordstr(dict, w), pronlen);
-        n += pronlen;
+        n += (pronlen == 1 ? 0 : pronlen - 2);
     }
 
     internal = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
@@ -315,8 +316,9 @@
         if (pronlen >= 2) {
             b = dict_pron(dict, w, 0);
             r = dict_pron(dict, w, 1);
+            /* Populate ldiph_lc */
             if (bitvec_is_clear(ldiph, b * mdef->n_ciphone + r)) {
-                /* Mark this as done */
+                /* Mark this diphone as done */
                 bitvec_set(ldiph, b * mdef->n_ciphone + r);
 
                 /* Record all possible ssids for b(?,r) */
@@ -328,9 +330,6 @@
                 }
             }
 
-            /* Not used (FIXME: do not bother allocating it then!) */
-            internal[0] = BAD_S3SSID;
-
             /* Now find ssids for all the word internal triphones and
              * place them in internal[i].  */
             for (i = 1; i < pronlen - 1; i++) {
@@ -341,17 +340,14 @@
                 p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                           (s3cipid_t) l, (s3cipid_t) r,
                                           WORD_POSN_INTERNAL);
-                internal[i] = bin_mdef_pid2ssid(mdef, p);
+                internal[i-1] = bin_mdef_pid2ssid(mdef, p);
             }
 
-            /** This part will take care of the initialization of 
-		internal[pronlen-1] and rdiph[b][l][r]. Notice that this 
-		is symmetric to the first part of the code. 
-            */
+            /* Populate rdiph_rc */
             l = b;
             b = r;
             if (bitvec_is_clear(rdiph, b * mdef->n_ciphone + l)) {
-                /* Mark this as done */
+                /* Mark this diphone as done */
                 bitvec_set(rdiph, b * mdef->n_ciphone + l);
 
                 for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
@@ -361,15 +357,12 @@
                     dict2pid->rdiph_rc[b][l][r] = bin_mdef_pid2ssid(mdef, p);
                 }
             }
-
-            /* Also not used, see above FIXME */
-            internal[pronlen - 1] = BAD_S3SSID;
         }
         else if (pronlen == 1) {
             b = dict_pron(dict, w, 0);
             E_DEBUG(1,("Building tables for single phone word %s phone %d = %s\n",
                        dict_wordstr(dict, w), b, bin_mdef_ciphone_str(mdef, b)));
-            /* Don't compress but build table directly */
+            /* Populate lrdiph_rc (and also ldiph_lc, rdiph_rc if needed) */
             if (bitvec_is_clear(single, b)) {
                 for (l = 0; l < bin_mdef_n_ciphone(mdef); l++) {
                     for (r = 0; r < bin_mdef_n_ciphone(mdef); r++) {
@@ -395,18 +388,8 @@
                 }
                 bitvec_set(single, b);
             }
-            /* ssid goes into single, not internal... */
-            internal[pronlen - 1] = BAD_S3SSID;
         }
-        else {
-            E_FATAL("panic: pronlen=0, what's going on?\n");
-        }
-
-        /*      E_INFO("internal[0] %d, internal[pronlen-1] %d\n", internal[0],internal[pronlen-1]); */
-        assert(internal[0] == BAD_S3SSID
-               && internal[pronlen - 1] == BAD_S3SSID);
-
-        internal += pronlen;
+        internal += (pronlen == 1 ? 0 : pronlen - 2);
     }
 
     bitvec_free(ldiph);

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-02 05:57:50 UTC (rev 9587)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-02 06:15:26 UTC (rev 9588)
@@ -182,8 +182,11 @@
 } dict2pid_t;
 
 /** Access macros; not designed for arbitrary use */
-#define dict2pid_internal(d,w,p)	((d)->internal[w][p]) /**< return internal dict2pid*/
-#define dict2pid_rssid(d,ci,lc) (&(d)->rssid[ci][lc])
+#define dict2pid_internal(d,w,p) ((d)->internal[w][p-1]) /**< return internal dict2pid */
+#define dict2pid_rssid(d,ci,lc)  (&(d)->rssid[ci][lc])
+#define dict2pid_ldiph_lc(d,b,r,l) ((d)->ldiph_lc[b][r][l])
+#define dict2pid_rdiph_rc(d,b,l,r) ((d)->rdiph_rc[b][l][r])
+#define dict2pid_lrdiph_rc(d,b,l,r) ((d)->lrdiph_rc[b][l][r])
 
 /** Build the dict2pid structure for the given model/dictionary */
 dict2pid_t *dict2pid_build(bin_mdef_t *mdef,   /**< A  model definition*/

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-02 05:57:50 UTC (rev 9587)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-02 06:15:26 UTC (rev 9588)
@@ -498,7 +498,7 @@
                 }
             }
             else if (p != pronlen - 1) {        /* Word internal phone */
-                ssid = lextree->d2p->internal[dictwid][p];
+                ssid = dict2pid_internal(lextree->d2p, dictwid, p);
                 pnode = (fsg_pnode_t *) ckd_calloc(1, sizeof(fsg_pnode_t));
                 pnode->ctx = lextree->ctx;
                 pnode->logs2prob = lextree->pip;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9589
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9589&view=rev
Author:   dhdfu
Date:     2010-01-02 06:32:18 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
No need to keep rdiph_rc around as nothing uses it.  Also switch to
using access macros for these, which might make them easier to switch
in the future.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
    trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-02 06:15:26 UTC (rev 9588)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-02 06:32:18 UTC (rev 9589)
@@ -78,7 +78,8 @@
 
 
 static void
-compress_right_context_tree(bin_mdef_t * mdef, dict2pid_t * d2p)
+compress_right_context_tree(bin_mdef_t * mdef, dict2pid_t * d2p,
+                            s3ssid_t ***rdiph_rc)
 {
     int32 n_ci;
     int32 b, l, r;
@@ -91,7 +92,6 @@
     tmpssid = ckd_calloc(n_ci, sizeof(s3ssid_t));
     tmpcimap = ckd_calloc(n_ci, sizeof(s3cipid_t));
 
-    assert(d2p->rdiph_rc);
     d2p->rssid =
         (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
 
@@ -102,7 +102,7 @@
 
         for (l = 0; l < n_ci; l++) {
 
-            rmap = d2p->rdiph_rc[b][l];
+            rmap = rdiph_rc[b][l];
 
             compress_table(rmap, tmpssid, tmpcimap, mdef->n_ciphone);
 
@@ -128,11 +128,8 @@
         }
     }
 
-    /* Try to compress lrdiph_rc into lrdiph_rc_compressed */
     ckd_free(tmpssid);
     ckd_free(tmpcimap);
-
-
 }
 
 static void
@@ -265,7 +262,7 @@
 dict2pid_build(bin_mdef_t * mdef, dict_t * dict, logmath_t *logmath)
 {
     dict2pid_t *dict2pid;
-    s3ssid_t *internal;
+    s3ssid_t *internal, ***rdiph_rc;
     bitvec_t *ldiph, *rdiph, *single;
     int32 pronlen;
     int32 i, b, l, r, w, n, p;
@@ -282,7 +279,8 @@
     dict2pid->ldiph_lc =
         (s3ssid_t ***) ckd_calloc_3d(mdef->n_ciphone, mdef->n_ciphone,
                                      mdef->n_ciphone, sizeof(s3ssid_t));
-    dict2pid->rdiph_rc =
+    /* Only used internally to generate rssid */
+    rdiph_rc =
         (s3ssid_t ***) ckd_calloc_3d(mdef->n_ciphone, mdef->n_ciphone,
                                      mdef->n_ciphone, sizeof(s3ssid_t));
 
@@ -354,7 +352,7 @@
                     p = bin_mdef_phone_id_nearest(mdef, (s3cipid_t) b,
                                               (s3cipid_t) l, (s3cipid_t) r,
                                               WORD_POSN_END);
-                    dict2pid->rdiph_rc[b][l][r] = bin_mdef_pid2ssid(mdef, p);
+                    rdiph_rc[b][l][r] = bin_mdef_pid2ssid(mdef, p);
                 }
             }
         }
@@ -376,7 +374,7 @@
                             dict2pid->ldiph_lc[b][r][l]
                                 = bin_mdef_pid2ssid(mdef, p);
                         if (l == bin_mdef_silphone(mdef))
-                            dict2pid->rdiph_rc[b][l][r]
+                            rdiph_rc[b][l][r]
                                 = bin_mdef_pid2ssid(mdef, p);
                         assert(IS_S3SSID(bin_mdef_pid2ssid(mdef, p)));
                         E_DEBUG(2,("%s(%s,%s) => %d / %d\n",
@@ -397,9 +395,11 @@
     bitvec_free(single);
 
     /* Try to compress rdiph_rc into rdiph_rc_compressed */
-    compress_right_context_tree(mdef, dict2pid);
+    compress_right_context_tree(mdef, dict2pid, rdiph_rc);
     compress_left_right_context_tree(mdef, dict2pid);
 
+    ckd_free_3d(rdiph_rc);
+
     dict2pid_report(dict2pid);
     return dict2pid;
 }
@@ -422,10 +422,6 @@
     if (d2p->ldiph_lc)
         ckd_free_3d((void ***) d2p->ldiph_lc);
 
-
-    if (d2p->rdiph_rc)
-        ckd_free_3d((void ***) d2p->rdiph_rc);
-
     if (d2p->lrdiph_rc)
         ckd_free_3d((void ***) d2p->lrdiph_rc);
 

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-02 06:15:26 UTC (rev 9588)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-02 06:32:18 UTC (rev 9589)
@@ -159,9 +159,6 @@
 				   word-initial base x rc combinations in current vocabulary */
 
 
-    s3ssid_t ***rdiph_rc;	/**< For multi-phone words, [base][lc][rc] -> ssid; filled out for
-				   word-final base x lc combinations in current vocabulary */
-
     xwdssid_t **rssid;          /**< Right context state sequence id table 
                                    First dimension: base phone,
                                    Second dimension: left context. 
@@ -185,7 +182,6 @@
 #define dict2pid_internal(d,w,p) ((d)->internal[w][p-1]) /**< return internal dict2pid */
 #define dict2pid_rssid(d,ci,lc)  (&(d)->rssid[ci][lc])
 #define dict2pid_ldiph_lc(d,b,r,l) ((d)->ldiph_lc[b][r][l])
-#define dict2pid_rdiph_rc(d,b,l,r) ((d)->rdiph_rc[b][l][r])
 #define dict2pid_lrdiph_rc(d,b,l,r) ((d)->lrdiph_rc[b][l][r])
 
 /** Build the dict2pid structure for the given model/dictionary */

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-02 06:15:26 UTC (rev 9588)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-02 06:32:18 UTC (rev 9589)
@@ -392,7 +392,7 @@
 
             for (i = 0; lclist[i] >= 0; i++) {
                 lc = lclist[i];
-                ssid = lextree->d2p->lrdiph_rc[ci][lc][silcipid];
+                ssid = dict2pid_lrdiph_rc(lextree->d2p, ci, lc, silcipid);
                 /* Check if this ssid already allocated for some other context */
                 for (gn = lc_pnodelist; gn; gn = gnode_next(gn)) {
                     pnode = (fsg_pnode_t *) gnode_ptr(gn);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2010-01-02 06:15:26 UTC (rev 9588)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2010-01-02 06:32:18 UTC (rev 9589)
@@ -651,8 +651,8 @@
                     /* DICT2PID: This is where mpx ssids get introduced. */
                     /* Look up the ssid to use when entering this mpx triphone. */
                     hmm_mpx_ssid(&rhmm->hmm, 0) =
-                        d2p->ldiph_lc[rhmm->ciphone][rhmm->ci2phone]
-                        [dict_last_phone(dict, bp->wid)];
+                        dict2pid_ldiph_lc(d2p, rhmm->ciphone, rhmm->ci2phone,
+                                          dict_last_phone(dict, bp->wid));
                     assert(IS_S3SSID(hmm_mpx_ssid(&rhmm->hmm, 0)));
                     E_DEBUG(6,("ssid %d(%d,%d) = %d\n",
                                rhmm->ciphone, dict_last_phone(dict, bp->wid), rhmm->ci2phone,

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2010-01-02 06:15:26 UTC (rev 9588)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2010-01-02 06:32:18 UTC (rev 9589)
@@ -1264,7 +1264,7 @@
                 /* DICT2PID: Another place where mpx ssids are entered. */
                 /* Look up the ssid to use when entering this mpx triphone. */
                 hmm_mpx_ssid(&rhmm->hmm, 0) =
-                    d2p->ldiph_lc[rhmm->ciphone][rhmm->ci2phone][bestbp_rc_ptr->lc];
+                    dict2pid_ldiph_lc(d2p, rhmm->ciphone, rhmm->ci2phone, bestbp_rc_ptr->lc);
                 assert(hmm_mpx_ssid(&rhmm->hmm, 0) != BAD_SSID);
             }
         }
@@ -1317,8 +1317,8 @@
                 /* DICT2PID: another place where mpx ssids are entered. */
                 /* Look up the ssid to use when entering this mpx triphone. */
                 hmm_mpx_ssid(&rhmm->hmm, 0) =
-                    d2p->ldiph_lc[rhmm->ciphone][rhmm->ci2phone]
-                    [dict_last_phone(dict, bpe->wid)];
+                    dict2pid_ldiph_lc(d2p, rhmm->ciphone, rhmm->ci2phone,
+                                      dict_last_phone(dict, bpe->wid));
                 assert(hmm_mpx_ssid(&rhmm->hmm, 0) != BAD_SSID);
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9590
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9590&view=rev
Author:   dhdfu
Date:     2010-01-02 06:36:15 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
Remove unused functions

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict.c
    trunk/pocketsphinx/src/libpocketsphinx/dict.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict.c	2010-01-02 06:32:18 UTC (rev 9589)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict.c	2010-01-02 06:36:15 UTC (rev 9590)
@@ -305,36 +305,6 @@
 }
 
 
-s3wid_t
-_dict_basewid(dict_t * d, s3wid_t w)
-{
-    assert(d);
-    assert((w >= 0) && (w < d->n_word));
-
-    return (d->word[w].basewid);
-}
-
-
-char *
-_dict_wordstr(dict_t * d, s3wid_t wid)
-{
-    assert(d);
-    assert(IS_S3WID(wid) && (wid < d->n_word));
-
-    return (d->word[wid].word);
-}
-
-
-s3wid_t
-_dict_nextalt(dict_t * d, s3wid_t wid)
-{
-    assert(d);
-    assert(IS_S3WID(wid) && (wid < d->n_word));
-
-    return (d->word[wid].alt);
-}
-
-
 int
 dict_filler_word(dict_t * d, s3wid_t w)
 {

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict.h	2010-01-02 06:32:18 UTC (rev 9589)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict.h	2010-01-02 06:36:15 UTC (rev 9590)
@@ -166,25 +166,7 @@
 #define S3_SILENCE_WORD		"<sil>"
 #define S3_UNKNOWN_WORD		"<UNK>"
 
-/* Function versions of some of the above macros; note the leading underscore. */
-
 /**
- * Return base word id for given word id w (which may be itself).  w must be valid.
- */
-s3wid_t _dict_basewid(dict_t *d, s3wid_t w);
-
-/**
- * Return word string for given word id, which must be valid.
- */
-char *_dict_wordstr(dict_t *d, s3wid_t wid);
-
-/**
- * Return the next alternative word id for the given word id, which must be valid.
- * The returned id may be BAD_S3WID if there is none.
- */
-s3wid_t _dict_nextalt(dict_t *d, s3wid_t wid);
-
-/**
  * If the given word contains a trailing "(....)" (i.e., a Sphinx-II style alternative
  * pronunciation specification), strip that trailing portion from it.  Note that the given
  * string is modified.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9591
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9591&view=rev
Author:   dhdfu
Date:     2010-01-02 06:37:52 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
deadc0de

Removed Paths:
-------------
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
    trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h

Deleted: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	2010-01-02 06:36:15 UTC (rev 9590)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.c	2010-01-02 06:37:52 UTC (rev 9591)
@@ -1,524 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1995-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*
- * ctxt_table.c -- Building a context table , split from flat_fwd.c (or fwd.c)
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1995 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 14-Jul-05    ARCHAN (archan@...) at Carnegie Mellon Unversity 
- *              First created it. 
- *
- * $Log$
- * Revision 1.2  2006/02/22  20:46:05  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: ctxt_table is a wrapper of the triphone context structure and its maniuplations which were used in flat_fwd.c .  The original flat_fwd.c was very long (3000) lines.  It was broken in 5 parts, ctxt_table is one of the 5.
- * 
- * Revision 1.1.2.3  2005/10/09 19:55:33  arthchan2003
- * Changed int8 to uint8. This follows Dave's change in the trunk.
- *
- * Revision 1.1.2.2  2005/09/27 07:39:17  arthchan2003
- * Added ctxt_table_free.
- *
- * Revision 1.1.2.1  2005/09/25 19:08:25  arthchan2003
- * Move context table from search to here.
- *
- * Revision 1.1.2.4  2005/09/07 23:32:03  arthchan2003
- * 1, Added get_lcpid in parrallel with get_rcpid. 2, Also fixed small mistakes in the macro.
- *
- * Revision 1.1.2.3  2005/07/24 01:32:54  arthchan2003
- * Flush the output of the cross word triphone in ctxt_table.c
- *
- * Revision 1.1.2.2  2005/07/17 05:42:27  arthchan2003
- * Added super-detailed comments ctxt_table.h. Also added dimension to the arrays that stores all context tables.
- *
- * Revision 1.1.2.1  2005/07/15 07:48:32  arthchan2003
- * split the hmm (whmm_t) and context building process (ctxt_table_t) from the the flat_fwd.c
- *
- *
- */
-
-#include <string.h>
-#include <ckd_alloc.h>
-
-#include "ctxt_table.h"
-
-void
-dump_xwdssidmap(xwdssid_t ** x, bin_mdef_t * mdef)
-{
-    s3cipid_t b, c1, c2;
-    s3ssid_t p;
-
-    for (b = 0; b < mdef->n_ciphone; b++) {
-        if (!x[b])
-            continue;
-
-        for (c1 = 0; c1 < mdef->n_ciphone; c1++) {
-            if (!x[b][c1].cimap)
-                continue;
-
-            printf("n_ssid(%s, %s) = %d\n",
-                   bin_mdef_ciphone_str(mdef, b), bin_mdef_ciphone_str(mdef, c1),
-                   x[b][c1].n_ssid);
-
-            for (c2 = 0; c2 < mdef->n_ciphone; c2++) {
-                p = x[b][c1].ssid[x[b][c1].cimap[c2]];
-                printf("  %10s %5d\n", bin_mdef_ciphone_str(mdef, c2), p);
-            }
-        }
-    }
-    fflush(stdout);
-}
-
-/**
- * Utility function for building cross-word ssid maps.  Looks up
- * senone sequence IDs.
- */
-int32
-xwdssid_compress(s3pid_t p, s3ssid_t * out_ssid, s3cipid_t * map, s3cipid_t ctx,
-                 int32 n, bin_mdef_t * mdef)
-{
-    s3cipid_t i;
-    int32 ssid;
-
-    ssid = bin_mdef_pid2ssid(mdef, p);
-    for (i = 0; i < n; i++) {
-        if (out_ssid[i] == ssid) {
-            /* This state sequence same as a previous ones; just map to it */
-            map[ctx] = i;
-            return n;
-        }
-    }
-
-    /* This state sequence different from all previous ones; allocate new entry */
-    map[ctx] = n;
-    out_ssid[n] = ssid;
-
-    return (n + 1);
-}
-
-
-/**
- * Given base b, and right context rc, build left context cross-word triphones map
- * for all left context ciphones.  Compress map to unique list.
- */
-void
-build_lcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t rc, bin_mdef_t * mdef,
-             uint8 *word_end_ci, s3pid_t *tmp_xwdssid)
-
-{
-    s3cipid_t lc, *map;
-    s3ssid_t p;
-    int32 n;
-
-    /* Maps left CI phone to index in "compressed" phone ID table */
-    map = (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
-
-    n = 0;
-    for (lc = 0; lc < mdef->n_ciphone; lc++) {
-        p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_BEGIN);
-        if ((!mdef->phone[b].info.ci.filler) && word_end_ci[lc] &&
-            bin_mdef_is_ciphone(mdef, p))
-            ct->n_backoff_ci++;
-
-        n = xwdssid_compress(p, tmp_xwdssid, map, lc, n, mdef);
-    }
-
-    /* Copy/Move to lcssid */
-    ct->lcssid[b][rc].cimap = map;
-    ct->lcssid[b][rc].n_ssid = n;
-    /* Array of phone IDs with unique senone sequences, pointed to by cimap. */
-    ct->lcssid[b][rc].ssid = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
-    memcpy(ct->lcssid[b][rc].ssid, tmp_xwdssid, n * sizeof(s3ssid_t));
-}
-
-
-/**
- * Given base b, and left context lc, build right context cross-word triphones map
- * for all right context ciphones.  Compress map to unique list.
- *
- * \note This is identical to build_lcssid except for right contexts.
- */
-void
-build_rcssid(ctxt_table_t * ct, s3cipid_t b, s3cipid_t lc, bin_mdef_t * mdef,
-             uint8 *word_start_ci, s3pid_t *tmp_xwdssid)
-{
-    s3cipid_t rc, *map;
-    s3ssid_t p;
-    int32 n;
-
-    /* Maps right CI phone to index in "compressed" phone ID table */
-    map = (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
-
-    n = 0;
-    for (rc = 0; rc < mdef->n_ciphone; rc++) {
-        p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_END);
-        if ((!mdef->phone[b].info.ci.filler) && word_start_ci[rc] &&
-            bin_mdef_is_ciphone(mdef, p))
-            ct->n_backoff_ci++;
-
-        n = xwdssid_compress(p, tmp_xwdssid, map, rc, n, mdef);
-    }
-
-    /* Copy/Move to rcssid */
-    ct->rcssid[b][lc].cimap = map;
-    ct->rcssid[b][lc].n_ssid = n;
-    /* Array of phone IDs with unique senone sequences, pointed to by cimap. */
-    ct->rcssid[b][lc].ssid = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
-    memcpy(ct->rcssid[b][lc].ssid, tmp_xwdssid, n * sizeof(s3ssid_t));
-}
-
-/**
- * Given base b for a single-phone word, build context cross-word triphones map
- * for all left and right context ciphones.
- *
- * These are uncompressed for some reason.
- */
-void
-build_lrcssid(ctxt_table_t * ct, s3cipid_t b, bin_mdef_t * mdef,
-              uint8 *word_start_ci, uint8 *word_end_ci)
-{
-    s3cipid_t rc, lc;
-
-    for (lc = 0; lc < mdef->n_ciphone; lc++) {
-        s3ssid_t p;
-
-        ct->lrcssid[b][lc].ssid =
-            (s3ssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3ssid_t));
-        ct->lrcssid[b][lc].cimap =
-            (s3cipid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3cipid_t));
-
-        for (rc = 0; rc < mdef->n_ciphone; rc++) {
-            p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_SINGLE);
-            ct->lrcssid[b][lc].cimap[rc] = rc;
-            ct->lrcssid[b][lc].ssid[rc] = bin_mdef_pid2ssid(mdef, p);
-            if ((!mdef->phone[b].info.ci.filler) && word_start_ci[rc]
-                && word_end_ci[lc] && bin_mdef_is_ciphone(mdef, p))
-                ct->n_backoff_ci++;
-        }
-        ct->lrcssid[b][lc].n_ssid = mdef->n_ciphone;
-    }
-}
-
-
-
-
-/**
- * Build within-word triphones sequence for each word.  The extreme ends are not needed
- * since cross-word modelling is used for those.  (See lcssid, rcssid, lrcssid.)
- */
-
-void
-build_wwssid(ctxt_table_t * ct, dict_t * dict, bin_mdef_t * mdef)
-{
-    s3wid_t w;
-    s3ssid_t p;
-    int32 pronlen, l;
-    s3cipid_t b, lc, rc;
-
-    E_INFO("Building within-word triphones\n");
-    ct->n_backoff_ci = 0;
-
-    ct->wwssid = (s3ssid_t **) ckd_calloc(dict->n_word, sizeof(s3ssid_t *));
-    for (w = 0; w < dict->n_word; w++) {
-        pronlen = dict->word[w].pronlen;
-        if (pronlen >= 3)
-            ct->wwssid[w] =
-                (s3ssid_t *) ckd_calloc(pronlen - 1, sizeof(s3ssid_t));
-        else
-            continue;
-
-        lc = dict->word[w].ciphone[0];
-        b = dict->word[w].ciphone[1];
-        for (l = 1; l < pronlen - 1; l++) {
-            rc = dict->word[w].ciphone[l + 1];
-            p = bin_mdef_phone_id_nearest(mdef, b, lc, rc, WORD_POSN_INTERNAL);
-            ct->wwssid[w][l] = bin_mdef_pid2ssid(mdef, p);
-            if ((!mdef->phone[b].info.ci.filler) && bin_mdef_is_ciphone(mdef, p))
-                ct->n_backoff_ci++;
-
-            lc = b;
-            b = rc;
-        }
-#if 0
-        printf("%-25s ", dict->word[w].word);
-        for (l = 1; l < pronlen - 1; l++)
-            printf(" %5d", ct->wwssid[w][l]);
-        printf("\n");
-#endif
-    }
-
-    E_INFO("%d within-word triphone instances mapped to CI-phones\n",
-           ct->n_backoff_ci);
-
-}
-
-/**
- * Build cross-word triphones map for the entire dictionary.
- */
-void
-build_xwdssid_map(ctxt_table_t * ct, dict_t * dict, bin_mdef_t * mdef)
-{
-    s3wid_t w;
-    int32 pronlen;
-    s3cipid_t b, lc, rc;
-    s3ssid_t *tmp_xwdssid;
-    uint8 *word_start_ci;
-    uint8 *word_end_ci;
-
-
-    ct->n_backoff_ci = 0;
-
-    /* Build cross-word triphone models */
-    E_INFO("Building cross-word triphones\n");
-
-    word_start_ci = (uint8 *) ckd_calloc(mdef->n_ciphone, sizeof(uint8));
-    word_end_ci = (uint8 *) ckd_calloc(mdef->n_ciphone, sizeof(uint8));
-
-    /* Mark word beginning and ending ciphones that occur in given dictionary */
-    for (w = 0; w < dict->n_word; w++) {
-        word_start_ci[dict->word[w].ciphone[0]] = 1;
-        word_end_ci[dict->word[w].ciphone[dict->word[w].pronlen - 1]] = 1;
-    }
-    ct->lcssid =
-        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
-    ct->rcssid =
-        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
-    ct->lrcssid =
-        (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
-    tmp_xwdssid = (s3ssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(s3ssid_t));
-
-    for (w = 0; w < dict->n_word; w++) {
-        pronlen = dict->word[w].pronlen;
-        if (pronlen > 1) {
-            /* Multi-phone word; build rcmap and lcmap if not already present */
-	    /* Right edge of word: rcmap */
-            b = dict->word[w].ciphone[pronlen - 1];
-            lc = dict->word[w].ciphone[pronlen - 2];
-            if (!ct->rcssid[b])
-                ct->rcssid[b] =
-                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
-                                             sizeof(xwdssid_t));
-            if (!ct->rcssid[b][lc].cimap)
-                build_rcssid(ct, b, lc, mdef,
-                             word_start_ci, tmp_xwdssid);
-
-            /* Left edge of word: lcmap */
-            b = dict->word[w].ciphone[0];
-            rc = dict->word[w].ciphone[1];
-            if (!ct->lcssid[b])
-                ct->lcssid[b] =
-                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
-                                             sizeof(xwdssid_t));
-            if (!ct->lcssid[b][rc].cimap)
-                build_lcssid(ct, b, rc, mdef,
-                             word_end_ci, tmp_xwdssid);
-
-        }
-        else {
-            /* Single-phone word; build lrcmap if not already present */
-            b = dict->word[w].ciphone[0];
-            if (!ct->lrcssid[b]) {
-                ct->lrcssid[b] =
-                    (xwdssid_t *) ckd_calloc(mdef->n_ciphone,
-                                             sizeof(xwdssid_t));
-                build_lrcssid(ct, b, mdef,
-                              word_start_ci, word_end_ci);
-            }
-        }
-    }
-
-    ckd_free(word_start_ci);
-    ckd_free(word_end_ci);
-    ckd_free(tmp_xwdssid);
-    E_INFO("%d cross-word triphones mapped to CI-phones\n",
-           ct->n_backoff_ci);
-
-#if 0
-    E_INFO("LCXWDSSID\n");
-    dump_xwdssidmap(ct->lcssid, mdef);
-
-    E_INFO("RCXWDSSID\n");
-    dump_xwdssidmap(ct->rcssid, mdef);
-
-    E_INFO("LRCXWDSSID\n");
-    dump_xwdssidmap(ct->lrcssid, mdef);
-#endif
-}
-
-ctxt_table_t *
-ctxt_table_init(dict_t * dict, bin_mdef_t * mdef)
-{
-    ctxt_table_t *ct;
-    ct = (ctxt_table_t *) ckd_calloc(1, sizeof(ctxt_table_t));
-
-    ct->n_ci = mdef->n_ciphone;
-    ct->n_word = dict->n_word;
-
-    build_wwssid(ct, dict, mdef);
-    build_xwdssid_map(ct, dict, mdef);
-
-    return ct;
-}
-
-void
-xwdssid_free(xwdssid_t **xs, int32 n_ci)
-{
-    s3cipid_t b, c;
-
-    if (xs == NULL)
-        return;
-    for (b = 0; b < n_ci; ++b) {
-        if (xs[b] == NULL)
-            continue;
-        for (c = 0; c < n_ci; ++c) {
-            ckd_free(xs[b][c].cimap);
-            ckd_free(xs[b][c].ssid);
-        }
-        ckd_free(xs[b]);
-    }
-    ckd_free(xs);
-}
-
-void
-ctxt_table_free(ctxt_table_t * ct)
-{
-    xwdssid_free(ct->lcssid, ct->n_ci);
-    xwdssid_free(ct->rcssid, ct->n_ci);
-    xwdssid_free(ct->lrcssid, ct->n_ci);
-
-    if (ct->wwssid) {
-        s3wid_t w;
-        for (w = 0; w < ct->n_word; ++w)
-            ckd_free(ct->wwssid[w]);
-        ckd_free(ct->wwssid);
-    }
-    ckd_free(ct);
-}
-
-s3cipid_t *
-get_rc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
-{
-    int32 pronlen;
-    s3cipid_t b, lc;
-
-    pronlen = dict->word[w].pronlen;
-    b = dict->word[w].ciphone[pronlen - 1];
-    if (pronlen == 1) {
-        /* No known left context.  But all cimaps (for any l) are identical; pick one */
-        return (ct->lrcssid[b][0].cimap);
-    }
-    else {
-        lc = dict->word[w].ciphone[pronlen - 2];
-        return (ct->rcssid[b][lc].cimap);
-    }
-}
-
-s3cipid_t *
-get_lc_cimap(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
-{
-    int32 pronlen;
-    s3cipid_t b, rc;
-
-    pronlen = dict->word[w].pronlen;
-    b = dict->word[w].ciphone[0];
-    if (pronlen == 1) {
-        /* No known right context.  But all cimaps (for any l) are identical; pick one */
-        return (ct->lrcssid[b][0].cimap);
-    }
-    else {
-        rc = dict->word[w].ciphone[1];
-        return (ct->lcssid[b][rc].cimap);
-    }
-}
-
-
-void
-get_rcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
-           dict_t * dict)
-{
-    int32 pronlen;
-    s3cipid_t b, lc;
-
-    pronlen = dict->word[w].pronlen;
-    assert(pronlen > 1);
-
-    b = dict->word[w].ciphone[pronlen - 1];
-    lc = dict->word[w].ciphone[pronlen - 2];
-
-    *ssid = ct->rcssid[b][lc].ssid;
-    *nssid = ct->rcssid[b][lc].n_ssid;
-}
-
-void
-get_lcssid(ctxt_table_t * ct, s3wid_t w, s3ssid_t ** ssid, int32 * nssid,
-           dict_t * dict)
-{
-    int32 pronlen;
-    s3cipid_t b, rc;
-
-    pronlen = dict->word[w].pronlen;
-    assert(pronlen > 1);
-
-    b = dict->word[w].ciphone[0];
-    rc = dict->word[w].ciphone[1];
-
-    *ssid = ct->lcssid[b][rc].ssid;
-    *nssid = ct->lcssid[b][rc].n_ssid;
-}
-
-int32
-ct_get_rc_nssid(ctxt_table_t * ct, s3wid_t w, dict_t * dict)
-{
-    int32 pronlen;
-    s3cipid_t b, lc;
-
-    pronlen = dict->word[w].pronlen;
-    b = dict->word[w].ciphone[pronlen - 1];
-    assert(ct);
-    assert(ct->lrcssid);
-    if (pronlen == 1) {
-        /* No known left context.  But all cimaps (for any l) are identical; pick one */
-        return (ct->lrcssid[b][0].n_ssid);
-    }
-    else {
-        lc = dict->word[w].ciphone[pronlen - 2];
-        return (ct->rcssid[b][lc].n_ssid);
-    }
-}

Deleted: trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	2010-01-02 06:36:15 UTC (rev 9590)
+++ trunk/pocketsphinx/src/libpocketsphinx/ctxt_table.h	2010-01-02 06:37:52 UTC (rev 9591)
@@ -1,449 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1995-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*
- * ctxt_table.h -- Phone Context Table Structure
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1995 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 14-Jul-05    ARCHAN (archan@...) at Carnegie Mellon Unversity 
- *              First created it. 
- *
- * $Log$
- * Revision 1.1  2006/04/05  20:27:30  dhdfu
- * A Great Reorganzation of header files and executables
- * 
- * Revision 1.2  2006/02/22 20:46:05  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: ctxt_table is a wrapper of the triphone context structure and its maniuplations which were used in flat_fwd.c .  The original flat_fwd.c was very long (3000) lines.  It was broken in 5 parts, ctxt_table is one of the 5.
- *
- * Revision 1.1.2.2  2005/09/27 07:39:17  arthchan2003
- * Added ctxt_table_free.
- *
- * Revision 1.1.2.1  2005/09/25 19:08:25  arthchan2003
- * Move context table from search to here.
- *
- * Revision 1.1.2.3  2005/09/07 23:32:03  arthchan2003
- * 1, Added get_lcpid in parrallel with get_rcpid. 2, Also fixed small mistakes in the macro.
- *
- * Revision 1.1.2.2  2005/07/17 05:42:27  arthchan2003
- * Added super-detailed comments ctxt_table.h. Also added dimension to the arrays that stores all context tables.
- *
- * Revision 1.1.2.1  2005/07/15 07:48:32  arthchan2003
- * split the hmm (whmm_t) and context building process (ctxt_table_t) from the the flat_fwd.c
- *
- *
- */
-
-/* 
- * \file ctxt_table.h
- * \brief data structure for building cross word triphones for Sphinx 3. 
- */
-
-#ifndef _CTX_TAB_
-#define _CTX_TAB_
-
-#include <prim_type.h>
-
-#include "s3types.h"
-#include "bin_mdef.h"
-#include "dict.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/**
- * Triphone information in the flat lexicon search in Sphinx 3.0
- * for all word hmm modelling broken up into 4 cases:
- * 	within-word triphones
- * 	left-context cross-word triphones (multi-phone words)
- * 	right-context cross-word triphones (multi-phone words)
- * 	left- and right-cross-word triphones (single-phone words)
- * These 4 cases captured by the following data structures.
- */
-
-/**
- * \struct xwdssid_t
- * \brief cross word triphone model structure 
- */
-
-typedef struct {
-    s3ssid_t  *ssid;	/**< Senone Sequence ID list for all context ciphones */
-    s3cipid_t *cimap;	/**< Index into ssid[] above for each ci phone */
-    int32     n_ssid;	/**< #Unique ssid in above, compressed ssid list */
-} xwdssid_t;
-
-
-#define ctxt_table_left_ctxt_ssid(ct,l,b,r)  ((ct)->lcssid[b][r].ssid[ct->lcssid[b][r].cimap[l]])
-#define ctxt_table_word_int_ssid(ct,wid,wpos)  ((ct)->wwssid[wid][wpos])
-#define ctxt_table_right_ctxt_ssid(ct,l,b,r)  ((ct)->rcssid[b][l].ssid[ct->rcssid[b][l].cimap[r]])
-#define ctxt_table_single_phone_ssid(ct,l,b,r)  ((ct)->lrcssid[b][l].ssid[ct->lrcssid[b][l].cimap[r]])
-
-/**
- * \struct ctxt_table_t 
- *
- * Ravi's Comment
- * First, the within word triphone models.  wwssid[w] = list of
- * senone sequences for word w.  Since left and right extremes
- * require cross-word modelling (see below), wwssid[w][0] and
- * wwssid[w][pronlen-1] contain no information and shouldn't be
- * touched.
- *
- * Left context mapping (for multiphone words): given the 1st base phone, b, of a word
- * and its right context, r, the senone sequence for any left context l =
- *     lcssid[b][r].ssid[lcssid[b][r].cimap[l]].
- * 
- * Similarly, right context mapping (for multiphone words): given b and left context l,
- * the senone sequence for any right context r =
- *     rcssid[b][l].ssid[lcssid[b][l].cimap[r]].
- * 
- * A single phone word is a combination of the above, where both l and r are unknown.
- * Senone sequence, given any l and r context ciphones:
- *     lrcssid[b][l].ssid[lcssid[b][l].cimap[r]].
- * For simplicity, all cimap[] vectors (for all l) must be identical.  For now, this is
- * attained by avoiding any compression and letting cimap be the identity map.
- *
- *
- * Note by ARCHAN at 20050715
- *
- * Ever wonder how cross word triphones in a search actually work? I
- * will guess sphinx 3.x is perhaps the best example of how
- * context-dependent phone is implemented. Either exact or approximation. 
- * 
- * The following is more a mental exercise that help all of you who
- * are not familiar with this part of programming and get you
- * understand what Ravi and I were actually do it.  (I used this note
- * to train myself when I tried to understand Ravi's code.)
- *
- * If you know some stuffs, you will know that the following are all
- * well-explored by some other people (I think), one can also use FSM
- * to implement most of the below so why bother? Well, it is always
- * not a bad idea to work things our from its simplest form.  I always
- * find insights when working things out step by step. Therefore I
- * believe you will find the following discussion be interesting. 
- *
- * First part, If you are into static allocation of a CD graph. 
- *
- * 0, Something very very trivial. In the case of word internal
- * triphone expansion, what will be the graph look like? Hmm. This
- * looks trivial but could already many block many people. I will
- * guess the reason is how CD phone is expressed is already something
- * very non-intuitive. For example, with base phone b, left context l,
- * right context r. Many will represent it as b(l,r), so I found it
- * pretty hard to understand.  So I prefer the following "tied-fighter"
- * representation for triphones
- * l<-b->r 
- *
- * For quinphones:
- * l2<-l1<-b->r1->r2
- *
- * For septaphone
- * l3<-l2<l1<-b->r1->r2->r3
- *
- * So for a ci-phone graph look like this
- *
- * -> ph1 -> ph2 -> ph3 -> 
- * -> ph4 -> ph5 -> ph6 ->
- * 
- * Then the ci phone graph will look like
- * -> (ph1->ph2) -> (ph1<-ph2->ph3) -> (ph2<-ph3) ->
- * -> (ph4->ph5) -> (ph4<-ph5->ph6) -> (ph5<-ph6) ->
- *
- * 1, Something trivial: In the case of full cross word triphone
- * expansion, how do you quickly decide which phone to expand?  Assume
- * you have an arbitrary polyphone with Base phone B, with L phone
- * context at the left and R phone context at the right (or a
- * (L+R+1)-phone).
- * 
- * Then what you need to do is just to look at all R phones right
- * after word begin.  And to look at all L phones before the word end.
- *
- * For example, In this two words case, AND: AE N D , BIT, B IY D. And
- * you consider triphone, i.e. L=1, R=1, then You know that the D in
- * "AE N D" needs to be expanded to the right.  As well as D in "B IY
- * D".  You will also know that AE in "AE N D" and B in "B IY D".  
- *
- * 2, Another something which is trivial, Once we know that a ci-phone
- * in a word need to be expanded.  How to expand then? The first thing
- * to remember is that context-dependent phone (triphone,quinphone,
- * setaphone) is a stupid approach.  It just tries to eliminate
- * things.  For example, when you know that the word-end phone need to
- * be expanded to the right by 2 contexts.  Then what you need to do
- * is to enumerate all possible 2 phones begins. 
- *
- * 3, Here comes a part which is slighly non-trivial.  This is related
- * to state-tying. What is the effect of having tied-state in the HMM
- * (or in CMU terminology, senone)? This is one of the fun-part. You
- * will come up with situations where the definition of state of a HMM
- * (means, variances) would be exactly the same as another state of a
- * HMM. (usually the same location.). So in some situations, one
- * triphone HMM could actually be exactly the same as another one. 
- *
- * Once you enumerate all possible contexts (either left or right),
- * then, you will find that some of them are actually the same because
- * of state-tying. So, here comes a process where we (CMU folks) call
- * it compression.  That is why in Sphinx's code, you will see a term
- * call "senone sequence ID". Which essentially means a unique HMM
- * instance that is shared by multiple expanded triphones.  You can
- * imagine this will be the same for quinphones or septaphones. 
- *
- * 4, What if we have a very short word?  Simple example is a
- * single-phone word in the case of triphone. How do we deal with
- * that? In a single word case for triphone expansion case, we just
- * need to enumerate all possible left **and** right context.  Then,
- * you will get everything you want. HTK's HVite will exactly handle
- * this. When I first read its code, I am very impressed. 
- * 
- * Now in general, how long of a word will be affected by
- * context-dependent phone expansion which has L left phone context
- * and R right phone context? Or we need to think of "a special case"
- * to consider both left and right context at the same time?  First,
- * consider what length of the word, the answer is trivial, if you
- * have a crossword n-phone, then if a word has less (n-2) phones,
- * then you need to consider both left and right context together. I
- * usually think in this way, this is case where the phone has totally
- * "covered" the whole word! 
- * 
- * An even more detail question, how many contexts one needs to expand
- * in position i of a word with m phones but we are using n-phone
- * expansion where m<=n-2? This is slightly tougher. This is how you
- * could think about it.  What you need to do to think you always need
- * to consider L left context and R right context. Let's just say they
- * are all right context for the sake of argument.  Then, for i=1 to
- * m, if m-i <= R, then you don't need to consider right context. else
- * you will need to consider R-(m-i) cross word context.  Similar
- * argument will work for left context. 
- *
- *
- * 5, Now make all together, the following is one way for you to
- * allocate a graph with CD phone or m-phone.  
- *
- * i, look at its length, if it is smaller than m-2, then use the
- * discussion in 4 to handle it. 
- *
- * ii, if it is larger than m-2, then 
- *     iia, identify all position which will have CD phone expansion
- *     iib, expand those which will not have CD phone expansion first
- *     iic then expand those which has CD phone expansion by enumerate
- *     its context. If it is at the right of the word begin, then
- *     consider all L phone combination at the word end.  Vice versa. 
- *
- * Most algorithm essentially just work in this way but this
- * simplistic views forgot the one important problem. After the phone
- * expanded, how do we link expanded CD phone together within a word?
- * There is no such problem at all in triphones because we just need
- * to consider the left-most or right most context.  So if you work on
- * quinphone for the first time, you will be slightly surprised. What
- * you got from a flat lexicon after quinphone expansion will be
- * actually a tree lexicon.  Why?
- *
- * Consider this example
- *
- * ph1 -> ph2 -> ph3 -> ph4 ->ph5
- *     -> ph2_2-> ......
- * ph6 -> ph7 -> ph8 -> ph9 ->ph10
- *     -> ph7_2-> ......
- *
- * If we just consider expansion to right context and we start the the
- * internal phone. Then we have
- *
- * Step 1
- * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> ph4 ->ph5
- *   |--> ph2_2-> ......
- * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> ph9 ->ph10
- *   |--> ph7_2-> ......
- * 
- * Step 2
- * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> (ph2<-ph3<-ph4->ph5->ph1) -> ph5
- *   |--> ph2_2-> ......                  |--> (ph2<-ph3<-ph4->ph5->ph6) -> ph5
- * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> (ph7<-ph8<-ph9->ph10->ph1)-> ph10
- *   |--> ph7_2-> ......                  |--> (ph7<-ph8<-ph9->ph10->ph1)-> ph10
- *
- * Step 3
- * ph1 -> ph2 -> (ph1<-ph2<-ph3->ph4->ph5)  -> (ph2<-ph3<-ph4->ph5->ph1) -> (ph3<-ph4<-ph5->ph1->ph2)
- *   |                                    |                           |---> (ph3<-ph4<-ph5->ph1->ph2_2)
- *   |--> ph2_2-> ......                  |--> (ph2<-ph3<-ph4->ph5->ph6) -> (ph3<-ph4<-ph5->ph6->ph7)
- *                                                                    |---> (ph3<-ph4<-ph5->6->ph7_2)
- * ph6 -> ph7 -> (ph6<-ph7<-ph8->ph9->ph10) -> (ph7<-ph8<-ph9->ph10->ph1)-> (ph8<-ph9->ph10->ph1->ph2 )
- *   |                                    |                           |---> (ph8<-ph9->ph10->ph1->ph2_2 )
- *   |--> ph7_2-> ......                  |--> (ph7<-ph8<-ph9->ph10->ph1)-> (ph8<-ph9->ph10->ph1->ph7) 
- *                                                                    |---> (ph8<-ph9->ph10->ph1->ph7_2 )
- *
- * See? A tree!
- *
- * So, here comes an important insight.  If there is a techniques that
- * could be used in lexical tree, it can also be used in cross word
- * triphones. Vice versa. Of course, there is small difference, but
- * this is one way you can understand algorithm in the field.  See XW
- * triphone lookahead below. 
- *
- * 6, We are almost done with static allocation. How about silence in
- * between the words? What should we do with them? This is actually a
- * simpler situation. As an approximation, you could treat silence not
- * as a word, then, you will avoid CD phone but a one phone word (sil
- * with sil as prounciation). Then, you could treat it just as another
- * left or right context. This is perhaps nice enough. 
- * 
- * 7, What we have done so far.  What we observe is how consideration
- * of context dependency complicates the search graph if we statically
- * allocate the tree.  No fast search algorithm will even bother to do
- * these things.  So, here we come an important aspects of search in
- * speech recognition.  i.e. For most of the time time, one could not
- * statically allocate the search graph with context-dependency. Most
- * of the context are dynamically allocated.  
- * 
- * Another important aspect is you will seldom see a good fast search
- * implement triphones to be exact because it usually causes too much
- * computation than necessary.  
- * 
- * So, we will spend more time on this in the second part.  This is
- * also more relate to your purpose, tracing the source code of Sphinx
- * 2 and Sphinx 3 to try to understand something out of it. 
- *
- * Second part, cross-word context-dependent phone in search in speech
- * recognition.
- *
- * 8, Types of approximation of triphones. 
- * 
- * 
- * 
- */
-
-typedef struct {
-    xwdssid_t **lcssid; /**< Left context phone id table 
-                           First dimension: basephone, 
-                           Second dimension: right context
-                        */
-  
-    xwdssid_t **rcssid; /**< right context phone id table 
-                           First dimension: basephone, 
-                           Second dimension: left context
-
-                        */
-    xwdssid_t **lrcssid; /**< left-right ntext phone id table 
-                            First dimension: basephone
-                            Second dimension: left context. 
-                         */
-
-
-    s3ssid_t **wwssid;  /**< Within word triphone models 
-                           First dimension: the word id
-                           Second dimension: the phone position. 
-                        */
-    int32 n_backoff_ci; /**< # of backoff CI phone */
-    int32 n_ci, n_word;
-} ctxt_table_t ;
-
-/**
- * Initialize a context table 
- */
-
-ctxt_table_t *ctxt_table_init(dict_t *dict,  /**< A dictionary*/
-			      bin_mdef_t *mdef   /**< A model definition*/
-    );
-
-/**
- * Uninitialize a context table
- */
-
-void ctxt_table_free(ctxt_table_t *ct); /**< Context Table */
-
-/**
- * Get the array of right context senone sequence ID for the last phone. 
- */
-void get_rcssid(ctxt_table_t *ct,   /**< A context table */
-                s3wid_t w,          /**< A word for query */
-                s3ssid_t **ssid,    /**< Out: An array of right context phone ID */
-                int32 *nssid,       /**< Out: Number of SSID */
-                dict_t *dict        /**< In: a dictionary */
-    );
-
-/**
- * Get the array of left context senone sequence ID for the first phone.
- */
-void get_lcssid(ctxt_table_t *ct,  /**< A context table */
-                s3wid_t w,         /**< A word for query */
-                s3ssid_t **ssid,    /**< Out: An array of right context SSID */
-                int32 *nssid,      /**< Out: Number of SSID */
-                dict_t *dict       /**< In: a dictionary */
-    );
-
-
-/**
- * Get the context-independent phone map for the last phone of a
- * parcitular word 
- * @return an array of ciphone ID. 
- */
-s3cipid_t *get_rc_cimap(ctxt_table_t *ct, /**< A context table */
-                        s3wid_t w, /**< A word for query*/
-                        dict_t *dict /**< A dictionary */
-    );
-
-/**
- * Get the context-independent phone map for the last phone of a
- * parcitular word 
- * @return an array of ciphone ID. 
- */
-s3cipid_t *get_lc_cimap(ctxt_table_t *ct, /**< A context table */
-                        s3wid_t w, /**< A word for query*/
-                        dict_t *dict /**< A dictionary */
-    );
-
-/**
- * Get number of right context for the last phone of a word. 
- * @return number of right context 
- *
- */
-int32 ct_get_rc_nssid(ctxt_table_t *ct,  /**< A context table */
-                      s3wid_t w,          /**< Word for query. */
-                      dict_t *dict        /**< A dictionary */
-    );
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /*_CTX_TAB_*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9592
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9592&view=rev
Author:   dhdfu
Date:     2010-01-02 06:38:14 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
deadc0de

Removed Paths:
-------------
    trunk/pocketsphinx/src/libpocketsphinx/fillpen.c
    trunk/pocketsphinx/src/libpocketsphinx/fillpen.h

Deleted: trunk/pocketsphinx/src/libpocketsphinx/fillpen.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fillpen.c	2010-01-02 06:37:52 UTC (rev 9591)
+++ trunk/pocketsphinx/src/libpocketsphinx/fillpen.c	2010-01-02 06:38:14 UTC (rev 9592)
@@ -1,184 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*
- * fillpen.c -- Filler penalties (penalties for words that do not show up in
- * the main LM.
- * 
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1996 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log$
- * Revision 1.6  2006/02/23  04:11:13  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: Added silprob and fillprob. Added fillpen_report.
- * 
- * Revision 1.5.4.1  2005/06/28 06:59:04  arthchan2003
- * Add silence probability and filler probability as members of fillpen_t, add reporting functions.
- *
- * Revision 1.5  2005/06/21 21:09:22  arthchan2003
- * 1, Fixed doxygen documentation. 2, Added  keyword.
- *
- * Revision 1.3  2005/03/30 01:22:46  archan
- * Fixed mistakes in last updates. Add
- *
- * 20-Apr-2001  Ricky Houghton (ricky.houghton@... or rhoughton@...)
- *              Added fillpen_free to free memory allocated by fillpen_init
- * 
- * 30-Dec-2000  Rita Singh (rsingh@...) at Carnegie Mellon University
- *		Removed language weight application to wip. To maintain
- *		comparability between s3decode and current decoder. Does
- *		not affect decoding performance.
- *
- * 24-Feb-2000	M K Ravishankar (rkm@...) at Carnegie Mellon University
- * 		Bugfix: Applied language weight to word insertion penalty.
- * 
- * 11-Oct-96	M K Ravishankar (rkm@...) at Carnegie Mellon University
- * 		Created.
- */
-
-
-#include "fillpen.h"
-
-fillpen_t *
-fillpen_init(dict_t * dict, const char *file, float64 silprob, float64 fillprob,
-             float64 lw, float64 wip, logmath_t *logmath)
-{
-    s3wid_t w, bw;
-    float64 prob;
-    FILE *fp;
-    char line[1024], wd[1024];
-    int32 k;
-    fillpen_t *_fillpen;
-
-    _fillpen = (fillpen_t *) ckd_calloc(1, sizeof(fillpen_t));
-
-    _fillpen->dict = dict;
-    _fillpen->lw = lw;
-    _fillpen->wip = wip;
-    _fillpen->silprob = silprob;
-    _fillpen->fillerprob = fillprob;
-    if (dict->filler_end >= dict->filler_start)
-        _fillpen->prob =
-            (int32 *) ckd_calloc(dict->filler_end - dict->filler_start + 1,
-                                 sizeof(int32));
-    else
-        _fillpen->prob = NULL;
-
-    /* Initialize all words with filler penalty (HACK!! backward compatibility) */
-    prob = fillprob;
-    for (w = dict->filler_start; w <= dict->filler_end; w++)
-    _fillpen->prob[w - dict->filler_start] =
-        (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
-
-    /* Overwrite silence penalty (HACK!! backward compatibility) */
-    w = dict_wordid(dict, S3_SILENCE_WORD);
-    if (NOT_S3WID(w) || (w < dict->filler_start) || (w > dict->filler_end))
-        E_FATAL("%s not a filler word in the given dictionary\n",
-                S3_SILENCE_WORD);
-    prob = silprob;
-    _fillpen->prob[w - dict->filler_start] =
-        (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
-
-    /* Overwrite with filler prob input file, if specified */
-    if (!file)
-        return _fillpen;
-
-    E_INFO("Reading filler penalty file: %s\n", file);
-    if ((fp = fopen(file, "r")) == NULL)
-        E_FATAL("fopen(%s,r) failed\n", file);
-    while (fgets(line, sizeof(line), fp) != NULL) {
-        if (line[0] == '#')     /* Skip comment lines */
-            continue;
-
-        k = sscanf(line, "%s %lf", wd, &prob);
-        if ((k != 0) && (k != 2))
-            E_FATAL("Bad input line: %s\n", line);
-        w = dict_wordid(dict, wd);
-        if (NOT_S3WID(w) || (w < dict->filler_start)
-            || (w > dict->filler_end))
-            E_FATAL("%s not a filler word in the given dictionary\n",
-                    S3_SILENCE_WORD);
-
-        _fillpen->prob[w - dict->filler_start] =
-            (int32) ((logmath_log(logmath, prob) * lw + logmath_log(logmath, wip)));
-    }
-    fclose(fp);
-
-    /* Replicate fillpen values for alternative pronunciations */
-    for (w = dict->filler_start; w <= dict->filler_end; w++) {
-        bw = dict_basewid(dict, w);
-        if (bw != w)
-            _fillpen->prob[w - dict->filler_start] =
-                _fillpen->prob[bw - dict->filler_start];
-    }
-
-    return _fillpen;
-}
-
-void
-fillpen_report(fillpen_t * f)
-{
-    E_INFO_NOFN("Initialization of fillpen_t, report:\n");
-    E_INFO_NOFN("Language weight =%f \n", f->lw);
-    E_INFO_NOFN("Word Insertion Penalty =%f \n", f->wip);
-    E_INFO_NOFN("Silence probability =%f \n", f->silprob);
-    E_INFO_NOFN("Filler probability =%f \n", f->fillerprob);
-    E_INFO_NOFN("\n");
-
-}
-
-int32
-fillpen(fillpen_t * f, s3wid_t w)
-{
-    assert((w >= f->dict->filler_start) && (w <= f->dict->filler_end));
-    return (f->prob[w - f->dict->filler_start]);
-}
-
-
-/* RAH, free memory allocated above */
-void
-fillpen_free(fillpen_t * f)
-{
-    if (f) {
-        if (f->prob)
-            ckd_free((void *) f->prob);
-        ckd_free((void *) f);
-    }
-}

Deleted: trunk/pocketsphinx/src/libpocketsphinx/fillpen.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fillpen.h	2010-01-02 06:37:52 UTC (rev 9591)
+++ trunk/pocketsphinx/src/libpocketsphinx/fillpen.h	2010-01-02 06:38:14 UTC (rev 9592)
@@ -1,159 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*
- * fillpen.c -- Filler penalties (penalties for words that do not show up in
- * the main LM.
- * 
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1996 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log$
- * Revision 1.1  2006/04/05  20:27:30  dhdfu
- * A Great Reorganzation of header files and executables
- * 
- * Revision 1.11  2006/02/23 04:11:13  arthchan2003
- * Merged from branch SPHINX3_5_2_RCI_IRII_BRANCH: Added silprob and fillprob. Added fillpen_report.
- *
- * Revision 1.10.4.2  2005/06/28 19:09:04  arthchan2003
- * Add declaration for fillpen_report.
- *
- * Revision 1.10.4.1  2005/06/28 06:59:04  arthchan2003
- * Add silence probability and filler probability as members of fillpen_t, add reporting functions.
- *
- * Revision 1.10  2005/06/21 21:09:22  arthchan2003
- * 1, Fixed doxygen documentation. 2, Added  keyword.
- *
- * Revision 1.4  2005/06/13 04:02:58  archan
- * Fixed most doxygen-style documentation under libs3decoder.
- *
- * Revision 1.3  2005/03/30 01:22:46  archan
- * Fixed mistakes in last updates. Add
- *
- * 
- * 11-Oct-96	M K Ravishankar (rkm@...) at Carnegie Mellon University
- * 		Created.
- */
-
-
-#ifndef _S3_FILLPEN_H_
-#define _S3_FILLPEN_H_
-
-#include <logmath.h>
-
-#include "s3types.h"
-#include "dict.h"
-
-
-/** \file fillpen.h
-    \brief Filler penalties, penalties for words that do not show up in
-    * the main LM.
-    */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-} /* Fool Emacs into not indenting things. */
-#endif
-
-
-typedef struct {
-    dict_t *dict;	/** Reference dictionary for which the filler word probabilities
-			    are maintained in this structure */
-    int32 *prob;	/** Filler word probability (in logs3 space, after
-			    langwt and inspen application) */
-    float64 lw;		/** Language weight */
-    float64 wip;	/** Word insertion penalty */
-
-    float64 silprob;      /** Probability of silence */
-    float64 fillerprob;      /** Probability of filler */
-} fillpen_t;
-
-
-/**
- * Initialize filler probabilities (penalties, whatever) module and return a pointer to the
- * structure created.  Filler word probabilities are simple unigram probabilities.  Here is an
- * example of such a file (one entry per line; a word and a probability):
- *   <sil>  0.10792
- *   <uh>   0.00866
- *   <um>   0.00147
- * If the first character in a line is a '#', the line is treated as a comment and ignored.
- * If no filler probabilities file is provided, the silence word gets silprob, and all other
- * filler words get fillprob.  As with the trigram LM, the resulting log-probabilities are
- * multiplied by a language weight and finally a word insertion penalty is tacked on.
- */
-fillpen_t *fillpen_init (dict_t *dict,	/**< In: Dictionary containing filler words */
-			 const char *file,	/**< In: Filler word probabilities file, if any */
-			 float64 silprob,	/**< In: Default probability for silence word */
-			 float64 fillprob,	/**< In: Default probability for non-silence filler
-						   words */
-			 float64 lw,		/**< In: Language weight (see lm.h) */
-			 float64 wip,		/**< In: Word insertion penalty (see lm.h) */
-			 logmath_t *logmath
-    );
-
-/**
- * Return the filler word probability for the given dictionary word-ID.
- */
-int32 fillpen(fillpen_t *f,	/**< In: Filler word probabilities structure */
-              s3wid_t w		/**< In: Dictionary word-ID of filler word */
-    );
-
-/**
-   Report the fillpen_t structure 
-*/
-void fillpen_report(fillpen_t *f        /**< In: Filler word probabilities structure */
-    );
-
-/* RAH 
-   free memory allocated by fillpen_init
-*/
-void fillpen_free (fillpen_t *f /**< A filler penalty structure */
-    );
-
-#if 0
-{ /* Stop indent from complaining */
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9596
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9596&view=rev
Author:   dhdfu
Date:     2010-01-04 01:56:53 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
report memory allocation in a few places

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
    trunk/pocketsphinx/src/libpocketsphinx/dict.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2010-01-02 22:25:51 UTC (rev 9595)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.c	2010-01-04 01:56:53 UTC (rev 9596)
@@ -170,9 +170,9 @@
         ++lc_idx;               /* Start of LC nodes (after CI nodes) */
         ++rc_idx;               /* STart of RC nodes (after wpos, CI, and LC nodes) */
     }
-    E_INFO
-        ("cd_tree: nodes %d wpos start 0 ci start %d lc start %d rc start %d\n",
-         nodes, ci_idx, lc_idx, rc_idx);
+    E_INFO("Allocating %d * %d bytes (%d KiB) for CD tree\n",
+           nodes, sizeof(*bmdef->cd_tree), 
+           nodes * sizeof(*bmdef->cd_tree) / 1024);
     bmdef->n_cd_tree = nodes;
     bmdef->cd_tree = ckd_calloc(nodes, sizeof(*bmdef->cd_tree));
     for (i = 0; i < N_WORD_POSN; ++i) {

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict.c	2010-01-02 22:25:51 UTC (rev 9595)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict.c	2010-01-04 01:56:53 UTC (rev 9596)
@@ -37,6 +37,7 @@
 
 #include <string.h>
 
+#include "pio.h"
 #include "strfuncs.h"
 #include "dict.h"
 
@@ -79,15 +80,13 @@
     s3wid_t newwid;
 
     if (d->n_word >= d->max_words) {
-        E_INFO
-            ("Dictionary max size (%d) exceeded; reallocate another entries %d \n",
-             d->max_words, S3DICT_INC_SZ);
+        E_INFO("Reallocating to %d KiB for word entries\n",
+               (d->max_words + S3DICT_INC_SZ) * sizeof(dictword_t) / 1024);
         d->word =
             (dictword_t *) ckd_realloc(d->word,
                                        (d->max_words +
                                         S3DICT_INC_SZ) * sizeof(dictword_t));
         d->max_words = d->max_words + S3DICT_INC_SZ;
-
         return (BAD_S3WID);
     }
 
@@ -140,24 +139,33 @@
 static int32
 dict_read(FILE * fp, dict_t * d)
 {
-    char line[16384], **wptr;
-    s3cipid_t p[4096];
+    lineiter_t *li;
+    char **wptr;
+    s3cipid_t *p;
     int32 lineno, nwd;
     s3wid_t w;
     int32 i, maxwd;
+    size_t stralloc, phnalloc;
 
-    maxwd = 4092;
+    maxwd = 512;
+    p = (s3cipid_t *) ckd_calloc(maxwd + 4, sizeof(*p));
     wptr = (char **) ckd_calloc(maxwd, sizeof(char *)); /* Freed below */
 
     lineno = 0;
-    while (fgets(line, sizeof(line), fp) != NULL) {
+    stralloc = phnalloc = 0;
+    for (li = lineiter_start(fp); li; li = lineiter_next(li)) {
         lineno++;
-        if (line[0] == '#')     /* Comment line */
+        if (li->buf[0] == '#')     /* Comment line */
             continue;
 
-        if ((nwd = str2words(line, wptr, maxwd)) < 0)
-            E_FATAL("str2words(%s) failed; Increase maxwd from %d\n", line,
-                    maxwd);
+        if ((nwd = str2words(li->buf, wptr, maxwd)) < 0) {
+            /* Increase size of p, wptr. */
+            nwd = str2words(li->buf, NULL, 0);
+            assert(nwd > maxwd); /* why else would it fail? */
+            maxwd = nwd;
+            p = (s3cipid_t *) ckd_realloc(p, (maxwd + 4) * sizeof(*p));
+            wptr = (char **) ckd_realloc(wptr, maxwd * sizeof(*wptr));
+        }
 
         if (nwd == 0)           /* Empty line */
             continue;
@@ -168,6 +176,7 @@
             continue;
         }
 
+
         /* Convert pronunciation string to CI-phone-ids */
         for (i = 1; i < nwd; i++) {
             p[i - 1] = dict_ciphone_id(d, wptr[i]);
@@ -184,8 +193,13 @@
                 E_ERROR
                     ("Line %d: dict_add_word (%s) failed (duplicate?); ignored\n",
                      lineno, wptr[0]);
+            stralloc += strlen(d->word[w].word);
+            phnalloc += d->word[w].pronlen * sizeof(s3cipid_t);
         }
     }
+    E_INFO("Allocated %d KiB for strings, %d KiB for phones\n",
+           (int)stralloc / 1024, (int)phnalloc / 1024);
+    ckd_free(p);
     ckd_free(wptr);
 
     return 0;
@@ -196,7 +210,7 @@
 {
     FILE *fp, *fp2;
     int32 n;
-    char line[1024];
+    lineiter_t *li;
     dict_t *d;
     s3cipid_t sil;
     char const *dictfile = cmd_ln_str_r(config, "-dict");
@@ -210,8 +224,8 @@
     if ((fp = fopen(dictfile, "r")) == NULL)
         E_FATAL_SYSTEM("fopen(%s,r) failed\n", dictfile);
     n = 0;
-    while (fgets(line, sizeof(line), fp) != NULL) {
-        if (line[0] != '#')
+    for (li = lineiter_start(fp); li; li = lineiter_next(li)) {
+        if (li->buf[0] != '#')
             n++;
     }
     rewind(fp);
@@ -221,8 +235,8 @@
         if ((fp2 = fopen(fillerfile, "r")) == NULL)
             E_FATAL_SYSTEM("fopen(%s,r) failed\n", fillerfile);
 
-        while (fgets(line, sizeof(line), fp2) != NULL) {
-            if (line[0] != '#')
+        for (li = lineiter_start(fp2); li; li = lineiter_next(li)) {
+            if (li->buf[0] != '#')
                 n++;
         }
         rewind(fp2);
@@ -240,6 +254,9 @@
         E_FATAL("#Words in dictionaries (%d) exceeds limit (%d)\n", n,
                 MAX_S3WID);
 
+    E_INFO("Allocating %d * %d bytes (%d KiB) for word entries\n",
+           d->max_words, sizeof(dictword_t),
+           d->max_words * sizeof(dictword_t) / 1024);
     d->word = (dictword_t *) ckd_calloc(d->max_words, sizeof(dictword_t));      /* freed in dict_free() */
     d->n_word = 0;
     d->mdef = bin_mdef_retain(mdef);

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-02 22:25:51 UTC (rev 9595)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-04 01:56:53 UTC (rev 9596)
@@ -86,6 +86,7 @@
     s3ssid_t *rmap;
     s3ssid_t *tmpssid;
     s3cipid_t *tmpcimap;
+    size_t alloc;
 
     n_ci = mdef->n_ciphone;
 
@@ -94,16 +95,15 @@
 
     d2p->rssid =
         (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
+    alloc = mdef->n_ciphone * sizeof(xwdssid_t *);
 
     for (b = 0; b < n_ci; b++) {
-
         d2p->rssid[b] =
             (xwdssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t));
+        alloc += mdef->n_ciphone * sizeof(xwdssid_t);
 
         for (l = 0; l < n_ci; l++) {
-
             rmap = rdiph_rc[b][l];
-
             compress_table(rmap, tmpssid, tmpcimap, mdef->n_ciphone);
 
             for (r = 0; r < mdef->n_ciphone && tmpssid[r] != BAD_S3SSID;
@@ -124,10 +124,11 @@
                 d2p->rssid[b][l].cimap = NULL;
                 d2p->rssid[b][l].n_ssid = 0;
             }
-
         }
     }
 
+    E_INFO("Allocated %d bytes (%d KiB) for word-final triphones\n",
+           (int)alloc, (int)alloc / 1024);
     ckd_free(tmpssid);
     ckd_free(tmpcimap);
 }
@@ -140,6 +141,7 @@
     s3ssid_t *rmap;
     s3ssid_t *tmpssid;
     s3cipid_t *tmpcimap;
+    size_t alloc;
 
     n_ci = mdef->n_ciphone;
 
@@ -150,11 +152,13 @@
 
     d2p->lrssid =
         (xwdssid_t **) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t *));
+    alloc = mdef->n_ciphone * sizeof(xwdssid_t *);
 
     for (b = 0; b < n_ci; b++) {
 
         d2p->lrssid[b] =
             (xwdssid_t *) ckd_calloc(mdef->n_ciphone, sizeof(xwdssid_t));
+        alloc += mdef->n_ciphone * sizeof(xwdssid_t);
 
         for (l = 0; l < n_ci; l++) {
             rmap = d2p->lrdiph_rc[b][l];
@@ -186,7 +190,8 @@
     ckd_free(tmpssid);
     ckd_free(tmpcimap);
 
-
+    E_INFO("Allocated %d bytes (%d KiB) for single-phone word triphones\n",
+           (int)alloc, (int)alloc / 1024);
 }
 
 /**
@@ -238,12 +243,8 @@
         lc = dict->word[w].ciphone[pronlen - 2];
         return (d2p->rssid[b][lc].cimap);
     }
-
 }
 
-
-
-
 static void
 free_compress_map(xwdssid_t ** tree, int32 n_ci)
 {
@@ -274,8 +275,14 @@
     dict2pid = (dict2pid_t *) ckd_calloc(1, sizeof(dict2pid_t));
 
     dict2pid->n_dictsize = dict_size(dict);
+    E_INFO("Allocating %d * %d bytes (%d KiB) for word-internal arrays\n",
+           dict_size(dict), sizeof(s3ssid_t *),
+           dict_size(dict) * sizeof(s3ssid_t *) / 1024);
     dict2pid->internal =
         (s3ssid_t **) ckd_calloc(dict_size(dict), sizeof(s3ssid_t *));
+    E_INFO("Allocating %d^3 * %d bytes (%d KiB) for word-initial triphones\n",
+           mdef->n_ciphone, sizeof(s3ssid_t),
+           mdef->n_ciphone * mdef->n_ciphone * mdef->n_ciphone * sizeof(s3ssid_t) / 1024);
     dict2pid->ldiph_lc =
         (s3ssid_t ***) ckd_calloc_3d(mdef->n_ciphone, mdef->n_ciphone,
                                      mdef->n_ciphone, sizeof(s3ssid_t));
@@ -300,6 +307,8 @@
         n += (pronlen == 1 ? 0 : pronlen - 2);
     }
 
+    E_INFO("Allocating %d entries of %d bytes (%d KiB) for internal ssids\n",
+           n, sizeof(s3ssid_t), n * sizeof(s3ssid_t) / 1024);
     internal = (s3ssid_t *) ckd_calloc(n, sizeof(s3ssid_t));
 
     /* Track which diphones / ciphones have been seen. */

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-02 22:25:51 UTC (rev 9595)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.h	2010-01-04 01:56:53 UTC (rev 9596)
@@ -154,7 +154,9 @@
 				*/
 
     /*Notice the order of the arguments */
-
+    /* FIXME: This is crying out for compression - in Mandarin we have
+     * 180 context independent phones, which makes this an 11MB
+     * array. */
     s3ssid_t ***ldiph_lc;	/**< For multi-phone words, [base][rc][lc] -> ssid; filled out for
 				   word-initial base x rc combinations in current vocabulary */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9606
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9606&view=rev
Author:   dhdfu
Date:     2010-01-05 21:46:47 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Switch the remaining direct access to ldiph_lc over to a macro.  At
the very least we'll do the same compress for left contexts as we do
for right ones, as it's really necessary for mandarin.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
    trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-05 17:34:15 UTC (rev 9605)
+++ trunk/pocketsphinx/src/libpocketsphinx/dict2pid.c	2010-01-05 21:46:47 UTC (rev 9606)
@@ -338,7 +338,8 @@
             }
 
             /* Now find ssids for all the word internal triphones and
-             * place them in internal[i].  */
+             * place them in internal[i].  FIXME: This is so totally
+             * not necessary and a big waste of memory. */
             for (i = 1; i < pronlen - 1; i++) {
                 l = b;
                 b = r;

Modified: trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-05 17:34:15 UTC (rev 9605)
+++ trunk/pocketsphinx/src/libpocketsphinx/fsg_lextree.c	2010-01-05 21:46:47 UTC (rev 9606)
@@ -461,7 +461,7 @@
                 rc = dict_pron(lextree->dict, dictwid, 1);
                 for (i = 0; lclist[i] >= 0; i++) {
                     lc = lclist[i];
-                    ssid = lextree->d2p->ldiph_lc[ci][rc][lc];
+                    ssid = dict2pid_ldiph_lc(lextree->d2p, ci, rc, lc);
                     /* Compression is not done by d2p, so we do it
                      * here.  This might be slow, but it might not
                      * be... we'll see. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9644
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9644&view=rev
Author:   dhdfu
Date:     2010-01-12 19:28:11 +0000 (Tue, 12 Jan 2010)

Log Message:
-----------
built in support for phonetically tied mixtures (but not optimized yet, still)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/acmod.c
    trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
    trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c
    trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/acmod.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/acmod.c	2010-01-12 19:28:11 UTC (rev 9644)
@@ -117,7 +117,7 @@
     }
     else {
         E_INFO("Falling back to general multi-stream GMM computation\n");
-        acmod->mgau = ms_mgau_init(acmod->config, acmod->lmath);
+        acmod->mgau = ms_mgau_init(acmod->config, acmod->lmath, acmod->mdef);
     }
     if (acmod->mgau == NULL)
         return -1;

Modified: trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/bin_mdef.h	2010-01-12 19:28:11 UTC (rev 9644)
@@ -159,6 +159,8 @@
 #define bin_mdef_pid2ssid(m,p)		((m)->phone[p].ssid)
 #define bin_mdef_pid2tmatid(m,p)	((m)->phone[p].tmat)
 #define bin_mdef_silphone(m)		((m)->sil)
+/* FIXME: Should be noted that almost nothing uses this, and it is problematic in other ways */
+#define bin_mdef_sen2cimap(m,s)		((m)->sen2cimap[s])
 #define bin_mdef_sseq2sen(m,ss,pos)	((m)->sseq[ss][pos])
 #define bin_mdef_pid2ci(m,p)		(((p) < (m)->n_ciphone) ? (p) \
                                          : (m)->phone[p].info.cd.ctx[0])

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.c	2010-01-12 19:28:11 UTC (rev 9644)
@@ -79,7 +79,7 @@
 };
 
 ps_mgau_t *
-ms_mgau_init(cmd_ln_t *config, logmath_t *lmath)
+ms_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef)
 {
     /* Codebooks */
     ms_mgau_model_t *msg;
@@ -99,7 +99,8 @@
     msg->s = senone_init(msg->g,
 			 cmd_ln_str_r(config, "-mixw"),
                          cmd_ln_str_r(config, "-senmgau"),
-			 cmd_ln_float32_r(config, "-mixwfloor"), lmath);
+			 cmd_ln_float32_r(config, "-mixwfloor"),
+                         lmath, mdef);
 
     g = ms_mgau_gauden(msg);
     s = ms_mgau_senone(msg);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_mgau.h	2010-01-12 19:28:11 UTC (rev 9644)
@@ -103,6 +103,7 @@
 
 /* Local headers. */
 #include "acmod.h"
+#include "bin_mdef.h"
 #include "ms_gauden.h"
 #include "ms_senone.h"
 
@@ -126,7 +127,7 @@
 #define ms_mgau_senone(msg) (msg->s)
 #define ms_mgau_topn(msg) (msg->topn)
 
-ps_mgau_t* ms_mgau_init(cmd_ln_t *config, logmath_t *lmath);
+ps_mgau_t* ms_mgau_init(cmd_ln_t *config, logmath_t *lmath, bin_mdef_t *mdef);
 void ms_mgau_free(ps_mgau_t *g);
 int32 ms_cont_mgau_frame_eval(ps_mgau_t * msg,
                               int16 *senscr,

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_senone.c	2010-01-12 19:28:11 UTC (rev 9644)
@@ -1,3 +1,4 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* ====================================================================
  * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
  * reserved.
@@ -283,7 +284,7 @@
 
 senone_t *
 senone_init(gauden_t *g, char const *mixwfile, char const *sen2mgau_map_file,
-	    float32 mixwfloor, logmath_t *lmath)
+	    float32 mixwfloor, logmath_t *lmath, bin_mdef_t *mdef)
 {
     senone_t *s;
     int32 n = 0, i;
@@ -295,6 +296,7 @@
     s->n_gauden = g->n_mgau;
     if (sen2mgau_map_file) {
 	if (!(strcmp(sen2mgau_map_file, ".semi.") == 0
+	      || strcmp(sen2mgau_map_file, ".ptm.") == 0
 	      || strcmp(sen2mgau_map_file, ".cont.") == 0)) {
 	    senone_mgau_map_read(s, sen2mgau_map_file);
 	    n = s->n_sen;
@@ -303,6 +305,8 @@
     else {
 	if (s->n_gauden == 1)
 	    sen2mgau_map_file = ".semi.";
+	else if (s->n_gauden == bin_mdef_n_ciphone(mdef))
+	    sen2mgau_map_file = ".ptm.";
 	else
 	    sen2mgau_map_file = ".cont.";
     }
@@ -311,18 +315,27 @@
 
     if (strcmp(sen2mgau_map_file, ".semi.") == 0) {
         /* All-to-1 senones-codebook mapping */
+	E_INFO("Mapping all senones to one codebook\n");
         s->mgau = (uint32 *) ckd_calloc(s->n_sen, sizeof(*s->mgau));
     }
+    else if (strcmp(sen2mgau_map_file, ".ptm.") == 0) {
+        /* All-to-ciphone-id senones-codebook mapping */
+	E_INFO("Mapping senones to context-independent phone codebooks\n");
+        s->mgau = (uint32 *) ckd_calloc(s->n_sen, sizeof(*s->mgau));
+        for (i = 0; i < s->n_sen; i++)
+	    s->mgau[i] = bin_mdef_sen2cimap(mdef, i);
+    }
     else if (strcmp(sen2mgau_map_file, ".cont.") == 0
              || strcmp(sen2mgau_map_file, ".s3cont.") == 0) {
         /* 1-to-1 senone-codebook mapping */
+	E_INFO("Mapping senones to individual codebooks\n");
         if (s->n_sen <= 1)
             E_FATAL("#senone=%d; must be >1\n", s->n_sen);
 
         s->mgau = (uint32 *) ckd_calloc(s->n_sen, sizeof(*s->mgau));
         for (i = 0; i < s->n_sen; i++)
             s->mgau[i] = i;
-
+	/* Not sure why this is here, it probably does nothing. */
         s->n_gauden = s->n_sen;
     }
     else {

Modified: trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h	2010-01-12 18:54:26 UTC (rev 9643)
+++ trunk/pocketsphinx/src/libpocketsphinx/ms_senone.h	2010-01-12 19:28:11 UTC (rev 9644)
@@ -118,6 +118,7 @@
 
 /* Local headers. */
 #include "ms_gauden.h"
+#include "bin_mdef.h"
 
 /** \file ms_senone.h
  *  \brief (Sphinx 3.0 specific) multiple streams senones. used with ms_gauden.h
@@ -174,7 +175,8 @@
 						   senone to mixture gaussian codebook.
 						   If NULL all senones map to codebook 0 */
 		       float32 mixwfloor,	/**< In: Floor value for senone weights */
-                       logmath_t *lmath         /**< In: log math computation */
+                       logmath_t *lmath,        /**< In: log math computation */
+                       bin_mdef_t *mdef         /**< In: model definition */
     );
 
 /** Release memory allocated by senone_init. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9704
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9704&view=rev
Author:   dhdfu
Date:     2010-02-15 23:05:10 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
add some safeguards against segfaulting in pathological situations

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
    trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2010-02-15 21:38:27 UTC (rev 9703)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search.c	2010-02-15 23:05:10 UTC (rev 9704)
@@ -354,12 +354,16 @@
     int32 w, prev_bp;
     bptbl_t *be;
 
+    assert(bp != NO_BP);
+
     be = &(ngs->bp_table[bp]);
     prev_bp = bp;
     w = be->wid;
 
     while (dict_filler_word(ps_search_dict(ngs), w)) {
         prev_bp = ngs->bp_table[prev_bp].bp;
+        if (prev_bp == NO_BP)
+            return;
         w = ngs->bp_table[prev_bp].wid;
     }
 
@@ -397,6 +401,12 @@
         int32 i, rcsize, *bss;
         bptbl_t *be;
 
+        /* This might happen if recognition fails. */
+        if (ngs->bpidx == NO_BP) {
+            E_ERROR("No entries in backpointer table!");
+            return;
+        }
+
         /* Expand the backpointer tables if necessary. */
         if (ngs->bpidx >= ngs->bp_table_size) {
             ngs->bp_table_size *= 2;
@@ -1107,6 +1117,11 @@
 
     ngs = (ngram_search_t *)search;
 
+    /* If the best score is WORST_SCORE or worse, there is no way to
+     * make a lattice. */
+    if (ngs->best_score == WORST_SCORE || ngs->best_score WORSE_THAN WORST_SCORE)
+        return NULL;
+
     /* Check to see if a lattice has previously been created over the
      * same number of frames, and reuse it if so. */
     if (search->dag && search->dag->n_frames == ngs->n_frame)

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2010-02-15 21:38:27 UTC (rev 9703)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdflat.c	2010-02-15 23:05:10 UTC (rev 9704)
@@ -769,7 +769,11 @@
     /* Mark backpointer table for current frame. */
     ngram_search_mark_bptable(ngs, frame_idx);
 
-    /* Renormalize if necessary (FIXME: Make sure to test this) */
+    /* If the best score is equal to or worse than WORST_SCORE,
+     * recognition has failed, don't bother to keep trying. */
+    if (ngs->best_score == WORST_SCORE || ngs->best_score WORSE_THAN WORST_SCORE)
+        return 0;
+    /* Renormalize if necessary */
     if (ngs->best_score + (2 * ngs->beam) WORSE_THAN WORST_SCORE) {
         E_INFO("Renormalizing Scores at frame %d, best score %d\n",
                frame_idx, ngs->best_score);

Modified: trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2010-02-15 21:38:27 UTC (rev 9703)
+++ trunk/pocketsphinx/src/libpocketsphinx/ngram_search_fwdtree.c	2010-02-15 23:05:10 UTC (rev 9704)
@@ -871,6 +871,9 @@
     /* If best LM score and bp for candidate known use it, else sort cands by startfrm */
     E_DEBUG(3, ("n_lastphn_cand %d\n", ngs->n_lastphn_cand));
     for (i = 0, candp = ngs->lastphn_cand; i < ngs->n_lastphn_cand; i++, candp++) {
+        /* This can happen if recognition fails. */
+        if (candp->bp == -1)
+            continue;
         /* Backpointer entry for it. */
         bpe = &(ngs->bp_table[candp->bp]);
 
@@ -879,7 +882,6 @@
             ngram_search_exit_score
             (ngs, bpe, dict_first_phone(ps_search_dict(ngs), candp->wid));
         E_DEBUG(4, ("candp->score %d\n", candp->score));
-        E_DEBUG(4, ("candp->score %d\n", candp->score));
 
         /*
          * If this candidate not occurred in an earlier frame, prepare for finding
@@ -1416,7 +1418,11 @@
     /* Mark backpointer table for current frame. */
     ngram_search_mark_bptable(ngs, frame_idx);
 
-    /* Renormalize if necessary (FIXME: Make sure to test this) */
+    /* If the best score is equal to or worse than WORST_SCORE,
+     * recognition has failed, don't bother to keep trying. */
+    if (ngs->best_score == WORST_SCORE || ngs->best_score WORSE_THAN WORST_SCORE)
+        return 0;
+    /* Renormalize if necessary */
     if (ngs->best_score + (2 * ngs->beam) WORSE_THAN WORST_SCORE) {
         E_INFO("Renormalizing Scores at frame %d, best score %d\n",
                frame_idx, ngs->best_score);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9768
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9768&view=rev
Author:   dhdfu
Date:     2010-03-01 14:34:45 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Remove kd-trees.  They might come back in the future, but this implementation wasn't very good.

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
    trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Removed Paths:
-------------
    trunk/pocketsphinx/src/libpocketsphinx/kdtree.c
    trunk/pocketsphinx/src/libpocketsphinx/kdtree.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/Makefile.am
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2010-03-01 10:24:40 UTC (rev 9767)
+++ trunk/pocketsphinx/src/libpocketsphinx/Makefile.am	2010-03-01 14:34:45 UTC (rev 9768)
@@ -14,7 +14,6 @@
 	fsg_lextree.c				\
 	fsg_search.c				\
 	hmm.c					\
-	kdtree.c				\
 	mdef.c					\
 	ms_gauden.c				\
 	ms_mgau.c				\

Deleted: trunk/pocketsphinx/src/libpocketsphinx/kdtree.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/kdtree.c	2010-03-01 10:24:40 UTC (rev 9767)
+++ trunk/pocketsphinx/src/libpocketsphinx/kdtree.c	2010-03-01 14:34:45 UTC (rev 9768)
@@ -1,302 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 2005 Carnegie Mellon University.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*********************************************************************
- *
- * File: kdtree.c
- * 
- * Description: 
- * 	Implement kd-trees using the BBI algorithm as detailed in
- * 	J. Frisch and I. Rogina, "The Bucket Box Intersection
- * 	Algorithm for fast approximate evaluation of Diagonal Mixture
- * 	Gaussians", Proceedings of ICASSP 1996.
- *
- * Author: 
- * 	David Huggins-Daines <dhuggins@...>
- *********************************************************************/
-
-/* System headers. */
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-
-/* SphinxBase headers. */
-#include <sphinx_config.h>
-#include <err.h>
-#include <ckd_alloc.h>
-#include <strfuncs.h>
-
-/* Local headers. */
-#include "kdtree.h"
-#include "s2_semi_mgau.h"
-
-#define KDTREE_VERSION 1
-
-static int32
-read_tree_int(FILE * fp, const char *name, int32 * out, int32 optional)
-{
-    char line[256];
-    int n;
-
-    n = fscanf(fp, "%255s %d", line, out);
-    if ((optional == 0 && n != 2) || strcmp(line, name)) {
-        E_ERROR("%s not found: %d %s %d\n", name, n, line, out);
-        return -1;
-    }
-    return n;
-}
-
-static int32
-read_tree_float(FILE * fp, const char *name, float32 * out, int32 optional)
-{
-    char line[256];
-    char outbuf[256];
-    int n;
-
-    n = fscanf(fp, "%255s %255s", line, outbuf);
-    if ((optional == 0 && n != 2) || strcmp(line, name)) {
-        E_ERROR("%s not found: %d %s %s\n", name, n, line, outbuf);
-        return -1;
-    }
-    *out = atof_c(outbuf);
-    return n;
-}
-
-static int32
-read_bbi_list(FILE * fp, kd_tree_node_t * node, int32 maxbbi)
-{
-    uint8 bbi_list[256];
-    int bbi, nbbi = 0, nr;
-
-    if (maxbbi == -1)
-        maxbbi = 256;
-    if ((nr = read_tree_int(fp, "bbi", &bbi, TRUE)) < 0)
-        return -1;
-    if (nr > 1) {
-        if (bbi >= 256) {
-            E_ERROR("BBI Gaussian %d out of range! %d\n", bbi);
-            return -1;
-        }
-        bbi_list[0] = bbi;
-        nbbi = 1;
-        while (fscanf(fp, "%d", &bbi) > 0) {
-            if (feof(fp))
-                break;
-            if (bbi >= 256) {
-                E_ERROR("BBI Gaussian %d out of range!\n", bbi);
-                return -1;
-            }
-            if (nbbi < maxbbi)
-                bbi_list[nbbi++] = bbi;
-        }
-    }
-    if (node == NULL)
-        return 0;
-    if (nbbi > maxbbi)
-        nbbi = maxbbi;
-    node->n_bbi = nbbi;
-    if (nbbi) {
-        node->bbi = ckd_calloc(node->n_bbi, sizeof(*node->bbi));
-        memcpy(node->bbi, bbi_list, node->n_bbi * sizeof(*node->bbi));
-    }
-    return 0;
-}
-
-static int32
-read_kd_nodes(FILE * fp, kd_tree_t * tree, uint32 maxdepth, int32 maxbbi)
-{
-    uint32 i, j, in, out;
-    int32 ilevel, olevel;
-
-    /* Balanced binary trees, so we have 2^nlevels-1 nodes. */
-    if (maxdepth == 0 || maxdepth > tree->n_level)
-        maxdepth = tree->n_level;
-    in = (1 << tree->n_level) - 1;
-    out = (1 << maxdepth) - 1;
-    tree->nodes = ckd_calloc(out, sizeof(kd_tree_node_t));
-
-    /* Nodes are read in depth-first ordering. */
-    for (j = i = 0; i < in; ++i) {
-        float32 split_plane;
-        int32 split_comp;
-
-        if (read_tree_int(fp, "NODE", &ilevel, FALSE) < 0)
-            break;
-        if (read_tree_int(fp, "split_comp", &split_comp, FALSE) < 0)
-            return -1;
-        if (read_tree_float(fp, "split_plane", &split_plane, FALSE) < 0)
-            return -1;
-        olevel = ilevel - (tree->n_level - maxdepth);
-        if (olevel > 0) {
-            /* Only create a node if we are above maxdepth */
-            assert(j < out);
-            tree->nodes[j].split_comp = split_comp;
-            tree->nodes[j].split_plane = FLOAT2MFCC(split_plane);
-            /* We only need the BBI list for leafnodes now. */
-            if (olevel == 1) {
-                if (read_bbi_list(fp, tree->nodes + j, maxbbi) < 0)
-                    return -1;
-            }
-            else {
-                if (read_bbi_list(fp, NULL, 0) < 0)
-                    return -1;
-            }
-            /* They are also full trees, hence: */
-            if (olevel > 1) {
-                tree->nodes[j].left = j + 1;
-                tree->nodes[j].right = j + (1 << (olevel - 1));
-            }
-            ++j;
-        }
-        else {                  /* Have to read the BBI list anyway. */
-            if (read_bbi_list(fp, NULL, 0) < 0)
-                return -1;
-        }
-    }
-    E_INFO("Read %d nodes\n", j);
-
-    return 0;
-}
-
-int32
-read_kd_trees(const char *infile, kd_tree_t *** out_trees,
-              uint32 * out_n_trees, uint32 maxdepth, int32 maxbbi)
-{
-    FILE *fp;
-    char line[256];
-    int n, version;
-    uint32 i;
-
-    if ((fp = fopen(infile, "r")) == NULL) {
-        E_ERROR("Failed to open %s", infile);
-        return -1;
-    }
-    n = fscanf(fp, "%256s", line);
-    if (n != 1 || strcmp(line, "KD-TREES")) {
-        E_ERROR("%s doesn't appear to be a kd-tree file: %s\n",
-                infile, line);
-        return -1;
-    }
-    n = fscanf(fp, "%256s %d", line, &version);
-    if (n != 2 || strcmp(line, "version") || version > KDTREE_VERSION) {
-        E_ERROR("Unsupported kd-tree file format %s %d\n", line, version);
-        return -1;
-    }
-    if (read_tree_int(fp, "n_trees", (int32 *)out_n_trees, FALSE) < 0)
-        return -1;
-
-    *out_trees = ckd_calloc(*out_n_trees, sizeof(kd_tree_t **));
-    for (i = 0; i < *out_n_trees; ++i) {
-        kd_tree_t *tree;
-        uint32 n_density;
-        float32 threshold;
-
-        if (read_tree_int(fp, "TREE", &n, FALSE) < 0)
-            goto error_out;
-        if (n != i) {
-            E_ERROR("Tree number %d out of sequence\n", n);
-            goto error_out;
-        }
-
-        E_INFO("Reading tree for feature %d\n", i);
-        (*out_trees)[i] = tree = ckd_calloc(1, sizeof(*tree));
-        if (read_tree_int(fp, "n_density", (int32 *)&n_density, FALSE) < 0)
-            goto error_out;
-        if (n_density > 256) {
-            E_ERROR("Number of densities (%d) must be <= 256!\n", n_density);
-            goto error_out;
-        }
-        if (read_tree_int(fp, "n_comp", (int32 *)&tree->n_comp, FALSE) < 0)
-            goto error_out;
-        if (read_tree_int(fp, "n_level", (int32 *)&tree->n_level, FALSE) < 0)
-            goto error_out;
-        if (tree->n_level > 16) {
-            E_ERROR("Depth of tree (%d) must be < 16!\n", tree->n_level);
-            goto error_out;
-        }
-        if (read_tree_float(fp, "threshold", &threshold, FALSE) < 0)
-            goto error_out;
-        E_INFO("n_density %d n_comp %d n_level %d threshold %f\n",
-               n_density, tree->n_comp, tree->n_level, threshold);
-        if (read_kd_nodes(fp, tree, maxdepth, maxbbi) < 0)
-            goto error_out;
-        if (maxdepth)
-            tree->n_level = maxdepth;
-    }
-    fclose(fp);
-    return 0;
-
-  error_out:
-    fclose(fp);
-    for (i = 0; i < *out_n_trees; ++i) {
-        free_kd_tree((*out_trees)[i]);
-        (*out_trees)[i] = NULL;
-    }
-    ckd_free(*out_trees);
-    *out_trees = NULL;
-    return -1;
-}
-
-void
-free_kd_tree(kd_tree_t * tree)
-{
-    uint32 i, n;
-
-    if (tree == NULL)
-        return;
-    /* Balanced binary trees, so we have 2^level-1 nodes. */
-    n = (1 << tree->n_level) - 1;
-    for (i = 0; i < n; ++i)
-        ckd_free(tree->nodes[i].bbi);
-    ckd_free(tree->nodes);
-    ckd_free(tree);
-}
-
-kd_tree_node_t *
-eval_kd_tree(kd_tree_t * tree, mfcc_t * feat, uint32 maxdepth)
-{
-    uint32 node;
-
-    node = 0;                   /* Root of tree. */
-    while (tree->nodes[node].left && --maxdepth > 0) {
-        if (feat[tree->nodes[node].split_comp]
-            < tree->nodes[node].split_plane)
-            node = tree->nodes[node].left;
-        else
-            node = tree->nodes[node].right;
-    }
-    return tree->nodes + node;
-}

Deleted: trunk/pocketsphinx/src/libpocketsphinx/kdtree.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/kdtree.h	2010-03-01 10:24:40 UTC (rev 9767)
+++ trunk/pocketsphinx/src/libpocketsphinx/kdtree.h	2010-03-01 14:34:45 UTC (rev 9768)
@@ -1,75 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 Carnegie Mellon University.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ====================================================================
- *
- */
-/*********************************************************************
- *
- * File: kdtree.h
- * 
- * Description: Cut-down kd-trees for Sphinx2 decoding
- * 
- * Author: David Huggins-Daines <dhuggins@...>
- * 
- *********************************************************************/
-
-#ifndef __KDTREE_H__
-#define __KDTREE_H__
-
-/* SphinxBase headers. */
-#include <fixpoint.h>
-#include <fe.h>
-#include <prim_type.h>
-
-/* Local headers.  */
-#include "vector.h"
-
-typedef struct kd_tree_node_s kd_tree_node_t;
-struct kd_tree_node_s {
-	uint8 *bbi; /* BBI list of intersecting Gaussians */
-	mfcc_t split_plane;
-	uint16 n_bbi, split_comp;
-	uint16 left, right; /* Indices of left and right child nodes */
-};
-typedef struct kd_tree_s kd_tree_t;
-struct kd_tree_s {
-	uint32 n_nodes, n_level, n_comp;
-	kd_tree_node_t *nodes;
-};
-
-int32 read_kd_trees(const char *infile, kd_tree_t ***out_trees, uint32 *out_n_trees,
-		    uint32 maxdepth, int32 maxbbi);
-void free_kd_tree(kd_tree_t *tree);
-kd_tree_node_t *eval_kd_tree(kd_tree_t *tree, mfcc_t *feat, uint32 maxdepth);
-
-#endif /* __KDTREE_H__ */

Modified: trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2010-03-01 10:24:40 UTC (rev 9767)
+++ trunk/pocketsphinx/src/libpocketsphinx/pocketsphinx.c	2010-03-01 14:34:45 UTC (rev 9768)
@@ -100,7 +100,6 @@
         ps_add_file(ps, "-tmat", hmmdir, "transition_matrices");
         ps_add_file(ps, "-mixw", hmmdir, "mixture_weights");
         ps_add_file(ps, "-sendump", hmmdir, "sendump");
-        ps_add_file(ps, "-kdtree", hmmdir, "kdtrees");
         ps_add_file(ps, "-fdict", hmmdir, "noisedict");
         ps_add_file(ps, "-lda", hmmdir, "feature_transform");
         ps_add_file(ps, "-featparams", hmmdir, "feat.params");

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2010-03-01 10:24:40 UTC (rev 9767)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h	2010-03-01 14:34:45 UTC (rev 9768)
@@ -100,8 +100,6 @@
                             int32 compallsen);
 int s2_semi_mgau_mllr_transform(ps_mgau_t *s,
                                 ps_mllr_t *mllr);
-int s2_semi_mgau_load_kdtree(ps_mgau_t *s, const char *kdtree_path,
-                             uint32 maxdepth, int32 maxbbi);
 
 
 #endif /*  __S2_SEMI_MGAU_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9773
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9773&view=rev
Author:   dhdfu
Date:     2010-03-03 02:57:00 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
Revert ill-considered multiple codebook support in here.  Best to keep
PTM computation separate at least for now as it has different
requirements (i.e. we need to do more sophisticated GMM and Gaussian
selection for it)

Modified Paths:
--------------
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
    trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.h

Modified: trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c
===================================================================
--- trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2010-03-03 02:20:35 UTC (rev 9772)
+++ trunk/pocketsphinx/src/libpocketsphinx/s2_semi_mgau.c	2010-03-03 02:57:00 UTC (rev 9773)
@@ -151,12 +151,12 @@
 }
 
 static void
-eval_topn(s2_semi_mgau_t *s, int cb, int feat, mfcc_t *z)
+eval_topn(s2_semi_mgau_t *s, int32 feat, mfcc_t *z)
 {
     int i, ceplen;
     vqFeature_t *topn;
 
-    topn = s->f[cb][feat];
+    topn = s->f[feat];
     ceplen = s->veclen[feat];
 
     for (i = 0; i < s->max_topn; i++) {
@@ -167,9 +167,9 @@
         int32 cw, j;
 
         cw = topn[i].codeword;
-        mean = s->means[cb][feat][cw];
-        var = s->vars[cb][feat][cw];
-        d = s->dets[cb][feat][cw];
+        mean = s->means[feat][0] + cw * ceplen;
+        var = s->vars[feat][0] + cw * ceplen;
+        d = s->dets[feat][cw];
         obs = z;
         for (j = 0; j < ceplen; j++) {
             diff = *obs++ - *mean++;
@@ -190,18 +190,18 @@
 }
 
 static void
-eval_cb(s2_semi_mgau_t *s, int cb, int feat, mfcc_t *z)
+eval_cb(s2_semi_mgau_t *s, int32 feat, mfcc_t *z)
 {
     vqFeature_t *worst, *best, *topn;
     mfcc_t *mean;
     mfcc_t *var, *det, *detP, *detE;
     int32 i, ceplen;
 
-    best = topn = s->f[cb][feat];
+    best = topn = s->f[feat];
     worst = topn + (s->max_topn - 1);
-    mean = s->means[cb][feat][0];
-    var = s->vars[cb][feat][0];
-    det = s->dets[cb][feat];
+    mean = s->means[feat][0];
+    var = s->vars[feat][0];
+    det = s->dets[feat];
     detE = det + s->n_density;
     ceplen = s->veclen[feat];
 
@@ -247,66 +247,67 @@
 }
 
 static void
-mgau_dist(s2_semi_mgau_t * s, int frame, int cb, int feat, mfcc_t * z)
+mgau_dist(s2_semi_mgau_t * s, int32 frame, int32 feat, mfcc_t * z)
 {
-    eval_topn(s, cb, feat, z);
+    eval_topn(s, feat, z);
 
     /* If this frame is skipped, do nothing else. */
     if (frame % s->ds_ratio)
         return;
 
-    eval_cb(s, cb, feat, z);
+    /* Evaluate the rest of the codebook (or subset thereof). */
+    eval_cb(s, feat, z);
 }
 
 static int
-mgau_norm(s2_semi_mgau_t *s, int cb, int feat)
+mgau_norm(s2_semi_mgau_t *s, int feat)
 {
     int32 norm;
     int j;
 
     /* Compute quantized normalizing constant. */
-    norm = s->f[cb][feat][0].score >> SENSCR_SHIFT;
+    norm = s->f[feat][0].score >> SENSCR_SHIFT;
 
     /* Normalize the scores, negate them, and clamp their dynamic range. */
     for (j = 0; j < s->max_topn; ++j) {
-        s->f[cb][feat][j].score = -((s->f[cb][feat][j].score >> SENSCR_SHIFT) - norm);
-        if (s->f[cb][feat][j].score > MAX_NEG_ASCR)
-            s->f[cb][feat][j].score = MAX_NEG_ASCR;
-        if (s->topn_beam[feat] && s->f[cb][feat][j].score > s->topn_beam[feat])
+        s->f[feat][j].score = -((s->f[feat][j].score >> SENSCR_SHIFT) - norm);
+        if (s->f[feat][j].score > MAX_NEG_ASCR)
+            s->f[feat][j].score = MAX_NEG_ASCR;
+        if (s->topn_beam[feat] && s->f[feat][j].score > s->topn_beam[feat])
             break;
     }
     return j;
 }
 
 static int32
-get_scores_8b_feat_6(s2_semi_mgau_t * s, int cb, int i,
+get_scores_8b_feat_6(s2_semi_mgau_t * s, int i,
                      int16 *senone_scores, uint8 *senone_active,
                      int32 n_senone_active)
 {
     int32 j, l;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3, *pid_cw4, *pid_cw5;
 
-    pid_cw0 = s->mixw[i][s->f[cb][i][0].codeword];
-    pid_cw1 = s->mixw[i][s->f[cb][i][1].codeword];
-    pid_cw2 = s->mixw[i][s->f[cb][i][2].codeword];
-    pid_cw3 = s->mixw[i][s->f[cb][i][3].codeword];
-    pid_cw4 = s->mixw[i][s->f[cb][i][4].codeword];
-    pid_cw5 = s->mixw[i][s->f[cb][i][5].codeword];
+    pid_cw0 = s->mixw[i][s->f[i][0].codeword];
+    pid_cw1 = s->mixw[i][s->f[i][1].codeword];
+    pid_cw2 = s->mixw[i][s->f[i][2].codeword];
+    pid_cw3 = s->mixw[i][s->f[i][3].codeword];
+    pid_cw4 = s->mixw[i][s->f[i][4].codeword];
+    pid_cw5 = s->mixw[i][s->f[i][5].codeword];
 
     for (l = j = 0; j < n_senone_active; j++) {
         int sen = senone_active[j] + l;
-        int32 tmp = pid_cw0[sen] + s->f[cb][i][0].score;
+        int32 tmp = pid_cw0[sen] + s->f[i][0].score;
 
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw1[sen] + s->f[cb][i][1].score);
+                               pid_cw1[sen] + s->f[i][1].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw2[sen] + s->f[cb][i][2].score);
+                               pid_cw2[sen] + s->f[i][2].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw3[sen] + s->f[cb][i][3].score);
+                               pid_cw3[sen] + s->f[i][3].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw4[sen] + s->f[cb][i][4].score);
+                               pid_cw4[sen] + s->f[i][4].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw5[sen] + s->f[cb][i][5].score);
+                               pid_cw5[sen] + s->f[i][5].score);
 
         senone_scores[sen] += tmp;
         l = sen;
@@ -315,31 +316,31 @@
 }
 
 static int32
-get_scores_8b_feat_5(s2_semi_mgau_t * s, int cb, int i,
+get_scores_8b_feat_5(s2_semi_mgau_t * s, int i,
                      int16 *senone_scores, uint8 *senone_active,
                      int32 n_senone_active)
 {
     int32 j, l;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3, *pid_cw4;
 
-    pid_cw0 = s->mixw[i][s->f[cb][i][0].codeword];
-    pid_cw1 = s->mixw[i][s->f[cb][i][1].codeword];
-    pid_cw2 = s->mixw[i][s->f[cb][i][2].codeword];
-    pid_cw3 = s->mixw[i][s->f[cb][i][3].codeword];
-    pid_cw4 = s->mixw[i][s->f[cb][i][4].codeword];
+    pid_cw0 = s->mixw[i][s->f[i][0].codeword];
+    pid_cw1 = s->mixw[i][s->f[i][1].codeword];
+    pid_cw2 = s->mixw[i][s->f[i][2].codeword];
+    pid_cw3 = s->mixw[i][s->f[i][3].codeword];
+    pid_cw4 = s->mixw[i][s->f[i][4].codeword];
 
     for (l = j = 0; j < n_senone_active; j++) {
         int sen = senone_active[j] + l;
-        int32 tmp = pid_cw0[sen] + s->f[cb][i][0].score;
+        int32 tmp = pid_cw0[sen] + s->f[i][0].score;
 
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw1[sen] + s->f[cb][i][1].score);
+                               pid_cw1[sen] + s->f[i][1].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw2[sen] + s->f[cb][i][2].score);
+                               pid_cw2[sen] + s->f[i][2].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw3[sen] + s->f[cb][i][3].score);
+                               pid_cw3[sen] + s->f[i][3].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw4[sen] + s->f[cb][i][4].score);
+                               pid_cw4[sen] + s->f[i][4].score);
 
         senone_scores[sen] += tmp;
         l = sen;
@@ -348,28 +349,28 @@
 }
 
 static int32
-get_scores_8b_feat_4(s2_semi_mgau_t * s, int cb, int i,
+get_scores_8b_feat_4(s2_semi_mgau_t * s, int i,
                      int16 *senone_scores, uint8 *senone_active,
                      int32 n_senone_active)
 {
     int32 j, l;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2, *pid_cw3;
 
-    pid_cw0 = s->mixw[i][s->f[cb][i][0].codeword];
-    pid_cw1 = s->mixw[i][s->f[cb][i][1].codeword];
-    pid_cw2 = s->mixw[i][s->f[cb][i][2].codeword];
-    pid_cw3 = s->mixw[i][s->f[cb][i][3].codeword];
+    pid_cw0 = s->mixw[i][s->f[i][0].codeword];
+    pid_cw1 = s->mixw[i][s->f[i][1].codeword];
+    pid_cw2 = s->mixw[i][s->f[i][2].codeword];
+    pid_cw3 = s->mixw[i][s->f[i][3].codeword];
 
     for (l = j = 0; j < n_senone_active; j++) {
         int sen = senone_active[j] + l;
-        int32 tmp = pid_cw0[sen] + s->f[cb][i][0].score;
+        int32 tmp = pid_cw0[sen] + s->f[i][0].score;
 
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw1[sen] + s->f[cb][i][1].score);
+                               pid_cw1[sen] + s->f[i][1].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw2[sen] + s->f[cb][i][2].score);
+                               pid_cw2[sen] + s->f[i][2].score);
         tmp = fast_logmath_add(s->lmath_8b, tmp,
-                               pid_cw3[sen] + s->f[cb][i][3].score);
+                               pid_cw3[sen] + s->f[i][3].score);
 
         senone_scores[sen] += tmp;
         l = sen;
@@ -378,25 +379,25 @@
 }
 
 static int32
-get_scores_8b_feat_3(s2_semi_mgau_t * s, int cb, int i,
+get_scores_8b_feat_3(s2_semi_mgau_t * s, int i,
                      int16 *senone_scores, uint8 *senone_active,
                      int32 n_senone_active)
 {
     int32 j, l;
     uint8 *pid_cw0, *pid_cw1, *pid_cw2;
 
-    pid_cw0 = s->mixw[i][s->f[cb][i][0].codeword];
-    pid_cw1 = s->mixw[i][s->f[cb][i][1].codeword];
-    pid_cw2 = s->mixw[i][s->f[cb][i][2].codeword];
+    pid_cw0 = s->mixw[i][