[Julius-cvs 857] CVS update: julius4/libjulius/src

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2013年 6月 21日 (金) 14:24:26 JST


Index: julius4/libjulius/src/mbr.c
diff -u julius4/libjulius/src/mbr.c:1.2 julius4/libjulius/src/mbr.c:1.3
--- julius4/libjulius/src/mbr.c:1.2	Fri Jun 21 02:02:29 2013
+++ julius4/libjulius/src/mbr.c	Fri Jun 21 14:24:26 2013
@@ -14,11 +14,11 @@
  * @author Hiroaki NANJO, Ryo FURUTANI
  * @date   28 March 2011
  *
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  * 
  */
 /*
- * Copyright (c) 2010-2013 NANJO lab. Ryukoku University
+ * Copyright (c) 2011-2013 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -207,6 +207,21 @@
   return d;
 }
 
+static float
+get_weight(WORD_INFO *winfo, WORD_ID id)
+{
+  float val;
+
+  if (winfo->weight) {
+    /* word-level weight exist, return the value */
+    val = winfo->weight[id];
+  } else {
+    /* no word-level weight, return default value */
+    val = 1.0;
+  }
+  return val;
+}
+
 
 /** 
  * <JA>
@@ -246,19 +261,19 @@
 
       if(d[now].r == 1){
 	/* Deletion error */
-	error1 += winfo->weight[a->seq[i - 1]];
+	error1 += get_weight(winfo, a->seq[i - 1]);
 	i--;
       }
       else if(d[now].r == 2){
 	/* Insertion error */
-	error2 += winfo->weight[b->seq[j - 1]];
+	error2 += get_weight(winfo, b->seq[j - 1]);
 	j--;
       }
       else if(d[now].r == 3){
 	if(d[now].c == 1){
 	  /* Substitution error */
-	  error1 += winfo->weight[a->seq[i - 1]];
-	  error2 += winfo->weight[b->seq[j - 1]];
+	  error1 += get_weight(winfo, a->seq[i - 1]);
+	  error2 += get_weight(winfo, b->seq[j - 1]);
 	}
 	else if(d[now].c == 0){
 	  /* Correct word */
Index: julius4/libjulius/src/version.c.in
diff -u julius4/libjulius/src/version.c.in:1.11 julius4/libjulius/src/version.c.in:1.12
--- julius4/libjulius/src/version.c.in:1.11	Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/version.c.in	Fri Jun 21 14:24:26 2013
@@ -14,7 +14,7 @@
  * @author Akinobu Lee
  * @date   Mon Sep 12 01:34:15 2005
  *
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  * 
  */
 /*
@@ -231,8 +231,8 @@
   fprintf(strm, " PowerReject");
 #endif
 
-#ifdef USE_MBR
-  fprintf(strm," MBR");
+#ifndef USE_MBR
+  fprintf(strm," NoMBR");
 #endif
 
   fprintf(strm, "\n");



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る