CMU Sphinx

Revision: 8934
          http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=8934&view=rev
Author:   dhdfu
Date:     2009-01-19 20:52:32 +0000 (Mon, 19 Jan 2009)

Log Message:
-----------
fix n-gram iterators a bit

Modified Paths:
--------------
    trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c

Modified: trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c
===================================================================
--- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c	2009-01-18 00:55:30 UTC (rev 8933)
+++ trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c	2009-01-19 20:52:32 UTC (rev 8934)
@@ -316,7 +316,7 @@
     switch (bitor->m) {
     case 0:
         /* This indicates no successors (FIXME: make sure this is true!) */
-        if (itor->ug->bo_wt1.l == 0)
+        if (itor->ug->bo_wt1.l == 0 && itor->ug->bigrams == 0)
             goto done;
         /* Start iterating from first bigram successor of from->ug. */
         itor->bg = model->lm3g.bigrams + itor->ug->bigrams;
@@ -361,7 +361,10 @@
         break;
     case 1:
         *out_score = model->lm3g.prob2[itor->bg->prob2].l;
-        *out_bowt = model->lm3g.bo_wt2[itor->bg->bo_wt2].l;
+        if (model->lm3g.bo_wt2)
+            *out_bowt = model->lm3g.bo_wt2[itor->bg->bo_wt2].l;
+        else
+            *out_bowt = 0;
         break;
     case 2:
         *out_score = model->lm3g.prob3[itor->tg->prob3].l;


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

[Cmusphinx-commits] SF.net SVN: cmusphinx:[9832] trunk/sphinxbase/src/libsphinxbase/lm/ lm3g_templates.c From: <dhdfu@us...> - 2010-03-09 11:35 Revision: 9832 http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9832&view=rev Author: dhdfu Date: 2010-03-09 11:35:25 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Impossible conditions, or so one would imagine Modified Paths: -------------- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c Modified: trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c =================================================================== --- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-09 11:34:46 UTC (rev 9831) +++ trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-09 11:35:25 UTC (rev 9832) @@ -533,6 +533,9 @@ goto done; } + assert(itor->ug - model->lm3g.unigrams < base->model->n_counts[0]); + assert(itor->bg - model->lm3g.bigrams < base->model->n_counts[1]); + assert(itor->tg - model->lm3g.trigrams < base->model->n_counts[2]); return (ngram_iter_t *)itor; done: ngram_iter_free(base); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cmusphinx-commits] SF.net SVN: cmusphinx:[9847] trunk/sphinxbase/src/libsphinxbase/lm/ lm3g_templates.c From: <dhdfu@us...> - 2010-03-12 01:38 Revision: 9847 http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9847&view=rev Author: dhdfu Date: 2010-03-12 01:38:13 +0000 (Fri, 12 Mar 2010) Log Message: ----------- do not crash if lm2 is -1 Modified Paths: -------------- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c Modified: trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c =================================================================== --- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-12 00:34:15 UTC (rev 9846) +++ trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-12 01:38:13 UTC (rev 9847) @@ -164,7 +164,7 @@ trigram_t *tg; tginfo_t *tginfo, *prev_tginfo; - if ((base->n < 3) || (lw1 < 0)) + if ((base->n < 3) || (lw1 < 0) || (lw2 < 0)) return (lm3g_bg_score(model, lw2, lw3, n_used)); prev_tginfo = NULL; @@ -223,7 +223,7 @@ static int32 lm3g_template_raw_score(ngram_model_t *base, int32 wid, - int32 *history, int32 n_hist, + int32 *history, int32 n_hist, int32 *n_used) { NGRAM_MODEL_TYPE *model = (NGRAM_MODEL_TYPE *)base; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cmusphinx-commits] SF.net SVN: cmusphinx:[9906] trunk/sphinxbase/src/libsphinxbase/lm/ lm3g_templates.c From: <dhdfu@us...> - 2010-03-23 01:39 Revision: 9906 http://cmusphinx.svn.sourceforge.net/cmusphinx/?rev=9906&view=rev Author: dhdfu Date: 2010-03-23 01:39:38 +0000 (Tue, 23 Mar 2010) Log Message: ----------- these asserts turn out to be really bogus, and break when iterating on a 2g model NOTE: 0.6BRANCH (!!!) Modified Paths: -------------- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c Modified: trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c =================================================================== --- trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-23 00:59:29 UTC (rev 9905) +++ trunk/sphinxbase/src/libsphinxbase/lm/lm3g_templates.c 2010-03-23 01:39:38 UTC (rev 9906) @@ -533,9 +533,6 @@ goto done; } - assert(itor->ug - model->lm3g.unigrams < base->model->n_counts[0]); - assert(itor->bg - model->lm3g.bigrams < base->model->n_counts[1]); - assert(itor->tg - model->lm3g.trigrams < base->model->n_counts[2]); return (ngram_iter_t *)itor; done: ngram_iter_free(base); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

18 messages have been excluded from this view by a project administrator.