sumom****@users*****
sumom****@users*****
2013年 6月 21日 (金) 02:02:28 JST
Index: julius4/julius/output_file.c
diff -u julius4/julius/output_file.c:1.6 julius4/julius/output_file.c:1.7
--- julius4/julius/output_file.c:1.6 Wed Jun 12 18:48:25 2013
+++ julius4/julius/output_file.c Fri Jun 21 02:02:28 2013
@@ -12,7 +12,7 @@
* @author Akinobu Lee
* @date Wed Dec 12 11:07:46 2007
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
*/
/*
@@ -152,26 +152,10 @@
fprintf(fp, "\n");
#endif
#ifdef USE_MBR
- /**
- *
- * Update 2 September 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
if(r->config->mbr.use_mbr == TRUE){
fprintf(fp, "MBRscore%d: %f\n", n+1, s->score_mbr);
}
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
fprintf(fp, "score%d: %f", n+1, s->score);
Index: julius4/julius/output_module.c
diff -u julius4/julius/output_module.c:1.10 julius4/julius/output_module.c:1.11
--- julius4/julius/output_module.c:1.10 Wed Jun 12 18:48:25 2013
+++ julius4/julius/output_module.c Fri Jun 21 02:02:28 2013
@@ -12,7 +12,7 @@
* @author Akinobu Lee
* @date Tue Sep 06 14:46:49 2005
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
*/
/*
@@ -445,27 +445,10 @@
module_send(module_sd, " <SHYPO RANK=\"%d\"", n+1);
if (out2_score) {
#ifdef USE_MBR
-
- /**
- *
- * Update 2 September 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
if(r->config->mbr.use_mbr == TRUE){
module_send(module_sd, " MBRSCORE=\"%f\"", s->score_mbr);
}
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
module_send(module_sd, " SCORE=\"%f\"", s->score);
if (r->lmtype == LM_PROB) {
Index: julius4/julius/output_stdout.c
diff -u julius4/julius/output_stdout.c:1.12 julius4/julius/output_stdout.c:1.13
--- julius4/julius/output_stdout.c:1.12 Wed Jun 12 18:48:25 2013
+++ julius4/julius/output_stdout.c Fri Jun 21 02:02:28 2013
@@ -12,7 +12,7 @@
* @author Akinobu Lee
* @date Tue Sep 06 17:18:46 2005
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
*/
/*
@@ -908,27 +908,9 @@
}
if (verbose_flag) {
#ifdef USE_MBR
-
- /**
- *
- * Update 7 September 2010
- *
- * MBR Expansion Hiroaki NANJO
- * Ryo FURUTANI
- *
- **/
-
if(r->config->mbr.use_mbr == TRUE){
-
printf("MBRscore%d: %f\n", n+1, s->score_mbr);
}
-
- /**
- *
- * MBR Expansion End
- *
- **/
-
#endif
printf("score%d: %f", n+1, s->score);
if (r->lmtype == LM_PROB) {