86 lines
2.0 KiB
Diff
86 lines
2.0 KiB
Diff
|
--- src/liblmest/generate.c
|
||
|
|
+++ src/liblmest/generate.c
|
||
|
|
@@ -99,8 +99,8 @@
|
||
|
|
int i,j,bo_case,initial_history_id;
|
||
|
|
id__t sought_trigram[3];
|
||
|
|
double p,acc,trigram_prob;
|
||
|
|
- vocab_sz_t lm_vocab_sz;
|
||
|
|
- char** lm_vocab;
|
||
|
|
+ vocab_sz_t lm_vocab_sz = 0;
|
||
|
|
+ char** lm_vocab = NULL;
|
||
|
|
|
||
|
|
if(png!=NULL && pang!=NULL)
|
||
|
|
quit(-1,"Confused by multiple input type.\n");
|
||
|
|
--- src/libs/rr_mkdtemp.c
|
||
|
|
+++ src/libs/rr_mkdtemp.c
|
||
|
|
@@ -36,6 +36,8 @@
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
+#include <sys/types.h>
|
||
|
|
+#include <sys/stat.h>
|
||
|
|
|
||
|
|
#include <../win32/compat.h>
|
||
|
|
|
||
|
|
--- src/programs/text2idngram.c
|
||
|
|
+++ src/programs/text2idngram.c
|
||
|
|
@@ -51,7 +51,7 @@
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <string.h>
|
||
|
|
-#include <sys/types.h>
|
||
|
|
+#include <unistd.h>
|
||
|
|
#include <errno.h>
|
||
|
|
|
||
|
|
#include "../liblmest/toolkit.h"
|
||
|
|
--- src/programs/text2wngram.c
|
||
|
|
+++ src/programs/text2wngram.c
|
||
|
|
@@ -36,10 +36,10 @@
|
||
|
|
|
||
|
|
#define DEFAULT_MAX_FILES 20
|
||
|
|
|
||
|
|
-#include <sys/types.h>
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <string.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
+#include <unistd.h>
|
||
|
|
#include <errno.h>
|
||
|
|
|
||
|
|
#include "../liblmest/toolkit.h"
|
||
|
|
@@ -70,6 +70,15 @@
|
||
|
|
fprintf(stderr," < .text > .wngram\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
+void merge_tempfiles (int start_file,
|
||
|
|
+ int end_file,
|
||
|
|
+ char *temp_file_root,
|
||
|
|
+ char *temp_file_ext,
|
||
|
|
+ int max_files,
|
||
|
|
+ FILE *outfile,
|
||
|
|
+ int n,
|
||
|
|
+ int verbosity);
|
||
|
|
+
|
||
|
|
int main (int argc, char **argv) {
|
||
|
|
|
||
|
|
int n;
|
||
|
|
--- src/programs/wngram2idngram.c
|
||
|
|
+++ src/programs/wngram2idngram.c
|
||
|
|
@@ -45,7 +45,7 @@
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <string.h>
|
||
|
|
-#include <sys/types.h>
|
||
|
|
+#include <unistd.h>
|
||
|
|
#include <errno.h>
|
||
|
|
|
||
|
|
#include "../liblmest/toolkit.h"
|
||
|
|
@@ -361,7 +361,7 @@
|
||
|
|
}else {
|
||
|
|
/* Write to temporary file */
|
||
|
|
for (i=0;i<=n-1;i++)
|
||
|
|
- rr_fwrite((char*)¤t_ngram[i],sizeof(unsigned short),1,
|
||
|
|
+ rr_fwrite((char*)¤t_ngram[i],sizeof(wordid_t),1,
|
||
|
|
non_unk_fp,"temporary n-gram ids");
|
||
|
|
|
||
|
|
rr_fwrite((char*)¤t_count,sizeof(int),1,non_unk_fp,
|