sumom****@users*****
sumom****@users*****
2013年 6月 21日 (金) 02:02:29 JST
Index: julius4/libjulius/include/julius/extern.h
diff -u julius4/libjulius/include/julius/extern.h:1.21 julius4/libjulius/include/julius/extern.h:1.22
--- julius4/libjulius/include/julius/extern.h:1.21 Wed Jun 12 18:48:26 2013
+++ julius4/libjulius/include/julius/extern.h Fri Jun 21 02:02:29 2013
@@ -12,7 +12,7 @@
* @author Akinobu LEE
* @date Mon Mar 7 23:19:14 2005
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
*/
/*
@@ -328,25 +328,8 @@
int mfc_module_read(MFCCCalc *mfcc, int *new_t);
char *mfc_module_input_name(MFCCCalc *mfcc);
#ifdef USE_MBR
-
-/**
- *
- * Update 21 October 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
/* mbr.c */
void candidate_mbr(NODE **r_start, NODE **r_bottom, int r_stacknum, RecogProcess *r);
-
-/**
- *
- * MBR Expansion End
- *
- **/
-
#endif
#ifdef __cplusplus
}
Index: julius4/libjulius/include/julius/jconf.h
diff -u julius4/libjulius/include/julius/jconf.h:1.17 julius4/libjulius/include/julius/jconf.h:1.18
--- julius4/libjulius/include/julius/jconf.h:1.17 Wed Jun 12 18:48:26 2013
+++ julius4/libjulius/include/julius/jconf.h Fri Jun 21 02:02:29 2013
@@ -23,7 +23,7 @@
* @author Akinobu Lee
* @date Fri Feb 16 13:42:28 2007
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
*/
/*
@@ -792,16 +792,6 @@
} sw;
#ifdef USE_MBR
-
- /**
- *
- * Update 7 March 2011
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
struct {
/* Rescoring sentence on MBR (-mbr) */
@@ -817,13 +807,6 @@
float loss_weight;
} mbr;
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
/* pointer to next instance */
Index: julius4/libjulius/include/julius/recog.h
diff -u julius4/libjulius/include/julius/recog.h:1.19 julius4/libjulius/include/julius/recog.h:1.20
--- julius4/libjulius/include/julius/recog.h:1.19 Wed Jun 12 18:48:26 2013
+++ julius4/libjulius/include/julius/recog.h Fri Jun 21 02:02:29 2013
@@ -70,7 +70,7 @@
* @author Akinobu Lee
* @date Fri Feb 16 13:42:28 2007
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
*/
/*
@@ -334,24 +334,7 @@
SentenceAlign *align;
#ifdef USE_MBR
-
- /**
- *
- * Update 19 October 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
LOGPROB score_mbr; ///< MBR score
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
} Sentence;
Index: julius4/libjulius/include/julius/search.h
diff -u julius4/libjulius/include/julius/search.h:1.5 julius4/libjulius/include/julius/search.h:1.6
--- julius4/libjulius/include/julius/search.h:1.5 Wed Jun 12 18:48:26 2013
+++ julius4/libjulius/include/julius/search.h Fri Jun 21 02:02:29 2013
@@ -29,7 +29,7 @@
* @author Akinobu Lee
* @date Wed Sep 07 07:40:11 2005
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
*/
/*
@@ -131,24 +131,7 @@
struct __recogprocess__ *region; ///> Where this node belongs to
#ifdef USE_MBR
-
- /**
- *
- * Update 19 October 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
float score_mbr; ///< MBR score
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
} NODE;
@@ -185,20 +168,13 @@
*/
#ifdef USE_MBR
-
-/**
- *
- * Update 21 October 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
/**
* <JA>
* DPマッチングで使うノード
* </JA>
+ * <EN>
+ * Nodes for DP matching
+ * </EN>
*/
typedef struct {
@@ -206,14 +182,6 @@
int r; // 遷移元 1=Ins. 2=Del. 3=Sub. or Cor.
int c; // r=3とした場合の遷移コスト 1=Sub. 0=Cor.
} DP;
-
-
-/**
- *
- * MBR Expansion End
- *
- **/
-
#endif
#endif /* __J_SEARCH_H__ */