Merge pull request #99 from nutterb/current-devel

Fixes for DiagrammeR 0.9.0

DESCRIPTION

@@ -1,8 +1,7 @@
 Package: HydeNet
 Type: Package
 Title: Hybrid Bayesian Networks Using R and JAGS
-Version: 0.10.3
-Date: 2015-01-18
+Version: 0.10.5
 Author: Jarrod E. Dalton <[email protected]> and Benjamin Nutter
     <[email protected]>
 Maintainer: Benjamin Nutter <[email protected]>
@@ -22,17 +21,17 @@ Description: Facilities for easy implementation of hybrid Bayesian networks
 License: MIT + file LICENSE
 Depends:
     R (>= 3.0.0),
-    nnet,
-    rjags
+    nnet
 Imports:
-    ArgumentCheck,
-    DiagrammeR (>= 0.8),
+    checkmate,
+    DiagrammeR (>= 0.9.0),
     plyr,
     dplyr,
     graph,
     gRbase,
     magrittr,
     pixiedust (>= 0.6.1),
+    rjags,
     stats,
     stringr,
     utils

NAMESPACE

@@ -11,6 +11,7 @@ S3method(modelToNode,default)
 S3method(modelToNode,glm)
 S3method(modelToNode,lm)
 S3method(modelToNode,multinom)
+S3method(modelToNode,survreg)
 S3method(modelToNode,xtabs)
 S3method(plot,HydeNetwork)
 S3method(print,HydeNetwork)
@@ -22,7 +23,9 @@ S3method(writeJagsFormula,cpt)
 S3method(writeJagsFormula,glm)
 S3method(writeJagsFormula,lm)
 S3method(writeJagsFormula,multinom)
+S3method(writeJagsFormula,survreg)
 S3method(writeJagsFormula,xtabs)
+export("%$%")
 export("%>%")
 export(HydeNetwork)
 export(HydePlotOptions)
@@ -48,20 +51,14 @@ export(vectorProbs)
 export(writeJagsFormula)
 export(writeNetworkModel)
 import(nnet)
-import(rjags)
-importFrom(DiagrammeR,create_edges)
-importFrom(DiagrammeR,create_graph)
-importFrom(DiagrammeR,render_graph)
 importFrom(dplyr,bind_rows)
-importFrom(dplyr,filter)
 importFrom(dplyr,group_by_)
-importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
-importFrom(dplyr,select)
 importFrom(dplyr,summarise)
 importFrom(gRbase,dag)
 importFrom(gRbase,graphNEL2adjMAT)
 importFrom(graph,nodes)
+importFrom(magrittr,"%$%")
 importFrom(magrittr,"%>%")
 importFrom(plyr,is.formula)
 importFrom(stats,as.formula)

NEWS

@@ -1,4 +1,14 @@
-### 0.10.3 (18 January 2015)
+## 0.10.5 (6 January 2016)
+* Update `plot.HydeNetwork` to accommodate changes in `DiagrammeR`.
+
+### 0.10.4 (1 April 2016)
+* Added methods for survreg models.  The predicted value returned is the predicted
+  survival time.
+* Made changes to unit tests to accommodate new version of `testthat`
+* Replaced dependency on `ArgumentCheck` to `checkmate`
+* Code formatting changes.
+
+### 0.10.3 (18 January 2016)
 * Added dependency to `pixiedust` to allow better parsing of term names.  This
   also resulted in removing the dependency on `broom` (which is alright, because
   `pixiedust` depends on `broom`.