rename dicts -> dict

This commit is contained in:
wyy 2013-12-24 02:32:00 -08:00
parent 657aee0fda
commit 418b18db55
18 changed files with 23 additions and 32 deletions

View File

@ -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)

View File

@ -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

View File

@ -2,4 +2,4 @@ if [ $# -lt 1 ]; then
echo "usage: $0 <file>"
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

View File

@ -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"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dicts/jieba.dict.utf8 --algorithm cutDAG\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dicts/jieba.dict.utf8 --algorithm cutFull\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --modelpath ../dicts/hmm_model.utf8 --algorithm cutHMM\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dicts/jieba.dict.utf8 --modelpath ../dicts/hmm_model.utf8 --algorithm cutMix\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dicts/jieba.dict.utf8 --modelpath ../dicts/hmm_model.utf8 --algorithm cutQuery --maxlen 3\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dict/jieba.dict.utf8 --algorithm cutDAG\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dict/jieba.dict.utf8 --algorithm cutFull\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --modelpath ../dict/hmm_model.utf8 --algorithm cutHMM\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dict/jieba.dict.utf8 --modelpath ../dict/hmm_model.utf8 --algorithm cutMix\n"
<<"\t"<<argv[0]<<" ../test/testdata/testlines.utf8 --dictpath ../dict/jieba.dict.utf8 --modelpath ../dict/hmm_model.utf8 --algorithm cutQuery --maxlen 3\n"
<<endl;
return EXIT_FAILURE;

View File

@ -22,28 +22,19 @@ void cut(const ISegment * seg, const char * const filePath, size_t times = 10)
for(uint i = 0; i < times; i ++)
{
LogInfo("times[%u]", i);
//ifile.seekg(0);
//while(getline(ifile, line))
//{
// if(!line.empty())
// {
res.clear();
seg->cut(doc, res);
//print(res);
//cout<<join(res.begin(), res.end(),"/")<<endl;
// }
//}
res.clear();
seg->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."<<endl;
return false;
return EXIT_FAILURE;
}
cut(&seg, "../test/testdata/weicheng.utf8");
}

View File

@ -23,8 +23,8 @@ void cut(const ISegment * seg, const char * const filePath)
}
const char * const TEST_FILE = "../test/testdata/testlines.utf8";
const char * const JIEBA_DICT_FILE = "../dicts/jieba.dict.utf8";
const char * const HMM_DICT_FILE = "../dicts/hmm_model.utf8";
const char * const JIEBA_DICT_FILE = "../dict/jieba.dict.utf8";
const char * const HMM_DICT_FILE = "../dict/hmm_model.utf8";
int main(int argc, char ** argv)
{

View File

@ -8,8 +8,8 @@
using namespace Husky;
using namespace CppJieba;
const char * const DEFAULT_DICTPATH = "../dicts/jieba.dict.utf8";
const char * const DEFAULT_MODELPATH = "../dicts/hmm_model.utf8";
const char * const DEFAULT_DICTPATH = "../dict/jieba.dict.utf8";
const char * const DEFAULT_MODELPATH = "../dict/hmm_model.utf8";
class ServerDemo: public IRequestHandler
{

View File

@ -5,7 +5,7 @@ using namespace CppJieba;
TEST(FullSegment, Test1)
{
FullSegment segment("../dicts/jieba.dict.utf8");
FullSegment segment("../dict/jieba.dict.utf8");
const char* str = "我来自北京邮电大学。。。 学号 123456";
const char* res[] = {"", "来自", "北京", "北京邮电", "北京邮电大学", "邮电", "邮电大学", "电大", "大学", "", "", "", " ", "学号", " 123456"};
vector<string> words;

View File

@ -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;

View File

@ -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<string> words;

View File

@ -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<string> words;

View File

@ -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<string> words;

View File

@ -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)
{