[Swift-commit] r4200 - in SwiftApps/SwiftR: . Swift Swift/R

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-03-21 13:44:22 -0500 (Mon, 21 Mar 2011)
New Revision: 4200

Modified:
   SwiftApps/SwiftR/IMMEDIATE-TODO
   SwiftApps/SwiftR/Swift/DESCRIPTION
   SwiftApps/SwiftR/Swift/R/Apply.R
Log:
version 0.1.6 for posting to web



Modified: SwiftApps/SwiftR/IMMEDIATE-TODO
===================================================================
--- SwiftApps/SwiftR/IMMEDIATE-TODO	2011-03-18 19:08:14 UTC (rev 4199)
+++ SwiftApps/SwiftR/IMMEDIATE-TODO	2011-03-21 18:44:22 UTC (rev 4200)
@@ -6,6 +6,9 @@
 
 
 VERY HIGH:
+-- OpenMx doco on wiki
+
+VERY HIGH:
 -- get working on beagle.
 
 VERY HIGH:

Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-03-18 19:08:14 UTC (rev 4199)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-03-21 18:44:22 UTC (rev 4200)
@@ -1,12 +1,12 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.1.5
-Date: 2011-04-03
+Version: 0.1.6
+Date: 2011-04-21
 Author: Michael Wilde
 Maintainer: Michael Wilde <wilde at mcs.anl.gov>
 Description: Routines to invoke R functions on remote resources through Swift.
 License: Apache License
 LazyLoad: yes
-Packaged: 2011-04-03; Tim Armstrong
+Packaged: 2011-04-21; Tim Armstrong
 

Modified: SwiftApps/SwiftR/Swift/R/Apply.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Apply.R	2011-03-18 19:08:14 UTC (rev 4199)
+++ SwiftApps/SwiftR/Swift/R/Apply.R	2011-03-21 18:44:22 UTC (rev 4200)
@@ -122,7 +122,7 @@
  
   if (printTiming) startTime = proc.time()[["elapsed"]]
   # Fetch the batch results
-  res <- fetchBatchResults(reqdir, nbatches, arglists, keepwork)
+  res <- fetchBatchResults(reqdir, nbatches, arglists, keepwork, quiet)
   if (printTiming) {
     endTime = proc.time()[["elapsed"]]
     cat(paste("Swift results retrieved from disk in",
@@ -251,7 +251,7 @@
   return (batch - 1)
 }
 
-fetchBatchResults <- function (reqdir, nbatches, arglists, keepwork) {
+fetchBatchResults <- function (reqdir, nbatches, arglists, keepwork, quiet) {
   rno <- 1
   rlist <- list()
   for(batch in 1:nbatches) {
@@ -272,7 +272,8 @@
   }
   names(rlist) = names(arglists)
   if( ! keepwork ) {
-    cat("Removing ", reqdir, "\n")
+    if (!quiet)
+        cat("Removing ", reqdir, "\n")
     unlink(reqdir,recursive=TRUE)
   }
   return(rlist)