Skip to content

Commit 41ca2b4

Browse files
committed
Merge branch 'develop'
# Conflicts: # README.md (fixed)
2 parents 9e618f7 + 02965c1 commit 41ca2b4

File tree

153 files changed

+6030
-4459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+6030
-4459
lines changed

.Rbuildignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
^\.Rproj\.user$
33
LICENSE
44
^\.travis\.yml$
5-
^NEWS\.md$
65
^README\.md$
76
.gitignore
87
^cran-comments\.md$
98
^revdep$
9+
man-roxygen/*

.gitignore

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
# History files
21
.Rhistory
32
.Rapp.history
4-
5-
# Example code in package build process
63
*-Ex.R
7-
# R data files from past sessions
84
.Rdata
9-
# RStudio files
10-
.Rproj.user/
11-
shinyStan.Rproj
12-
# For the Mac
13-
*.DS_Store
145
.Rproj.user
6+
shinystan.Rproj
7+
8+
*.DS_Store
159
inst/doc
1610
^cran-comments\.md$
17-
1811
cran-comments.md
1912

13+
revdep/
2014
*.swf

.travis.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,9 @@
11
language: r
2-
sudo: required
2+
r: devel
3+
cache: packages
34

4-
cran: http://cran.rstudio.com/
5-
r_check_revdep: false
6-
pandoc: false
5+
r_github_packages:
6+
- jimhester/covr
77

8-
env:
9-
global:
10-
- _R_CHECK_FORCE_SUGGESTS_=false
11-
12-
r_binary_packages:
13-
- coda
14-
- dygraphs
15-
- ggplot2
16-
- gtools
17-
- httpuv
18-
- inline
19-
- jsonlite
20-
- knitr
21-
- markdown
22-
- reshape2
23-
- Rcpp
24-
- RUnit
25-
- shiny
26-
- testthat
27-
- xts
28-
- yaml
29-
30-
notifications:
31-
email:
32-
on_success: change
33-
on_failure: change
8+
after_success:
9+
- Rscript -e 'covr::codecov(function_exclusions = c("launch$", "launch_shinystan_demo"), line_exclusions = list("R/zzz.R"))'

DESCRIPTION

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: shinystan
22
Title: Interactive Visual and Numerical Diagnostics and Posterior Analysis for
33
Bayesian Models
4-
Version: 2.1.0
5-
Date: 2016-01-06
4+
Version: 2.2.0
5+
Date: 2016-05-23
66
Authors@R: c(person("Jonah", "Gabry", role = c("aut", "cre"),
77
email = "[email protected]"),
88
person(family = "Stan Development Team", role = "ctb"),
@@ -16,12 +16,12 @@ Authors@R: c(person("Jonah", "Gabry", role = c("aut", "cre"),
1616
person("Dongying", "Song", role = "ctb"),
1717
person("Rob", "Trangucci", role = "ctb"))
1818
Maintainer: Jonah Gabry <[email protected]>
19-
Description: We provide a graphical user interface for interactive Markov chain
20-
Monte Carlo (MCMC) diagnostics and plots and tables helpful for analyzing a
21-
posterior sample. The interface is powered by RStudio's Shiny web application
22-
framework and works with the output of MCMC programs written in any programming
23-
language (and has extended functionality for Stan models fit using the rstan
24-
package and the No-U-Turn sampler).
19+
Description: A graphical user interface for interactive Markov chain Monte
20+
Carlo (MCMC) diagnostics and plots and tables helpful for analyzing a
21+
posterior sample. The interface is powered by RStudio's Shiny web
22+
application framework and works with the output of MCMC programs written
23+
in any programming language (and has extended functionality for Stan models
24+
fit using the rstan and rstanarm packages).
2525
URL: https://github.com/stan-dev/shinystan/, http://mc-stan.org/
2626
BugReports: https://github.com/stan-dev/shinystan/issues/
2727
Depends:
@@ -32,18 +32,20 @@ LazyData: true
3232
Suggests:
3333
coda,
3434
knitr (>= 1.9),
35-
rstan (>= 2.7),
3635
rmarkdown (>= 0.8.1),
36+
rstanarm (>= 2.9.0-3),
3737
testthat
3838
Imports:
3939
DT (>= 0.1),
4040
dygraphs (>= 0.4.5),
41-
ggplot2 (>= 2.0.0),
41+
ggplot2 (>= 2.1.0),
4242
gridExtra,
4343
gtools,
4444
markdown (>= 0.7.4),
4545
methods,
4646
reshape2,
47+
rsconnect (>= 0.4.2),
48+
rstan (>= 2.9.0-3),
4749
stats,
4850
shinyjs (>= 0.1.0),
4951
shinythemes (>= 1.0.1),

NAMESPACE

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
export(as.shinystan)
44
export(deploy_shinystan)
5+
export(drop_parameters)
56
export(generate_quantity)
7+
export(is.shinystan)
68
export(launch_shinystan)
79
export(launch_shinystan_demo)
810
export(model_code)
11+
export(model_name)
912
export(notes)
1013
export(rename_model)
1114
export(retrieve)
@@ -24,12 +27,12 @@ importFrom(gridExtra,grid.arrange)
2427
importFrom(gtools,mixedsort)
2528
importFrom(markdown,markdownToHTML)
2629
importFrom(reshape2,melt)
30+
importFrom(rsconnect,deployApp)
2731
importFrom(shinyjs,colourInput)
2832
importFrom(shinyjs,useShinyjs)
2933
importFrom(shinythemes,shinytheme)
3034
importFrom(stats,acf)
31-
importFrom(stats,model.frame)
32-
importFrom(stats,model.response)
35+
importFrom(stats,na.omit)
3336
importFrom(stats,quantile)
3437
importFrom(stats,time)
3538
importFrom(stats,var)

NEWS.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
# `shinystan news`
1+
### Version 2.2.0
2+
* Add optional argument `pars` to the `as.shinystan` method for stanfit objects,
3+
allowing a subset of parameters to be selected for inclusion in the resulting
4+
shinystan object.
5+
* Introduce `drop_parameters` function for removing parameters from a shinystan
6+
object (useful for very large objects when you only want to look at a subset of
7+
parameters).
8+
* Add **rstanarm** to Suggests (in the DESCRIPTION file) so `rstanarm::pp_check`
9+
can be called.
10+
* Allow selecting `yrep` from global environment for PPcheck
11+
* Change `as.shinystan` to S4 generic with methods
12+
* Add **rsconnect** to `Imports` in `DESCRIPTION`.
13+
* Rename some of the slots in shinystan objects. The `update_sso` function can
14+
be used to ensure that old shinystan objects have an internal structure
15+
compatible with this release.
16+
* Improve line coverage of api tests
217

318
### Version 2.1.0
419
* Compatibility with recent ggplot2 update
@@ -16,13 +31,12 @@ plot ('Estimate' page)
1631
Version 2.0.0 has a new look, a new(ish) name, and a lot of new functionality.
1732
Many bugs have also been fixed (see GitHub issue tracker).
1833

19-
[Available on CRAN](https://cran.rstudio.com/web/packages/shinystan/index.html).
2034

2135
### New names
2236
* The name of the R package is **shinystan** and the app/GUI is **ShinyStan**.
2337

2438
### Deploy ShinyStan apps to shinyapps.io (RStudio's ShinyApps service)
25-
* The 'deploy_shinystan' function lets you easily deploy ShinyStan apps
39+
* The `deploy_shinystan` function lets you easily deploy ShinyStan apps
2640
to RStudio's shinyapps.io for any of your models. Each of your apps
2741
(i.e. each of your models) will have a unique url.
2842

R/array2shinystan.R

Lines changed: 0 additions & 87 deletions
This file was deleted.

R/as.shinystan.R

Lines changed: 0 additions & 117 deletions
This file was deleted.

0 commit comments

Comments
 (0)