Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gforge/Gmisc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.11.0
Choose a base ref
...
head repository: gforge/Gmisc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 3,996 additions and 2,273 deletions.
  1. +2 −0 .Rbuildignore
  2. +1 −0 .gitignore
  3. +5 −0 .lintr
  4. +4 −6 .travis.yml
  5. +2 −2 CRAN-RELEASE
  6. +3 −0 CRAN-SUBMISSION
  7. +10 −7 DESCRIPTION
  8. +16 −0 NAMESPACE
  9. +149 −109 NEWS → NEWS.md
  10. +1 −1 R/Gmisc.R
  11. +6 −6 R/boxGrobs_S3_fns.R
  12. +11 −6 R/boxGrobs_boxGrob.R
  13. +1 −1 R/copyAllNewAttributes.R
  14. +4 −3 R/descriptionStats.R
  15. +2 −2 R/docx_document.R
  16. +2 −2 R/fastDoCall.R
  17. +244 −414 R/getDescriptionStatsBy.R
  18. +50 −0 R/getDescriptionStatsBy_S3_fns.R
  19. +44 −0 R/getDescriptionStatsBy_prAddDescStats.R
  20. +38 −0 R/getDescriptionStatsBy_prAddDescUnitColumn.R
  21. +58 −0 R/getDescriptionStatsBy_prAddEmptyVals.R
  22. +68 −0 R/getDescriptionStatsBy_prAddTotalDescColumn.R
  23. +64 −0 R/getDescriptionStatsBy_prFactorDescs.R
  24. +25 −0 R/getDescriptionStatsBy_prFixDescRownames.R
  25. +42 −0 R/getDescriptionStatsBy_prGetDescHeader.R
  26. +78 −0 R/getDescriptionStatsBy_prNumericDescs.R
  27. +90 −0 R/getDescriptionStatsBy_prPropDescs.R
  28. +2 −3 R/getPval.R
  29. +94 −68 R/getSvdMostInfluential.R
  30. +1 −79 R/mergeDesc.R
  31. +77 −0 R/mergeDesc_S3_fns.R
  32. +43 −6 R/mergeLists.R
  33. +46 −6 R/pathJoin.R
  34. +32 −31 R/private_functions.R
  35. +8 −0 R/sefeLoadPkg.R
  36. +35 −0 R/set_column_labels.R
  37. +33 −0 R/set_column_units.R
  38. +198 −190 R/transitionClass.R
  39. +51 −65 R/transitionClass_helpers.R
  40. +27 −12 R/transitionPlot_helpers.R
  41. +21 −1 R/yamlDump.R
  42. +89 −42 inst/examples/getDescriptionStatsBy_example.R
  43. +37 −39 inst/examples/getSvdMostInfluential_example.R
  44. +3 −3 inst/examples/transitionClass_example.R
  45. +1 −0 inst/include/Gmisc.h
  46. +9 −6 man/Transition-class.Rd
  47. +2 −2 man/bezierArrowGradient.Rd
  48. +2 −2 man/bezierArrowSmpl.Rd
  49. +8 −5 man/box.Rd
  50. +2 −2 man/boxPropGrob.Rd
  51. +1 −1 man/describeProp.Rd
  52. +1 −1 man/docx_document.Rd
  53. +1 −1 man/fastDoCall.Rd
  54. +126 −66 man/getDescriptionStatsBy.Rd
  55. +36 −38 man/getSvdMostInfluential.Rd
  56. +3 −3 man/htmlTable_latex.Rd
  57. +89 −42 man/mergeDesc.Rd
  58. +8 −1 man/mergeLists.Rd
  59. +8 −1 man/pathJoin.Rd
  60. +53 −0 man/prAddDescStats.Rd
  61. +30 −0 man/prAddDescUnitColumn.Rd
  62. +20 −0 man/prAddEmptyVals.Rd
  63. +88 −0 man/prAddTotalDescColumn.Rd
  64. +68 −0 man/prFactorDescs.Rd
  65. +21 −0 man/prFixDescRownames.Rd
  66. +28 −0 man/prGetDescHeader.Rd
  67. +13 −8 man/prGetStatistics.Rd
  68. +69 −0 man/prNumericDescs.Rd
  69. +72 −0 man/prPropDescs.Rd
  70. +11 −1 man/prTcPlotBoxColumn.Rd
  71. +0 −2 man/prTpGetBoxPositions.Rd
  72. +10 −1 man/prTpGetBoxSizedTextGrob.Rd
  73. +1 −1 man/prTpGetColors.Rd
  74. +13 −1 man/prTpPlotBox.Rd
  75. +3 −0 man/prTpPlotBoxes.Rd
  76. +33 −0 man/set_column_labels.Rd
  77. +31 −0 man/set_column_units.Rd
  78. +4 −0 man/yamlDump.Rd
  79. +1 −1 src/Gmisc_lines.cpp
  80. +1 −1 src/Makevars
  81. +1 −1 src/Makevars.win
  82. +5 −0 src/RcppExports.cpp
  83. +12 −12 src/bezierArrowFn.cpp
  84. +17 −20 tests/testthat/test-bezier.R
  85. +1 −1 tests/testthat/test-descriptionStats.R
  86. +114 −796 tests/testthat/test-getDescriptionStats.R
  87. +569 −0 tests/testthat/test-getDescriptionStats_missing_data.R
  88. +323 −0 tests/testthat/test-getDescriptionStats_p-values.R
  89. +63 −0 tests/testthat/test-getDescriptionStats_tidyselect.R
  90. +29 −16 tests/testthat/test-mergeLists.R
  91. +32 −4 tests/testthat/test-pathJoin.R
  92. +14 −0 tests/testthat/test-retrieve_and_has.R
  93. +4 −5 tests/visual_tests/FTP_test/Setup_and_munge.R
  94. +114 −109 vignettes/Descriptives.Rmd
  95. +13 −16 vignettes/Transition-class.Rmd
  96. +1 −2 vignettes/transitionPlot.Rmd
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -9,3 +9,5 @@
^cran-comments\.md$
.vscode
Gmisc/inst/extdata/Full_test_suite_files/*
.lintr
^CRAN-SUBMISSION$
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,3 +16,4 @@ vignettes/*.html
inst/extdata/*.html
inst/extdata/*.css
inst/extdata/Full_test_suite_files/*
.vscode
5 changes: 5 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
linters: with_defaults(
line_length_linter(120),
object_name_linter = NULL,
object_usage_linter = NULL,
open_curly_linter(FALSE))
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Sample .travis.yml for R projects

language: r
warnings_are_errors: true
sudo: required

before_install:
Rscript -e 'update.packages(ask = FALSE)'
r:
- oldrel
- release
- devel
4 changes: 2 additions & 2 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This package was submitted to CRAN on 2020-05-06.
Once it is accepted, delete this file and tag the release (commit bed562e745).
This package was submitted to CRAN on 2021-05-04.
Once it is accepted, delete this file and tag the release (commit 350c561).
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 3.0.2
Date: 2023-03-13 12:52:25 UTC
SHA: e98472a8d34beacb33604e59ae2a916f932cbeb6
17 changes: 10 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Package: Gmisc
Version: 1.11.0
Date: 2020-06-30
Version: 3.0.3
Title: Descriptive Statistics, Transition Plots, and More
Author: Max Gordon <max@gforge.se>
Maintainer: Max Gordon <max@gforge.se>
@@ -10,11 +9,11 @@ Description: Tools for making the descriptive "Table 1" used in medical
a method for variable selection based on the SVD, Bézier lines with arrows
complementing the ones in the 'grid' package, and more.
License: GPL (>= 3)
URL: http://gforge.se
URL: https://gforge.se
BugReports: https://github.com/gforge/Gmisc/issues
Biarch: yes
Depends:
R (>= 3.2.0),
R (>= 4.1.0),
Rcpp (>= 0.11.4),
htmlTable (>= 2.0.0)
Imports:
@@ -31,17 +30,21 @@ Imports:
lubridate,
magrittr,
methods,
rlang,
rmarkdown,
stringr,
stats,
yaml,
XML,
yaml,
utils
Suggests:
datasets,
dplyr,
jsonlite,
testthat,
datasets
tidyselect
Encoding: UTF-8
NeedsCompilation: no
VignetteBuilder: knitr
LinkingTo: Rcpp
RoxygenNote: 7.1.1
RoxygenNote: 7.2.2
16 changes: 16 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# Generated by roxygen2: do not edit by hand

S3method(getDescriptionStatsBy,data.frame)
S3method(getDescriptionStatsBy,default)
S3method(heightDetails,box)
S3method(htmlTable,Gmisc_getDescriptionStatsBy)
S3method(htmlTable,descMrg)
S3method(knit_print,Gmisc_getDescriptionStatsBy)
S3method(knit_print,descMrg)
S3method(latex,descMrg)
S3method(length,Gmisc_getDescriptionStatsBy)
S3method(plot,box)
S3method(plot,connect_boxes)
S3method(print,Gmisc_getDescriptionStatsBy)
S3method(print,Gmisc_list_of_boxes)
S3method(print,Gmisc_unit)
S3method(print,box)
S3method(print,connect_boxes)
S3method(print,descMrg)
S3method(widthDetails,box)
S3method(yamlDump,character)
S3method(yamlDump,default)
S3method(yamlDump,json)
export(alignHorizontal)
export(alignVertical)
export(bezierArrowGradient)
@@ -49,6 +58,8 @@ export(mergeLists)
export(moveBox)
export(pathJoin)
export(retrieve)
export(set_column_labels)
export(set_column_units)
export(spreadHorizontal)
export(spreadVertical)
export(time2spanTxt)
@@ -82,15 +93,20 @@ importFrom(grDevices,as.raster)
importFrom(grDevices,colorRampPalette)
importFrom(grDevices,grey)
importFrom(graphics,par)
importFrom(grid,gpar)
importFrom(grid,is.unit)
importFrom(knitr,asis_output)
importFrom(knitr,knit_print)
importFrom(lubridate,as_date)
importFrom(lubridate,mday)
importFrom(lubridate,month)
importFrom(lubridate,year)
importFrom(methods,formalArgs)
importFrom(methods,is)
importFrom(methods,new)
importFrom(methods,setRefClass)
importFrom(rlang,enquo)
importFrom(rlang,expr)
importFrom(rmarkdown,html_document)
importFrom(stats,anova)
importFrom(stats,chisq.test)
Loading