version 1.3.8

cran · Oct 17, 2018 · 9a27c81 · 9a27c81
1 parent 8186d6f
commit 9a27c81
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 191 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bmlm
 Title: Bayesian Multilevel Mediation
-Version: 1.3.7
-Date: 2018-07-11
+Version: 1.3.8
+Date: 2018-10-16
 Authors@R: person(given = "Matti", 
                   family = "Vuorre", 
                   email = "[email protected]",
@@ -13,14 +13,14 @@ BugReports: http://github.com/mvuorre/bmlm/issues/
 License: GPL (>= 3)
 LazyData: true
 NeedsCompilation: yes
-Depends: R (>= 3.0.2), Rcpp (>= 0.12.0)
-Imports: rstan (>= 2.12.1), ggplot2 (>= 2.0.0), methods
+Depends: R (>= 3.4.0), Rcpp (>= 0.12.0)
+Imports: rstan (>= 2.18.1), ggplot2 (>= 2.0.0), methods
 Suggests: qgraph, knitr, rmarkdown, reshape2, dplyr
-LinkingTo: StanHeaders (>= 2.12.0), rstan (>= 2.12.1), BH (>= 1.60.0),
+LinkingTo: StanHeaders (>= 2.18.0), rstan (>= 2.18.1), BH (>= 1.66.0),
         Rcpp (>= 0.12.0), RcppEigen
 RoxygenNote: 6.0.1
-Packaged: 2018-07-11 15:47:09 UTC; Matti
+Packaged: 2018-10-17 17:13:28 UTC; Matti
 Author: Matti Vuorre [aut, cre] (<https://orcid.org/0000-0001-5052-066X>)
 Maintainer: Matti Vuorre <[email protected]>
 Repository: CRAN
-Date/Publication: 2018-07-11 16:10:03 UTC
+Date/Publication: 2018-10-17 17:40:03 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-0e67db25d13b2eec2bf5df43c652fd3e *DESCRIPTION
+6f49eac14d8fdef46afdd79bf315da16 *DESCRIPTION
 7eddf402870e7c3c0184e3ac1b017b30 *NAMESPACE
-479cbccc5601e1c2c379ac26915c8a56 *NEWS.md
+9ae1f7275493f54d6643fcec447c0575 *NEWS.md
 e751d50e7dd45705c9476d677e229606 *R/bmlm-package.R
 b8e5ac987fd287497d7e70aab17d550c *R/data.R
 3117fa4730a61155ccd7b838a649d961 *R/mlm.R
@@ -9,8 +9,8 @@ b89164881c3522bee3a439ee46c0ee94 *R/mlm_plot.R
 5b6ddb22b37698990ba4a75178f9a6b1 *R/utils.R
 21db4c960c8ba78c0affd62f3bb48583 *R/zzz.R
 835244456b3a88558c9fac93d4c9e915 *README.md
-2bb19368407d2456784438e7963389f9 *cleanup
-2bb19368407d2456784438e7963389f9 *cleanup.win
+0cfd703ef51b6e2610d1fa2885380ec5 *cleanup
+0cfd703ef51b6e2610d1fa2885380ec5 *cleanup.win
 f813fa046b7756f079ae57c23d083a0e *data/BLch9.rda
 2c06feb54a4e73659ecbba1bce1f7899 *data/MEC2010.rda
 acb992ae02a3ddc4b1aab8cc3958dde6 *exec/bmlm.stan
@@ -34,9 +34,9 @@ ee096dff1d308b7102486712051b6ebf *man/mlm_path_plot.Rd
 40074d0c7b00fd61bd9a565d0f4a6d20 *man/mlm_spaghetti_plot.Rd
 94d66f3fe5f4d552a46debbeb316d020 *man/mlm_summary.Rd
 8abbedbb8b749f5cc0f53f9f0e426dce *src/Makevars
-ee1f06fa53f6b420147d53202c16a4ca *src/Makevars.win
+880d0c74ef9c4e34d44881a6621da74c *src/Makevars.win
 4f61b280464f4481d757953a9273eb79 *src/Modules.cpp
 712ca1634c9d3aea62cdac1643295237 *src/RcppExports.cpp
-8d3509ab46a08e7b51e291f460814a41 *src/include/models.hpp
+d6c371676d749e0d66aa2fced52157f3 *src/include/models.hpp
 1cb0ca046451b91fc4be46e748317909 *src/init.cpp
 d09025e378d96d89b1a2aa6c5bf3493c *tools/make_cpp.R
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# bmlm 1.3.8
+
+* Update to C++14, thanks to Ben Goodrich.
+
 # bmlm 1.3.7
 
 * Removed `tab2doc()`, package no longer needs archived ReporteRs package.

diff --git a/cleanup b/cleanup
@@ -6,7 +6,6 @@ mkdir -p src/include
 sed -i.bak '/current_statement_begin__ = [0-9]/d' src/include/models.hpp
 cat src/*.cc > src/Modules.cpp
 rm src/*.cc
-"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
 exit $?
 
 

diff --git a/cleanup.win b/cleanup.win
@@ -6,7 +6,6 @@ mkdir -p src/include
 sed -i.bak '/current_statement_begin__ = [0-9]/d' src/include/models.hpp
 cat src/*.cc > src/Modules.cpp
 rm src/*.cc
-"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
 exit $?
 
 

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,4 +1,4 @@
 STANHEADERS_SRC = `"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" --vanilla -e "cat(system.file('include', 'src', package = 'StanHeaders'))"`
 BOOST_NOT_IN_BH_SRC = `"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" --vanilla -e "cat(system.file('include', 'boost_not_in_BH', package = 'rstan'))"`
 PKG_CPPFLAGS = -I"$(STANHEADERS_SRC)" -I"$(BOOST_NOT_IN_BH_SRC)" -DBOOST_RESULT_OF_USE_TR1 -DBOOST_NO_DECLTYPE -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_NO_CXX11_RVALUE_REFERENCES
-CXX_STD = CXX11
+CXX_STD = CXX14