[Gmm-commits] r153 - in pkg: causalGel gmm4/R

[noreply at r-forge.r-project.org]

Author: chaussep
Date: 2019-11-15 23:49:10 +0100 (Fri, 15 Nov 2019)
New Revision: 153

Modified:
   pkg/causalGel/DESCRIPTION
   pkg/gmm4/R/gelfit-methods.R
Log:
fixed a few minor things

Modified: pkg/causalGel/DESCRIPTION
===================================================================
--- pkg/causalGel/DESCRIPTION	2019-11-15 19:56:25 UTC (rev 152)
+++ pkg/causalGel/DESCRIPTION	2019-11-15 22:49:10 UTC (rev 153)
@@ -1,6 +1,6 @@
 Package: causalGel
 Version: 0.0-1
-Date: 2019-10-16
+Date: 2019-11-15
 Title: Causal Inference using Generalized Empirical
         Likelihood Methods
 Author: Pierre Chausse <pchausse at uwaterloo.ca>

Modified: pkg/gmm4/R/gelfit-methods.R
===================================================================
--- pkg/gmm4/R/gelfit-methods.R	2019-11-15 19:56:25 UTC (rev 152)
+++ pkg/gmm4/R/gelfit-methods.R	2019-11-15 22:49:10 UTC (rev 153)
@@ -357,7 +357,7 @@
                     fact = 3, vcov="iid", n=10, cores=4, ...) 
               {
                   type <- match.arg(type)
-                  if (Sys.info()["sysname"] == "Windows")
+                  if(.Platform$OS.type == "windows")
                       cores <- 1L
                   n <- floor(n/2)
                   if (missing(parm))
@@ -395,9 +395,9 @@
                       (p[2]-mu[2])/(p[1]-mu[1])})                      
                   slope <- c(slU, slD)
                   resU <- mclapply(slU, function(s) .lineInterval(fit, s, ...),
-                                  mc.cores=8)
+                                   mc.cores=cores)
                   resD <- mclapply(slD, function(s) .lineInterval(fit, s, ...),
-                                   mc.cores=8)
+                                   mc.cores=cores)
                   Q1 <- cbind(p3, sapply(resU, function(l) l[1,]))
                   Q2 <- cbind(p4, sapply(resD, function(l) l[1,]))
                   Q3 <- cbind(p1, sapply(resU, function(l) l[2,]))