Skip to content
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

Added skip_absent arguement to colnamesInt() #6068

Merged
merged 29 commits into from
Apr 11, 2024
Merged

Added skip_absent arguement to colnamesInt() #6068

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e81f30c
Added skip_absent arguement to colnamesInt()
Apr 10, 2024
3b19900
Update NEWS.md
Nj221102 Apr 10, 2024
d924584
Update NEWS.md
Nj221102 Apr 10, 2024
f423930
Update utils.c
Nj221102 Apr 10, 2024
e8c2f0f
Update utils.c
Nj221102 Apr 10, 2024
5a4e230
Update utils.c
Nj221102 Apr 10, 2024
eab32e6
Update utils.c
Nj221102 Apr 10, 2024
58e335a
Update utils.c
Nj221102 Apr 10, 2024
583ce4d
added test
Apr 10, 2024
d5d3e10
Update src/nafill.c
Nj221102 Apr 11, 2024
fdb30c8
Update src/utils.c
Nj221102 Apr 11, 2024
4d0273d
Update src/utils.c
Nj221102 Apr 11, 2024
ade9f96
Update src/utils.c
Nj221102 Apr 11, 2024
5938bdd
Implemented suggestions
Apr 11, 2024
39b73f1
Merge branch 'master' into colnamesInt
Nj221102 Apr 11, 2024
9fdf048
small fix
Apr 11, 2024
b9a3135
Update utils.c
Nj221102 Apr 11, 2024
c525564
minor issues
MichaelChirico Apr 11, 2024
02d758d
restore comment for now
MichaelChirico Apr 11, 2024
1de9230
Update nafill.Rraw
Nj221102 Apr 11, 2024
6bc4fd0
adjusted any colno. > ncol to 0L
Apr 11, 2024
eae60d5
Added test and changed refrence to deep copy
Apr 11, 2024
d8510b0
Merge branch 'master' into colnamesInt
Nj221102 Apr 11, 2024
53eaf43
annotate test purpose
MichaelChirico Apr 11, 2024
fd4b01d
More careful about when duplicate() is needed
MichaelChirico Apr 11, 2024
701ff2e
refine comment
MichaelChirico Apr 11, 2024
6c422bc
whitespace
MichaelChirico Apr 11, 2024
1344bf3
Add a new test against duplicates for numeric input
MichaelChirico Apr 11, 2024
cc0d661
update last test number
MichaelChirico Apr 11, 2024
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
Prev Previous commit
Next Next commit
Update utils.c
  • Loading branch information
@Nj221102
Nj221102 authored Apr 11, 2024
commit b9a31354b05da22935d863cad069216ee4305c5a
2 changes: 1 addition & 1 deletion src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ SEXP colnamesInt(SEXP x, SEXP cols, SEXP check_dups, SEXP skip_absent) {
}
int *icols = INTEGER(ricols);
for (int i=0; i<nc; ++i) {
if ((icols[i]>nx && !bskip_absent) || (icols[i]<1 && icols[i]!=R_NaReal))
if ((icols[i]>nx && !bskip_absent) || (icols[i]<1))
error(_("argument specifying columns received non-existing column(s): cols[%d]=%d"), i+1, icols[i]); // handles NAs also
}
} else if (isString(cols)) {
Expand Down
Loading