rewriting trie.cpp/h

This commit is contained in:
gwdwyy 2013-07-21 10:01:50 +08:00
parent 8d1c326a40
commit ea36cf6794
2 changed files with 11 additions and 11 deletions

View File

@ -60,7 +60,7 @@ namespace CppJieba
bool Trie::init()
{
if(_getInitFlag())
if(!_getInitFlag())
{
LogError("already initted!");
return false;
@ -157,7 +157,7 @@ namespace CppJieba
bool Trie::destroy()
{
if(NULL == _root)
if(!_getInitFlag())
{
return false;
}
@ -180,19 +180,19 @@ namespace CppJieba
}
}
const TrieNodeInfo* Trie::findPrefix(const string& utf8Str)
const TrieNodeInfo* Trie::findPrefix(const string& str)
{
if(NULL == _root)
if(!_getInitFlag())
{
LogFatal("trie not initted!");
return NULL;
}
if(utf8Str.empty())
if(str.empty())
{
LogError("utf8Str is empty");
LogError("str is empty");
return NULL;
}
string uniStr = utf8ToUnicode(utf8Str);
string uniStr = decode(str);
if(uniStr.empty())
{
LogError("utf8ToUnicode return empty star");
@ -243,7 +243,7 @@ namespace CppJieba
const TrieNodeInfo* Trie::_findUniStr(const string& uniStr)
{
if(NULL == _root)
if(!_getInitFlag())
{
LogFatal("trie not initted!");
return NULL;
@ -346,9 +346,9 @@ namespace CppJieba
bool Trie::insert(const TrieNodeInfo& nodeInfo)
{
if(NULL == _root)
if(!_getInitFlag())
{
LogError("_root is NULL");
LogFatal("not initted!");
return false;
}

View File

@ -93,7 +93,7 @@ namespace CppJieba
//const TrieNodeInfo* find(const string& uniStr);
//const TrieNodeInfo* find(const ChUnicode* const chUniStr, size_t len);
const TrieNodeInfo* find(const string& str);
const TrieNodeInfo* findPrefix(const string& utf8Str);
const TrieNodeInfo* findPrefix(const string& str);
public:
//double getWeight(const ChUnicode* uniStr, size_t len);