solved problems with NANs

sestelo · Oct 30, 2017 · 4a186f5 · 4a186f5
1 parent a57bfa5
commit 4a186f5
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 10 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,2 +1,4 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+.travis.yml
+.lsq.mod
diff --git a/NAMESPACE b/NAMESPACE
@@ -48,8 +48,4 @@ importFrom(stats,runif)
 importFrom(stats,terms.formula)
 importFrom(utils,combn)
 importFrom(wesanderson,wes_palettes)
-useDynLib(npregfast, .registration = TRUE)
-useDynLib(npregfast,allotest_)
 useDynLib(npregfast,frfast_)
-useDynLib(npregfast,globaltest_)
-useDynLib(npregfast,localtest_)
diff --git a/R/allotest.R b/R/allotest.R
@@ -73,13 +73,13 @@
 #'@examples
 #' library(npregfast)
 #' data(barnacle)
-#' allotest(DW ~ RC, data = barnacle, nboot = 50, seed = 130853)
+#' allotest(DW ~ RC, data = barnacle, nboot = 50, seed = 130853, cluster = FALSE)
 #' 
-#' @useDynLib npregfast allotest_
 #' @importFrom stats na.omit runif
 #' @export
 
 
+# @useDynLib npregfast allotest_
 
 
 

diff --git a/R/frfast.R b/R/frfast.R
@@ -213,8 +213,6 @@
 #' # fit4 <- frfast(DW ~ RC : F, data = barnacle, model = "allo", nboot = 100)
 #' # summary(fit4)
 #' 
-#' @useDynLib npregfast, .registration = TRUE
-#' @useDynLib npregfast frfast_
 #' @importFrom stats na.omit runif lm predict quantile
 #' @importFrom mgcv interpret.gam gam predict.gam
 #' @importFrom sfsmisc D1D2

diff --git a/R/globaltest.R b/R/globaltest.R
@@ -107,7 +107,6 @@
 #' # seed = 130853, der = 0, smooth = "splines")
 #' 
 #' 
-#' @useDynLib npregfast globaltest_
 #' @importFrom stats na.omit runif
 #' @importFrom mgcv interpret.gam gam predict.gam
 #' @importFrom sfsmisc D1D2

diff --git a/R/localtest.R b/R/localtest.R
@@ -127,7 +127,6 @@
 #' # localtest(height ~ s(age, by = sex), data = children, seed = 130853, 
 #' # der = 1, smooth = "splines") 
 #' 
-#' @useDynLib npregfast localtest_
 #' @importFrom stats na.omit runif
 #' @importFrom mgcv interpret.gam gam predict.gam
 #' @importFrom sfsmisc D1D2

diff --git a/src/npregfast_init.c b/src/npregfast_init.c
@@ -0,0 +1,25 @@
+#include <R_ext/RS.h>
+#include <stdlib.h> // for NULL
+#include <R_ext/Rdynload.h>
+
+/* FIXME: 
+  Check these declarations against the C/Fortran source code.
+*/
+
+  /* .Fortran calls */
+extern void F77_NAME(frfast_)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *);
+extern void F77_NAME(globaltest_)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *);
+extern void F77_NAME(localtest_)(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *);
+
+static const R_FortranMethodDef FortranEntries[] = {
+  {"frfast_",     (DL_FUNC) &F77_NAME(frfast_),     43},
+  {"globaltest_", (DL_FUNC) &F77_NAME(globaltest_), 18},
+  {"localtest_",  (DL_FUNC) &F77_NAME(localtest_),  23},
+  {NULL, NULL, 0}
+};
+
+void R_init_npregfast(DllInfo *dll)
+{
+  R_registerRoutines(dll, NULL, NULL, FortranEntries, NULL);
+  R_useDynamicSymbols(dll, FALSE);
+}
diff --git a/src/npregfast_init.o b/src/npregfast_init.o
diff --git a/src/symbols.rds b/src/symbols.rds