Updated flashpcaR DESCRIPTION; Makefile.win

flashpcaR/DESCRIPTION

@@ -3,15 +3,16 @@ Depends: R(>= 3.0.2)
 Type: Package
 Title: R Interface to FlashPCA
 Version: 2.0
-Date: 2016-11-30
+Date: 2016-15-12
 Authors@R: c(
    person("Gad", "Abraham", , "gad.abraham@unimelb.edu.au", c("aut", "cre")),
    person("Yixuan", "Qiu", , "yixuan.qiu@cos.name", c("aut"))
    )
-Description: flashpca is an efficient implementation of principal
+Description: FlashPCA is an efficient implementation of principal
    component analysis (PCA), useful for rapidly estimating the top principal
-   components of data. In addition to standard PCA, flashpca implements kernal PCA
-   and sparse (L1-penalized) canonical correlation analysis (SCCA).
+   components of data. In addition to standard PCA, FlashPCA implements
+   sparse (L1-penalised) canonical correlation analysis (SCCA) as well as
+   per-SNP canonical correlation analysis (ANOVA).
 URL:
    https://github.com/gabraham/flashpca
 BugReports:

flashpcaR/src/Makevars.win

@@ -6,6 +6,7 @@
 # doesn't like.
 PKG_CXXFLAGS = -DRENV -DNDEBUG
 PKG_LIBS = 
+CXX_STD = CXX11
 
 ## With R 3.1.0 or later, you can uncomment the following line to tell R to 
 ## enable compilation with C++11 (where available)

util.cpp

@@ -14,11 +14,6 @@ using namespace Eigen;
 
 bool show_timestamp;
 
-int inline is_nan(double x)
-{
-   return isnan(x);
-}
-
 // Standardise matrix column-wise to zero mean and unit variance.
 // *Standardises in place*
 // If a column is all zeros, it will remain zero.