Skip to content

substitute RCPP_UNORDERED_MAP with std::unordered_map #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Enchufa2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

substitute RCPP_UNORDERED_MAP with std::unordered_map #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/get_idf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using namespace Rcpp;
using namespace std;
typedef RCPP_UNORDERED_MAP< string, pair<unsigned int,unsigned int > > IDFmap;
typedef std::unordered_map< string, pair<unsigned int,unsigned int > > IDFmap;

void inner_find(CharacterVector& y,IDFmap& m,unsigned int dis){
for(CharacterVector::iterator it = y.begin();it!=y.end();it++){
Expand Down
8 changes: 4 additions & 4 deletions src/get_tuple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ string get_string(CharacterVector::iterator begin,CharacterVector::iterator end)
return s;
}

void get_tuple_void(CharacterVector& x,unsigned int step,RCPP_UNORDERED_MAP< string, unsigned int >& m) {
void get_tuple_void(CharacterVector& x,unsigned int step,std::unordered_map< string, unsigned int >& m) {

for(CharacterVector::iterator it = x.begin();it+step-1 != x.end();it++){
string r = get_string(it,it+step);
RCPP_UNORDERED_MAP< string, unsigned int >::iterator m_it = m.find(r);
std::unordered_map< string, unsigned int >::iterator m_it = m.find(r);
if(m_it==m.end()){
m[r]=1;
}else{
Expand All @@ -38,7 +38,7 @@ void get_tuple_void(CharacterVector& x,unsigned int step,RCPP_UNORDERED_MAP< str

// [[Rcpp::export]]
List get_tuple_list(ListOf<CharacterVector> x,R_xlen_t step) {
RCPP_UNORDERED_MAP< string, unsigned int > res;
std::unordered_map< string, unsigned int > res;
for(ListOf<CharacterVector>::iterator it = x.begin();it != x.end();it++){
for(R_xlen_t cnt=2;cnt<=step;cnt++){
CharacterVector tmp = as<CharacterVector>(*it);
Expand All @@ -51,7 +51,7 @@ List get_tuple_list(ListOf<CharacterVector> x,R_xlen_t step) {

// [[Rcpp::export]]
List get_tuple_vector(CharacterVector& x,R_xlen_t step) {
RCPP_UNORDERED_MAP< string, unsigned int > res;
std::unordered_map< string, unsigned int > res;
for(R_xlen_t cnt=2;cnt<=step;cnt++){
get_tuple_void(x,cnt,res);
}
Expand Down
4 changes: 2 additions & 2 deletions src/word_freq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ using namespace std;

// [[Rcpp::export]]
IntegerVector words_freq(const CharacterVector& x) {
RCPP_UNORDERED_MAP< string, unsigned int > m;
std::unordered_map< string, unsigned int > m;
CharacterVector::const_iterator it = x.begin();
for(;it != x.end();it++){
string r = as<string>(*it);
RCPP_UNORDERED_MAP< string, unsigned int >::iterator m_it = m.find(r);
std::unordered_map< string, unsigned int >::iterator m_it = m.find(r);
if(m_it==m.end()){
m[r]=1;
}else{
Expand Down