Skip to content

Use an explicit vector rather than R_alloc in sample #1075

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

Merged
merged 2 commits into from
Apr 25, 2020
Merged

Use an explicit vector rather than R_alloc in sample #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef1c40
allocate two temp objects as simple vectors (closes #1074)
eddelbuettel Apr 25, 2020
24f8d05
initialize via no_init(n)
eddelbuettel Apr 25, 2020
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
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2020-04-25 Dirk Eddelbuettel <edd@debian.org>

* inst/include/Rcpp/sugar/functions/sample.h: Replace R_alloc() with
a standard vector allocation to reduce memory consumption in sample

2020-04-16 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
5 changes: 5 additions & 0 deletions inst/NEWS.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
\item The exceptions test is now partially skipped on Solaris as
it already is on Windows (Dirk in \ghpr{1065}).
}
\item Changes in Rcpp Sugar:
\itemize{
\item Two \code{sample()} objects are now standard vectors and not
\code{R_alloc} created (Dirk in \ghpr{1075} fixing \ghpr{1074}).
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/sugar/functions/sample.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ inline Vector<INTSXP> EmpiricalSample(int n, int size, bool replace, bool one_ba
return ans;
}

int* x = reinterpret_cast<int*>(R_alloc(n, sizeof(int)));
IntegerVector x = no_init(n);
for (int i = 0; i < n; i++) {
x[i] = i;
}
Expand Down Expand Up @@ -378,7 +378,7 @@ inline Vector<RTYPE> EmpiricalSample(int size, bool replace, const Vector<RTYPE>
return ans;
}

int* x = reinterpret_cast<int*>(R_alloc(n, sizeof(int)));
IntegerVector x = no_init(n);
for (int i = 0; i < n; i++) {
x[i] = i;
}
Expand Down