[Swift-commit] r4066 - in SwiftApps/SwiftR: Swift/R mxtests/swift

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-02-07 16:50:53 -0600 (Mon, 07 Feb 2011)
New Revision: 4066

Modified:
   SwiftApps/SwiftR/Swift/R/Apply.R
   SwiftApps/SwiftR/Swift/R/Workers.R
   SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R
Log:
Minor fix for text, and converting openmx test


Modified: SwiftApps/SwiftR/Swift/R/Apply.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Apply.R	2011-02-07 22:07:51 UTC (rev 4065)
+++ SwiftApps/SwiftR/Swift/R/Apply.R	2011-02-07 22:50:53 UTC (rev 4066)
@@ -266,8 +266,8 @@
     }
     else {
         stop(paste("Have you run swiftInit?\n",
-                "It appears that no SwiftR servers of type", server, 
-                "are running, as no request pipe exists at", 
+                "It appears that the SwiftR server is not running",  
+                ", as no request pipe exists at", 
                 requestPipeName))
     }
 

Modified: SwiftApps/SwiftR/Swift/R/Workers.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Workers.R	2011-02-07 22:07:51 UTC (rev 4065)
+++ SwiftApps/SwiftR/Swift/R/Workers.R	2011-02-07 22:50:53 UTC (rev 4066)
@@ -204,7 +204,8 @@
     }
     # shut down all worker processes using kill
     for (worker in workers) {
-        cat("Terminating worker", worker$pid, " of type ",worker$server, "\n")
+        cat(paste("Terminating worker", worker$pid, "of type", 
+                    worker$server, "\n"))
         cmdString <- file.path(.find.package("Swift"), "exec/killtree &> /dev/null ")
         killCmd <- paste(cmdString, worker$pid)
         system(killCmd, wait=FALSE)

Modified: SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R
===================================================================
--- SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R	2011-02-07 22:07:51 UTC (rev 4065)
+++ SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R	2011-02-07 22:50:53 UTC (rev 4066)
@@ -101,7 +101,7 @@
 
 topModel <- mxModel(name = 'container')
 
-#sfExportAll()
+swiftExportAll()
 
 submodels <- swiftLapply(1:nReps, createNewModel, 'stErrSim', template)