Skip to content

Commit 4c723ab

Browse files
Merge branch 'datashield:refactor/perf-batch-2' into refactor/perf-batch-2
2 parents 1bb8941 + b8d7187 commit 4c723ab

28 files changed

Lines changed: 52 additions & 15 deletions

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
^\.circleci$
2424
^\.circleci/config\.yml$
2525
^\.github$
26+
^man-roxygen$

DESCRIPTION

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ Authors@R: c(person(given = "Paul",
5656
family = "Wheater",
5757
role = c("aut", "cre"),
5858
email = "stuart.wheater@arjuna.com",
59-
comment = c(ORCID = "0009-0003-2419-1964")))
59+
comment = c(ORCID = "0009-0003-2419-1964")),
60+
person(given = "Tim",
61+
family = "Cadman",
62+
role = c("aut"),
63+
comment = c(ORCID = "0000-0002-7682-5645",
64+
affiliation = "Genomics Coordination Centre, UMCG, Netherlands")))
6065
License: GPL-3
6166
Depends:
6267
R (>= 4.0.0),
@@ -70,8 +75,7 @@ Imports:
7075
gridExtra,
7176
data.table,
7277
methods,
73-
dplyr,
74-
cli
78+
dplyr
7579
Suggests:
7680
lme4,
7781
httr,

R/ds.dataFrameFill.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
#' client-side indicating the name of the \code{newobj} that has been created in each data source
2222
#' and if it is in a valid form.
2323
#' @author Demetris Avraam for DataSHIELD Development Team
24-
#'
24+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
25+
#'
2526
#' @examples
2627
#' \dontrun{
2728
#'

R/ds.numNA.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#' @details The number of missing entries are counted and the total for each study is returned.
77
#'
88
#' Server function called: \code{numNaDS}
9-
#' @param x a character string specifying the name of the vector.
9+
#' @param x a character string specifying the name of the vector.
10+
#' @template classConsistencyCheck
1011
#' @param datasources a list of \code{\link[DSI]{DSConnection-class}}
1112
#' objects obtained after login. If the \code{datasources} argument is not specified
1213
#' the default set of connections will be used: see \code{\link[DSI]{datashield.connections_default}}.

R/ds.quantileMean.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#' @return \code{ds.quantileMean} returns to the client-side the quantiles and statistical mean
2222
#' of a server-side numeric vector.
2323
#' @author DataSHIELD Development Team
24+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
2425
#' @seealso \code{\link{ds.mean}} to compute the statistical mean.
2526
#' @seealso \code{\link{ds.summary}} to generate the summary of a variable.
2627
#' @export

R/ds.recodeLevels.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#' @return \code{ds.recodeLevels} returns to the server-side a variable of type factor
2020
#' with the replaces levels.
2121
#' @author DataSHIELD Development Team
22+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
2223
#' @export
2324
#' @examples
2425
#' \dontrun{

R/ds.replaceNA.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#' with the missing values replaced by the specified values.
2727
#' The class of the vector is the same as the initial vector.
2828
#' @author DataSHIELD Development Team
29+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
2930
#' @export
3031
#' @examples
3132
#' \dontrun{

R/ds.rowColCalc.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#' the default set of connections will be used: see \code{\link[DSI]{datashield.connections_default}}.
2020
#' @return \code{ds.rowColCalc} returns to the server-side rows and columns sums and means.
2121
#' @author DataSHIELD Development Team
22+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
2223
#' @examples
2324
#' \dontrun{
2425
#'

R/ds.subsetByClass.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#' the default set of connections will be used: see \link[DSI]{datashield.connections_default}.
1616
#' @return a no data are return to the user but messages are printed out.
1717
#' @author Gaye, A.
18+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
1819
#' @seealso \link{ds.meanByClass} to compute mean and standard deviation across categories of a factor vectors.
1920
#' @seealso \link{ds.subset} to subset by complete cases (i.e. removing missing values), threshold, columns and rows.
2021
#' @export

R/ds.summary.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#' such as the minimum and maximum values of numeric vectors are not returned.
2020
#' The summary is given for each study separately.
2121
#' @author DataSHIELD Development Team
22+
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
2223
#' @export
2324
#' @examples
2425
#' \dontrun{

0 commit comments

Comments
 (0)