diff --git a/DESCRIPTION b/DESCRIPTION index 40c73c0d..2bba03a5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dsHelper Type: Package Title: Helper Functions for Use with 'DataSHIELD' -Version: 0.4.20.9000 +Version: 0.4.21 Description: Often we need to automate things with 'DataSHIELD'. These functions help to do that. Authors@R: c(person(given= "Tim", diff --git a/NEWS.md b/NEWS.md index 735489b9..32184e15 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# dsHelper (development version) +# dsHelper 0.4.21 # dsHelper 0.4.19 diff --git a/docs/404.html b/docs/404.html index 82fb432b..025cb7a8 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -106,7 +106,7 @@

Page not found (404)

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/ISSUE_TEMPLATE.html b/docs/ISSUE_TEMPLATE.html index 4fd7fee7..7ba47c14 100644 --- a/docs/ISSUE_TEMPLATE.html +++ b/docs/ISSUE_TEMPLATE.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -87,7 +87,7 @@

NA

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/PULL_REQUEST_TEMPLATE.html b/docs/PULL_REQUEST_TEMPLATE.html index 0b026dd5..8b905d63 100644 --- a/docs/PULL_REQUEST_TEMPLATE.html +++ b/docs/PULL_REQUEST_TEMPLATE.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -99,7 +99,7 @@

Vignettes: -

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/articles/TROUBLESHOOTING.html b/docs/articles/TROUBLESHOOTING.html index 556fef4c..6b22f6cc 100644 --- a/docs/articles/TROUBLESHOOTING.html +++ b/docs/articles/TROUBLESHOOTING.html @@ -33,7 +33,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -139,7 +139,7 @@

Tidyr/CPP 11 install error

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/articles/index.html b/docs/articles/index.html index 46992c5e..f36b6f96 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -82,7 +82,7 @@

All vignettes

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/authors.html b/docs/authors.html index 0f44ce92..18913e29 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -85,7 +85,7 @@

Citation

-

Cadman T (2022). +

Cadman T (2023). dsHelper: Helper Functions for Use with 'DataSHIELD'. https://github.com/lifecycle-project/ds-helper/, https://lifecycle-project.github.io/ds-helper/. @@ -93,7 +93,7 @@

Citation

@Manual{,
   title = {dsHelper: Helper Functions for Use with 'DataSHIELD'},
   author = {Tim Cadman},
-  year = {2022},
+  year = {2023},
   note = {https://github.com/lifecycle-project/ds-helper/,
 https://lifecycle-project.github.io/ds-helper/},
 }
@@ -109,7 +109,7 @@

Citation

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/index.html b/docs/index.html index 21ca667b..a566b34e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -86,7 +86,7 @@

DataSHIELD helper functions

- +

CRAN status Codecov test coverage Build Status

This is a set of functions to automate processes in ‘DataSHIELD’ to make data manipulation and analysis easier. They are very much a work in progress! If you have written functions that would also be useful to other DS users drop me an email and we can incorporate them in the package.

Install @@ -146,14 +146,7 @@

Developers

-
-

Dev status

- -
+
@@ -166,7 +159,7 @@

Dev status

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/news/index.html b/docs/news/index.html index 3c52051e..7e3fe92f 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -63,6 +63,7 @@

Changelog

Source: NEWS.md +

dsHelper 0.4.21

dsHelper 0.4.19

dsHelper 0.4.18

dsHelper 0.4.17

@@ -106,7 +107,7 @@

dsHelpe
-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 36d1222a..0e817081 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -1,9 +1,9 @@ pandoc: 2.14.0.3 -pkgdown: 2.0.6 +pkgdown: 2.0.7 pkgdown_sha: ~ articles: TROUBLESHOOTING: TROUBLESHOOTING.html ds-helper-main-vignette: ds-helper-main-vignette.html ds-helper-trajectories-vignette: ds-helper-trajectories-vignette.html -last_built: 2022-07-27T10:14Z +last_built: 2023-02-20T16:06Z diff --git a/docs/reference/dh.anyData.html b/docs/reference/dh.anyData.html index f6e041f7..45c00598 100644 --- a/docs/reference/dh.anyData.html +++ b/docs/reference/dh.anyData.html @@ -21,7 +21,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -110,6 +110,7 @@

Value

See also

Other descriptive functions: dh.classDiscrepancy(), +dh.createTableOne(), dh.defineCases(), dh.getStats(), dh.lmTab(), @@ -128,7 +129,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.classDiscrepancy.html b/docs/reference/dh.classDiscrepancy.html index fb0526f3..412dd45e 100644 --- a/docs/reference/dh.classDiscrepancy.html +++ b/docs/reference/dh.classDiscrepancy.html @@ -23,7 +23,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -115,6 +115,7 @@

Value

See also

Other descriptive functions: dh.anyData(), +dh.createTableOne(), dh.defineCases(), dh.getStats(), dh.lmTab(), @@ -133,7 +134,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.defineCases.html b/docs/reference/dh.defineCases.html index 452f4025..ae98bd15 100644 --- a/docs/reference/dh.defineCases.html +++ b/docs/reference/dh.defineCases.html @@ -22,7 +22,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -139,6 +139,7 @@

See also

Other descriptive functions: dh.anyData(), dh.classDiscrepancy(), +dh.createTableOne(), dh.getStats(), dh.lmTab(), dh.meanByGroup()

@@ -156,7 +157,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.dropCols.html b/docs/reference/dh.dropCols.html index 5a4b522b..87a64ea6 100644 --- a/docs/reference/dh.dropCols.html +++ b/docs/reference/dh.dropCols.html @@ -19,7 +19,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -76,7 +76,7 @@

Removes columns from a serverside data frame

dh.dropCols(
   df = NULL,
   vars = NULL,
-  new_obj = df,
+  new_obj = NULL,
   type = NULL,
   conns = NULL,
   checks = TRUE,
@@ -133,7 +133,8 @@ 
See also

 dh.makeStrata(),
 dh.quartileSplit(),
 dh.renameVars(),
-dh.tidyEnv()
+dh.tidyEnv(), +dh.zByGroup()

@@ -148,7 +149,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.findVarsIndex.html b/docs/reference/dh.findVarsIndex.html index b848c8b6..d5ca9132 100644 --- a/docs/reference/dh.findVarsIndex.html +++ b/docs/reference/dh.findVarsIndex.html @@ -20,7 +20,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -118,7 +118,7 @@

Value

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.getAnonPlotData.html b/docs/reference/dh.getAnonPlotData.html index 290cc4e5..a308b699 100644 --- a/docs/reference/dh.getAnonPlotData.html +++ b/docs/reference/dh.getAnonPlotData.html @@ -23,7 +23,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -142,7 +142,7 @@

Details

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.getStats.html b/docs/reference/dh.getStats.html index e8dded99..dfadb0cb 100644 --- a/docs/reference/dh.getStats.html +++ b/docs/reference/dh.getStats.html @@ -20,7 +20,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -152,6 +152,7 @@

See also

Other descriptive functions: dh.anyData(), dh.classDiscrepancy(), +dh.createTableOne(), dh.defineCases(), dh.lmTab(), dh.meanByGroup()

@@ -169,7 +170,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.lmTab.html b/docs/reference/dh.lmTab.html index 0aec567b..f35ee48c 100644 --- a/docs/reference/dh.lmTab.html +++ b/docs/reference/dh.lmTab.html @@ -19,7 +19,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -155,6 +155,7 @@

See also

Other descriptive functions: dh.anyData(), dh.classDiscrepancy(), +dh.createTableOne(), dh.defineCases(), dh.getStats(), dh.meanByGroup()

@@ -172,7 +173,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.lmeMultPoly.html b/docs/reference/dh.lmeMultPoly.html index 3d666c4b..67539e78 100644 --- a/docs/reference/dh.lmeMultPoly.html +++ b/docs/reference/dh.lmeMultPoly.html @@ -20,7 +20,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -124,7 +124,8 @@

See also

dh.makeAgePolys(), dh.makeLmerForm(), dh.predictLmer(), -dh.trimPredData()

+dh.trimPredData(), +dh.zByGroup()

@@ -139,7 +140,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.localProxy.html b/docs/reference/dh.localProxy.html index 248b920f..644657ed 100644 --- a/docs/reference/dh.localProxy.html +++ b/docs/reference/dh.localProxy.html @@ -22,7 +22,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -128,7 +128,7 @@

Details

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.makeAgePolys.html b/docs/reference/dh.makeAgePolys.html index fb9d5135..b7836161 100644 --- a/docs/reference/dh.makeAgePolys.html +++ b/docs/reference/dh.makeAgePolys.html @@ -21,7 +21,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -132,14 +132,16 @@

See also

dh.lmeMultPoly(), dh.makeLmerForm(), dh.predictLmer(), -dh.trimPredData()

+dh.trimPredData(), +dh.zByGroup()

Other data manipulation functions: dh.dropCols(), dh.makeIQR(), dh.makeStrata(), dh.quartileSplit(), dh.renameVars(), -dh.tidyEnv()

+dh.tidyEnv(), +dh.zByGroup()

@@ -154,7 +156,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.makeIQR.html b/docs/reference/dh.makeIQR.html index b0ddd2e7..0f12f809 100644 --- a/docs/reference/dh.makeIQR.html +++ b/docs/reference/dh.makeIQR.html @@ -19,7 +19,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -133,7 +133,8 @@

See also

dh.makeStrata(), dh.quartileSplit(), dh.renameVars(), -dh.tidyEnv()

+dh.tidyEnv(), +dh.zByGroup()

@@ -148,7 +149,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.makeLmerForm.html b/docs/reference/dh.makeLmerForm.html index 73cde68a..61fc1fd9 100644 --- a/docs/reference/dh.makeLmerForm.html +++ b/docs/reference/dh.makeLmerForm.html @@ -19,7 +19,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -79,7 +79,7 @@

Make formulae for fitting multiple fractional polynomial models

age_vars = NULL, random = NULL, fixed = NULL, - age_interactions = FALSE + age_interactions = NULL ) @@ -129,7 +129,8 @@

See also

dh.lmeMultPoly(), dh.makeAgePolys(), dh.predictLmer(), -dh.trimPredData()

+dh.trimPredData(), +dh.zByGroup()

@@ -144,7 +145,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.makeOutcome.html b/docs/reference/dh.makeOutcome.html index 36d12a32..a02b4754 100644 --- a/docs/reference/dh.makeOutcome.html +++ b/docs/reference/dh.makeOutcome.html @@ -18,7 +18,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -145,7 +145,7 @@

Arguments

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.meanByAge.html b/docs/reference/dh.meanByAge.html index 49ff9d43..9d950fb0 100644 --- a/docs/reference/dh.meanByAge.html +++ b/docs/reference/dh.meanByAge.html @@ -19,7 +19,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -129,7 +129,7 @@

Value

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.metaManual.html b/docs/reference/dh.metaManual.html index 7a3dba78..e96b1d9f 100644 --- a/docs/reference/dh.metaManual.html +++ b/docs/reference/dh.metaManual.html @@ -21,7 +21,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -116,7 +116,7 @@

Details

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.predictLmer.html b/docs/reference/dh.predictLmer.html index 39be2c87..3fc06da6 100644 --- a/docs/reference/dh.predictLmer.html +++ b/docs/reference/dh.predictLmer.html @@ -20,7 +20,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -113,7 +113,8 @@

See also

dh.lmeMultPoly(), dh.makeAgePolys(), dh.makeLmerForm(), -dh.trimPredData()

+dh.trimPredData(), +dh.zByGroup()

@@ -128,7 +129,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.renameVars.html b/docs/reference/dh.renameVars.html index 1234f5ed..416d3dc7 100644 --- a/docs/reference/dh.renameVars.html +++ b/docs/reference/dh.renameVars.html @@ -18,7 +18,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -119,7 +119,8 @@

See also

dh.makeIQR(), dh.makeStrata(), dh.quartileSplit(), -dh.tidyEnv()

+dh.tidyEnv(), +dh.zByGroup()

@@ -134,7 +135,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.subjHasData.html b/docs/reference/dh.subjHasData.html index dd188329..94bedd95 100644 --- a/docs/reference/dh.subjHasData.html +++ b/docs/reference/dh.subjHasData.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -85,7 +85,7 @@

This was an old version of dh.defineCases which is now defunct

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.tidyEnv.html b/docs/reference/dh.tidyEnv.html index 8ac45c5e..977fa94d 100644 --- a/docs/reference/dh.tidyEnv.html +++ b/docs/reference/dh.tidyEnv.html @@ -18,7 +18,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -103,7 +103,8 @@

See also

dh.makeIQR(), dh.makeStrata(), dh.quartileSplit(), -dh.renameVars()

+dh.renameVars(), +dh.zByGroup()

@@ -118,7 +119,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dh.trimPredData.html b/docs/reference/dh.trimPredData.html index 005bbace..e9760849 100644 --- a/docs/reference/dh.trimPredData.html +++ b/docs/reference/dh.trimPredData.html @@ -21,7 +21,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -124,7 +124,8 @@

See also

dh.lmeMultPoly(), dh.makeAgePolys(), dh.makeLmerForm(), -dh.predictLmer()

+dh.predictLmer(), +dh.zByGroup()

@@ -139,7 +140,7 @@

See also

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/dot-onLoad.html b/docs/reference/dot-onLoad.html index ed82534c..ce178807 100644 --- a/docs/reference/dot-onLoad.html +++ b/docs/reference/dot-onLoad.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -95,7 +95,7 @@

Arguments

-

Site built with pkgdown 2.0.6.

+

Site built with pkgdown 2.0.7.

diff --git a/docs/reference/index.html b/docs/reference/index.html index 6d6ae53e..8b1205a0 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ dsHelper - 0.4.19 + 0.4.21 @@ -79,6 +79,10 @@

All functions dh.columnCast()

Casts column classes of a table

+ +

dh.createTableOne()

+ +

Creates tables in useful formats for including in manuscripts

dh.defineCases()

@@ -148,6 +152,14 @@

All functions dh.metaManual()

Wrapper to manaully perform two-stage meta-analysis using metafor

+ +

dh.metaSepModels()

+ +

Function in progress to meta-analyse separate models.

+ +

dh.multGLM()

+ +

Loop multiple GLM models and handle errors & non-convergence

dh.predictLmer()

@@ -172,6 +184,19 @@

All functions dh.trimPredData()

Trims predicted values based on min and max values provided

+ +

dh.zByGroup()

+ +

Creates z-scores within specified bands

+ +

.checkLabCols()

+ +

Checks that the columns provided in labs contain all and only those provided +in `required_cols`

+ +

dt.makeExcludedDf()

+ +

Given df-A & df-B, creates a new df which is the rows in A but not in B