git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/TextCollection@823
3cdefd35-fc62-479d-8e8d-
bae585ffb9ca
using std::pair;
using std::make_pair;
using std::map;
using std::pair;
using std::make_pair;
using std::map;
// Following methods are not part of the public API
uchar * BWT(uchar *);
void makewavelet(uchar *);
// Following methods are not part of the public API
uchar * BWT(uchar *);
void makewavelet(uchar *);
- void maketables(ulong, char, CSA::DeltaVector &, const string &);
+ void maketables(ulong, char, CSA::DeltaVector &, const std::string &);
DocId DocIdAtTextPos(BlockArray*, TextPosition) const;
ulong Search(uchar const *, TextPosition, TextPosition *, TextPosition *) const;
ulong Search(uchar const *, TextPosition, TextPosition *, TextPosition *, DocId, DocId) const;
DocId DocIdAtTextPos(BlockArray*, TextPosition) const;
ulong Search(uchar const *, TextPosition, TextPosition *, TextPosition *) const;
ulong Search(uchar const *, TextPosition, TextPosition *, TextPosition *, DocId, DocId) const;
// Rank among the end-markers in BWT
unsigned endmarkerRank = tmp_rank_c-1; //alphabetrank->rank(0, i) - 1;
DocId docId = Doc->access(endmarkerRank);
// Rank among the end-markers in BWT
unsigned endmarkerRank = tmp_rank_c-1; //alphabetrank->rank(0, i) - 1;
DocId docId = Doc->access(endmarkerRank);
- result.push_back(make_pair(docId, dist));
+ result.push_back(std::make_pair(docId, dist));
}
else
{
TextPosition textPos = (*suffixes)[sampled->rank1(i)-1] + dist;
DocId docId = (*suffixDocId)[sampled->rank1(i)-1];
}
else
{
TextPosition textPos = (*suffixes)[sampled->rank1(i)-1] + dist;
DocId docId = (*suffixDocId)[sampled->rank1(i)-1];
- result.push_back(make_pair(docId, textPos));
+ result.push_back(std::make_pair(docId, textPos));
unsigned endmarkerRank = tmp_rank_c-1; //alphabetrank->rank(0, i) - 1;
DocId docId = Doc->access(endmarkerRank);
if (docId >= begin && docId <= end)
unsigned endmarkerRank = tmp_rank_c-1; //alphabetrank->rank(0, i) - 1;
DocId docId = Doc->access(endmarkerRank);
if (docId >= begin && docId <= end)
- result.push_back(make_pair(docId, dist));
+ result.push_back(std::make_pair(docId, dist));
DocId docId = (*suffixDocId)[sampled->rank1(i)-1];
if (docId >= begin && docId <= end)
DocId docId = (*suffixDocId)[sampled->rank1(i)-1];
if (docId >= begin && docId <= end)
- result.push_back(make_pair(docId, textPos));
+ result.push_back(std::make_pair(docId, textPos));
/**
* Init text collection from a file
*
/**
* Init text collection from a file
*