[Gmpm-commits] r13 - in pkg: . R man

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

Author: dalebarr
Date: 2009-09-16 13:50:48 +0200 (Wed, 16 Sep 2009)
New Revision: 13

Modified:
   pkg/DESCRIPTION
   pkg/R/gmp.R
   pkg/man/gmpm-package.Rd
Log:
minor bug fixes

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-08-31 12:36:32 UTC (rev 12)
+++ pkg/DESCRIPTION	2009-09-16 11:50:48 UTC (rev 13)
@@ -1,8 +1,8 @@
 Package: gmpm
 Type: Package
 Title: Generalized Multilevel Permutation Models
-Version: 0.1-4
-Date: 2009-08-27
+Version: 0.1-5
+Date: 2009-09-16
 Author: Dale Barr <dale.barr at ucr.edu>
 Maintainer: Dale Barr <dale.barr at ucr.edu>
 Description: Permutation methods for testing hypotheses on various types of multilevel data

Modified: pkg/R/gmp.R
===================================================================
--- pkg/R/gmp.R	2009-08-31 12:36:32 UTC (rev 12)
+++ pkg/R/gmp.R	2009-09-16 11:50:48 UTC (rev 13)
@@ -28,9 +28,8 @@
               nform <- paste(lhs, "~", object at ivars[i], sep="")
               fcall$formula <- nform
               if (object at famtype == "multinomial") {
-                sink(".multinom.txt")
-                nn1 <- colnames(coef(eval(as.call(fcall))))
-                sink(NULL)
+                tryCatch({sink(".multinom.txt"); nn1 <- colnames(coef(eval(as.call(fcall))))},
+                         finally=sink(NULL))
               } else {
                 nn1 <- names(coef(eval(as.call(fcall))))
               }
@@ -550,6 +549,7 @@
             }
             cat(sprintf("%02dm:", floor(remn/60)))
             cat(sprintf("%02ds", round(remn %% 60)), "left\n")
+            flush.console()
           }
           )
 
@@ -570,9 +570,8 @@
             nameObject <- deparse(substitute(x))
             
             x at pmx <- array(dim=c(maxruns+1, dim(x at coef0)[1], dim(x at coef0)[2]))
-            sink(".multinom.txt")
-            f0 <- origFit(x)
-            sink(NULL)
+            tryCatch({sink(".multinom.txt");
+                      f0 <- origFit(x)}, finally=sink(NULL))
             x at pmx[1,,] <-coef(f0)
               
             dimnames(x at pmx) <- list(run=1:(maxruns+1),

Modified: pkg/man/gmpm-package.Rd
===================================================================
--- pkg/man/gmpm-package.Rd	2009-08-31 12:36:32 UTC (rev 12)
+++ pkg/man/gmpm-package.Rd	2009-09-16 11:50:48 UTC (rev 13)
@@ -13,8 +13,8 @@
 \tabular{ll}{
 Package: \tab gmpm\cr
 Type: \tab Package\cr
-Version: \tab 0.1-4\cr
-Date: \tab 2009-08-27\cr
+Version: \tab 0.1-5\cr
+Date: \tab 2009-09-16\cr
 License: \tab GPL-2\cr
 LazyLoad: \tab yes\cr
 Depends: \tab methods\cr