summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2016-03-30 14:55:29 +0800
committerPeng Wu <alexepico@gmail.com>2016-03-30 14:55:29 +0800
commit09181e7491bfabbd11ea80633214231404766b22 (patch)
tree3e6d32316b5951580a5ce3fe18da2940a5933d6b
parent9f79258f900dd9899549fe6e743e090f5ebb8186 (diff)
downloadlibpinyin-09181e7491bfabbd11ea80633214231404766b22.tar.gz
libpinyin-09181e7491bfabbd11ea80633214231404766b22.tar.xz
libpinyin-09181e7491bfabbd11ea80633214231404766b22.zip
update utils/segment
-rw-r--r--utils/segment/mergeseq.cpp6
-rw-r--r--utils/segment/ngseg.cpp2
-rw-r--r--utils/segment/spseg.cpp6
-rw-r--r--utils/training/gen_deleted_ngram.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/utils/segment/mergeseq.cpp b/utils/segment/mergeseq.cpp
index 05ceb3c..81fa2a8 100644
--- a/utils/segment/mergeseq.cpp
+++ b/utils/segment/mergeseq.cpp
@@ -69,7 +69,7 @@ gint calculate_sequence_length(TokenInfoVector tokeninfos) {
* if not, just output the first token;
* pop the first token or sequence.
*/
-bool merge_sequence(FacadePhraseTable2 * phrase_table,
+bool merge_sequence(FacadePhraseTable3 * phrase_table,
FacadePhraseIndex * phrase_index,
UnicodeCharVector unichars,
TokenInfoVector tokeninfos) {
@@ -141,7 +141,7 @@ bool pop_first_token(UnicodeCharVector unichars,
return true;
}
-bool feed_line(FacadePhraseTable2 * phrase_table,
+bool feed_line(FacadePhraseTable3 * phrase_table,
FacadePhraseIndex * phrase_index,
UnicodeCharVector unichars,
TokenInfoVector tokeninfos,
@@ -237,7 +237,7 @@ int main(int argc, char * argv[]){
}
/* init phrase table */
- FacadePhraseTable2 phrase_table;
+ FacadePhraseTable3 phrase_table;
phrase_table.load(SYSTEM_PHRASE_INDEX, NULL);
/* init phrase index */
diff --git a/utils/segment/ngseg.cpp b/utils/segment/ngseg.cpp
index 8064f27..c4937f8 100644
--- a/utils/segment/ngseg.cpp
+++ b/utils/segment/ngseg.cpp
@@ -143,7 +143,7 @@ int main(int argc, char * argv[]){
}
/* init phrase table */
- FacadePhraseTable2 phrase_table;
+ FacadePhraseTable3 phrase_table;
phrase_table.load(SYSTEM_PHRASE_INDEX, NULL);
/* init phrase index */
diff --git a/utils/segment/spseg.cpp b/utils/segment/spseg.cpp
index c7bdcfe..b434e4a 100644
--- a/utils/segment/spseg.cpp
+++ b/utils/segment/spseg.cpp
@@ -77,7 +77,7 @@ public:
bool backtrace(GArray * steps, glong phrase_len, GArray * strings);
/* Note: do not free phrase, as it is used by strings (array of segment). */
-bool segment(FacadePhraseTable2 * phrase_table,
+bool segment(FacadePhraseTable3 * phrase_table,
FacadePhraseIndex * phrase_index,
GArray * current_ucs4,
GArray * strings /* Array of SegmentStep. */){
@@ -160,7 +160,7 @@ bool backtrace(GArray * steps, glong phrase_len, GArray * strings){
return true;
}
-bool deal_with_segmentable(FacadePhraseTable2 * phrase_table,
+bool deal_with_segmentable(FacadePhraseTable3 * phrase_table,
FacadePhraseIndex * phrase_index,
GArray * current_ucs4,
FILE * output){
@@ -237,7 +237,7 @@ int main(int argc, char * argv[]){
}
/* init phrase table */
- FacadePhraseTable2 phrase_table;
+ FacadePhraseTable3 phrase_table;
phrase_table.load(SYSTEM_PHRASE_INDEX, NULL);
/* init phrase index */
diff --git a/utils/training/gen_deleted_ngram.cpp b/utils/training/gen_deleted_ngram.cpp
index bdbf00e..40f9f5a 100644
--- a/utils/training/gen_deleted_ngram.cpp
+++ b/utils/training/gen_deleted_ngram.cpp
@@ -60,7 +60,7 @@ int main(int argc, char * argv[]){
}
/* load phrase table. */
- PhraseLargeTable2 phrase_table;
+ PhraseLargeTable3 phrase_table;
MemoryChunk * new_chunk = new MemoryChunk;
new_chunk->load(SYSTEM_PHRASE_INDEX);
phrase_table.load(new_chunk);