Trying to fix Travis build

Author: schuemie

Cyclops.Rproj

@@ -17,4 +17,5 @@ StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageInstallArgs: --no-multiarch --with-keep.source
+PackageCheckArgs: --as-cran
 PackageRoxygenize: rd,namespace

src/Makevars

@@ -1,13 +1,13 @@
-## Use the R_HOME indirection to support installations of multiple R version 
+## Use the R_HOME indirection to support installations of multiple R version
 PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
 
 ## As an alternative, one can also add this code in a file 'configure'
 ##
 ##    PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
-## 
+##
 ##    sed -e "s|@PKG_LIBS@|${PKG_LIBS}|" \
 ##        src/Makevars.in > src/Makevars
-## 
+##
 ## which together with the following file 'src/Makevars.in'
 ##
 ##    PKG_LIBS = @PKG_LIBS@
@@ -18,7 +18,7 @@ PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
 ##
 ##    rm src/Makevars
 ##
-## which removes the autogenerated file src/Makevars. 
+## which removes the autogenerated file src/Makevars.
 ##
 ## Of course, autoconf can also be used to write configure files. This is
 ## done by a number of packages, but recommended only for more advanced users
@@ -49,29 +49,30 @@ OBJECTS.drivers = \
     cyclops/drivers/HierarchyAutoSearchCrossValidationDriver.o \
     cyclops/drivers/HierarchyGridSearchCrossValidationDriver.o \
     cyclops/drivers/ProportionSelector.o
-    
+
 OBJECTS.priors = \
     cyclops/priors/CovariatePrior.o
-    
+
 OBJECTS.io = \
     cyclops/io/InputReader.o
-    
+
 OBJECTS.engine = \
     cyclops/engine/AbstractModelSpecifics.o
-    
+
 OBJECTS.utils = \
     utils/HParSearch.o
 
 OBJECTS.thread = \
     tinythread/tinythread.o
-    
+
 OBJECTS.R = \
     IsSorted.o \
+    BySum.o \
     RcppExports.o \
     RcppModelData.o \
     RcppCyclopsInterface.o \
     RcppIsSorted.o
-     
+
 OBJECTS = $(OBJECTS.cyclops) $(OBJECTS.drivers) \
           $(OBJECTS.engine) $(OBJECTS.utils) \
           $(OBJECTS.threads) $(OBJECTS.R) \

tests/testthat/test-predict.R

@@ -13,11 +13,11 @@ test_that("Test predict for Poisson regression", {
 
     # Test using data frames
     predictNew <- predict(fit, outcomes, covariates)
-    expect_less_than(max(abs(predictOriginal - predictNew)), 1e-08)
+    expect_lt(max(abs(predictOriginal - predictNew)), 1e-08)
 
     # Test using ffdf
     predictNew <- predict(fit, as.ffdf(outcomes),as.ffdf(covariates))
-    expect_less_than(max(abs(predictOriginal - predictNew)), 1e-08)
+    expect_lt(max(abs(predictOriginal - predictNew)), 1e-08)
 })
 
 test_that("Test predict for logistic regression", {
@@ -31,9 +31,9 @@ test_that("Test predict for logistic regression", {
 
     # Test using data frames
     predictNew <- predict(fit, outcomes, covariates)
-    expect_less_than(max(abs(predictOriginal - predictNew)), 1e-08)
+    expect_lt(max(abs(predictOriginal - predictNew)), 1e-08)
 
     # Test using ffdf
     predictNew <- predict(fit, as.ffdf(outcomes),as.ffdf(covariates))
-    expect_less_than(max(abs(predictOriginal - predictNew)), 1e-08)
+    expect_lt(max(abs(predictOriginal - predictNew)), 1e-08)
 })