From c0ea1499417167c99f03eee1ea61ff1aaa2c5d4f Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 6 Feb 2026 13:37:26 +0000 Subject: [PATCH 1/6] Changes required to address devtools::check issues --- DESCRIPTION | 4 +++- R/dateDS.R | 23 +++++++++++------------ R/predictDS.R | 19 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 84e31fa3..bb70a19f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -59,7 +59,9 @@ Imports: childsds, purrr, tibble, - tidyselect + tidyselect, + stats, + lubridate Suggests: testthat RoxygenNote: 7.3.3 diff --git a/R/dateDS.R b/R/dateDS.R index ed54bf67..701db399 100644 --- a/R/dateDS.R +++ b/R/dateDS.R @@ -29,7 +29,6 @@ dateDS <- function(x=NULL, type=NULL, newobj=NULL, unit=NULL, add.column=NULL) { - library(lubridate) add.column <- as.logical(add.column) # If argument not in c("extractdate", "makedate", "timebetween") throw an error @@ -119,9 +118,9 @@ dateDS <- function(x=NULL, type=NULL, # Extract the requested component result <- switch(unit, - days = day(date_input), - months = month(date_input), - years = year(date_input), + days = lubridate::day(date_input), + months = lubridate::month(date_input), + years = lubridate::year(date_input), stop("Invalid unit. Must be one of: days, months, years")) } @@ -141,7 +140,7 @@ dateDS <- function(x=NULL, type=NULL, } if (any(year_vec < 1000 | year_vec > 3000, na.rm = TRUE)) { - stop("The 'year' input in 'makedate' must contain plausible 4-digit years (1000–3000). + stop("The 'year' input in 'makedate' must contain plausible 4-digit years (1000-3000). Check that year, month, and day are given in the correct order (year, month, day).", call. = FALSE) } if (any(month_vec < 1 | month_vec > 12, na.rm = TRUE)) { @@ -154,9 +153,9 @@ dateDS <- function(x=NULL, type=NULL, } - result <- make_date(year = year_vec, - month = month_vec, - day = day_vec) + result <- lubridate::make_date(year = year_vec, + month = month_vec, + day = day_vec) } @@ -166,12 +165,12 @@ dateDS <- function(x=NULL, type=NULL, # inputs[[1]] = start date, inputs[[2]] = end date units <- list( - years = years(1), - months = months(1), - days = days(1) + years = lubridate::years(1), + months = lubridate::month(1), + days = lubridate::days(1) ) - result <- interval(inputs[[1]], inputs[[2]]) %/% units[[unit]] + result <- lubridate::interval(inputs[[1]], inputs[[2]]) %/% units[[unit]] } # Save result based on add.column diff --git a/R/predictDS.R b/R/predictDS.R index e42c8beb..e3311f91 100644 --- a/R/predictDS.R +++ b/R/predictDS.R @@ -71,15 +71,15 @@ predictDS <- function(newdataname, traindataname, type = c("response", "link"), # SPECIAL CASE HANDLING: y ~ 1, intercept only ###################### # A numeric vector will be created wit the mean, with the same length as the row number in newdataname - special_case <- length(attr(terms(formula(model_formula)), "term.labels")) == 0 + special_case <- length(attr(stats::terms(stats::formula(model_formula)), "term.labels")) == 0 if(special_case){ intercept <- coefficients # If the input is just a numeric vector, get the length - if(class(newdf)=="numeric"){ + if(all(c("numeric") %in% class(newdf))){ predictions.f <- rep(intercept, length(newdf)) - } else if(class(newdf)=="data.frame"){ + } else if(all(c("data.frame") %in% class(newdf))){ predictions.f <- rep(intercept, nrow(newdf)) # Otherwise use the number of rows } else { stop("Invalid input: The object called 'newdataname' must be either a numeric vector or a data.frame.",, call. = FALSE) @@ -95,7 +95,7 @@ predictDS <- function(newdataname, traindataname, type = c("response", "link"), predictions.f <- exp(predictions.f) } else if (family_name == "binomial") { # logit - predictions.f <- plogis(predictions.f) + predictions.f <- stats::plogis(predictions.f) } else { stop("Unsupported family for intercept-only prediction: Family must be either Gaussian, Poisson, or Binomial.", call. = FALSE) } @@ -121,18 +121,17 @@ predictDS <- function(newdataname, traindataname, type = c("response", "link"), na.action.fun <- match.fun(na.action) # Use a dummy glm object with the correct formula and family - dummy_fit <- glm(model_formula, - data = traindata, - family = family_obj, - control = glm.control(maxit = 1)) + dummy_fit <- stats::glm(model_formula, + data = traindata, + family = family_obj, + control = stats::glm.control(maxit = 1)) # Change its coefficients with the correct ones names(coefficients) <- names(dummy_fit$coefficients) dummy_fit$coefficients <- coefficients # New predictions - prediction <- predict(dummy_fit, newdata = newdf, type = type, na.action = na.action.fun) + prediction <- stats::predict(dummy_fit, newdata = newdf, type = type, na.action = na.action.fun) return(prediction) } - \ No newline at end of file From 1789c99a19480fb8b202f1a65c6c79a79c68214f Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 12 Jun 2026 16:15:34 +0100 Subject: [PATCH 2/6] Updated RoxygenNote to 8.0.0 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 77954f4a..a9573b74 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -81,6 +81,6 @@ Suggests: spelling, testthat, tidytable -RoxygenNote: 7.3.3 +RoxygenNote: 8.0.0 Encoding: UTF-8 Language: en-GB From 5eaa2324e6aeb46f4b57b27944e286f29f7dea97 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 16 Jun 2026 14:27:37 +0100 Subject: [PATCH 3/6] Update DESCRIPTION and docs --- DESCRIPTION | 2 +- docs/index.html | 4 +- docs/pkgdown.yml | 2 +- docs/reference/asDataMatrixDS.html | 12 +- .../checkPermissivePrivacyControlLevel.html | 4 +- docs/reference/dateDS.html | 120 +++++++++++++++++ docs/reference/dsBase-package.html | 88 ++++++++++++ docs/reference/glmDS1.html | 4 +- docs/reference/glmDS2.html | 4 +- docs/reference/index.html | 16 +++ docs/reference/lexisDS1.html | 4 +- docs/reference/meanSdGpDS.html | 4 +- docs/reference/predictDS.html | 118 ++++++++++++++++ docs/reference/roundDS.html | 126 ++++++++++++++++++ docs/reference/scaleDS.html | 105 +++++++++++++++ docs/reference/testObjExistsDS.html | 4 +- docs/sitemap.xml | 4 + 17 files changed, 601 insertions(+), 20 deletions(-) create mode 100644 docs/reference/dateDS.html create mode 100644 docs/reference/dsBase-package.html create mode 100644 docs/reference/predictDS.html create mode 100644 docs/reference/roundDS.html create mode 100644 docs/reference/scaleDS.html diff --git a/DESCRIPTION b/DESCRIPTION index 0e261ce4..b2e7bc2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -80,7 +80,7 @@ Imports: tidytable Suggests: spelling, - testthat, + testthat RoxygenNote: 8.0.0 Encoding: UTF-8 Language: en-GB diff --git a/docs/index.html b/docs/index.html index 1d86586f..34fba0b5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -70,10 +70,10 @@

InstallationGitHub with: 

 install.packages("remotes")
-remotes::install_github("datashield/dsBase", "<BRANCH>")
+remotes::install_github("datashield/dsBase", "<BRANCH>")
 
 # Install v6.3.4 with the following
-remotes::install_github("datashield/dsBase", "6.3.4")
+remotes::install_github("datashield/dsBase", "6.3.4")

For a full list of development branches, checkout https://github.com/datashield/dsBase/branches

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 9cfbee88..824a5118 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,4 +2,4 @@ pandoc: 3.1.3 pkgdown: 2.2.0 pkgdown_sha: ~ articles: {} -last_built: 2026-02-20T10:54Z +last_built: 2026-06-16T13:15Z diff --git a/docs/reference/asDataMatrixDS.html b/docs/reference/asDataMatrixDS.html index eae50c28..dcedd916 100644 --- a/docs/reference/asDataMatrixDS.html +++ b/docs/reference/asDataMatrixDS.html @@ -1,6 +1,5 @@ -< -head>asDataFrameDS a serverside assign function called by ds.asDataFrame — asDataMatrixDS • dsBaseasDataFrameDS a serverside assign function called by ds.asDataFrame — asDataMatrixDS • dsBasecheckPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBasecheckPermissivePrivacyControlLevel — checkPermissivePrivacyControlLevel • dsBase @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000
diff --git a/docs/reference/dateDS.html b/docs/reference/dateDS.html new file mode 100644 index 00000000..78f75753 --- /dev/null +++ b/docs/reference/dateDS.html @@ -0,0 +1,120 @@ + +dateDS — dateDS • dsBase + + +
+
+ + + +
+
+
+

dateDS

+ + +
+ +
+

Takes an object that is either a data-frame column or a vector, and can do extraction of +components of full date (extractdate), can combine date components to a full date (makedate), +or can calculate the time between two dates (timebetween).

+
+ +
+ 
dateDS(x = NULL, type = NULL, newobj = NULL, unit = NULL, add.column = NULL)
+
+ +
+

Arguments

+ + +
x
+

Character vector specifying the server-side object(s). For data-frame columns, use the format df$column.

+ + +
type
+

Character string specifying the operation: "extractdate", "makedate", or "timebetween".

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "date.result".

+ + +
unit
+

Character string specifying the unit for extractdate or timebetween: "days", "months", or "years".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ +
+
+

Value

+

the created numeric vector or date object, or the updated dataframe with the added column

+
+
+

Details

+

If the input is a data-frame column, it must be provided in the x argument as data-frame$column. +Inputs for extractdate and timebetween must be date objects. +For makedate, three numeric vectors (year, month, day) must be provided in the correct order. +The add.column argument determines whether the result is added as a new column in the existing +data-frame (TRUE), or created as a new server-side object (FALSE). +Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/dsBase-package.html b/docs/reference/dsBase-package.html new file mode 100644 index 00000000..e17af507 --- /dev/null +++ b/docs/reference/dsBase-package.html @@ -0,0 +1,88 @@ + +dsBase: 'DataSHIELD' Server Side Base Functions — dsBase-package • dsBase + + +
+
+ + + +
+
+
+

dsBase: 'DataSHIELD' Server Side Base Functions

+ + +
+ +
+

Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a software package which allows you to do non-disclosive federated analysis on sensitive data. 'DataSHIELD' analytic functions have been designed to only share non disclosive summary statistics, with built in automated output checking based on statistical disclosure control. With data sites setting the threshold values for the automated output checks. For more details, see 'citation("dsBase")'.

+
+ + +
+

Author

+

Maintainer: Stuart Wheater stuart.wheater@arjuna.com (ORCID)

+

Authors:

+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/glmDS1.html b/docs/reference/glmDS1.html index fc6eaad7..e105c614 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 @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000 diff --git a/docs/reference/glmDS2.html b/docs/reference/glmDS2.html index 8ebfd011..3d71a1b2 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 @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000 diff --git a/docs/reference/index.html b/docs/reference/index.html index efa3d316..720ca309 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -185,6 +185,10 @@

All functions dataFrameSubsetDS2()

dataFrameSubsetDS2 an assign function called by ds.dataFrameSubset

+ +

dateDS()

+ +

dateDS

densityGridDS()

@@ -437,6 +441,10 @@

All functions numNaDS()

Counts the number of missing values

+ +

predictDS()

+ +

predictDS

qlsplineDS()

@@ -513,6 +521,10 @@

All functions rmDS()

rmDS an aggregate function called by ds.rm

+ +

roundDS()

+ +

roundDS

rowColCalcDS()

@@ -521,6 +533,10 @@

All functions sampleDS()

random sampling and permuting of vectors, dataframes and matrices

+ +

scaleDS()

+ +

scaleDS

scatterPlotDS()

diff --git a/docs/reference/lexisDS1.html b/docs/reference/lexisDS1.html index 7117f909..ee21e0ee 100644 --- a/docs/reference/lexisDS1.html +++ b/docs/reference/lexisDS1.html @@ -1,5 +1,5 @@ -lexisDS1 — lexisDS1 • dsBaselexisDS1 — lexisDS1 • dsBase @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000 diff --git a/docs/reference/meanSdGpDS.html b/docs/reference/meanSdGpDS.html index 9fa9ee0e..b2a892c7 100644 --- a/docs/reference/meanSdGpDS.html +++ b/docs/reference/meanSdGpDS.html @@ -1,5 +1,5 @@ -MeanSdGpDS — meanSdGpDS • dsBaseMeanSdGpDS — meanSdGpDS • dsBase @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000 diff --git a/docs/reference/predictDS.html b/docs/reference/predictDS.html new file mode 100644 index 00000000..9e70992f --- /dev/null +++ b/docs/reference/predictDS.html @@ -0,0 +1,118 @@ + +predictDS — predictDS • dsBase + + +
+
+ + + +
+
+
+

predictDS

+ + +
+ +
+

Generates server-side predictions using the client-side output from ds.glm.

+
+ +
+ 
predictDS(
+  newdataname,
+  traindataname,
+  type = c("response", "link"),
+  na.action = "na.pass"
+)
+
+ +
+

Arguments

+ + +
newdataname
+

A character string specifying the name of the new dataset to be used for predictions.

+ + +
traindataname
+

A character string specifying the name of the dataset used for model training.

+ + +
type
+

A character string specifying the type of prediction. Options are "response" or "link".

+ + +
na.action
+

A character string to specify the action to take if missing values are present. Default is "na.pass".

+ +
+
+

Value

+

a numeric vector containing the predicted values

+
+
+

Details

+

This function uses the components supplied by the client-side function (coefficients, family, formula, +and any categorical variables) to generate predictions on the server. To use the base R predict() function, +a "dummy" glm object is created using the same model formula, family, and link function as the original model. +The dummy model's coefficients are then replaced with the client-side coefficient estimates.

+

To avoid mismatches between the factors used in the original glm and those in the dummy glm, the categorical +variables saved by the client-side function are applied to the newdata.

+

For intercept-only models, the function simply returns a vector of predicted values equal to the model intercept, with the appropriate length +based on the row length of newdataname.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/roundDS.html b/docs/reference/roundDS.html new file mode 100644 index 00000000..5a1730ac --- /dev/null +++ b/docs/reference/roundDS.html @@ -0,0 +1,126 @@ + +roundDS — roundDS • dsBase + + +
+
+ + + +
+
+
+

roundDS

+ + +
+ +
+

Generates objects from a server-side object, which can be either a vector or +a data-frame column. Supports five operations: +1. (round) +2. (ceiling) +3. (floor) +4. (trunc) +5. (signif) +where each function in baseR is applied on the server side to the specified object.

+
+ +
+ 
roundDS(x, type, digits, add.column, newobj)
+
+ +
+

Arguments

+ + +
x
+

Character vector specifying the server-side object(s). For data-frame columns, use the format df$column.

+ + +
type
+

Character string specifying the operation: "round", "ceiling", "floor", +trunc, or "signif".

+ + +
digits
+

Number of digits to be used in arguments "round" and "signif".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "rounding.result".

+ +
+
+

Value

+

the created numeric vector or the updated dataframe with the added column

+
+
+

Details

+

Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/scaleDS.html b/docs/reference/scaleDS.html new file mode 100644 index 00000000..3ba2392f --- /dev/null +++ b/docs/reference/scaleDS.html @@ -0,0 +1,105 @@ + +scaleDS — scaleDS • dsBase + + +
+
+ + + +
+
+
+

scaleDS

+ + +
+ +
+

Generates scaled objects using a server-side object, which can be either a vector or +a data-frame column.

+
+ +
+ 
scaleDS(x = NULL, newobj = NULL, add.column = NULL)
+
+ +
+

Arguments

+ + +
x
+

Character string specifying the server-side vector For data-frame columns, use the format df$column.

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "scaled.data".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ +
+
+

Value

+

the created numeric vector or the updated dataframe with the added column

+
+
+

Details

+

Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/testObjExistsDS.html b/docs/reference/testObjExistsDS.html index ed693254..c006a722 100644 --- a/docs/reference/testObjExistsDS.html +++ b/docs/reference/testObjExistsDS.html @@ -1,5 +1,5 @@ -testObjExistsDS — testObjExistsDS • dsBasetestObjExistsDS — testObjExistsDS • dsBase @@ -17,7 +17,7 @@ dsBase - 6.4.0-9000 + 6.4.0.9000 diff --git a/docs/sitemap.xml b/docs/sitemap.xml index a38f2f20..8f4e88ad 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -39,6 +39,7 @@ /reference/dataFrameSortDS.html /reference/dataFrameSubsetDS1.html /reference/dataFrameSubsetDS2.html +/reference/dateDS.html /reference/densityGridDS.html /reference/dimDS.html /reference/dmtC2SDS.html @@ -106,6 +107,7 @@ /reference/namesDS.html /reference/nsDS.html /reference/numNaDS.html +/reference/predictDS.html /reference/qlsplineDS.html /reference/quantileMeanDS.html /reference/rBinomDS.html @@ -125,8 +127,10 @@ /reference/repDS.html /reference/replaceNaDS.html /reference/rmDS.html +/reference/roundDS.html /reference/rowColCalcDS.html /reference/sampleDS.html +/reference/scaleDS.html /reference/scatterPlotDS.html /reference/seqDS.html /reference/setFilterDS.html From 56f47aafd6f37e790bc76dff60eeb39e87055450 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 16 Jun 2026 15:13:28 +0100 Subject: [PATCH 4/6] Update documentation ans manual --- DESCRIPTION | 6 +- docs/authors.html | 12 -- docs/index.html | 8 +- docs/pkgdown.yml | 6 +- docs/reference/BooleDS.html | 4 - docs/reference/absDS.html | 4 - docs/reference/asCharacterDS.html | 4 - docs/reference/asFactorDS1.html | 4 - docs/reference/asFactorDS2.html | 4 - docs/reference/asFactorSimpleDS.html | 4 - docs/reference/asIntegerDS.html | 4 - docs/reference/asListDS.html | 4 - docs/reference/asLogicalDS.html | 4 - docs/reference/asMatrixDS.html | 4 - docs/reference/asNumericDS.html | 4 - docs/reference/aucDS.html | 4 - docs/reference/blackBoxDS.html | 4 - docs/reference/blackBoxRanksDS.html | 4 - docs/reference/boxPlotGGDS.html | 4 - .../reference/boxPlotGG_data_TreatmentDS.html | 4 - .../boxPlotGG_data_Treatment_numericDS.html | 4 - docs/reference/bp_standardsDS.html | 4 - docs/reference/cDS.html | 4 - docs/reference/cbindDS.html | 4 - docs/reference/changeRefGroupDS.html | 4 - docs/reference/checkNegValueDS.html | 4 - docs/reference/classDS.html | 4 - docs/reference/colnamesDS.html | 4 - docs/reference/completeCasesDS.html | 4 - docs/reference/corDS.html | 4 - docs/reference/corTestDS.html | 4 - docs/reference/covDS.html | 4 - docs/reference/dataFrameDS.html | 4 - docs/reference/dataFrameFillDS.html | 4 - docs/reference/dataFrameSortDS.html | 4 - docs/reference/dataFrameSubsetDS1.html | 4 - docs/reference/dataFrameSubsetDS2.html | 4 - docs/reference/dateDS.html | 120 +++++++++++++++++ docs/reference/densityGridDS.html | 4 - docs/reference/dimDS.html | 4 - docs/reference/dmtC2SDS.html | 4 - docs/reference/dsBase-package.html | 7 +- docs/reference/elsplineDS.html | 4 - docs/reference/extractQuantilesDS1.html | 4 - docs/reference/extractQuantilesDS2.html | 4 - docs/reference/gamlssDS.html | 4 - docs/reference/getWGSRDS.html | 4 - docs/reference/glmPredictDS.ag.html | 4 - docs/reference/glmPredictDS.as.html | 4 - docs/reference/glmSLMADS.assign.html | 4 - docs/reference/glmSLMADS1.html | 4 - docs/reference/glmSLMADS2.html | 4 - docs/reference/glmSummaryDS.ag.html | 4 - docs/reference/glmSummaryDS.as.html | 4 - docs/reference/glmerSLMADS.assign.html | 4 - docs/reference/glmerSLMADS2.html | 4 - docs/reference/heatmapPlotDS.html | 4 - docs/reference/hetcorDS.html | 4 - docs/reference/histogramDS1.html | 4 - docs/reference/histogramDS2.html | 4 - docs/reference/igb_standardsDS.html | 4 - docs/reference/index.html | 20 ++- docs/reference/isNaDS.html | 4 - docs/reference/isValidDS.html | 4 - docs/reference/kurtosisDS1.html | 4 - docs/reference/kurtosisDS2.html | 4 - docs/reference/lengthDS.html | 4 - docs/reference/levelsDS.html | 4 - docs/reference/lexisDS2.html | 4 - docs/reference/lexisDS3.html | 4 - docs/reference/listDS.html | 4 - docs/reference/listDisclosureSettingsDS.html | 4 - docs/reference/lmerSLMADS.assign.html | 4 - docs/reference/lmerSLMADS2.html | 4 - docs/reference/lsDS.html | 4 - docs/reference/lsplineDS.html | 4 - docs/reference/matrixDS.html | 4 - docs/reference/matrixDetDS1.html | 4 - docs/reference/matrixDetDS2.html | 4 - docs/reference/matrixDiagDS.html | 4 - docs/reference/matrixDimnamesDS.html | 4 - docs/reference/matrixInvertDS.html | 4 - docs/reference/matrixMultDS.html | 4 - docs/reference/matrixTransposeDS.html | 4 - docs/reference/mdPatternDS.html | 4 - docs/reference/meanDS.html | 4 - docs/reference/mergeDS.html | 4 - docs/reference/messageDS.html | 4 - docs/reference/metadataDS.html | 4 - docs/reference/miceDS.html | 4 - docs/reference/minMaxRandDS.html | 4 - docs/reference/namesDS.html | 4 - docs/reference/nsDS.html | 4 - docs/reference/numNaDS.html | 4 - docs/reference/predictDS.html | 118 ++++++++++++++++ docs/reference/qlsplineDS.html | 4 - docs/reference/quantileMeanDS.html | 4 - docs/reference/rBinomDS.html | 4 - docs/reference/rNormDS.html | 4 - docs/reference/rPoisDS.html | 4 - docs/reference/rUnifDS.html | 4 - docs/reference/rangeDS.html | 4 - docs/reference/ranksSecureDS1.html | 4 - docs/reference/ranksSecureDS2.html | 4 - docs/reference/ranksSecureDS3.html | 4 - docs/reference/ranksSecureDS4.html | 4 - docs/reference/ranksSecureDS5.html | 4 - docs/reference/rbindDS.html | 4 - docs/reference/reShapeDS.html | 4 - docs/reference/recodeLevelsDS.html | 4 - docs/reference/recodeValuesDS.html | 4 - docs/reference/repDS.html | 4 - docs/reference/replaceNaDS.html | 4 - docs/reference/rmDS.html | 4 - docs/reference/roundDS.html | 126 ++++++++++++++++++ docs/reference/rowColCalcDS.html | 4 - docs/reference/sampleDS.html | 4 - docs/reference/scaleDS.html | 105 +++++++++++++++ docs/reference/scatterPlotDS.html | 4 - docs/reference/seqDS.html | 4 - docs/reference/setSeedDS.html | 4 - docs/reference/skewnessDS1.html | 4 - docs/reference/skewnessDS2.html | 4 - docs/reference/sqrtDS.html | 4 - docs/reference/subsetByClassDS.html | 4 - docs/reference/subsetDS.html | 4 - docs/reference/table1DDS.html | 4 - docs/reference/table2DDS.html | 4 - docs/reference/tableDS.assign.html | 4 - docs/reference/tableDS.html | 4 - docs/reference/tableDS2.html | 4 - docs/reference/tapplyDS.assign.html | 4 - docs/reference/tapplyDS.html | 4 - docs/reference/unListDS.html | 4 - docs/reference/uniqueDS.html | 4 - docs/reference/varDS.html | 4 - docs/reference/vectorDS.html | 4 - docs/sitemap.xml | 4 + man/dsBase-package.Rd | 1 + 139 files changed, 498 insertions(+), 543 deletions(-) create mode 100644 docs/reference/dateDS.html create mode 100644 docs/reference/predictDS.html create mode 100644 docs/reference/roundDS.html create mode 100644 docs/reference/scaleDS.html diff --git a/DESCRIPTION b/DESCRIPTION index a9573b74..b2e7bc2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -76,11 +76,11 @@ Imports: tibble, tidyselect, stats, - lubridate + lubridate, + tidytable Suggests: spelling, - testthat, - tidytable + testthat RoxygenNote: 8.0.0 Encoding: UTF-8 Language: en-GB diff --git a/docs/authors.html b/docs/authors.html index dc54dd5e..3526a873 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev @@ -106,20 +102,12 @@

Citation

Burton P, Wilson R, Butters O, Ryser-Welch P, Westerberg A, Abarrategui L, Villegas-Diaz R, Avraam D, Marcon Y, Bishop T, Gaye A, Escribà-Montagut X, Wheater S (????). dsBase: 'DataSHIELD' Server Side Base Functions. -<<<<<<< HEAD R package version 6.4.0.9000. -======= -R package version 6.3.5.9000. ->>>>>>> origin/v6.3.5-dev 

@Manual{,
   title = {dsBase: 'DataSHIELD' Server Side 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 Tom Bishop and Amadou Gaye and Xavier Escribà-Montagut and Stuart Wheater},
-<<<<<<< HEAD
   note = {R package version 6.4.0.9000},
-=======
-  note = {R package version 6.3.5.9000},
->>>>>>> origin/v6.3.5-dev
 }

Gaye A, Marcon Y, Isaeva J, LaFlamme P, Turner A, Jones E, Minion J, Boyd A, Newby C, Nuotio M, Wilson R, Butters O, Murtagh B, Demir I, Doiron D, Giepmans L, Wallace S, Budin-Ljøsne I, Schmidt C, Boffetta P, Boniol M, Bota M, Carter K, deKlerk N, Dibben C, Francis R, Hiekkalinna T, Hveem K, Kvaløy K, Millar S, Perry I, Peters A, Phillips C, Popham F, Raab G, Reischl E, Sheehan N, Waldenberger M, Perola M, van den Heuvel E, Macleod J, Knoppers B, Stolk R, Fortier I, Harris J, Woffenbuttel B, Murtagh M, Ferretti V, Burton P (2014). “DataSHIELD: taking the analysis to the data, not the data to the analysis.” diff --git a/docs/index.html b/docs/index.html index 41bcede1..34fba0b5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,11 +33,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev @@ -74,10 +70,10 @@

InstallationGitHub with: 

 install.packages("remotes")
-remotes::install_github("datashield/dsBase", "<BRANCH>")
+remotes::install_github("datashield/dsBase", "<BRANCH>")
 
 # Install v6.3.4 with the following
-remotes::install_github("datashield/dsBase", "6.3.4")
+remotes::install_github("datashield/dsBase", "6.3.4")

For a full list of development branches, checkout https://github.com/datashield/dsBase/branches

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 6f09758f..a3463688 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,8 +2,4 @@ pandoc: 3.1.3 pkgdown: 2.2.0 pkgdown_sha: ~ articles: {} -<<<<<<< HEAD -last_built: 2025-11-28T12:54Z -======= -last_built: 2025-11-30T16:44Z ->>>>>>> origin/v6.3.5-dev +last_built: 2026-06-16T13:21Z diff --git a/docs/reference/BooleDS.html b/docs/reference/BooleDS.html index d5f322aa..6c120d76 100644 --- a/docs/reference/BooleDS.html +++ b/docs/reference/BooleDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev
diff --git a/docs/reference/absDS.html b/docs/reference/absDS.html index fc172e34..9ffeb870 100644 --- a/docs/reference/absDS.html +++ b/docs/reference/absDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asCharacterDS.html b/docs/reference/asCharacterDS.html index 40f94a04..24b7fe91 100644 --- a/docs/reference/asCharacterDS.html +++ b/docs/reference/asCharacterDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asFactorDS1.html b/docs/reference/asFactorDS1.html index 1b5fb524..63be3a65 100644 --- a/docs/reference/asFactorDS1.html +++ b/docs/reference/asFactorDS1.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asFactorDS2.html b/docs/reference/asFactorDS2.html index 0f6a0188..a532de83 100644 --- a/docs/reference/asFactorDS2.html +++ b/docs/reference/asFactorDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asFactorSimpleDS.html b/docs/reference/asFactorSimpleDS.html index f1b21583..0b2282b2 100644 --- a/docs/reference/asFactorSimpleDS.html +++ b/docs/reference/asFactorSimpleDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asIntegerDS.html b/docs/reference/asIntegerDS.html index edb23eba..dd699c11 100644 --- a/docs/reference/asIntegerDS.html +++ b/docs/reference/asIntegerDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asListDS.html b/docs/reference/asListDS.html index 8597fb41..5fd009ba 100644 --- a/docs/reference/asListDS.html +++ b/docs/reference/asListDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asLogicalDS.html b/docs/reference/asLogicalDS.html index ecdc1351..d420e7e7 100644 --- a/docs/reference/asLogicalDS.html +++ b/docs/reference/asLogicalDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asMatrixDS.html b/docs/reference/asMatrixDS.html index 6eb27fa0..79fa77b2 100644 --- a/docs/reference/asMatrixDS.html +++ b/docs/reference/asMatrixDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/asNumericDS.html b/docs/reference/asNumericDS.html index 403c1e98..99fd40de 100644 --- a/docs/reference/asNumericDS.html +++ b/docs/reference/asNumericDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/aucDS.html b/docs/reference/aucDS.html index 916b3ef1..bdc3b9e0 100644 --- a/docs/reference/aucDS.html +++ b/docs/reference/aucDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/blackBoxDS.html b/docs/reference/blackBoxDS.html index ac9c92d2..03b1184c 100644 --- a/docs/reference/blackBoxDS.html +++ b/docs/reference/blackBoxDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/blackBoxRanksDS.html b/docs/reference/blackBoxRanksDS.html index c031b213..35ba5807 100644 --- a/docs/reference/blackBoxRanksDS.html +++ b/docs/reference/blackBoxRanksDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/boxPlotGGDS.html b/docs/reference/boxPlotGGDS.html index 4da4ef43..7f09ec5b 100644 --- a/docs/reference/boxPlotGGDS.html +++ b/docs/reference/boxPlotGGDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/boxPlotGG_data_TreatmentDS.html b/docs/reference/boxPlotGG_data_TreatmentDS.html index f67fa578..c4ea8d07 100644 --- a/docs/reference/boxPlotGG_data_TreatmentDS.html +++ b/docs/reference/boxPlotGG_data_TreatmentDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/boxPlotGG_data_Treatment_numericDS.html b/docs/reference/boxPlotGG_data_Treatment_numericDS.html index 03f090d0..b9397d80 100644 --- a/docs/reference/boxPlotGG_data_Treatment_numericDS.html +++ b/docs/reference/boxPlotGG_data_Treatment_numericDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/bp_standardsDS.html b/docs/reference/bp_standardsDS.html index 6e27eb6f..89765849 100644 --- a/docs/reference/bp_standardsDS.html +++ b/docs/reference/bp_standardsDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/cDS.html b/docs/reference/cDS.html index 29105de0..7c339a02 100644 --- a/docs/reference/cDS.html +++ b/docs/reference/cDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/cbindDS.html b/docs/reference/cbindDS.html index c79d4677..4df08184 100644 --- a/docs/reference/cbindDS.html +++ b/docs/reference/cbindDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/changeRefGroupDS.html b/docs/reference/changeRefGroupDS.html index ffc9e860..3e66be1b 100644 --- a/docs/reference/changeRefGroupDS.html +++ b/docs/reference/changeRefGroupDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/checkNegValueDS.html b/docs/reference/checkNegValueDS.html index 0de7609d..e356a27f 100644 --- a/docs/reference/checkNegValueDS.html +++ b/docs/reference/checkNegValueDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/classDS.html b/docs/reference/classDS.html index 5a0fab58..55390ce4 100644 --- a/docs/reference/classDS.html +++ b/docs/reference/classDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/colnamesDS.html b/docs/reference/colnamesDS.html index d1e770d4..c43ba5cb 100644 --- a/docs/reference/colnamesDS.html +++ b/docs/reference/colnamesDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/completeCasesDS.html b/docs/reference/completeCasesDS.html index af9b8d44..a53e10fa 100644 --- a/docs/reference/completeCasesDS.html +++ b/docs/reference/completeCasesDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/corDS.html b/docs/reference/corDS.html index b4fb7229..07cbf5e9 100644 --- a/docs/reference/corDS.html +++ b/docs/reference/corDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/corTestDS.html b/docs/reference/corTestDS.html index 2ead0203..5b58cb0a 100644 --- a/docs/reference/corTestDS.html +++ b/docs/reference/corTestDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/covDS.html b/docs/reference/covDS.html index bfc552fb..f4901bf1 100644 --- a/docs/reference/covDS.html +++ b/docs/reference/covDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dataFrameDS.html b/docs/reference/dataFrameDS.html index 50ae4fac..eba9e1a6 100644 --- a/docs/reference/dataFrameDS.html +++ b/docs/reference/dataFrameDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dataFrameFillDS.html b/docs/reference/dataFrameFillDS.html index 3e6098c1..3f9e3a32 100644 --- a/docs/reference/dataFrameFillDS.html +++ b/docs/reference/dataFrameFillDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dataFrameSortDS.html b/docs/reference/dataFrameSortDS.html index d4395261..01144cd3 100644 --- a/docs/reference/dataFrameSortDS.html +++ b/docs/reference/dataFrameSortDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dataFrameSubsetDS1.html b/docs/reference/dataFrameSubsetDS1.html index 1210c05c..4585d60c 100644 --- a/docs/reference/dataFrameSubsetDS1.html +++ b/docs/reference/dataFrameSubsetDS1.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dataFrameSubsetDS2.html b/docs/reference/dataFrameSubsetDS2.html index 5e41ee7e..929ae49c 100644 --- a/docs/reference/dataFrameSubsetDS2.html +++ b/docs/reference/dataFrameSubsetDS2.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dateDS.html b/docs/reference/dateDS.html new file mode 100644 index 00000000..78f75753 --- /dev/null +++ b/docs/reference/dateDS.html @@ -0,0 +1,120 @@ + +dateDS — dateDS • dsBase + + +
+
+ + + +
+
+
+

dateDS

+ + +
+ +
+

Takes an object that is either a data-frame column or a vector, and can do extraction of +components of full date (extractdate), can combine date components to a full date (makedate), +or can calculate the time between two dates (timebetween).

+
+ +
+ 
dateDS(x = NULL, type = NULL, newobj = NULL, unit = NULL, add.column = NULL)
+
+ +
+

Arguments

+ + +
x
+

Character vector specifying the server-side object(s). For data-frame columns, use the format df$column.

+ + +
type
+

Character string specifying the operation: "extractdate", "makedate", or "timebetween".

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "date.result".

+ + +
unit
+

Character string specifying the unit for extractdate or timebetween: "days", "months", or "years".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ +
+
+

Value

+

the created numeric vector or date object, or the updated dataframe with the added column

+
+
+

Details

+

If the input is a data-frame column, it must be provided in the x argument as data-frame$column. +Inputs for extractdate and timebetween must be date objects. +For makedate, three numeric vectors (year, month, day) must be provided in the correct order. +The add.column argument determines whether the result is added as a new column in the existing +data-frame (TRUE), or created as a new server-side object (FALSE). +Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/densityGridDS.html b/docs/reference/densityGridDS.html index 823b1bc2..6fba6784 100644 --- a/docs/reference/densityGridDS.html +++ b/docs/reference/densityGridDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dimDS.html b/docs/reference/dimDS.html index 92e4c87f..b9b9f448 100644 --- a/docs/reference/dimDS.html +++ b/docs/reference/dimDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dmtC2SDS.html b/docs/reference/dmtC2SDS.html index 0a8f128d..787d6d90 100644 --- a/docs/reference/dmtC2SDS.html +++ b/docs/reference/dmtC2SDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/dsBase-package.html b/docs/reference/dsBase-package.html index 7270ec16..e17af507 100644 --- a/docs/reference/dsBase-package.html +++ b/docs/reference/dsBase-package.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev @@ -51,7 +47,8 @@

dsBase: 'DataSHIELD' Server Side Base Functions

Author

Maintainer: Stuart Wheater stuart.wheater@arjuna.com (ORCID)

-

Authors:

  • Paul Burton (ORCID)

    • +

    Authors:

    • Stuart Wheater stuart.wheater@arjuna.com (ORCID)

      • +

    • Paul Burton (ORCID)

    • Rebecca Wilson (ORCID)

    • Olly Butters (ORCID)

    • Patricia Ryser-Welch (ORCID)

      • diff --git a/docs/reference/elsplineDS.html b/docs/reference/elsplineDS.html index 4b5e028f..58b697b2 100644 --- a/docs/reference/elsplineDS.html +++ b/docs/reference/elsplineDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev
diff --git a/docs/reference/extractQuantilesDS1.html b/docs/reference/extractQuantilesDS1.html index 96214bba..39592b32 100644 --- a/docs/reference/extractQuantilesDS1.html +++ b/docs/reference/extractQuantilesDS1.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/extractQuantilesDS2.html b/docs/reference/extractQuantilesDS2.html index 3dc4bcbe..c923aade 100644 --- a/docs/reference/extractQuantilesDS2.html +++ b/docs/reference/extractQuantilesDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/gamlssDS.html b/docs/reference/gamlssDS.html index 87c1c2ec..4154cb98 100644 --- a/docs/reference/gamlssDS.html +++ b/docs/reference/gamlssDS.html @@ -23,11 +23,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/getWGSRDS.html b/docs/reference/getWGSRDS.html index bc8addbf..f508fd7e 100644 --- a/docs/reference/getWGSRDS.html +++ b/docs/reference/getWGSRDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmPredictDS.ag.html b/docs/reference/glmPredictDS.ag.html index a3fa4124..0b109c1a 100644 --- a/docs/reference/glmPredictDS.ag.html +++ b/docs/reference/glmPredictDS.ag.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmPredictDS.as.html b/docs/reference/glmPredictDS.as.html index 2ba9f101..002579d5 100644 --- a/docs/reference/glmPredictDS.as.html +++ b/docs/reference/glmPredictDS.as.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmSLMADS.assign.html b/docs/reference/glmSLMADS.assign.html index 6eb9263c..2b74522b 100644 --- a/docs/reference/glmSLMADS.assign.html +++ b/docs/reference/glmSLMADS.assign.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmSLMADS1.html b/docs/reference/glmSLMADS1.html index 5f31583e..dc0ff1c1 100644 --- a/docs/reference/glmSLMADS1.html +++ b/docs/reference/glmSLMADS1.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmSLMADS2.html b/docs/reference/glmSLMADS2.html index 517c0e88..da588dbc 100644 --- a/docs/reference/glmSLMADS2.html +++ b/docs/reference/glmSLMADS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmSummaryDS.ag.html b/docs/reference/glmSummaryDS.ag.html index 23900009..62722c50 100644 --- a/docs/reference/glmSummaryDS.ag.html +++ b/docs/reference/glmSummaryDS.ag.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmSummaryDS.as.html b/docs/reference/glmSummaryDS.as.html index 560f1c9e..a5b7e116 100644 --- a/docs/reference/glmSummaryDS.as.html +++ b/docs/reference/glmSummaryDS.as.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmerSLMADS.assign.html b/docs/reference/glmerSLMADS.assign.html index 1bc06981..27b81174 100644 --- a/docs/reference/glmerSLMADS.assign.html +++ b/docs/reference/glmerSLMADS.assign.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/glmerSLMADS2.html b/docs/reference/glmerSLMADS2.html index 29b69c56..c1ae0c27 100644 --- a/docs/reference/glmerSLMADS2.html +++ b/docs/reference/glmerSLMADS2.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/heatmapPlotDS.html b/docs/reference/heatmapPlotDS.html index 6d0d668b..269a92a2 100644 --- a/docs/reference/heatmapPlotDS.html +++ b/docs/reference/heatmapPlotDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/hetcorDS.html b/docs/reference/hetcorDS.html index 4eaa70ca..80051a85 100644 --- a/docs/reference/hetcorDS.html +++ b/docs/reference/hetcorDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/histogramDS1.html b/docs/reference/histogramDS1.html index e4a874f9..3d71cf6f 100644 --- a/docs/reference/histogramDS1.html +++ b/docs/reference/histogramDS1.html @@ -23,11 +23,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/histogramDS2.html b/docs/reference/histogramDS2.html index 3aa9fc39..679967c7 100644 --- a/docs/reference/histogramDS2.html +++ b/docs/reference/histogramDS2.html @@ -21,11 +21,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/igb_standardsDS.html b/docs/reference/igb_standardsDS.html index 25725319..7cafd7ed 100644 --- a/docs/reference/igb_standardsDS.html +++ b/docs/reference/igb_standardsDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/index.html b/docs/reference/index.html index b1f06f78..720ca309 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev @@ -189,6 +185,10 @@

All functions dataFrameSubsetDS2()

dataFrameSubsetDS2 an assign function called by ds.dataFrameSubset

+ +

dateDS()

+ +

dateDS

densityGridDS()

@@ -441,6 +441,10 @@

All functions numNaDS()

Counts the number of missing values

+ +

predictDS()

+ +

predictDS

qlsplineDS()

@@ -517,6 +521,10 @@

All functions rmDS()

rmDS an aggregate function called by ds.rm

+ +

roundDS()

+ +

roundDS

rowColCalcDS()

@@ -525,6 +533,10 @@

All functions sampleDS()

random sampling and permuting of vectors, dataframes and matrices

+ +

scaleDS()

+ +

scaleDS

scatterPlotDS()

diff --git a/docs/reference/isNaDS.html b/docs/reference/isNaDS.html index 1a66df1a..5c9fcca6 100644 --- a/docs/reference/isNaDS.html +++ b/docs/reference/isNaDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/isValidDS.html b/docs/reference/isValidDS.html index c02ede88..2c695d33 100644 --- a/docs/reference/isValidDS.html +++ b/docs/reference/isValidDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/kurtosisDS1.html b/docs/reference/kurtosisDS1.html index 04665d0e..6867e232 100644 --- a/docs/reference/kurtosisDS1.html +++ b/docs/reference/kurtosisDS1.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/kurtosisDS2.html b/docs/reference/kurtosisDS2.html index 69e52f40..29d4c56d 100644 --- a/docs/reference/kurtosisDS2.html +++ b/docs/reference/kurtosisDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lengthDS.html b/docs/reference/lengthDS.html index 6f5e9d66..b0cc498d 100644 --- a/docs/reference/lengthDS.html +++ b/docs/reference/lengthDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/levelsDS.html b/docs/reference/levelsDS.html index bdc7da95..3bda828c 100644 --- a/docs/reference/levelsDS.html +++ b/docs/reference/levelsDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lexisDS2.html b/docs/reference/lexisDS2.html index 8b4802d9..16d5547b 100644 --- a/docs/reference/lexisDS2.html +++ b/docs/reference/lexisDS2.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lexisDS3.html b/docs/reference/lexisDS3.html index e90963c5..b5b5c79d 100644 --- a/docs/reference/lexisDS3.html +++ b/docs/reference/lexisDS3.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/listDS.html b/docs/reference/listDS.html index aab15eb1..d1e47dd2 100644 --- a/docs/reference/listDS.html +++ b/docs/reference/listDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/listDisclosureSettingsDS.html b/docs/reference/listDisclosureSettingsDS.html index 6f051378..231c3372 100644 --- a/docs/reference/listDisclosureSettingsDS.html +++ b/docs/reference/listDisclosureSettingsDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lmerSLMADS.assign.html b/docs/reference/lmerSLMADS.assign.html index a8c903db..cf28e3e1 100644 --- a/docs/reference/lmerSLMADS.assign.html +++ b/docs/reference/lmerSLMADS.assign.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lmerSLMADS2.html b/docs/reference/lmerSLMADS2.html index f2201bd4..9a324996 100644 --- a/docs/reference/lmerSLMADS2.html +++ b/docs/reference/lmerSLMADS2.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lsDS.html b/docs/reference/lsDS.html index 0747857d..faed01e5 100644 --- a/docs/reference/lsDS.html +++ b/docs/reference/lsDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/lsplineDS.html b/docs/reference/lsplineDS.html index 03a511ea..1f54ed5a 100644 --- a/docs/reference/lsplineDS.html +++ b/docs/reference/lsplineDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixDS.html b/docs/reference/matrixDS.html index 39e1cea8..5dbae7c2 100644 --- a/docs/reference/matrixDS.html +++ b/docs/reference/matrixDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixDetDS1.html b/docs/reference/matrixDetDS1.html index e1c28b77..4528346e 100644 --- a/docs/reference/matrixDetDS1.html +++ b/docs/reference/matrixDetDS1.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixDetDS2.html b/docs/reference/matrixDetDS2.html index 8c0be8db..728ef556 100644 --- a/docs/reference/matrixDetDS2.html +++ b/docs/reference/matrixDetDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixDiagDS.html b/docs/reference/matrixDiagDS.html index ffe9cfa1..53382d75 100644 --- a/docs/reference/matrixDiagDS.html +++ b/docs/reference/matrixDiagDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixDimnamesDS.html b/docs/reference/matrixDimnamesDS.html index 49ade78e..276f377f 100644 --- a/docs/reference/matrixDimnamesDS.html +++ b/docs/reference/matrixDimnamesDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixInvertDS.html b/docs/reference/matrixInvertDS.html index f555d483..79d56475 100644 --- a/docs/reference/matrixInvertDS.html +++ b/docs/reference/matrixInvertDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixMultDS.html b/docs/reference/matrixMultDS.html index 2dc680b3..854dd216 100644 --- a/docs/reference/matrixMultDS.html +++ b/docs/reference/matrixMultDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/matrixTransposeDS.html b/docs/reference/matrixTransposeDS.html index 7f1abc24..d9f0cbfb 100644 --- a/docs/reference/matrixTransposeDS.html +++ b/docs/reference/matrixTransposeDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/mdPatternDS.html b/docs/reference/mdPatternDS.html index d5469e97..f9187ff5 100644 --- a/docs/reference/mdPatternDS.html +++ b/docs/reference/mdPatternDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/meanDS.html b/docs/reference/meanDS.html index c0123dc2..3a75d1c6 100644 --- a/docs/reference/meanDS.html +++ b/docs/reference/meanDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/mergeDS.html b/docs/reference/mergeDS.html index 55b7aa45..b7ddf47b 100644 --- a/docs/reference/mergeDS.html +++ b/docs/reference/mergeDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/messageDS.html b/docs/reference/messageDS.html index 26e2dc2d..7f4a190e 100644 --- a/docs/reference/messageDS.html +++ b/docs/reference/messageDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/metadataDS.html b/docs/reference/metadataDS.html index ac629de7..79913002 100644 --- a/docs/reference/metadataDS.html +++ b/docs/reference/metadataDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/miceDS.html b/docs/reference/miceDS.html index e0244b84..fff5eafb 100644 --- a/docs/reference/miceDS.html +++ b/docs/reference/miceDS.html @@ -23,11 +23,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/minMaxRandDS.html b/docs/reference/minMaxRandDS.html index ca3d03d1..3e42e684 100644 --- a/docs/reference/minMaxRandDS.html +++ b/docs/reference/minMaxRandDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/namesDS.html b/docs/reference/namesDS.html index 6441b400..3e39c9ae 100644 --- a/docs/reference/namesDS.html +++ b/docs/reference/namesDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/nsDS.html b/docs/reference/nsDS.html index 39bfe0c6..2dec2458 100644 --- a/docs/reference/nsDS.html +++ b/docs/reference/nsDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/numNaDS.html b/docs/reference/numNaDS.html index ad021f9a..9cc7a6c2 100644 --- a/docs/reference/numNaDS.html +++ b/docs/reference/numNaDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/predictDS.html b/docs/reference/predictDS.html new file mode 100644 index 00000000..9e70992f --- /dev/null +++ b/docs/reference/predictDS.html @@ -0,0 +1,118 @@ + +predictDS — predictDS • dsBase + + +
+
+ + + +
+
+
+

predictDS

+ + +
+ +
+

Generates server-side predictions using the client-side output from ds.glm.

+
+ +
+ 
predictDS(
+  newdataname,
+  traindataname,
+  type = c("response", "link"),
+  na.action = "na.pass"
+)
+
+ +
+

Arguments

+ + +
newdataname
+

A character string specifying the name of the new dataset to be used for predictions.

+ + +
traindataname
+

A character string specifying the name of the dataset used for model training.

+ + +
type
+

A character string specifying the type of prediction. Options are "response" or "link".

+ + +
na.action
+

A character string to specify the action to take if missing values are present. Default is "na.pass".

+ +
+
+

Value

+

a numeric vector containing the predicted values

+
+
+

Details

+

This function uses the components supplied by the client-side function (coefficients, family, formula, +and any categorical variables) to generate predictions on the server. To use the base R predict() function, +a "dummy" glm object is created using the same model formula, family, and link function as the original model. +The dummy model's coefficients are then replaced with the client-side coefficient estimates.

+

To avoid mismatches between the factors used in the original glm and those in the dummy glm, the categorical +variables saved by the client-side function are applied to the newdata.

+

For intercept-only models, the function simply returns a vector of predicted values equal to the model intercept, with the appropriate length +based on the row length of newdataname.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/qlsplineDS.html b/docs/reference/qlsplineDS.html index 56969fb1..7150fcef 100644 --- a/docs/reference/qlsplineDS.html +++ b/docs/reference/qlsplineDS.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/quantileMeanDS.html b/docs/reference/quantileMeanDS.html index 0cdd525a..a227b129 100644 --- a/docs/reference/quantileMeanDS.html +++ b/docs/reference/quantileMeanDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rBinomDS.html b/docs/reference/rBinomDS.html index e29f7be7..385d3a2c 100644 --- a/docs/reference/rBinomDS.html +++ b/docs/reference/rBinomDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rNormDS.html b/docs/reference/rNormDS.html index b757e36e..84f8fb67 100644 --- a/docs/reference/rNormDS.html +++ b/docs/reference/rNormDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rPoisDS.html b/docs/reference/rPoisDS.html index d8ecfbcb..f644a9e7 100644 --- a/docs/reference/rPoisDS.html +++ b/docs/reference/rPoisDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rUnifDS.html b/docs/reference/rUnifDS.html index 1811a44c..2b98c15a 100644 --- a/docs/reference/rUnifDS.html +++ b/docs/reference/rUnifDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rangeDS.html b/docs/reference/rangeDS.html index 4231406b..87ac7d3f 100644 --- a/docs/reference/rangeDS.html +++ b/docs/reference/rangeDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/ranksSecureDS1.html b/docs/reference/ranksSecureDS1.html index 9f04e270..b858383b 100644 --- a/docs/reference/ranksSecureDS1.html +++ b/docs/reference/ranksSecureDS1.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/ranksSecureDS2.html b/docs/reference/ranksSecureDS2.html index 96e92343..c0d88cc7 100644 --- a/docs/reference/ranksSecureDS2.html +++ b/docs/reference/ranksSecureDS2.html @@ -24,11 +24,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/ranksSecureDS3.html b/docs/reference/ranksSecureDS3.html index f1d08714..acbb0e4a 100644 --- a/docs/reference/ranksSecureDS3.html +++ b/docs/reference/ranksSecureDS3.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/ranksSecureDS4.html b/docs/reference/ranksSecureDS4.html index eddcaf6f..e5acc10b 100644 --- a/docs/reference/ranksSecureDS4.html +++ b/docs/reference/ranksSecureDS4.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/ranksSecureDS5.html b/docs/reference/ranksSecureDS5.html index f51096cb..44a9158f 100644 --- a/docs/reference/ranksSecureDS5.html +++ b/docs/reference/ranksSecureDS5.html @@ -20,11 +20,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rbindDS.html b/docs/reference/rbindDS.html index fc36b471..64939f08 100644 --- a/docs/reference/rbindDS.html +++ b/docs/reference/rbindDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/reShapeDS.html b/docs/reference/reShapeDS.html index 2e5315ee..bb1201e2 100644 --- a/docs/reference/reShapeDS.html +++ b/docs/reference/reShapeDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/recodeLevelsDS.html b/docs/reference/recodeLevelsDS.html index 7f0e5c81..c34a5520 100644 --- a/docs/reference/recodeLevelsDS.html +++ b/docs/reference/recodeLevelsDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/recodeValuesDS.html b/docs/reference/recodeValuesDS.html index e744d6bf..ddf2d26d 100644 --- a/docs/reference/recodeValuesDS.html +++ b/docs/reference/recodeValuesDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/repDS.html b/docs/reference/repDS.html index 9cc5876d..503c7fb8 100644 --- a/docs/reference/repDS.html +++ b/docs/reference/repDS.html @@ -21,11 +21,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/replaceNaDS.html b/docs/reference/replaceNaDS.html index 2029f0a4..cf56b323 100644 --- a/docs/reference/replaceNaDS.html +++ b/docs/reference/replaceNaDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/rmDS.html b/docs/reference/rmDS.html index f55083b3..c1cc4c39 100644 --- a/docs/reference/rmDS.html +++ b/docs/reference/rmDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/roundDS.html b/docs/reference/roundDS.html new file mode 100644 index 00000000..5a1730ac --- /dev/null +++ b/docs/reference/roundDS.html @@ -0,0 +1,126 @@ + +roundDS — roundDS • dsBase + + +
+
+ + + +
+
+
+

roundDS

+ + +
+ +
+

Generates objects from a server-side object, which can be either a vector or +a data-frame column. Supports five operations: +1. (round) +2. (ceiling) +3. (floor) +4. (trunc) +5. (signif) +where each function in baseR is applied on the server side to the specified object.

+
+ +
+ 
roundDS(x, type, digits, add.column, newobj)
+
+ +
+

Arguments

+ + +
x
+

Character vector specifying the server-side object(s). For data-frame columns, use the format df$column.

+ + +
type
+

Character string specifying the operation: "round", "ceiling", "floor", +trunc, or "signif".

+ + +
digits
+

Number of digits to be used in arguments "round" and "signif".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "rounding.result".

+ +
+
+

Value

+

the created numeric vector or the updated dataframe with the added column

+
+
+

Details

+

Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/rowColCalcDS.html b/docs/reference/rowColCalcDS.html index cdde7901..5a40ca49 100644 --- a/docs/reference/rowColCalcDS.html +++ b/docs/reference/rowColCalcDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/sampleDS.html b/docs/reference/sampleDS.html index 39f03b28..7a482911 100644 --- a/docs/reference/sampleDS.html +++ b/docs/reference/sampleDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/scaleDS.html b/docs/reference/scaleDS.html new file mode 100644 index 00000000..3ba2392f --- /dev/null +++ b/docs/reference/scaleDS.html @@ -0,0 +1,105 @@ + +scaleDS — scaleDS • dsBase + + +
+
+ + + +
+
+
+

scaleDS

+ + +
+ +
+

Generates scaled objects using a server-side object, which can be either a vector or +a data-frame column.

+
+ +
+ 
scaleDS(x = NULL, newobj = NULL, add.column = NULL)
+
+ +
+

Arguments

+ + +
x
+

Character string specifying the server-side vector For data-frame columns, use the format df$column.

+ + +
newobj
+

Character string for the name of the object that will be created on the server. Default is "scaled.data".

+ + +
add.column
+

Logical. If FALSE, the result is created as a new server-side object; +if TRUE, the result is added as a new column in the existing data-frame. Default is FALSE.

+ +
+
+

Value

+

the created numeric vector or the updated dataframe with the added column

+
+
+

Details

+

Note: add.column = TRUE is only valid for data-frame inputs.

+
+
+

Author

+

Zulal Bekerecioglu

+
+ +
+ +
+ + +
+

Developed by Paul Burton, Rebecca Wilson, Olly Butters, Patricia Ryser-Welch, Alex Westerberg, Leire Abarrategui, Roberto Villegas-Diaz, Demetris Avraam, Yannick Marcon, Tom Bishop, Amadou Gaye, Xavier Escribà-Montagut, Stuart Wheater.

+
+ +
+

Site built with pkgdown 2.2.0.

+
+ +
+ + + + + + + + diff --git a/docs/reference/scatterPlotDS.html b/docs/reference/scatterPlotDS.html index 2bd086c0..858452d4 100644 --- a/docs/reference/scatterPlotDS.html +++ b/docs/reference/scatterPlotDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/seqDS.html b/docs/reference/seqDS.html index 89f85c1b..ca737326 100644 --- a/docs/reference/seqDS.html +++ b/docs/reference/seqDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/setSeedDS.html b/docs/reference/setSeedDS.html index 846a68dc..f7fbf96f 100644 --- a/docs/reference/setSeedDS.html +++ b/docs/reference/setSeedDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/skewnessDS1.html b/docs/reference/skewnessDS1.html index 95722055..d75060b2 100644 --- a/docs/reference/skewnessDS1.html +++ b/docs/reference/skewnessDS1.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/skewnessDS2.html b/docs/reference/skewnessDS2.html index 5f555c1c..3a1f7b67 100644 --- a/docs/reference/skewnessDS2.html +++ b/docs/reference/skewnessDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/sqrtDS.html b/docs/reference/sqrtDS.html index 36f7eae9..575ce4f7 100644 --- a/docs/reference/sqrtDS.html +++ b/docs/reference/sqrtDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/subsetByClassDS.html b/docs/reference/subsetByClassDS.html index 290fa538..c9f7a973 100644 --- a/docs/reference/subsetByClassDS.html +++ b/docs/reference/subsetByClassDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/subsetDS.html b/docs/reference/subsetDS.html index 151c0ab1..6ebe3cc2 100644 --- a/docs/reference/subsetDS.html +++ b/docs/reference/subsetDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/table1DDS.html b/docs/reference/table1DDS.html index 48e865ec..ff21fd5d 100644 --- a/docs/reference/table1DDS.html +++ b/docs/reference/table1DDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/table2DDS.html b/docs/reference/table2DDS.html index 1c375976..b3009107 100644 --- a/docs/reference/table2DDS.html +++ b/docs/reference/table2DDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/tableDS.assign.html b/docs/reference/tableDS.assign.html index d17715a4..7df8b1d3 100644 --- a/docs/reference/tableDS.assign.html +++ b/docs/reference/tableDS.assign.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/tableDS.html b/docs/reference/tableDS.html index 3d0ed49f..d0fb2550 100644 --- a/docs/reference/tableDS.html +++ b/docs/reference/tableDS.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/tableDS2.html b/docs/reference/tableDS2.html index 6b5e0ef7..713d4f3a 100644 --- a/docs/reference/tableDS2.html +++ b/docs/reference/tableDS2.html @@ -18,11 +18,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/tapplyDS.assign.html b/docs/reference/tapplyDS.assign.html index 6050a06a..cdb99f48 100644 --- a/docs/reference/tapplyDS.assign.html +++ b/docs/reference/tapplyDS.assign.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/tapplyDS.html b/docs/reference/tapplyDS.html index 2097b7b2..c9a9b945 100644 --- a/docs/reference/tapplyDS.html +++ b/docs/reference/tapplyDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/unListDS.html b/docs/reference/unListDS.html index 330d2969..f613a8d0 100644 --- a/docs/reference/unListDS.html +++ b/docs/reference/unListDS.html @@ -19,11 +19,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/uniqueDS.html b/docs/reference/uniqueDS.html index 090658a6..65899058 100644 --- a/docs/reference/uniqueDS.html +++ b/docs/reference/uniqueDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/varDS.html b/docs/reference/varDS.html index ab4deeb4..86e0bac6 100644 --- a/docs/reference/varDS.html +++ b/docs/reference/varDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/reference/vectorDS.html b/docs/reference/vectorDS.html index 49ca4a00..6fbba822 100644 --- a/docs/reference/vectorDS.html +++ b/docs/reference/vectorDS.html @@ -17,11 +17,7 @@ dsBase -<<<<<<< HEAD 6.4.0.9000 -======= - 6.3.5.9000 ->>>>>>> origin/v6.3.5-dev diff --git a/docs/sitemap.xml b/docs/sitemap.xml index a38f2f20..8f4e88ad 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -39,6 +39,7 @@ /reference/dataFrameSortDS.html /reference/dataFrameSubsetDS1.html /reference/dataFrameSubsetDS2.html +/reference/dateDS.html /reference/densityGridDS.html /reference/dimDS.html /reference/dmtC2SDS.html @@ -106,6 +107,7 @@ /reference/namesDS.html /reference/nsDS.html /reference/numNaDS.html +/reference/predictDS.html /reference/qlsplineDS.html /reference/quantileMeanDS.html /reference/rBinomDS.html @@ -125,8 +127,10 @@ /reference/repDS.html /reference/replaceNaDS.html /reference/rmDS.html +/reference/roundDS.html /reference/rowColCalcDS.html /reference/sampleDS.html +/reference/scaleDS.html /reference/scatterPlotDS.html /reference/seqDS.html /reference/setFilterDS.html diff --git a/man/dsBase-package.Rd b/man/dsBase-package.Rd index 725c4131..be7f5744 100644 --- a/man/dsBase-package.Rd +++ b/man/dsBase-package.Rd @@ -13,6 +13,7 @@ Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a software pack Authors: \itemize{ + \item Stuart Wheater \email{stuart.wheater@arjuna.com} (\href{https://orcid.org/0009-0003-2419-1964}{ORCID}) \item Paul Burton (\href{https://orcid.org/0000-0001-5799-9634}{ORCID}) \item Rebecca Wilson (\href{https://orcid.org/0000-0003-2294-593X}{ORCID}) \item Olly Butters (\href{https://orcid.org/0000-0003-0354-8461}{ORCID}) From 7a9f4fe8ebac270fd9ec8d086715bd1ea52fd9f6 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 7 Jul 2026 11:03:30 +0100 Subject: [PATCH 5/6] Progress to fix minor changes --- DESCRIPTION | 7 +++++-- README.md | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b2e7bc2b..6e4dfe83 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -59,12 +59,15 @@ Authors@R: c(person(given = "Paul", comment = c(ORCID = "0009-0003-2419-1964"))) License: GPL-3 Depends: - R (>= 4.0.0) + R (>= 4.1.0) Imports: RANN, stringr, lme4, dplyr, + tibble, + purrr, + tidyselect, reshape2, polycor (>= 0.8), splines, @@ -80,7 +83,7 @@ Imports: tidytable Suggests: spelling, - testthat + testthat (>= 3.0.0) RoxygenNote: 8.0.0 Encoding: UTF-8 Language: en-GB diff --git a/README.md b/README.md index bf9c1ada..ae2a36d5 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ And the development version from install.packages("remotes") remotes::install_github("datashield/dsBase", "") -# Install v6.3.4 with the following -remotes::install_github("datashield/dsBase", "6.3.4") +# Install v6.4.0 with the following +remotes::install_github("datashield/dsBase", "6.4.0") ``` For a full list of development branches, checkout https://github.com/datashield/dsBase/branches From b5828ea5adceafea934f99619e46ca55ed9a28ff Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 7 Jul 2026 12:21:24 +0100 Subject: [PATCH 6/6] Restructure packages --- DESCRIPTION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6e4dfe83..2c308768 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -79,11 +79,11 @@ Imports: tibble, tidyselect, stats, - lubridate, - tidytable + lubridate Suggests: spelling, - testthat (>= 3.0.0) + testthat (>= 3.0.0), + tidytable RoxygenNote: 8.0.0 Encoding: UTF-8 Language: en-GB