[Bugs-r-devel] SF.net SVN: bugs-r:[266] trunk/BRugs

[<li...@us...>]

Revision: 266
          http://sourceforge.net/p/bugs-r/code/266
Author:   ligges
Date:     2013-08-18 16:54:53 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Remove utils from Depends and make proper imports so ":::" usage is no longer necessary, as requested by CRAN maintainers.

Modified Paths:
--------------
    trunk/BRugs/DESCRIPTION
    trunk/BRugs/NAMESPACE
    trunk/BRugs/NEWS
    trunk/BRugs/R/buildMCMC.R
    trunk/BRugs/R/windows/findOpenBUGS.R

Modified: trunk/BRugs/DESCRIPTION
===================================================================
--- trunk/BRugs/DESCRIPTION	2013-05-26 16:05:18 UTC (rev 265)
+++ trunk/BRugs/DESCRIPTION	2013-08-18 16:54:53 UTC (rev 266)
@@ -1,11 +1,11 @@
 Package: BRugs
 Title: R interface to the OpenBUGS MCMC software
-Version: 0.8-1
-Date: 2013-05-26
+Version: 0.8-2
+Date: 2013-08-18
 Author: OpenBUGS was developed by Andrew Thomas, Dave Lunn, David Spiegelhalter and Nicky Best.  R interface developed by Uwe Ligges, Sibylle Sturtz, Andrew Gelman, Gregor Gorjanc and Chris Jackson.  Linux port and most recent developments by Chris Jackson.
 Description: Fully-interactive R interface to the OpenBUGS software for Bayesian analysis using MCMC sampling.  Runs natively and stably in 32-bit R under Windows.  Versions running on Linux and on 64-bit R under Windows are in "beta" status and less efficient.
 Maintainer: Uwe Ligges <li...@st...>
-Depends: R (>= 2.11.0), coda
+Depends: R (>= 2.11.0)
 Imports: utils, coda
 SystemRequirements: OpenBUGS (>= 3.2.2), hence Windows or Linux
 License: GPL-2

Modified: trunk/BRugs/NAMESPACE
===================================================================
--- trunk/BRugs/NAMESPACE	2013-05-26 16:05:18 UTC (rev 265)
+++ trunk/BRugs/NAMESPACE	2013-08-18 16:54:53 UTC (rev 266)
@@ -1,5 +1,5 @@
 importFrom(coda, mcmc, mcmc.list)
-importFrom(utils, compareVersion, maintainer)
+importFrom(utils, compareVersion, maintainer, packageDescription, readRegistry)
 export(BRugsFit, bugsData, bugsInits, buildMCMC,
 dicClear, dicSet, dicStats,
 getNumChains, help.BRugs, help.WinBUGS,

Modified: trunk/BRugs/NEWS
===================================================================
--- trunk/BRugs/NEWS	2013-05-26 16:05:18 UTC (rev 265)
+++ trunk/BRugs/NEWS	2013-08-18 16:54:53 UTC (rev 266)
@@ -1,6 +1,12 @@
 Changes to BRugs:
 =====================
 
+Version 0.8.2 (18 August 2013)
+-------------
+Bugfix: remove coda from"Depends:" as "Imports:" is sufficient.
+Bugfix: Remove ":::" constructs to access function from utils that are imported.
+
+
 Version 0.8.1  (26 May 2013)
 -------------
 Bugfix: samplesStats(node) did not work on node vectors of length > 1

Modified: trunk/BRugs/R/buildMCMC.R
===================================================================
--- trunk/BRugs/R/buildMCMC.R	2013-05-26 16:05:18 UTC (rev 265)
+++ trunk/BRugs/R/buildMCMC.R	2013-08-18 16:54:53 UTC (rev 266)
@@ -2,10 +2,6 @@
     firstChain = samplesGetFirstChain(), lastChain = samplesGetLastChain(), 
     thin = samplesGetThin()){
  
-    if(!is.R() && !require("coda"))
-        stop("package 'coda' is required to use this function")
-
- 
     oldBeg <- samplesGetBeg()
     oldEnd <- samplesGetEnd()
     oldFirstChain <- samplesGetFirstChain()

Modified: trunk/BRugs/R/windows/findOpenBUGS.R
===================================================================
--- trunk/BRugs/R/windows/findOpenBUGS.R	2013-05-26 16:05:18 UTC (rev 265)
+++ trunk/BRugs/R/windows/findOpenBUGS.R	2013-08-18 16:54:53 UTC (rev 266)
@@ -2,10 +2,10 @@
 {
     dir <- Sys.getenv("OpenBUGS_PATH")
     if(!nchar(dir)){
-        deps <- utils:::packageDescription("BRugs", fields="SystemRequirements")
+        deps <- packageDescription("BRugs", fields="SystemRequirements")
         version.req <- gsub(".*OpenBUGS ?\\(>= ?(.+)\\).*", "\\1", deps)
 
-        ob.reg <- try(utils:::readRegistry("Software\\OpenBUGS", "HLM", view = "32-bit"), silent = TRUE)
+        ob.reg <- try(readRegistry("Software\\OpenBUGS", "HLM", view = "32-bit"), silent = TRUE)
         if (inherits(ob.reg, "try-error")) {
             warning("OpenBUGS ", version.req, " or greater must be installed\n(if so, this indicates missing registry keys of OpenBUGS).\nSetting the environment variable 'OpenBUGS_PATH' in advance of loading 'BRugs' overwrites the path.\nSee ?loadOpenBUGS in order to load OpenBUGS manually.")
             return()
@@ -29,7 +29,7 @@
         }
 
         ## OpenBUGS installation location
-        dir <- utils:::readRegistry(paste("Software","OpenBUGS",rnames,sep="\\"), "HLM", view = "32-bit")[["InstallPath"]]
+        dir <- readRegistry(paste("Software","OpenBUGS",rnames,sep="\\"), "HLM", view = "32-bit")[["InstallPath"]]
     } else {
         if(!file.exists(file.path(dir, "libOpenBUGS.dll"))){
             warning("Environment variable OpenBUGS_PATH found but cannot access ", file.path(dir, "libOpenBUGS.dll"))

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