From 418b18db555c67f0ba47dc5c7ffa566571dc8f38 Mon Sep 17 00:00:00 2001 From: wyy Date: Tue, 24 Dec 2013 02:32:00 -0800 Subject: [PATCH] rename dicts -> dict --- CMakeLists.txt | 2 +- conf/server.conf | 4 ++-- {dicts => dict}/CMakeLists.txt | 0 {dicts => dict}/hmm_model.gbk | 0 {dicts => dict}/hmm_model.utf8 | 0 {dicts => dict}/jieba.dict.gbk | 0 {dicts => dict}/jieba.dict.utf8 | 0 scripts/cjseg.sh | 2 +- src/segment.cpp | 10 +++++----- test/load_test.cpp | 17 ++++------------- test/segment.cpp | 4 ++-- test/server.cpp | 4 ++-- test/unittest/TFullSegment.cpp | 2 +- test/unittest/THMMSegment.cpp | 2 +- test/unittest/TMPSegment.cpp | 2 +- test/unittest/TMixSegment.cpp | 2 +- test/unittest/TQuerySegment.cpp | 2 +- test/unittest/TTrie.cpp | 2 +- 18 files changed, 23 insertions(+), 32 deletions(-) rename {dicts => dict}/CMakeLists.txt (100%) rename {dicts => dict}/hmm_model.gbk (100%) rename {dicts => dict}/hmm_model.utf8 (100%) rename {dicts => dict}/jieba.dict.gbk (100%) rename {dicts => dict}/jieba.dict.utf8 (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bebd58..d1a792c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ IF (DEFINED ENC) ENDIF() #ADD_DEFINITIONS(-DNO_FILTER) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(dicts) +ADD_SUBDIRECTORY(dict) ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(conf) ADD_SUBDIRECTORY(test) diff --git a/conf/server.conf b/conf/server.conf index 068c48a..c0bc4c6 100644 --- a/conf/server.conf +++ b/conf/server.conf @@ -10,10 +10,10 @@ thread_num=4 daemonize=true #dict path -dict_path=/usr/share/CppJieba/dicts/jieba.dict.utf8 +dict_path=/usr/share/CppJieba/dict/jieba.dict.utf8 #model path -model_path=/usr/share/CppJieba/dicts/hmm_model.utf8 +model_path=/usr/share/CppJieba/dict/hmm_model.utf8 #pid file pid_file=/var/run/CppJieba/cjserver.pid diff --git a/dicts/CMakeLists.txt b/dict/CMakeLists.txt similarity index 100% rename from dicts/CMakeLists.txt rename to dict/CMakeLists.txt diff --git a/dicts/hmm_model.gbk b/dict/hmm_model.gbk similarity index 100% rename from dicts/hmm_model.gbk rename to dict/hmm_model.gbk diff --git a/dicts/hmm_model.utf8 b/dict/hmm_model.utf8 similarity index 100% rename from dicts/hmm_model.utf8 rename to dict/hmm_model.utf8 diff --git a/dicts/jieba.dict.gbk b/dict/jieba.dict.gbk similarity index 100% rename from dicts/jieba.dict.gbk rename to dict/jieba.dict.gbk diff --git a/dicts/jieba.dict.utf8 b/dict/jieba.dict.utf8 similarity index 100% rename from dicts/jieba.dict.utf8 rename to dict/jieba.dict.utf8 diff --git a/scripts/cjseg.sh b/scripts/cjseg.sh index 8bd5de5..cc9a513 100755 --- a/scripts/cjseg.sh +++ b/scripts/cjseg.sh @@ -2,4 +2,4 @@ if [ $# -lt 1 ]; then echo "usage: $0 " exit 1 fi -cjsegment --dictpath /usr/share/CppJieba/dicts/jieba.dict.utf8 --modelpath /usr/share/CppJieba/dicts/hmm_model.utf8 $1 +cjsegment --dictpath /usr/share/CppJieba/dict/jieba.dict.utf8 --modelpath /usr/share/CppJieba/dict/hmm_model.utf8 $1 diff --git a/src/segment.cpp b/src/segment.cpp index 5dafe25..6c67f2d 100644 --- a/src/segment.cpp +++ b/src/segment.cpp @@ -45,11 +45,11 @@ int main(int argc, char ** argv) <<"\t--modelpath\tsee example\n" <<"\t--maxlen\tspecify the granularity of cut used in cutQuery. \n\t\t\tIf not specified, the default is 3\n" <<"example:\n" - <<"\t"<cut(doc, res); - //print(res); - //cout<cut(doc, res); } } int main(int argc, char ** argv) { { - MixSegment seg("../dicts/jieba.dict.utf8", "../dicts/hmm_model.utf8"); + MixSegment seg("../dict/jieba.dict.utf8", "../dict/hmm_model.utf8"); if(!seg) { cout<<"seg init failed."< words; diff --git a/test/unittest/THMMSegment.cpp b/test/unittest/THMMSegment.cpp index 515802a..fc7c04c 100644 --- a/test/unittest/THMMSegment.cpp +++ b/test/unittest/THMMSegment.cpp @@ -5,7 +5,7 @@ using namespace CppJieba; TEST(HMMSegmentTest, Test1) { - HMMSegment segment("../dicts/hmm_model.utf8");; + HMMSegment segment("../dict/hmm_model.utf8");; const char* str = "我来自北京邮电大学。。。 学号 123456"; const char* res[] = {"我来", "自北京", "邮电大学", "。", "。", "。", " ", "学号", " 123456"}; //string s; diff --git a/test/unittest/TMPSegment.cpp b/test/unittest/TMPSegment.cpp index e812243..ade1010 100644 --- a/test/unittest/TMPSegment.cpp +++ b/test/unittest/TMPSegment.cpp @@ -5,7 +5,7 @@ using namespace CppJieba; TEST(MPSegmentTest, Test1) { - MPSegment segment("../dicts/jieba.dict.utf8");; + MPSegment segment("../dict/jieba.dict.utf8");; const char* str = "我来自北京邮电大学。。。 学号 123456"; const char* res[] = {"我", "来自", "北京邮电大学", "。","。","。"," ","学","号", " 123456"}; vector words; diff --git a/test/unittest/TMixSegment.cpp b/test/unittest/TMixSegment.cpp index 5c24fc3..421e636 100644 --- a/test/unittest/TMixSegment.cpp +++ b/test/unittest/TMixSegment.cpp @@ -5,7 +5,7 @@ using namespace CppJieba; TEST(MixSegmentTest, Test1) { - MixSegment segment("../dicts/jieba.dict.utf8", "../dicts/hmm_model.utf8");; + MixSegment segment("../dict/jieba.dict.utf8", "../dict/hmm_model.utf8");; const char* str = "我来自北京邮电大学。。。 学号 123456"; const char* res[] = {"我", "来自", "北京邮电大学", "。","。","。"," ","学号", " 123456"}; vector words; diff --git a/test/unittest/TQuerySegment.cpp b/test/unittest/TQuerySegment.cpp index 55704e6..51cd62b 100644 --- a/test/unittest/TQuerySegment.cpp +++ b/test/unittest/TQuerySegment.cpp @@ -5,7 +5,7 @@ using namespace CppJieba; TEST(QuerySegment, Test1) { - QuerySegment segment("../dicts/jieba.dict.utf8", "../dicts/hmm_model.utf8", 3); + QuerySegment segment("../dict/jieba.dict.utf8", "../dict/hmm_model.utf8", 3); const char* str = "小明硕士毕业于中国科学院计算所，后在日本京都大学深造"; const char* res[] = {"小明", "硕士", "毕业", "于", "中国", "中国科学院", "科学", "科学院", "学院", "计算所", "，", "后", "在", "日本", "日本京都大学", "京都", "京都大学", "大学", "深造"}; vector words; diff --git a/test/unittest/TTrie.cpp b/test/unittest/TTrie.cpp index 10358d7..a8cbf8c 100644 --- a/test/unittest/TTrie.cpp +++ b/test/unittest/TTrie.cpp @@ -3,7 +3,7 @@ using namespace CppJieba; -static const char* const DICT_FILE = "../dicts/jieba.dict.utf8"; +static const char* const DICT_FILE = "../dict/jieba.dict.utf8"; TEST(TrieTest, Test1) {