sumom****@users*****
sumom****@users*****
2013年 6月 12日 (水) 18:48:26 JST
Index: julius4/libjulius/include/julius/extern.h
diff -u julius4/libjulius/include/julius/extern.h:1.20 julius4/libjulius/include/julius/extern.h:1.21
--- julius4/libjulius/include/julius/extern.h:1.20 Tue Oct 9 20:25:21 2012
+++ julius4/libjulius/include/julius/extern.h Wed Jun 12 18:48:26 2013
@@ -12,7 +12,7 @@
* @author Akinobu LEE
* @date Mon Mar 7 23:19:14 2005
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
*/
/*
@@ -327,7 +327,27 @@
boolean mfc_module_end(MFCCCalc *mfcc);
int mfc_module_read(MFCCCalc *mfcc, int *new_t);
char *mfc_module_input_name(MFCCCalc *mfcc);
+#ifdef USE_MBR
+
+/**
+ *
+ * Update 21 October 2010
+ *
+ * MBR Expansion Hiroaki NANJO
+ * Ryo FURUTANI
+ *
+ **/
+
+/* mbr.c */
+void candidate_mbr(NODE **r_start, NODE **r_bottom, int r_stacknum, RecogProcess *r);
+
+/**
+ *
+ * MBR Expansion End
+ *
+ **/
+#endif
#ifdef __cplusplus
}
#endif
Index: julius4/libjulius/include/julius/jconf.h
diff -u julius4/libjulius/include/julius/jconf.h:1.16 julius4/libjulius/include/julius/jconf.h:1.17
--- julius4/libjulius/include/julius/jconf.h:1.16 Wed Jun 12 18:02:36 2013
+++ julius4/libjulius/include/julius/jconf.h Wed Jun 12 18:48:26 2013
@@ -23,7 +23,7 @@
* @author Akinobu Lee
* @date Fri Feb 16 13:42:28 2007
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
*/
/*
@@ -791,6 +791,41 @@
} sw;
+#ifdef USE_MBR
+
+ /**
+ *
+ * Update 7 March 2011
+ *
+ * MBR Expansion Hiroaki NANJO
+ * Ryo FURUTANI
+ *
+ **/
+
+ struct {
+
+ /* Rescoring sentence on MBR (-mbr) */
+ boolean use_mbr;
+
+ /* Use word weight on MBR (-mbr_wwer) */
+ boolean use_word_weight;
+
+ /* Likelihood weight */
+ float score_weight;
+
+ /* Loss function weight */
+ float loss_weight;
+
+ } mbr;
+
+ /**
+ *
+ * MBR Expansion End
+ *
+ **/
+
+#endif
+
/* pointer to next instance */
struct __jconf_search__ *next;
Index: julius4/libjulius/include/julius/recog.h
diff -u julius4/libjulius/include/julius/recog.h:1.18 julius4/libjulius/include/julius/recog.h:1.19
--- julius4/libjulius/include/julius/recog.h:1.18 Wed Jun 12 18:02:36 2013
+++ julius4/libjulius/include/julius/recog.h Wed Jun 12 18:48:26 2013
@@ -70,7 +70,7 @@
* @author Akinobu Lee
* @date Fri Feb 16 13:42:28 2007
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
*/
/*
@@ -333,6 +333,27 @@
int gram_id; ///< The grammar ID this sentence belongs to for DFA
SentenceAlign *align;
+#ifdef USE_MBR
+
+ /**
+ *
+ * Update 19 October 2010
+ *
+ * MBR Expansion Hiroaki NANJO
+ * Ryo FURUTANI
+ *
+ **/
+
+ LOGPROB score_mbr; ///< MBR score
+
+ /**
+ *
+ * MBR Expansion End
+ *
+ **/
+
+#endif
+
} Sentence;
/**
Index: julius4/libjulius/include/julius/search.h
diff -u julius4/libjulius/include/julius/search.h:1.4 julius4/libjulius/include/julius/search.h:1.5
--- julius4/libjulius/include/julius/search.h:1.4 Fri Jul 27 17:44:49 2012
+++ julius4/libjulius/include/julius/search.h Wed Jun 12 18:48:26 2013
@@ -29,7 +29,7 @@
* @author Akinobu Lee
* @date Wed Sep 07 07:40:11 2005
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
*/
/*
@@ -130,6 +130,26 @@
struct __recogprocess__ *region; ///> Where this node belongs to
+#ifdef USE_MBR
+
+ /**
+ *
+ * Update 19 October 2010
+ *
+ * MBR Expansion Hiroaki NANJO
+ * Ryo FURUTANI
+ *
+ **/
+
+ float score_mbr; ///< MBR score
+
+ /**
+ *
+ * MBR Expansion End
+ *
+ **/
+
+#endif
} NODE;
/*
@@ -164,4 +184,36 @@
===============================================================
*/
+#ifdef USE_MBR
+
+/**
+ *
+ * Update 21 October 2010
+ *
+ * MBR Expansion Hiroaki NANJO
+ * Ryo FURUTANI
+ *
+ **/
+
+/**
+ * <JA>
+ * DPマッチングで使うノード
+ * </JA>
+ */
+typedef struct {
+
+ int d; // 最短距離
+ int r; // 遷移元 1=Ins. 2=Del. 3=Sub. or Cor.
+ int c; // r=3とした場合の遷移コスト 1=Sub. 0=Cor.
+} DP;
+
+
+/**
+ *
+ * MBR Expansion End
+ *
+ **/
+
+#endif
+
#endif /* __J_SEARCH_H__ */