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

Jump to bottom

Fix #14 #15

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix #14 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cfb56f
Fix #10
OfekShilon Mar 9, 2021
a993ac8
Improve fix for log.integer64
OfekShilon Mar 9, 2021
0d9f5c4
Fix #12
OfekShilon Mar 9, 2021
f619050
Fix conflict of merge from Fix#12
OfekShilon Mar 10, 2021
8fcfeaf
Fix #14
OfekShilon Mar 10, 2021
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
100 changes: 80 additions & 20 deletions R/integer64.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2324,7 +2324,11 @@ as.data.frame.integer64 <- function(x, ...){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_plus_integer64, e1, e2, double(max(length(e1),length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
ret <- .Call(C_plus_integer64, e1, e2, ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2338,7 +2342,11 @@ as.data.frame.integer64 <- function(x, ...){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_minus_integer64, e1, e2, double(max(length(e1),length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
.Call(C_minus_integer64, e1, e2, ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2348,7 +2356,11 @@ as.data.frame.integer64 <- function(x, ...){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_intdiv_integer64, e1, e2, double(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
.Call(C_intdiv_integer64, e1, e2, ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2358,7 +2370,11 @@ as.data.frame.integer64 <- function(x, ...){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_mod_integer64, e1, e2, double(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
.Call(C_mod_integer64, e1, e2, ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2367,32 +2383,48 @@ as.data.frame.integer64 <- function(x, ...){

"*.integer64" <- function(e1, e2){
a <- binattr(e1,e2)
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
if (is.double(e2)) # implies !is.integer64(e2)
ret <- .Call(C_times_integer64_double, as.integer64(e1), e2, double(max(length(e1),length(e2))))
.Call(C_times_integer64_double, as.integer64(e1), e2, ret)
else if (is.double(e1))
.Call(C_times_integer64_double, as.integer64(e2), e1, ret)
else
ret <- .Call(C_times_integer64_integer64, as.integer64(e1), as.integer64(e2), double(max(length(e1),length(e2))))
.Call(C_times_integer64_integer64, as.integer64(e1), as.integer64(e2), ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
}

"^.integer64" <- function(e1, e2){
a <- binattr(e1,e2)
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
if (is.double(e2)) # implies !is.integer64(e2)
ret <- .Call(C_power_integer64_double, as.integer64(e1), e2, double(max(length(e1),length(e2))))
.Call(C_power_integer64_double, as.integer64(e1), e2, ret)
else
ret <- .Call(C_power_integer64_integer64, as.integer64(e1), as.integer64(e2), double(max(length(e1),length(e2))))
.Call(C_power_integer64_integer64, as.integer64(e1), as.integer64(e2), ret)
a$class <- plusclass(a$class, "integer64")
attributes(ret) <- a
ret
}

"/.integer64" <- function(e1, e2){
a <- binattr(e1,e2)
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- double(l)
if (is.double(e2)) # implies !is.integer64(e2)
ret <- .Call(C_divide_integer64_double, as.integer64(e1), e2, double(max(length(e1),length(e2))))
.Call(C_divide_integer64_double, as.integer64(e1), e2, ret)
else if (is.double(e1))
.Call(C_divide_double_integer64, e1, e2, ret)
else
ret <- .Call(C_divide_integer64_integer64, as.integer64(e1), as.integer64(e2), double(max(length(e1),length(e2))))
.Call(C_divide_integer64_integer64, as.integer64(e1), as.integer64(e2), ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand Down Expand Up @@ -2423,12 +2455,16 @@ as.data.frame.integer64 <- function(x, ...){

"log.integer64" <- function(x, base=NULL){
a <- attributes(x)
ret <- if (is.null(base)){
.Call(C_log_integer64, x, double(max(length(x),length(base))))
l.x <- length(x)
l.base <- length(base)
l <- if (l.x==0 || (!is.null(base) && l.base==0)) 0 else max(l.base,l.x)
ret <- double(l)
if (is.null(base)){
.Call(C_log_integer64, x, ret)
}else if(length(base)==1){
.Call(C_logbase_integer64, x, as.double(base), double(max(length(x),length(base))))
.Call(C_logbase_integer64, x, as.double(base), ret)
}else{
.Call(C_logvect_integer64, x, as.double(base), double(max(length(x),length(base))))
.Call(C_logvect_integer64, x, as.double(base), ret)
}
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
Expand Down Expand Up @@ -2705,7 +2741,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_EQ_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_EQ_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2715,7 +2755,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_NE_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_NE_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2725,7 +2769,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_LT_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_LT_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2735,7 +2783,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_LE_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_LE_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2745,7 +2797,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_GT_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_GT_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand All @@ -2755,7 +2811,11 @@ lim.integer64 <- function(){
a <- binattr(e1,e2)
e1 <- as.integer64(e1)
e2 <- as.integer64(e2)
ret <- .Call(C_GE_integer64, e1, e2, logical(max(length(e1), length(e2))))
l1 <- length(e1)
l2 <- length(e2)
l <- if (l1 == 0 || l2 == 0) 0 else max(l1,l2)
ret <- logical(l)
.Call(C_GE_integer64, e1, e2, ret)
a$class <- minusclass(a$class, "integer64")
attributes(ret) <- a
ret
Expand Down
2 changes: 2 additions & 0 deletions src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ extern SEXP cumprod_integer64(SEXP, SEXP);
extern SEXP cumsum_integer64(SEXP, SEXP);
extern SEXP diff_integer64(SEXP, SEXP, SEXP, SEXP);
extern SEXP divide_integer64_double(SEXP, SEXP, SEXP);
extern SEXP divide_double_integer64(SEXP, SEXP, SEXP);
extern SEXP divide_integer64_integer64(SEXP, SEXP, SEXP);
extern SEXP EQ_integer64(SEXP, SEXP, SEXP);
extern SEXP GE_integer64(SEXP, SEXP, SEXP);
Expand Down Expand Up @@ -133,6 +134,7 @@ static const R_CallMethodDef CallEntries[] = {
{"cumsum_integer64", (DL_FUNC) &cumsum_integer64, 2},
{"diff_integer64", (DL_FUNC) &diff_integer64, 4},
{"divide_integer64_double", (DL_FUNC) &divide_integer64_double, 3},
{"divide_double_integer64", (DL_FUNC) &divide_double_integer64, 3},
{"divide_integer64_integer64", (DL_FUNC) &divide_integer64_integer64, 3},
{"EQ_integer64", (DL_FUNC) &EQ_integer64, 3},
{"GE_integer64", (DL_FUNC) &GE_integer64, 3},
Expand Down
15 changes: 15 additions & 0 deletions src/integer64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,21 @@ SEXP divide_integer64_double(SEXP e1_, SEXP e2_, SEXP ret_){
return ret_;
}

SEXP divide_double_integer64(SEXP e1_, SEXP e2_, SEXP ret_){
long long i, n = LENGTH(ret_);
long long i1, n1 = LENGTH(e1_);
long long i2, n2 = LENGTH(e2_);
long long * e2 = (long long *) REAL(e2_);
double * e1 = REAL(e1_);
double * ret = REAL(ret_);
Rboolean naflag = FALSE;
mod_iterate(n1, n2, i1, i2) {
DIVIDEREAL64(e1[i1],e2[i2],ret[i],naflag)
}
if (naflag)warning(INTEGER64_OVERFLOW_WARNING);
return ret_;
}

SEXP sign_integer64(SEXP e1_, SEXP ret_){
long long i, n = LENGTH(ret_);
long long * e1 = (long long *) REAL(e1_);
Expand Down
11 changes: 11 additions & 0 deletions src/integer64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,17 @@
naflag = TRUE; \
}

#define DIVIDEREAL64(e1,e2,ret,naflag) \
if (e2 == NA_INTEGER64 || ISNAN(e1)) \
ret = NA_REAL; \
else { \
if (e2==0) \
ret = NA_REAL; \
else \
ret = (double)((long double) e1 / (long double) e2); \
if (ISNAN(ret)) \
naflag = TRUE; \
}
#define DIVIDE64(e1,e2,ret,naflag) \
if (e1 == NA_INTEGER64 || e2 == NA_INTEGER64) \
ret = NA_REAL; \
Expand Down