diff --git a/.Rbuildignore b/.Rbuildignore index 063a710..8db26dc 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -8,7 +8,6 @@ roxygen.R granovaGG.Rproj README.m* cran-comments.md -LICENSE ^.*\.Rproj$ diff --git a/DESCRIPTION b/DESCRIPTION index b9cb3cb..8989524 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -82,6 +82,7 @@ Description: create what we call Elemental Graphics for display of files for individual functions. URL: https://github.com/briandk/granovaGG BugReports: https://github.com/briandk/granovaGG/issues +License: MIT + file LICENSE Depends: R (>= 2.14.0), Imports: @@ -102,4 +103,3 @@ Collate: 'granovagg.1w.R' 'granovagg.contr.R' 'granovagg.ds.R' -License: MIT + file LICENSE diff --git a/R/granovagg.contr.R b/R/granovagg.contr.R index 924db9c..65625a1 100644 --- a/R/granovagg.contr.R +++ b/R/granovagg.contr.R @@ -323,8 +323,8 @@ granovagg.contr <- function(data, raw.data <- RenameSummaryColumnNames(raw.data) raw.data <- tidyr::gather( raw.data, - key = contrast_number, - value = score + key = "contrast_number", + value = "score" ) summary.data <- GetGroupSummary(raw.data) @@ -351,10 +351,10 @@ granovagg.contr <- function(data, standard.deviation <- NULL output <- data %>% - dplyr::group_by(contrast_number) %>% + dplyr::group_by(.data$contrast_number) %>% dplyr::summarise( - group.mean = mean(score), - standard.deviation = sd(score), + group.mean = mean(.data$score), + standard.deviation = sd(.data$score), pooled.standard.deviation = mean(standard.deviation)^0.5 ) return(output) @@ -438,12 +438,6 @@ granovagg.contr <- function(data, return(output) } - OptionalPlotPrinting <- function(output) { - if (print.four.plots.per.page) { - LayoutFourPlotsPerPage(output) - } - } - PrintOutput <- function() { PrintLinearModelSummary(ctr$linear.model) PrintSummaryDataByContrast(ctr)