From 6d105a864df9fc197c884e2a1aecc132cc36f425 Mon Sep 17 00:00:00 2001 From: Yanyi Wu Date: Tue, 3 May 2016 19:53:40 +0800 Subject: [PATCH] Update TextRankExtractor.hpp remove unused function which using c++11 keyword `auto` --- include/cppjieba/TextRankExtractor.hpp | 71 ++++++++++++-------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/include/cppjieba/TextRankExtractor.hpp b/include/cppjieba/TextRankExtractor.hpp index 82e56f3..948f3ad 100644 --- a/include/cppjieba/TextRankExtractor.hpp +++ b/include/cppjieba/TextRankExtractor.hpp @@ -1,4 +1,4 @@ -#ifndef CPPJIEBA_TEXTRANK_EXTRACTOR_H +#ifndef CPPJIEBA_TEXTRANK_EXTRACTOR_H #define CPPJIEBA_TEXTRANK_EXTRACTOR_H #include @@ -82,40 +82,40 @@ namespace cppjieba { } }; - public: - TextRankExtractor(const string& dictPath, - const string& hmmFilePath, - const string& stopWordPath, - const string& userDict = "") - : segment_(dictPath, hmmFilePath, userDict) { - LoadStopWordDict(stopWordPath); - } - TextRankExtractor(const DictTrie* dictTrie, - const HMMModel* model, - const string& stopWordPath) - : segment_(dictTrie, model) { - LoadStopWordDict(stopWordPath); + public: + TextRankExtractor(const string& dictPath, + const string& hmmFilePath, + const string& stopWordPath, + const string& userDict = "") + : segment_(dictPath, hmmFilePath, userDict) { + LoadStopWordDict(stopWordPath); + } + TextRankExtractor(const DictTrie* dictTrie, + const HMMModel* model, + const string& stopWordPath) + : segment_(dictTrie, model) { + LoadStopWordDict(stopWordPath); } TextRankExtractor(const Jieba& jieba, const string& stopWordPath) : segment_(jieba.GetDictTrie(), jieba.GetHMMModel()) { LoadStopWordDict(stopWordPath); } ~TextRankExtractor() { } - - void Extract(const string& sentence, vector& keywords, size_t topN) const { - vector topWords; - Extract(sentence, topWords, topN); - for (size_t i = 0; i < topWords.size(); i++) { - keywords.push_back(topWords[i].word); - } - } - - void Extract(const string& sentence, vector >& keywords, size_t topN) const { - vector topWords; - Extract(sentence, topWords, topN); - for (size_t i = 0; i < topWords.size(); i++) { - keywords.push_back(pair(topWords[i].word, topWords[i].weight)); - } + + void Extract(const string& sentence, vector& keywords, size_t topN) const { + vector topWords; + Extract(sentence, topWords, topN); + for (size_t i = 0; i < topWords.size(); i++) { + keywords.push_back(topWords[i].word); + } + } + + void Extract(const string& sentence, vector >& keywords, size_t topN) const { + vector topWords; + Extract(sentence, topWords, topN); + for (size_t i = 0; i < topWords.size(); i++) { + keywords.push_back(pair(topWords[i].word, topWords[i].weight)); + } } void Extract(const string& sentence, vector& keywords, size_t topN, size_t span=5,size_t rankTime=10) const { @@ -176,13 +176,6 @@ namespace cppjieba { return false; } - static void sortMapValue(WordMap &map,vector& result,size_t topN){ - for(auto i=map.begin();i!=map.end();i++){ - result.push_back(i->second); - } - partial_sort(result.begin(),result.begin()+topN,result.end(),Compare); - } - static bool Compare(const Word &x,const Word &y){ return x.weight > y.weight; } @@ -190,9 +183,9 @@ namespace cppjieba { MixSegment segment_; unordered_set stopWords_; }; - - inline ostream& operator << (ostream& os, const TextRankExtractor::Word& word) { - return os << word.word << '|' << word.offsets << '|' << word.weight; + + inline ostream& operator << (ostream& os, const TextRankExtractor::Word& word) { + return os << word.word << '|' << word.offsets << '|' << word.weight; } } // namespace cppjieba