fix bug in parser double release model, add file exist check

ting619409 · Aug 31, 2013 · 3d85cef · 3d85cef
1 parent b2b1fb9
commit 3d85cef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/ner/ner.cpp b/src/ner/ner.cpp
@@ -450,7 +450,10 @@ void NER::train(void) {
     const char * train_file = train_opt.train_file.c_str();
 
     // read in training instance
-    read_instance(train_file);
+    if (!read_instance(train_file)) {
+        ERROR_LOG("Training file doesn't exist");
+    }
+
     TRACE_LOG("Read in [%d] instances.", train_dat.size());
 
     model = new Model;

diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
@@ -833,6 +833,7 @@ void Parser::train(void) {
     }
 
     delete model;
+    model = 0;
 }
 
 void Parser::evaluate(void) {

diff --git a/src/postagger/postagger.cpp b/src/postagger/postagger.cpp
@@ -393,7 +393,10 @@ void Postagger::train(void) {
     const char * train_file = train_opt.train_file.c_str();
 
     // read in training instance
-    read_instance(train_file);
+    if (!read_instance(train_file)) {
+        ERROR_LOG("Training file doesn't exist.");
+    }
+
     TRACE_LOG("Read in [%d] instances.", train_dat.size());
 
     model = new Model;

diff --git a/src/segmentor/segmentor.cpp b/src/segmentor/segmentor.cpp
@@ -508,7 +508,10 @@ void Segmentor::train(void) {
     const char * train_file = train_opt.train_file.c_str();
 
     // read in training instance
-    read_instance(train_file);
+    if (!read_instance(train_file)) {
+        ERROR_LOG("Training file not exist.");
+        return;
+    }
     TRACE_LOG("Read in [%d] instances.", train_dat.size());
 
     model = new Model;
-Original file line number
+Diff line change
@@ Expand Up / @@ -833,6 +833,7 @@ void Parser::train(void) { @@
         }
         delete model;
+        model = 0;
     }
     void Parser::evaluate(void) {
@@ Expand Down @@