Skip to content

Commit 22a64fe

Browse files
Merge pull request datashield#611 from villegar/v6.3.4-dev
Update documentation prior to RC for CRAN
2 parents d4a7340 + aff3553 commit 22a64fe

224 files changed

Lines changed: 981 additions & 344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
^dsDanger_6.3.4.tar.gz$
2323
^\.circleci$
2424
^\.circleci/config\.yml$
25+
^\.github$

.github/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.html

.github/workflows/pkgdown.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
release:
8+
types: [published]
9+
workflow_dispatch:
10+
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
14+
15+
jobs:
16+
pkgdown:
17+
runs-on: ubuntu-latest
18+
# Only restrict concurrency for non-PR jobs
19+
concurrency:
20+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
21+
env:
22+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents: write
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- uses: r-lib/actions/setup-pandoc@v2
29+
30+
- uses: r-lib/actions/setup-r@v2
31+
with:
32+
use-public-rspm: true
33+
34+
- uses: r-lib/actions/setup-r-dependencies@v2
35+
with:
36+
extra-packages: any::pkgdown, local::.
37+
needs: website
38+
39+
- name: Build site
40+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
41+
shell: Rscript {0}
42+
43+
- name: Deploy to GitHub pages 🚀
44+
if: github.event_name != 'pull_request'
45+
uses: JamesIves/github-pages-deploy-action@v4.5.0
46+
with:
47+
clean: false
48+
branch: gh-pages
49+
folder: docs

DESCRIPTION

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: dsBaseClient
2-
Title: DataSHIELD Client Functions
2+
Title: 'DataSHIELD' Client Side Base Functions
33
Version: 6.3.4
4-
Description: Base DataSHIELD functions for the client side. DataSHIELD is a software package which allows
5-
you to do non-disclosive federated analysis on sensitive data. DataSHIELD analytic functions have
4+
Description: Base 'DataSHIELD' functions for the client side. 'DataSHIELD' is a software package which allows
5+
you to do non-disclosive federated analysis on sensitive data. 'DataSHIELD' analytic functions have
66
been designed to only share non disclosive summary statistics, with built in automated output
77
checking based on statistical disclosure control. With data sites setting the threshold values for
8-
the automated output checks.
8+
the automated output checks. For more details, see 'citation("dsBaseClient")'.
99
Authors@R: c(person(given = "Paul",
1010
family = "Burton",
1111
role = c("aut"),
@@ -77,6 +77,7 @@ Imports:
7777
Suggests:
7878
lme4,
7979
httr,
80+
spelling,
8081
tibble,
8182
testthat,
8283
e1071,
@@ -86,3 +87,4 @@ Suggests:
8687
DSLite
8788
RoxygenNote: 7.3.3
8889
Encoding: UTF-8
90+
Language: en-GB

R/ds.asNumeric.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' @details This function is based on the native R function \code{as.numeric}.
66
#' However, it behaves differently with some specific classes of variables. For example, if the input
77
#' object is of class factor, it first converts its values into characters and then convert those to
8-
#' numerics. This behavior is important for the case where the input object is of class factor having
8+
#' numerics. This behaviour is important for the case where the input object is of class factor having
99
#' numbers as levels. In that case, the native R
1010
#' \code{as.numeric} function returns the underlying level codes and not the values as numbers.
1111
#' For example \code{as.numeric} in R converts the factor vector: \cr

R/ds.corTest.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#' used for the test. One of "pearson", "kendall", or "spearman", can be abbreviated.
1111
#' Default is set to "pearson".
1212
#' @param exact a logical indicating whether an exact p-value should be computed. Used for
13-
#' Kendall's tau and Spearman's rho. See Details of R stats function \code{cor.test} for
13+
#' Kendall's tau and Spearman's rho. See \emph{Details} of R stats function \code{cor.test} for
1414
#' the meaning of NULL (the default).
1515
#' @param conf.level confidence level for the returned confidence interval. Currently
1616
#' only used for the Pearson product moment correlation coefficient if there are at least

R/ds.dataFrameSubset.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#'
1313
#' Server functions called: \code{dataFrameSubsetDS1} and \code{dataFrameSubsetDS2}
1414
#'
15-
#' @param df.name a character string providing the name of the data frame to be subseted.
15+
#' @param df.name a character string providing the name of the data frame to be subset.
1616
#' @param V1.name A character string specifying the name of the vector
1717
#' to which the Boolean operator is to be applied to define the subset.
1818
#' For more information see details.

R/ds.dmtC2S.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#' wish to change the connections you wish to use by default the call
3030
#' datashield.connections_default('opals.a') will set 'default.connections'
3131
#' to be 'opals.a' and so in the absence of specific instructions to the contrary
32-
#' (e.g. by specifiying a particular dataset to be used via the <datasources>
32+
#' (e.g. by specifying a particular dataset to be used via the <datasources>
3333
#' argument) all subsequent function calls will be to the datasets held in opals.a.
3434
#' If the <datasources> argument is specified, it should be set without
3535
#' inverted commas: e.g. datasources=opals.a or datasources=default.connections.

R/ds.elspline.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#' @param x the name of the input numeric variable
1414
#' @param n integer greater than 2, knots are computed such that they cut n equally-spaced
1515
#' intervals along the range of x
16-
#' @param marginal logical, how to parametrize the spline, see Details
16+
#' @param marginal logical, how to parametrise the spline, see Details
1717
#' @param names character, vector of names for constructed variables
1818
#' @param newobj a character string that provides the name for the output
1919
#' variable that is stored on the data servers. Default \code{elspline.newobj}.

R/ds.forestplot.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#' @title Forestplot for SLMA models
2-
#' @description Draws a foresplot of the coefficients for Study-Level Meta-Analysis performed with
2+
#' @description Draws a forestplot of the coefficients for Study-Level Meta-Analysis performed with
33
#' DataSHIELD
44
#'
5-
#' @param mod \code{list} List outputed by any of the SLMA models of DataSHIELD (\code{ds.glmerSLMA},
5+
#' @param mod \code{list} List outputted by any of the SLMA models of DataSHIELD (\code{ds.glmerSLMA},
66
#' \code{ds.glmSLMA}, \code{ds.lmerSLMA})
7-
#' @param variable \code{character} (default \code{NULL}) Variable to meta-analyze and visualize, by setting this
7+
#' @param variable \code{character} (default \code{NULL}) Variable to meta-analyse and visualise, by setting this
88
#' argument to \code{NULL} (default) the first independent variable will be used.
99
#' @param method \code{character} (Default \code{"ML"}) Method to estimate the between study variance.
1010
#' See details from \code{?meta::metagen} for the different options.

0 commit comments

Comments
 (0)