diff --git a/.Rbuildignore b/.Rbuildignore index 561a653e..59863e10 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -9,4 +9,5 @@ ^pkgdown$ ^\.circleci$ ^\.circleci/config\.yml$ -^\.github$ \ No newline at end of file +^\.github$ +^cran-comments\.md$ diff --git a/docs/authors.html b/docs/authors.html index cc06044e..345f4351 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -89,11 +89,11 @@

Citation

Burton P, Wilson R, Butters O, Ryser-Welch P, Westerberg A, Abarrategui L, Villegas-Diaz R, Avraam D, Marcon Y, Wheater S (2025). -dsBase: DataSHIELD Server Site Base Functions. +dsBase: 'DataSHIELD' Server Site Base Functions. R package version 6.3.3.

@Manual{,
-  title = {dsBase: DataSHIELD Server Site Base Functions},
+  title = {dsBase: 'DataSHIELD' Server Site Base Functions},
   author = {Paul Burton and Rebecca Wilson and Olly Butters and Patricia Ryser-Welch and Alex Westerberg and Leire Abarrategui and Roberto Villegas-Diaz and Demetris Avraam and Yannick Marcon and Stuart Wheater},
   year = {2025},
   note = {R package version 6.3.3},
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index 5c084b52..ca6da52a 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -2,4 +2,4 @@ pandoc: 3.1.3
 pkgdown: 2.1.3
 pkgdown_sha: ~
 articles: {}
-last_built: 2025-07-01T22:30Z
+last_built: 2025-07-16T10:31Z
diff --git a/docs/reference/BooleDS.html b/docs/reference/BooleDS.html
index 452f7f13..03e2b322 100644
--- a/docs/reference/BooleDS.html
+++ b/docs/reference/BooleDS.html
@@ -81,8 +81,7 @@ 

Arguments

A character string taking values 'NA', '1' or '0'. If 'NA' then any NA values in the input vector remain as NAs in the output vector. If '1' or '0' NA values in the -input vector are -all converted to 1 or 0 respectively.#' @return the levels of the input variable.

+input vector are all converted to 1 or 0 respectively.

numeric.output
@@ -91,6 +90,10 @@

Arguments

should be of class numeric (1/0) or class logical (TRUE/FALSE).

+
+

Value

+

the levels of the input variable.

+

Details

The function converts the input vector into Boolean indicators.

diff --git a/docs/reference/asFactorDS2.html b/docs/reference/asFactorDS2.html index 839d0522..a3ebf298 100644 --- a/docs/reference/asFactorDS2.html +++ b/docs/reference/asFactorDS2.html @@ -69,7 +69,7 @@

Arguments

fixed.dummy.vars

a boolean that determines whether the new object will be represented as a vector or as a matrix of dummy variables indicating the factor level of each data point. -If this argyment is set to FALSE (default) then the input variable is converted to a factor and +If this argument is set to FALSE (default) then the input variable is converted to a factor and assigned as a vector. If is set to TRUE then the input variable is converted to a factor but assigned as a matrix of dummy variables.

diff --git a/docs/reference/checkPermissivePrivacyControlLevel.html b/docs/reference/checkPermissivePrivacyControlLevel.html index 045de671..f570d1b1 100644 --- a/docs/reference/checkPermissivePrivacyControlLevel.html +++ b/docs/reference/checkPermissivePrivacyControlLevel.html @@ -1,5 +1,5 @@ -checkPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBasecheckPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBase @@ -40,7 +40,7 @@

checkPermissivePrivacyControlLevel

-

This serverside function check that the server is running in "permissive" privacy control level.

+

This server-side function check that the server is running in "permissive" privacy control level.

@@ -55,6 +55,10 @@

Arguments

is a vector of strings which contains the privacy control level names which are permitted by the calling method.

+
+

Value

+

No return value, called for side effects

+

Details

Tests whether the R option "datashield.privacyControlLevel" is set to "permissive", if it isn't @@ -63,7 +67,7 @@

Details

Author

-

Wheater, Dr SM., DataSHIELD Team.

+

Wheater, Dr SM., DataSHIELD Development Team.

diff --git a/docs/reference/covDS.html b/docs/reference/covDS.html index ec3dfaff..5b7d4204 100644 --- a/docs/reference/covDS.html +++ b/docs/reference/covDS.html @@ -76,7 +76,7 @@

Value

a list that includes a matrix with elements the sum of products between each two variables, a matrix with elements the sum of the values of each variable, a matrix with elements the number of complete cases in each pair of variables, a list with the number of missing values in each variable separately (columnwise) and the number -of missing values casewise or pairwise depending on the arqument use, and an error message which indicates +of missing values casewise or pairwise depending on the argument use, and an error message which indicates whether or not the input variables pass the disclosure controls. The first disclosure control checks that the number of variables is not bigger than a percentage of the individual-level records (the allowed percentage is pre-specified by the 'nfilter.glm'). The second disclosure control checks that none of them is dichotomous with a level having fewer diff --git a/docs/reference/glmDS1.html b/docs/reference/glmDS1.html index 38a6a16c..80525b07 100644 --- a/docs/reference/glmDS1.html +++ b/docs/reference/glmDS1.html @@ -1,5 +1,5 @@ -glmDS1 called by ds.glm — glmDS1 • dsBaseglmDS1 called by ds.glm — glmDS1 • dsBase @@ -40,7 +40,7 @@

glmDS1 called by ds.glm

-

This is the first serverside aggregate function called by ds.glm

+

This is the first server-side aggregate function called by ds.glm

@@ -75,6 +75,10 @@

Arguments

analysed under the specified model

+
+

Value

+

List with values from GLM model.

+

Details

It is an diff --git a/docs/reference/glmDS2.html b/docs/reference/glmDS2.html index 2cefd28f..0f9df3f4 100644 --- a/docs/reference/glmDS2.html +++ b/docs/reference/glmDS2.html @@ -1,5 +1,5 @@ -glmDS2 called by ds.glm — glmDS2 • dsBaseglmDS2 called by ds.glm — glmDS2 • dsBase @@ -40,7 +40,7 @@

glmDS2 called by ds.glm

-

This is the second serverside aggregate function called by ds.glm.

+

This is the second server-side aggregate function called by ds.glm.

@@ -79,6 +79,10 @@

Arguments

the data to be analysed under the specified model same

+
+

Value

+

List with values from GLM model

+

Details

It is an aggregate function that uses the model structure and starting diff --git a/docs/reference/heatmapPlotDS.html b/docs/reference/heatmapPlotDS.html index eb3715fa..cf9941b6 100644 --- a/docs/reference/heatmapPlotDS.html +++ b/docs/reference/heatmapPlotDS.html @@ -60,7 +60,7 @@

Arguments

k
-

the number of the nearest neghbours for which their centroid is calculated if the +

the number of the nearest neighbours for which their centroid is calculated if the method.indicator is equal to 1 (i.e. deterministic method).

diff --git a/docs/reference/histogramDS1.html b/docs/reference/histogramDS1.html index 59888e26..2a83be22 100644 --- a/docs/reference/histogramDS1.html +++ b/docs/reference/histogramDS1.html @@ -2,7 +2,7 @@ returns the minimum and the maximum of the input numeric vector — histogramDS1 • dsBaselexisDS1 — lexisDS1 • dsBaselexisDS1 — lexisDS1 • dsBase @@ -40,7 +40,7 @@

lexisDS1

-

The first serverside function called by ds.lexis.

+

The first server-side function called by ds.lexis.

@@ -55,6 +55,10 @@

Arguments

a character string specifying the variable holding the time that each individual is censored or fails

+
+

Value

+

List with `max.time`

+

Details

This is an aggregate function. diff --git a/docs/reference/lexisDS2.html b/docs/reference/lexisDS2.html index 39b99d50..89ebeabf 100644 --- a/docs/reference/lexisDS2.html +++ b/docs/reference/lexisDS2.html @@ -78,7 +78,7 @@

Arguments

idCol

a clientside generated character string specifying the variable -holding the IDs of indivuals in the data set to be expanded

+holding the IDs of individuals in the data set to be expanded

entryCol
@@ -103,6 +103,10 @@

Arguments

'data' argument is set the full data.frame will be expanded and carried forward

+
+

Value

+

List with `expanded.table`

+

Details

This is the assign @@ -111,7 +115,7 @@

Details

regression. lexisDS2 also carries out a series of disclosure checks and if the arguments or data fail any of those tests, -creation of the exapanded dataframe is blocked and an appropriate serverside error +creation of the expanded dataframe is blocked and an appropriate serverside error message is stored. For more details see the extensive header for ds.lexis.

diff --git a/docs/reference/lexisDS3.html b/docs/reference/lexisDS3.html index 023ff8e4..dc237cda 100644 --- a/docs/reference/lexisDS3.html +++ b/docs/reference/lexisDS3.html @@ -47,6 +47,10 @@

@title lexisDS3

lexisDS3()
+
+

Value

+

Data frame with `messageobj` object

+

Details

This is an assign function that simplifies the diff --git a/docs/reference/listDisclosureSettingsDS.html b/docs/reference/listDisclosureSettingsDS.html index 10134413..549c94e3 100644 --- a/docs/reference/listDisclosureSettingsDS.html +++ b/docs/reference/listDisclosureSettingsDS.html @@ -49,6 +49,10 @@

listDisclosureSettingsDS

listDisclosureSettingsDS()
+
+

Value

+

List with DataSHIELD disclosure settings

+

Details

For more details see the extensive header for ds.listDisclosureSettings

diff --git a/docs/reference/matrixMultDS.html b/docs/reference/matrixMultDS.html index 6af3ff82..c782eaac 100644 --- a/docs/reference/matrixMultDS.html +++ b/docs/reference/matrixMultDS.html @@ -69,7 +69,7 @@

Value

Details

Undertakes standard matrix multiplication where with input matrices A and B with -dimensions A: mxn and B: nxp the output C has dimensions mxp and each elemnt C[i,j] has +dimensions A: mxn and B: nxp the output C has dimensions mxp and each element C[i,j] has value equal to the dot product of row i of A and column j of B where the dot product is obtained as sum(A[i,1]*B[1,j] + A[i,2]*B[2,j] + .... + A[i,n]*B[n,j]). This calculation is only valid if the number of columns of A is the same as the number of rows of B

diff --git a/docs/reference/meanSdGpDS.html b/docs/reference/meanSdGpDS.html index d60d33d7..7e902552 100644 --- a/docs/reference/meanSdGpDS.html +++ b/docs/reference/meanSdGpDS.html @@ -1,5 +1,5 @@ -MeanSdGpDS — meanSdGpDS • dsBaseMeanSdGpDS — meanSdGpDS • dsBase @@ -40,7 +40,7 @@

MeanSdGpDS

-

Serverside function called by ds.meanSdGp

+

Server-side function called by ds.meanSdGp

@@ -52,15 +52,19 @@

Arguments

X
-

a clientside supplied character string identifying the variable for which +

a client-side supplied character string identifying the variable for which means/SDs are to be calculated

INDEX
-

a clientside supplied character string identifying the factor across +

a client-side supplied character string identifying the factor across which means/SDs are to be calculated

+
+

Value

+

List with results from the group statistics

+

Details

Computes the mean and standard deviation across groups defined by one diff --git a/docs/reference/scatterPlotDS.html b/docs/reference/scatterPlotDS.html index b1298f5d..2e3d5407 100644 --- a/docs/reference/scatterPlotDS.html +++ b/docs/reference/scatterPlotDS.html @@ -68,7 +68,7 @@

Arguments

k
-

the number of the nearest neghbours for which their centroid is calculated if the +

the number of the nearest neighbours for which their centroid is calculated if the deterministic method is selected.

diff --git a/docs/reference/subsetDS.html b/docs/reference/subsetDS.html index 8bc2f861..19e73aab 100644 --- a/docs/reference/subsetDS.html +++ b/docs/reference/subsetDS.html @@ -1,7 +1,7 @@ Generates a valid subset of a table or a vector — subsetDS • dsBase @@ -43,8 +43,8 @@

Generates a valid subset of a table or a vector

The function uses the R classical subsetting with squared brackets '[]' and allows also to -subset using a logical oprator and a threshold. The object to subset from must be a vector (factor, numeric -or charcater) or a table (data.frame or matrix).

+subset using a logical operator and a threshold. The object to subset from must be a vector (factor, numeric +or character) or a table (data.frame or matrix).

@@ -92,18 +92,18 @@

Arguments

varname

a character, if the input data is a table, if this parameter is provided along with the 'logical' and 'threshold' -parameters, a subtable is based the threshold applied to the speicified variable. This parameter is however ignored if the parameter +parameters, a subtable is based the threshold applied to the specified variable. This parameter is however ignored if the parameter 'rows' and/or 'cols' are provided.

Value

-

a subset of the vector, matric or dataframe as specified is stored on the server side

+

a subset of the vector, matrix or dataframe as specified is stored on the server side

Details

If the input data is a table: The user specifies the rows and/or columns to include in the subset if the input -object is a table; the columns can be refered to by their names. The name of a vector (i.e. a variable) can also be provided +object is a table; the columns can be referred to by their names. The name of a vector (i.e. a variable) can also be provided with a logical operator and a threshold (see example 3). If the input data is a vector: when the parameters 'rows', 'logical' and 'threshold' are all provided the last two are ignored ( 'rows' has precedence over the other two parameters then). diff --git a/docs/reference/table1DDS.html b/docs/reference/table1DDS.html index 6796312e..82d157f7 100644 --- a/docs/reference/table1DDS.html +++ b/docs/reference/table1DDS.html @@ -65,7 +65,7 @@

Value

Details

It generates a 1-dimensional tables where valid (non-disclosive) 1-dimensional tables are defined -as data from sources where no table cells have counts between 1 and the set threshold. When the ouput table +as data from sources where no table cells have counts between 1 and the set threshold. When the output table is invalid all cells but the total count are replaced by missing values. Only the total count is visible on the table returned to the client site. A message is also returned with the 1-dimensional; the message says "invalid table - invalid counts present" if the table is invalid and 'valid table' otherwise.

diff --git a/docs/reference/table2DDS.html b/docs/reference/table2DDS.html index 501a2273..0b5f74e1 100644 --- a/docs/reference/table2DDS.html +++ b/docs/reference/table2DDS.html @@ -69,7 +69,7 @@

Value

Details

It generates 2-dimensional contingency tables where valid (non-disclosive) tables are defined -as those where none of their cells have counts between 1 and the set threshold "nfilter.tab". When the ouput table +as those where none of their cells have counts between 1 and the set threshold "nfilter.tab". When the output table is invalid all cells except the total counts are replaced by missing values. Only the total counts are visible on the table returned to the client side. A message is also returned with the 2-dimensional table; the message says "invalid table - invalid counts present" if the table is invalid and 'valid table' otherwise.

diff --git a/docs/reference/testObjExistsDS.html b/docs/reference/testObjExistsDS.html index 09cb4b5f..a0246beb 100644 --- a/docs/reference/testObjExistsDS.html +++ b/docs/reference/testObjExistsDS.html @@ -1,5 +1,5 @@ -testObjExistsDS — testObjExistsDS • dsBasetestObjExistsDS — testObjExistsDS • dsBase @@ -40,7 +40,7 @@

testObjExistsDS

-

The serverside function called by ds.testObjExists

+

The server-side function called by ds.testObjExists

@@ -52,10 +52,14 @@

Arguments

test.obj.name
-

a clientside provided character string specifying the variable +

a client-side provided character string specifying the variable whose presence is to be tested in each data source

+
+

Value

+

List with `test.obj.exists` and `test.obj.class`

+

Details

Tests whether a given object exists in