bugs-r-devel Mailing List for BUGS-R (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 183
          http://bugs-r.svn.sourceforge.net/bugs-r/?rev=183&view=rev
Author:   chris-jackson
Date:     2011-03-23 11:58:16 +0000 (Wed, 23 Mar 2011)

Log Message:
-----------
Bug fixes ready for version 0.7 release on OpenBUGS wiki

Modified Paths:
--------------
    branches/linux/BRugs/R/unix/zzz.R
    branches/linux/BRugs/R/unix/zzz.R.in
    branches/linux/BRugs/R/windows/zzz.R
    branches/linux/BRugs/R/zzz.R
    branches/linux/BRugs/src/Makevars

Modified: branches/linux/BRugs/R/unix/zzz.R
===================================================================

--- branches/linux/BRugs/R/unix/zzz.R	2011-03-22 12:24:38 UTC (rev 182)
+++ branches/linux/BRugs/R/unix/zzz.R	2011-03-23 11:58:16 UTC (rev 183)
@@ -4,12 +4,15 @@
         ## TODO any need for these to be user specifiable?
         options("BRugsTmpdir" = gsub("\\\\", "/", tempdir()))
         options("BRugsExtFile" = paste(basename(tempfile()), ".bug", sep=""))
-        options(OpenBUGS = "/home/chris/usr/lib/OpenBUGS")
+        options(OpenBUGS = "/usr/local/lib/OpenBUGS")
 
         if(is.null(getOption("BRugsVerbose")))
             options("BRugsVerbose" = TRUE)
         .initGlobals()
         options(OpenBUGSExamples = paste(options()$OpenBUGS, "doc", "Examples", sep="/"))
+        ver <- system("echo \"modelQuit()\" | OpenBUGS", intern=TRUE)
+        ver <- sub("OpenBUGS version (([0-9]\\.)+[0-9]).+","\\1",ver[1])
+        message("Welcome to BRugs running on OpenBUGS version ", ver)
     }
 
     ".onUnload" <- function(libpath){

Modified: branches/linux/BRugs/R/unix/zzz.R.in
===================================================================
--- branches/linux/BRugs/R/unix/zzz.R.in	2011-03-22 12:24:38 UTC (rev 182)
+++ branches/linux/BRugs/R/unix/zzz.R.in	2011-03-23 11:58:16 UTC (rev 183)
@@ -10,6 +10,9 @@
             options("BRugsVerbose" = TRUE)
         .initGlobals()
         options(OpenBUGSExamples = paste(options()$OpenBUGS, "doc", "Examples", sep="/"))
+        ver <- system("echo \"modelQuit()\" | OpenBUGS", intern=TRUE)
+        ver <- sub("OpenBUGS version (([0-9]\\.)+[0-9]).+","\\1",ver[1])
+        message("Welcome to BRugs running on OpenBUGS version ", ver)
     }
 
     ".onUnload" <- function(libpath){

Modified: branches/linux/BRugs/R/windows/zzz.R
===================================================================
--- branches/linux/BRugs/R/windows/zzz.R	2011-03-22 12:24:38 UTC (rev 182)
+++ branches/linux/BRugs/R/windows/zzz.R	2011-03-23 11:58:16 UTC (rev 183)
@@ -2,36 +2,47 @@
 
     ".onLoad" <- function(lib, pkg){
         ob.reg <- try(utils:::readRegistry("Software\\OpenBUGS","HLM"))
-        if (inherits(ob.reg, "try-error")) stop("OpenBUGS 3.2.1 or greater must be installed")
+        if (inherits(ob.reg, "try-error")) {
+            warning("OpenBUGS 3.2.1 or greater must be installed")
+            return
+        }
         rnames <- names(ob.reg)
         ver <- gsub("OpenBUGS ", "", rnames)
-        ver <- gsub("(.+)e$","\\1", ver)
-        version.inst <- as.numeric(paste(substr(ver, 1, 2), gsub("\\.","",substr(ver, 3, nchar(ver))), sep=""))
+        veri <- gsub("(.+)e$","\\1", ver)
+        version.inst <- as.numeric(paste(substr(veri, 1, 2), gsub("\\.","",substr(veri, 3, nchar(veri))), sep=""))
         deps <- utils:::packageDescription("BRugs", fields="SystemRequirements")
         ver <- gsub(".*OpenBUGS ?\\(>= ?(.+)\\).*", "\\1", deps)
         version.req <- as.numeric(paste(substr(ver, 1, 2), gsub("\\.","",substr(ver, 3, nchar(ver))), sep=""))
-        if (max(version.inst) < version.req)
-            stop("Found OpenBUGS version ", version.inst, ". Requires ", version.req, " or greater")
+        if (max(version.inst) < version.req) {
+            warning("Found OpenBUGS version ", version.inst, ". Requires ", version.req, " or greater")
+            return
+        }
         ## OpenBUGS installation location
-        options(OpenBUGS = utils:::readRegistry(paste("Software","OpenBUGS",rnames[which.max(version.inst)],sep="\\"),"HLM")$InstallPath)
-        libname <- paste(options()$OpenBUGS, "libOpenBUGS.dll", sep="/")
+        dir <- utils:::readRegistry(paste("Software","OpenBUGS",rnames[which.max(version.inst)],sep="\\"),"HLM")$InstallPath
+        loadOpenBUGS(dir)
+        message("Welcome to BRugs running on OpenBUGS version ", veri[which.max(version.inst)])
+    }
+
+    ## Load OpenBUGS from specified location
+    loadOpenBUGS <- function(dir)  {
+        libname <- paste(dir, "libOpenBUGS.dll", sep="/")
         if (!file.exists(libname))  {
-            stop("Shared library \"libOpenBUGS.dll\" not found in ", options()$OpenBUGS)
+            warning("Shared library \"libOpenBUGS.dll\" not found in ", dir)
         }
+        options(OpenBUGS = dir)
         ## All checks passed - load the DLL
         dyn.load(libname)
-        len <- nchar(options()$OpenBUGS)
-        .C("SetWorkingDir", as.character(options()$OpenBUGS), len, PACKAGE="libOpenBUGS")
+        len <- nchar(dir)
+        .C("SetWorkingDir", as.character(dir), len, PACKAGE="libOpenBUGS")
         ## Set temporary dir for "buffer.txt" output
         tempDir <- gsub("\\\\", "/", tempdir())
         .C("SetTempDir", as.character(tempDir), nchar(tempDir), PACKAGE="libOpenBUGS")
         command <- "BugsMappers.SetDest(2)"
         .CmdInterpreter(command)
-
         if(is.null(getOption("BRugsVerbose")))
             options("BRugsVerbose" = TRUE)
         .initGlobals()
-        options(OpenBUGSExamples = paste(options()$OpenBUGS, "Examples", sep="/"))
+        options(OpenBUGSExamples = paste(dir, "Examples", sep="/"))
     }
 
     ".onUnload" <- function(libpath){

Modified: branches/linux/BRugs/R/zzz.R
===================================================================
--- branches/linux/BRugs/R/zzz.R	2011-03-22 12:24:38 UTC (rev 182)
+++ branches/linux/BRugs/R/zzz.R	2011-03-23 11:58:16 UTC (rev 183)
@@ -1,4 +1,4 @@
-## See unix/zzz.R, windows/zzz.R for platform specific .onLoad functions 
+## See unix/zzz.R, windows/zzz.R for platform specific .onLoad functions
 
 if (is.R()){
 
@@ -13,10 +13,6 @@
         options("BRugsPrec" = 4)
     }
 
-    ".onAttach" <- function(lib, pkg){
-        message("Welcome to BRugs running on OpenBUGS version 3.1.2")
-    }
-
     ## Overwriting new (from R-2.6.0) sQuote (for typing human readable text) in R within the BRugs Namespace!
     ## we cannot use sQuote that uses fancy quotes!
     sQuote <- function(x) paste("'", x, "'", sep="")

Modified: branches/linux/BRugs/src/Makevars
===================================================================
--- branches/linux/BRugs/src/Makevars	2011-03-22 12:24:38 UTC (rev 182)
+++ branches/linux/BRugs/src/Makevars	2011-03-23 11:58:16 UTC (rev 183)
@@ -1,5 +1,5 @@
-BUGS_LIBS = /home/chris/usr/lib/OpenBUGS/lib/libOpenBUGS.so 
-BUGS_LDFLAGS = -m32 -Wl,-rpath=/home/chris/usr/lib/OpenBUGS/lib 
+BUGS_LIBS = /usr/local/lib/OpenBUGS/lib/libOpenBUGS.so 
+BUGS_LDFLAGS = -m32 -Wl,-rpath=/usr/local/lib/OpenBUGS/lib 
 
 BugsHelper:
 	mkdir -p ../exec


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (11)	Dec (20)
2007	Jan	Feb	Mar	Apr (7)	May (24)	Jun (15)	Jul (5)	Aug (21)	Sep (85)	Oct (9)	Nov	Dec
2008	Jan (15)	Feb (11)	Mar	Apr (2)	May (3)	Jun	Jul	Aug	Sep (29)	Oct (47)	Nov (1)	Dec (1)
2009	Jan (8)	Feb (12)	Mar (14)	Apr (4)	May (1)	Jun	Jul (5)	Aug	Sep	Oct (11)	Nov (18)	Dec
2010	Jan	Feb	Mar (1)	Apr (3)	May (24)	Jun	Jul (1)	Aug (7)	Sep (5)	Oct (3)	Nov (4)	Dec
2011	Jan	Feb	Mar (13)	Apr (3)	May (2)	Jun	Jul (1)	Aug (24)	Sep (3)	Oct	Nov	Dec (29)
2012	Jan (5)	Feb (5)	Mar	Apr	May (1)	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr (9)	May (1)	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr (1)	May (1)	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec (1)
2017	Jan	Feb	Mar	Apr	May	Jun (5)	Jul	Aug	Sep	Oct	Nov	Dec