Skip to content
Permalink
Browse files

0.2.0.9000

  • Loading branch information...
oeysan committed Sep 13, 2018
1 parent c8e3ea9 commit 6e0cfe7c4fd4ca4ff959e9876a3224e264d3bd0a
@@ -6,8 +6,11 @@ Meta
*.Rmd
README.html
cran-comments.md
/doc/*.
/doc/*.html
/doc/*.Rmd
/doc/*.R
doc/*.R
doc/*.html
doc/*.Rmd
inst/doc/*.R
inst/doc/*.html
inst/doc/*.Rmd
.Rbuildignore
tests
@@ -57,4 +57,6 @@ r_github_packages:
- r-lib/covr

after_success:
- Rscript -e 'covr::coveralls()'
- Rscript -e 'covr::coveralls()'
- Rscript -e 'covr::codecov(type = "all")'

@@ -1,9 +1,9 @@
Package: bfw
Version: 0.2.0
Version: 0.2.0.9000
Date: 2018-09-11
Title: Bayesian Framework for Computational Modeling
Authors@R: person( "Øystein Olav","Skaar", email="bayesianfw@gmail.com", role=c("aut","cre"))
Maintainer: Øystein Olav Skaar <bayesianfw@gmail.com>
Authors@R: person( "�ystein Olav","Skaar", email="bayesianfw@gmail.com", role=c("aut","cre"))
Maintainer: �ystein Olav Skaar <bayesianfw@gmail.com>
URL: https://github.com/oeysan/bfw/
BugReports: https://github.com/oeysan/bfw/issues/
Description: Derived from the work of Kruschke (2015, <ISBN:9780124058880>),
@@ -30,12 +30,14 @@ Suggests:
psych (>= 1.7.8),
rmarkdown (>= 1.10),
rvg (>= 0.1.9),
scales (>= 0.5.0)
scales (>= 0.5.0),
testthat (>= 2.0.0),
covr (>= 3.1.0)
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
RoxygenNote: 6.1.0
VignetteBuilder: knitr
NeedsCompilation: no
Packaged: 2018-06-13 09:55:29 UTC; Melkor
Author: Øystein Olav Skaar [aut, cre]
Author: �ystein Olav Skaar [aut, cre]
@@ -1,3 +1,10 @@
# bfw 0.2.0.9000

## Minor
* Added a badge because all the cool kids have them
* Fixed small inconsistencies in ParsePlot parameters (i.e., type png with layout pw).
+ Defaults are now rasterized pdf on a4 layout with 12 pointsize.

# bfw 0.2.0

## Critical
@@ -421,15 +421,16 @@ RemoveSpaces <- function(x) gsub("[[:space:]]", "", x)
FileName <- function ( project = "Project" ,
subset = NULL ,
type = NULL ,
name = "Name",
name = NULL,
unix = TRUE ,
...) {
sName <- paste0(project, subset)
if(length(type)) sName <- paste(sName, type, sep="-")
save.name <- paste0(project, subset)
if(length(type)) save.name <- paste(save.name, type, sep="-")
unix <- if (unix) paste0("-" , as.integer(Sys.time()) )
sName <- RemoveSpaces(CapWords(paste0(sName, "-", name, unix)))
if (length(name)) name <- paste0("-" , name)
save.name <- RemoveSpaces(CapWords(paste0(save.name, name, unix)))

return (sName)
return (save.name)
}

#' @title Parse Plot
@@ -438,17 +439,17 @@ FileName <- function ( project = "Project" ,
#' @param project.dir define where to save data, Default: 'Results/'
#' @param project.name define name of project, Default: 'FileName(name="Plot")'
#' @param save.data logical, indicating whether or not to save data, Default: FALSE
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pptx'
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pdf'
#' @param plot.size size of plot, Default: '15,10'
#' @param scaling scale size of plot, Default: 100
#' @param plot.aspect aspect of plot, Default: NULL
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: TRUE
#' @param point.size point size used for visualizations, Default: 15
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: FALSE
#' @param point.size point size used for visualizations, Default: 12
#' @param font.type font type used for visualizations, Default: 'serif'
#' @param one.file logical, indicating whether or not visualizations should be placed in one or several files, Default: TRUE
#' @param ppi define pixel per inch used for visualizations, Default: 300
#' @param units define unit of length used for visualizations, Default: 'in'
#' @param layout define a layout size for visualizations, Default: 'pw'
#' @param layout define a layout size for visualizations, Default: 'a4'
#' @param layout.inverse logical, indicating whether or not to inverse layout (e.g., landscape) , Default: FALSE
#' @param return.files logical, indicating whether or not to return saved file names
#' @param ... further arguments passed to or from other methods
@@ -514,18 +515,18 @@ FileName <- function ( project = "Project" ,
ParsePlot <- function (plot.data,
project.dir = "Results/",
project.name = FileName(name="Plot"),
graphic.type = "pptx",
graphic.type = "pdf",
plot.size = "15,10",
scaling = 100,
plot.aspect = NULL,
save.data = FALSE,
vector.graphic = TRUE,
point.size = 15,
vector.graphic = FALSE,
point.size = 12,
font.type = "serif",
one.file = TRUE,
ppi = 300,
units = "in",
layout = "pw",
layout = "a4",
layout.inverse = FALSE,
return.files = FALSE,
...) {
@@ -18,17 +18,17 @@
#' @param sep symbol to separate data (e.g., comma-delimited), Default: ','
#' @param monochrome logical, indicating whether or not to use monochrome colors, else use \link[bfw]{DistinctColors}, Default: TRUE
#' @param plot.colors range of color to use, Default: c("#495054", "#e3e8ea")
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pptx'
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pdf'
#' @param plot.size size of plot, Default: '15,10'
#' @param scaling scale size of plot, Default: 100
#' @param plot.aspect aspect of plot, Default: NULL
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: TRUE
#' @param point.size point size used for visualizations, Default: 15
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: FALSE
#' @param point.size point size used for visualizations, Default: 12
#' @param font.type font type used for visualizations, Default: 'serif'
#' @param one.file logical, indicating whether or not visualizations should be placed in one or several files, Default: TRUE
#' @param ppi define pixel per inch used for visualizations, Default: 300
#' @param units define unit of length used for visualizations, Default: 'in'
#' @param layout define a layout size for visualizations, Default: 'pw'
#' @param layout define a layout size for visualizations, Default: 'a4'
#' @param layout.inverse logical, indicating whether or not to inverse layout (e.g., landscape) , Default: FALSE
#' @param ... further arguments passed to or from other methods
#' @return list containing MCMC chains , MCMC chains as matrix , summary of MCMC, list of name used, list of data, the jags model, running time of analysis and names of saved files
@@ -66,17 +66,17 @@ RunMCMC <- function(jags.model,
sep,
monochrome = TRUE,
plot.colors = c("#495054", "#e3e8ea"),
graphic.type = "png",
graphic.type = "pdf",
plot.size = "15,10",
scaling = 100,
plot.aspect = NULL,
vector.graphic = TRUE,
point.size = 15,
vector.graphic = FALSE,
point.size = 12,
font.type = "serif",
one.file = TRUE,
ppi = 300,
units = "in",
layout = "pw",
layout = "a4",
layout.inverse = FALSE,
...
) {
@@ -13,17 +13,17 @@
#' @param x.text label on x axis, Default: NULL
#' @param project.dir define where to save data, Default: 'Results/'
#' @param save.data logical, indicating whether or not to save data, Default: FALSE
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pptx'
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pdf'
#' @param plot.size size of plot, Default: '15,10'
#' @param scaling scale size of plot, Default: 100
#' @param plot.aspect aspect of plot, Default: NULL
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: TRUE
#' @param point.size point size used for visualizations, Default: 15
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: FALSE
#' @param point.size point size used for visualizations, Default: 12
#' @param font.type font type used for visualizations, Default: 'serif'
#' @param one.file logical, indicating whether or not visualizations should be placed in one or several files, Default: TRUE
#' @param ppi define pixel per inch used for visualizations, Default: 300
#' @param units define unit of length used for visualizations, Default: 'in'
#' @param layout define a layout size for visualizations, Default: 'pw'
#' @param layout define a layout size for visualizations, Default: 'a4'
#' @param layout.inverse logical, indicating whether or not to inverse layout (e.g., landscape) , Default: FALSE
#' @param ... further arguments passed to or from other methods
#' @seealso
@@ -76,17 +76,17 @@ PlotData <- function(data.MCMC = NULL,
x.text = NULL,
project.dir = "Results/",
save.data = FALSE,
graphic.type = "pptx",
graphic.type = "pdf",
plot.size = "15,10",
scaling = 100,
plot.aspect = NULL,
vector.graphic = TRUE,
point.size = 15,
vector.graphic = FALSE,
point.size = 12,
font.type = "serif",
one.file = TRUE,
ppi = 300,
units = "in",
layout = "pw",
layout = "a4",
layout.inverse = FALSE,
...
) {
@@ -46,17 +46,17 @@
#' @param sep symbol to separate data (e.g., comma-delimited), Default: ','
#' @param monochrome logical, indicating whether or not to use monochrome colors, else use \link[bfw]{DistinctColors}, Default: TRUE
#' @param plot.colors range of color to use, Default: c("#495054", "#e3e8ea")
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pptx'
#' @param graphic.type type of graphics to use (e.g., pdf, png, ps), Default: 'pdf'
#' @param plot.size size of plot, Default: '15,10'
#' @param scaling scale size of plot, Default: 100
#' @param plot.aspect aspect of plot, Default: NULL
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: TRUE
#' @param point.size point size used for visualizations, Default: 15
#' @param vector.graphic logical, indicating whether or not visualizations should be vector or raster graphics, Default: FALSE
#' @param point.size point size used for visualizations, Default: 12
#' @param font.type font type used for visualizations, Default: 'serif'
#' @param one.file logical, indicating whether or not visualizations should be placed in one or several files, Default: TRUE
#' @param ppi define pixel per inch used for visualizations, Default: 300
#' @param units define unit of length used for visualizations, Default: 'in'
#' @param layout define a layout size for visualizations, Default: 'pw'
#' @param layout define a layout size for visualizations, Default: 'a4'
#' @param layout.inverse logical, indicating whether or not to inverse layout (e.g., landscape) , Default: FALSE
#' @param silent logical, indicating whether or not analysis should be run silent, Default: FALSE
#' @param ... further arguments passed to or from other methods
@@ -113,17 +113,17 @@ bfw <- function(y = NULL,
sep = ",",
monochrome = TRUE,
plot.colors = c("#495054", "#e3e8ea"),
graphic.type = "pptx",
graphic.type = "pdf",
plot.size = "15,10",
scaling = 100,
plot.aspect = NULL,
vector.graphic = TRUE,
point.size = 15,
vector.graphic = FALSE,
point.size = 12,
font.type = "serif",
one.file = TRUE,
ppi = 300,
units = "in",
layout = "pw",
layout = "a4",
layout.inverse = FALSE,
silent = FALSE,
...
Oops, something went wrong.

0 comments on commit 6e0cfe7

Please sign in to comment.
You can’t perform that action at this time.