From e5d1ac7bc888414bd75041770455da86b16c6d3d Mon Sep 17 00:00:00 2001 From: yanyiwu Date: Fri, 5 Jun 2015 16:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8Adict/{extra=5Fdict,gbk=5Fdict}=20?= =?UTF-8?q?=E6=8C=AA=E8=BF=9B=20test/testdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testdata}/extra_dict/jieba.dict.small.utf8 | 0 {dict => test/testdata}/gbk_dict/hmm_model.gbk | 0 {dict => test/testdata}/gbk_dict/jieba.dict.gbk | 0 test/unittest/TKeywordExtractor.cpp | 4 ++-- test/unittest/TSegments.cpp | 14 +++++++------- test/unittest/TTrie.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename {dict => test/testdata}/extra_dict/jieba.dict.small.utf8 (100%) rename {dict => test/testdata}/gbk_dict/hmm_model.gbk (100%) rename {dict => test/testdata}/gbk_dict/jieba.dict.gbk (100%) diff --git a/dict/extra_dict/jieba.dict.small.utf8 b/test/testdata/extra_dict/jieba.dict.small.utf8 similarity index 100% rename from dict/extra_dict/jieba.dict.small.utf8 rename to test/testdata/extra_dict/jieba.dict.small.utf8 diff --git a/dict/gbk_dict/hmm_model.gbk b/test/testdata/gbk_dict/hmm_model.gbk similarity index 100% rename from dict/gbk_dict/hmm_model.gbk rename to test/testdata/gbk_dict/hmm_model.gbk diff --git a/dict/gbk_dict/jieba.dict.gbk b/test/testdata/gbk_dict/jieba.dict.gbk similarity index 100% rename from dict/gbk_dict/jieba.dict.gbk rename to test/testdata/gbk_dict/jieba.dict.gbk diff --git a/test/unittest/TKeywordExtractor.cpp b/test/unittest/TKeywordExtractor.cpp index cd24956..ca1041d 100644 --- a/test/unittest/TKeywordExtractor.cpp +++ b/test/unittest/TKeywordExtractor.cpp @@ -4,7 +4,7 @@ using namespace CppJieba; TEST(KeywordExtractorTest, Test1) { - KeywordExtractor extractor("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/idf.utf8", "../dict/stop_words.utf8"); + KeywordExtractor extractor("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/idf.utf8", "../dict/stop_words.utf8"); { string s("我是拖拉机学院手扶拖拉机专业的。不用多久，我就会升职加薪，当上CEO，走上人生巅峰。"); @@ -28,7 +28,7 @@ TEST(KeywordExtractorTest, Test1) { } TEST(KeywordExtractorTest, Test2) { - KeywordExtractor extractor("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/idf.utf8", "../dict/stop_words.utf8", "../test/testdata/userdict.utf8"); + KeywordExtractor extractor("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/idf.utf8", "../dict/stop_words.utf8", "../test/testdata/userdict.utf8"); { string s("蓝翔优秀毕业生"); diff --git a/test/unittest/TSegments.cpp b/test/unittest/TSegments.cpp index e5a7431..05519c3 100644 --- a/test/unittest/TSegments.cpp +++ b/test/unittest/TSegments.cpp @@ -23,7 +23,7 @@ TEST(MixSegmentTest, Test1) { } TEST(MixSegmentTest, NoUserDict) { - MixSegment segment("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8"); + MixSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8"); const char* str = "令狐冲是云计算方面的专家"; vector words; ASSERT_TRUE(segment.cut(str, words)); @@ -32,7 +32,7 @@ TEST(MixSegmentTest, NoUserDict) { } TEST(MixSegmentTest, UserDict) { - MixSegment segment("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/user.dict.utf8"); + MixSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../dict/user.dict.utf8"); { const char* str = "令狐冲是云计算方面的专家"; vector words; @@ -58,7 +58,7 @@ TEST(MixSegmentTest, UserDict) { } } TEST(MixSegmentTest, UserDict2) { - MixSegment segment("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8"); + MixSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8"); { const char* str = "令狐冲是云计算方面的专家"; vector words; @@ -102,7 +102,7 @@ TEST(MPSegmentTest, Test1) { } TEST(MPSegmentTest, Test2) { - MPSegment segment("../dict/extra_dict/jieba.dict.small.utf8"); + MPSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8"); string line; ifstream ifs("../test/testdata/review.100"); vector words; @@ -150,7 +150,7 @@ TEST(HMMSegmentTest, Test1) { } TEST(FullSegment, Test1) { - FullSegment segment("../dict/extra_dict/jieba.dict.small.utf8"); + FullSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8"); const char* str = "我来自北京邮电大学"; vector words; @@ -162,7 +162,7 @@ TEST(FullSegment, Test1) { } TEST(QuerySegment, Test1) { - QuerySegment segment("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "", 3); + QuerySegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "", 3); const char* str = "小明硕士毕业于中国科学院计算所，后在日本京都大学深造"; vector words; @@ -176,7 +176,7 @@ TEST(QuerySegment, Test1) { } TEST(QuerySegment, Test2) { - QuerySegment segment("../dict/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8", 3); + QuerySegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8", 3); { const char* str = "小明硕士毕业于中国科学院计算所，后在日本京都大学深造"; diff --git a/test/unittest/TTrie.cpp b/test/unittest/TTrie.cpp index e49aceb..cf18fd3 100644 --- a/test/unittest/TTrie.cpp +++ b/test/unittest/TTrie.cpp @@ -4,7 +4,7 @@ using namespace CppJieba; -static const char* const DICT_FILE = "../dict/extra_dict/jieba.dict.small.utf8"; +static const char* const DICT_FILE = "../test/testdata/extra_dict/jieba.dict.small.utf8"; TEST(DictTrieTest, NewAndDelete) { DictTrie * trie;