more resolution

Author: MichaelChirico

R/data.table.R

@@ -1770,43 +1770,7 @@ replace_dot_alias = function(e) {
         GForce = FALSE
       } else {
         # Apply GForce
-<<<<<<< HEAD
-        .gforce_ok = function(q) {  # TODO: move outside and test directly
-          if (dotN(q)) return(TRUE) # #334
-          # run GForce for gfuns(x, ...) where x is a column of .SD 
-          # is.symbol() is for #1369, #1974 and #2949
-          if (!(is.call(q) && is.symbol(q1<-q[[1L]]) && is.symbol(q2<-q[[2L]]) && q1 %chin% gfuns)) return(FALSE)
-          if (!q2 %chin% names(SDenv$.SDall) && q2!=".I") return(FALSE)  # 875
-          if (q1=="weighted.mean") return(TRUE)  #3977; the weight argument can be a symbol
-          if (length(q)==2L) return(TRUE)  # e.g. sum(colA) (i.e. no arguments)
-          # establish named arguments; e.g. if both na.rm and n have been passed to first/last, either one could appear first
-          f = get(q1)  # maybe a lookup table would be faster than get() but speed should be insignificant here up-front one-time
-          if (!is.primitive(f)) q = match.call(f, q)
-          # else the gfuns which are primitive functions (which match.call doesn't support and errors) are
-          # all of the form fun(..., na.rm=FALSE) so the na.rm arg has to be named in full by the user and
-          # so will be named in q already
-          for (argnum in seq.int(3L, length(q))) {
-            arg = if (is.null(names(q))) "" else names(q)[argnum]
-            if (arg=="na.rm") next
-            if (q1=="shift") {
-              if (arg=="fill" && (is.symbol(q$fill) || is.atomic(q$fill))) next
-              if (arg=="type" && (is.symbol(q$type) || is.atomic(q$type))) next # test 2224.01
-              if (arg=="n") next # negative n is supported by optimized shift, and in test 2224.01 n=-1 appears as a call to '-'()
-            }
-            if (arg=="n") {
-              if (!is.atomic(q$n) || !isTRUE(q$n>0L)) return(FALSE)  # n<=0 not optimized for first/last, [, [[
-              next
-            }
-            if (arg!="") return(FALSE)  # e.g. trim= and fill's give.names= are not yet optimized
-            if (length(q[[argnum]])!=1L || !is.atomic(q[[argnum]])) return(FALSE)  # test 173.1: DT[,B[B>3],by=A], and test 823: sum(b,a)
-            if (q1=="[[" && !eval(call('is.atomic', q2), envir=x)) return(FALSE)  # test 1581.16: dt[, .(l=l[[1L]]), by=a]
-          }
-          TRUE
-        }
-        if (jsub[[1L]]=="list") {
-=======
         if (jsub %iscall% "list") {
->>>>>>> master
           GForce = TRUE
           for (ii in seq.int(from=2L, length.out=length(jsub)-1L)) {
             if (!.gforce_ok(jsub[[ii]], SDenv$.SDall)) {GForce = FALSE; break}
@@ -1897,12 +1861,9 @@ replace_dot_alias = function(e) {
     assign(".N", len__, thisEnv) # For #334
     #fix for #1683
     if (use.I) assign(".I", seq_len(nrow(x)), thisEnv)
-<<<<<<< HEAD
     ans = gforce(thisEnv, jsub, o__, f__, len__, irows,  # irows needed for #971
                  .Call(CsubsetVector, groups, grpcols),  # just a list() subset to make C level neater; doesn't copy column contents
                  lhs)  # for now this just prevents := with new feature first/last n>1; in future see TODO below
-=======
-    ans = gforce(thisEnv, jsub, o__, f__, len__, irows) # irows needed for #971.
     gi = if (length(o__)) o__[f__] else f__
     g = lapply(grpcols, function(i) .Call(CsubsetVector, groups[[i]], gi)) # use CsubsetVector instead of [ to preserve attributes #5567
 
@@ -1943,7 +1904,6 @@ replace_dot_alias = function(e) {
       }
     }
     ans = c(g, ans)
->>>>>>> master
   } else {
     ans = .Call(Cdogroups, x, xcols, groups, grpcols, jiscols, xjiscols, grporder, o__, f__, len__, jsub, SDenv, cols, newnames, !missing(on), verbose, showProgress)
   }
@@ -3059,13 +3019,8 @@ gfuns = c(gdtfuns,
 `g[` = `g[[` = function(x, n) .Call(Cgnthvalue, x, as.integer(n)) # n is of length=1 here.
 ghead = function(x, n) .Call(Cghead, x, as.integer(n))
 gtail = function(x, n) .Call(Cgtail, x, as.integer(n))
-<<<<<<< HEAD
 gfirst = function(x, n=1L, na.rm=FALSE) .Call(Cgfirst, x, as.integer(n), na.rm)
 glast = function(x, n=1L, na.rm=FALSE) .Call(Cglast, x, as.integer(n), na.rm)
-=======
-gfirst = function(x) .Call(Cgfirst, x)
-glast = function(x) .Call(Cglast, x)
->>>>>>> master
 gsum = function(x, na.rm=FALSE) .Call(Cgsum, x, na.rm)
 gmean = function(x, na.rm=FALSE) .Call(Cgmean, x, na.rm)
 gweighted.mean = function(x, w, ..., na.rm=FALSE) {

R/test.data.table.R

@@ -435,9 +435,6 @@ test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,no
     }
     assign("prevtest", num, parent.frame(), inherits=TRUE)
   }
-<<<<<<< HEAD
-  if (length(output) || length(notOutput)) {
-=======
   if (!fail) for (type in c("warning","error","message")) {
     observed = actual[[type]]
     expected = get(type)
@@ -471,7 +468,6 @@ test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,no
     # nocov end
   }
   if (!fail && !length(error) && (length(output) || length(notOutput))) {
->>>>>>> master
     if (out[length(out)] == "NULL") out = out[-length(out)]
     out = paste(out, collapse="\n")
     output = paste(output, collapse="\n")  # so that output= can be either a \n separated string, or a vector of strings.

src/data.table.h

@@ -102,14 +102,11 @@ extern SEXP sym_index;
 extern SEXP sym_BY;
 extern SEXP sym_starts, char_starts;
 extern SEXP sym_maxgrpn;
-<<<<<<< HEAD
 extern SEXP sym_gforce_dynamic;
-=======
 extern SEXP sym_anyna;
 extern SEXP sym_anyinfnan;
 extern SEXP sym_anynotascii;
 extern SEXP sym_anynotutf8;
->>>>>>> master
 extern SEXP sym_colClassesAs;
 extern SEXP sym_verbose;
 extern SEXP SelfRefSymbol;

src/init.c

@@ -29,14 +29,11 @@ SEXP sym_index;
 SEXP sym_BY;
 SEXP sym_starts, char_starts;
 SEXP sym_maxgrpn;
-<<<<<<< HEAD
 SEXP sym_gforce_dynamic;
-=======
 SEXP sym_anyna;
 SEXP sym_anyinfnan;
 SEXP sym_anynotascii;
 SEXP sym_anynotutf8;
->>>>>>> master
 SEXP sym_colClassesAs;
 SEXP sym_verbose;
 SEXP SelfRefSymbol;
@@ -52,103 +49,6 @@ Rcomplex NA_CPLX;
 size_t __sizes[100];
 size_t __typeorder[100];
 
-<<<<<<< HEAD
-// .Calls
-SEXP setattrib();
-SEXP bmerge();
-SEXP assign();
-SEXP dogroups();
-SEXP copy();
-SEXP shallowwrapper();
-SEXP alloccolwrapper();
-SEXP selfrefokwrapper();
-SEXP truelength();
-SEXP settruelength();
-SEXP setcharvec();
-SEXP setcolorder();
-SEXP chmatch_R();
-SEXP chmatchdup_R();
-SEXP chin_R();
-SEXP fifelseR();
-SEXP fcaseR();
-SEXP freadR();
-SEXP fwriteR();
-SEXP reorder();
-SEXP rbindlist();
-SEXP vecseq();
-SEXP setlistelt();
-SEXP address();
-SEXP expandAltRep();
-SEXP fmelt();
-SEXP fcast();
-SEXP uniqlist();
-SEXP uniqlengths();
-SEXP forder();
-SEXP issorted();
-SEXP gforce();
-SEXP gsum();
-SEXP gmean();
-SEXP gmin();
-SEXP gmax();
-SEXP isOrderedSubset();
-SEXP setNumericRounding();
-SEXP getNumericRounding();
-SEXP binary();
-SEXP subsetDT();
-SEXP subsetVector();
-SEXP convertNegAndZeroIdx();
-SEXP frank();
-SEXP dt_na();
-SEXP lookup();
-SEXP overlaps();
-SEXP whichwrapper();
-SEXP shift();
-SEXP transpose();
-SEXP anyNA();
-SEXP isReallyReal();
-SEXP setlevels();
-SEXP rleid();
-SEXP gmedian();
-SEXP gtail();
-SEXP ghead();
-SEXP glast();
-SEXP gfirst();
-SEXP gnthvalue();
-SEXP dim();
-SEXP gvar();
-SEXP gsd();
-SEXP gprod();
-SEXP gshift();
-SEXP nestedid();
-SEXP setDTthreads();
-SEXP getDTthreads_R();
-SEXP nqRecreateIndices();
-SEXP fsort();
-SEXP inrange();
-SEXP between();
-SEXP hasOpenMP();
-SEXP uniqueNlogical();
-SEXP frollfunR();
-SEXP dllVersion();
-SEXP nafillR();
-SEXP colnamesInt();
-SEXP initLastUpdated();
-SEXP cj();
-SEXP lock();
-SEXP unlock();
-SEXP islockedR();
-SEXP allNAR();
-SEXP test_dt_win_snprintf();
-SEXP dt_zlib_version();
-SEXP startsWithAny();
-SEXP convertDate();
-SEXP notchin();
-
-// .Externals
-SEXP fastmean();
-
-=======
->>>>>>> master
 static const
 R_CallMethodDef callMethods[] = {
 {"Csetattrib", (DL_FUNC) &setattrib, -1},
@@ -386,14 +286,11 @@ void attribute_visible R_init_data_table(DllInfo *info)
   sym_index   = install("index");
   sym_BY      = install(".BY");
   sym_maxgrpn = install("maxgrpn");
-<<<<<<< HEAD
   sym_gforce_dynamic = install("gforce_dynamic");
-=======
   sym_anyna   = install("anyna");
   sym_anyinfnan = install("anyinfnan");
   sym_anynotascii = install("anynotascii");
   sym_anynotutf8 = install("anynotutf8");
->>>>>>> master
   sym_colClassesAs = install("colClassesAs");
   sym_verbose = install("datatable.verbose");
   SelfRefSymbol = install(".internal.selfref");