Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
itsrainingdata committed Mar 11, 2017
2 parents 6837a09 + e550a5f commit d01d990
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 30 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
@@ -1,15 +1,15 @@
Package: sparsebn
Title: Learning Sparse Bayesian Networks from High-Dimensional Data
Version: 0.0.2
Date: 2016-11-28
Version: 0.0.3
Date: 2017-03-10
Authors@R: person("Bryon", "Aragam", email = "sparsebn@gmail.com", role = c("aut", "cre"))
Maintainer: Bryon Aragam <sparsebn@gmail.com>
Description: Fast methods for learning sparse Bayesian networks from high-dimensional data using sparse regularization. Designed to incorporate mixed experimental and observational data with thousands of variables with either continuous or discrete observations.
Depends:
R (>= 3.2.3),
sparsebnUtils (>= 0.0.3),
ccdrAlgorithm (>= 0.0.2),
discretecdAlgorithm (>= 0.0.2)
sparsebnUtils (>= 0.0.4),
ccdrAlgorithm (>= 0.0.3),
discretecdAlgorithm (>= 0.0.3)
Suggests:
knitr,
rmarkdown,
Expand All @@ -20,6 +20,6 @@ Suggests:
URL: https://github.com/itsrainingdata/sparsebn
BugReports: https://github.com/itsrainingdata/sparsebn/issues
License: GPL (>= 2)
RoxygenNote: 5.0.1
RoxygenNote: 6.0.1
VignetteBuilder: knitr
LazyData: true
6 changes: 6 additions & 0 deletions NEWS.md
@@ -1,3 +1,9 @@
# sparsebn 0.0.3

## Bug fixes

* Minor bug fixes

# sparsebn 0.0.2

## Features
Expand Down
4 changes: 0 additions & 4 deletions R/sparsebn-main.R
Expand Up @@ -47,12 +47,10 @@
#'
#' @examples
#'
#' \dontrun{
#' # Estimate a DAG from the cytometry data
#' data(cytometryContinuous)
#' dat <- sparsebnData(cytometryContinuous$data, type = "c", ivn = cytometryContinuous$ivn)
#' estimate.dag(dat)
#' }
#'
#' @export
estimate.dag <- function(data,
Expand Down Expand Up @@ -133,12 +131,10 @@ estimate.dag <- function(data,
#'
#' @examples
#'
#' \dontrun{
#' data(cytometryContinuous)
#' dat <- sparsebnData(cytometryContinuous$data, type = "c", ivn = cytometryContinuous$ivn)
#' estimate.covariance(dat) # estimate covariance
#' estimate.precision(dat) # estimate precision
#' }
#'
#' @name estimate.covariance
#' @rdname estimate.covariance
Expand Down
2 changes: 1 addition & 1 deletion R/sparsebn-plotting.R
Expand Up @@ -30,7 +30,7 @@
#' @param ... Additional arguments to \code{\link{plot}}.
#'
#' @export
plotDAG <- function(x){
plotDAG <- function(x, ...){
### Must use igraph for the default method
current_plot_pkg <- getPlotPackage()
if(current_plot_pkg != "igraph"){
Expand Down
11 changes: 4 additions & 7 deletions cran-comments.md
@@ -1,19 +1,16 @@
## Test environments
* local OS X install, R 3.3.2
* ubuntu 12.04.5 (travis-ci), R 3.3.2 (oldrel, devel, and release)
* local OS X install, R 3.3.3
* ubuntu 12.04.5 (travis-ci), R 3.3.3 (oldrel, devel, and release)
* win-builder (devel and release)
* r-hub (oldrel, devel, and release)

## R CMD check results
There were no ERRORs, WARNINGs, or NOTEs.

## CRAN notes

The current warnings listed for v0.0.1 at https://cran.rstudio.com/web/checks/check_results_sparsebn.html are a result of recent updates to the dependencies for this submission. The current submission remedies all of these issues.

## Dependencies

CHECK has been run on all dependencies and passed.

## Reverse dependencies

There are no reverse dependencies.
There are no reverse dependencies.
1 change: 0 additions & 1 deletion man/cytometryContinuous.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/cytometryDiscrete.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions man/estimate.covariance.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/estimate.dag.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/pathfinder.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions man/plotDAG.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion man/sparsebn.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d01d990

Please sign in to comment.