Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
7934950
refactor: batch-10 server-side splines, tables, misc functions
timcadman Apr 16, 2026
50afcf3
refactor: add server-side .checkClass for getWGSRDS, rowColCalcDS
timcadman Apr 16, 2026
cbbfb0a
docs: updated authorship
timcadman Apr 16, 2026
5fb83af
docs: redocumented
timcadman Apr 16, 2026
508a1e6
Merge remote-tracking branch 'origin/v7.0-dev' into refactor/perf-bat…
timcadman Sep 15, 2026
f7b5267
tidied up refactor
timcadman Sep 15, 2026
754f335
Remove skip
StuartWheater Sep 18, 2026
119ee0f
merged latest changes
timcadman Sep 21, 2026
a77ac73
Removal of testthat 'skip's
StuartWheater Sep 21, 2026
323e86a
Merge branch 'datashield:refactor/perf-batch-10' into refactor/perf-b…
StuartWheater Sep 21, 2026
648d72b
Update perfence profile
StuartWheater Sep 21, 2026
fd20e4b
Merge branch 'refactor/perf-batch-10' of github.com:StuartWheater/dsB…
StuartWheater Sep 21, 2026
d8d7969
refactor: tidied up PR
timcadman Sep 21, 2026
6dbf845
chore: ignore plots
timcadman Sep 21, 2026
41046bd
Fix setting of PERF.PROFILE env variable
StuartWheater Sep 21, 2026
1923a11
Update to Circle CI code coverage
StuartWheater Sep 21, 2026
f670258
Fixed Comments, I hope
StuartWheater Sep 21, 2026
eec1ebe
Fixed Comments
StuartWheater Sep 21, 2026
c867e6e
Fixed Comments
StuartWheater Sep 21, 2026
824fb5d
Fix CircleCI performance
StuartWheater Sep 21, 2026
4577895
Added debugging output
StuartWheater Sep 21, 2026
cfead15
Added debugging output
StuartWheater Sep 21, 2026
a3540d1
Remove debug code and adjust perf profile
StuartWheater Sep 21, 2026
68f6016
Update logging
StuartWheater Sep 21, 2026
fd3db55
Fix code typo
StuartWheater Sep 21, 2026
59d76de
Fix perf profile
StuartWheater Sep 21, 2026
c3eaedd
Merge branch 'datashield:refactor/perf-batch-10' into refactor/perf-b…
StuartWheater Sep 21, 2026
06319bb
Merge pull request #513 from StuartWheater/refactor/perf-batch-10
StuartWheater Sep 21, 2026
dbd02c6
Merge pull request #512 from datashield/refactor/perf-batch-10
timcadman Sep 22, 2026
4ad51eb
refactor last functions
timcadman Sep 22, 2026
5a4dcd1
add tests for last functions
timcadman Sep 22, 2026
ad586b8
fix issues discovered in final review
timcadman Sep 22, 2026
be23fe7
fix/add tests
timcadman Sep 22, 2026
10512ab
Merge pull request #514 from datashield/refactor/perf-batch-11
timcadman Sep 25, 2026
886f6b7
refactor last functions
timcadman Sep 22, 2026
e1ffe28
add tests for last functions
timcadman Sep 22, 2026
4e98e2e
docs: updated server references to include Armadillo
timcadman Sep 25, 2026
bbb3d18
Merge pull request #516 from datashield/docs/server-names
timcadman Oct 13, 2026
7cfab53
Merge pull request #515 from datashield/refactor/fixes
timcadman Oct 13, 2026
b253c54
added tests coverage
timcadman Oct 13, 2026
81a9893
Remove server functions of defunct client functions
timcadman Oct 15, 2026
6ec4f2f
Removed 'PULL_REQUEST_TEMPLATE.md'
StuartWheater Oct 21, 2026
cd69354
Upgrade to 'roxygen2' version: 8.1.1
StuartWheater Oct 21, 2026
57f6985
Merge pull request #517 from datashield/refactor/tests
timcadman Oct 22, 2026
1086c17
Merge pull request #520 from StuartWheater/v7.0-dev
StuartWheater Oct 22, 2026
1de9eaa
Merge pull request #519 from datashield/refactor/deprecate-functions
timcadman Oct 23, 2026
6bed97d
last couple of fixes
timcadman Oct 23, 2026
d12edd1
remove asList from aggregate methods
timcadman Oct 23, 2026
411a74f
update tests
timcadman Oct 23, 2026
d71fcf6
update and pin lme4 version and fix tests as estimates slightly changed
timcadman Oct 29, 2026
8f99025
Merge pull request #521 from datashield/refactor/final-fixes
timcadman Oct 29, 2026
0f71904
List the calling environment in lsDS
timcadman Oct 29, 2026
b068684
Merge pull request #522 from datashield/fix/lsds-calling-env
timcadman Oct 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,8 @@ jobs:
- run:
command: |
echo "options(Ncpus=4)" >> ~/.Rprofile
sudo Rscript -e "install.packages('RANN', dependencies=TRUE)"
sudo Rscript -e "install.packages('stringr', dependencies=TRUE)"
sudo Rscript -e "install.packages('lme4', dependencies=TRUE)"
sudo Rscript -e "install.packages('dplyr', dependencies=TRUE)"
sudo Rscript -e "install.packages('reshape2', dependencies=TRUE)"
sudo Rscript -e "install.packages('polycor', dependencies=TRUE)"
sudo Rscript -e "install.packages('splines', dependencies=TRUE)"
sudo Rscript -e "install.packages('gamlss', dependencies=TRUE)"
sudo Rscript -e "install.packages('gamlss.dist', dependencies=TRUE)"
sudo Rscript -e "install.packages('mice', dependencies=TRUE)"
sudo Rscript -e "install.packages('childsds', dependencies=TRUE)"
sudo Rscript -e "install.packages('xml2', dependencies=TRUE)"
sudo Rscript -e "install.packages('covr', dependencies=TRUE)"
sudo Rscript -e "install.packages('devtools', dependencies=TRUE)"
sudo Rscript -e "install.packages('DSI', dependencies=TRUE)"
sudo Rscript -e "install.packages('DSLite', dependencies=TRUE)"

sudo R -q -e "options(repos=c(CRAN=paste0('https://packagemanager.posit.co/cran/__linux__/', system('lsb_release -cs', intern=TRUE), '/latest')), HTTPUserAgent=sprintf('R/%s R (%s)', getRversion(), paste(getRversion(), R.version\$platform, R.version\$arch, R.version\$os)), Ncpus=4); install.packages(c('devtools','RANN','stringr','lme4','dplyr','reshape2','polycor','splines','gamlss','gamlss.dist','mice','data.table','childsds'), dependencies=TRUE)"
- run:
command: |
sudo Rscript -e 'library(covr); covr::codecov(token = "'$CODECOV_TOKEN'")'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
.Rapp.history
.claude
.idea
tests/testthat/Rplots.pdf
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Depends:
Imports:
RANN,
stringr,
lme4,
lme4 (>= 2.1-0),
dplyr,
tibble,
purrr,
Expand All @@ -82,4 +82,4 @@ Suggests:
Encoding: UTF-8
Language: en-GB
Config/testthat/edition: 3
Config/roxygen2/version: 8.1.0
Config/roxygen2/version: 8.1.1
17 changes: 0 additions & 17 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ export(asLogicalDS)
export(asMatrixDS)
export(asNumericDS)
export(aucDS)
export(blackBoxDS)
export(blackBoxRanksDS)
export(boxPlotGGDS)
export(boxPlotGG_data_TreatmentDS)
export(boxPlotGG_data_Treatment_numericDS)
Expand All @@ -31,7 +29,6 @@ export(corDS)
export(corTestDS)
export(covDS)
export(dataFrameDS)
export(dataFrameFillDS)
export(dataFrameSortDS)
export(dataFrameSubsetDS1)
export(dataFrameSubsetDS2)
Expand All @@ -40,8 +37,6 @@ export(dimDS)
export(dmtC2SDS)
export(elsplineDS)
export(expDS)
export(extractQuantilesDS1)
export(extractQuantilesDS2)
export(fixClassDS)
export(fixColsDS)
export(fixLevelsDS)
Expand Down Expand Up @@ -93,10 +88,8 @@ export(mdPatternDS)
export(meanDS)
export(meanSdGpDS)
export(mergeDS)
export(messageDS)
export(metadataDS)
export(miceDS)
export(minMaxRandDS)
export(namesDS)
export(nsDS)
export(numNaDS)
Expand All @@ -107,14 +100,8 @@ export(rNormDS)
export(rPoisDS)
export(rUnifDS)
export(rangeDS)
export(ranksSecureDS1)
export(ranksSecureDS2)
export(ranksSecureDS3)
export(ranksSecureDS4)
export(ranksSecureDS5)
export(rbindDS)
export(reShapeDS)
export(recodeLevelsDS)
export(recodeValuesDS)
export(repDS)
export(replaceNaDS)
Expand All @@ -127,16 +114,12 @@ export(setSeedDS)
export(skewnessDS1)
export(skewnessDS2)
export(sqrtDS)
export(subsetByClassDS)
export(subsetDS)
export(table1DDS)
export(table2DDS)
export(tableDS)
export(tableDS.assign)
export(tableDS2)
export(tapplyDS)
export(tapplyDS.assign)
export(testObjExistsDS)
export(unListDS)
export(uniqueDS)
export(varDS)
Expand Down
20 changes: 0 additions & 20 deletions PULL_REQUEST_TEMPLATE.md

This file was deleted.

8 changes: 6 additions & 2 deletions R/BooleDS.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ thr <- dsBase::listDisclosureSettingsDS() #

V1<-.loadServersideObject(V1.name)

# V2 may be either a server-side object name or a literal scalar (e.g. "3", "-1")
# V2 may be either a server-side object name or a literal scalar (e.g. "3", "-1", "TRUE", "NA")
V2.numeric <- suppressWarnings(as.numeric(V2.name))
if(!is.na(V2.numeric)){
if(V2.name %in% c("TRUE", "FALSE")){
V2 <- as.logical(V2.name)
}else if(V2.name == "NA"){
V2 <- NA
}else if(!is.na(V2.numeric)){
V2 <- V2.numeric
}else{
V2 <- .loadServersideObject(V2.name)
Expand Down
27 changes: 8 additions & 19 deletions R/asListDS.R
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
#' @title asListDS a serverside aggregate function called by ds.asList
#' @title asListDS a serverside assign function called by ds.asList
#' @description Coerces an R object into a list
#' @details Unlike most other class coercing functions this is
#' an aggregate function rather than an assign function. This
#' is because the \code{datashield.assign} function in the data repository deals specially with
#' a created object (newobj) if it is of class list. Reconfiguring the
#' function as an aggregate function works around this problem.
#' This aggregate function is based on the native R function \code{as.list}
#' @details This assign function is based on the native R function \code{as.list}
#' and so additional information can be found in the help for \code{as.list}
#' @param x.name the name of the input object to be coerced to class
#' data.matrix. Must be specified in inverted commas. But this argument is
#' usually specified directly by <x.name> argument of the clientside function
#' \code{ds.asList}
#' @param newobj is the object hard assigned '<<-' to be the output of the
#' function written to the serverside
#' @return the object specified by the <newobj> argument (or its default name
#' <x.name>.mat) which is written to the serverside.
#' In addition, two validity messages are returned. The first confirms an output
#' object has been created, the second states its class. The way that \code{as.list}
#' coerces objects to list depends on the class of the object, but in general
#' the class of the output object should usually be 'list'
#' @return the input object coerced to a list, which \code{ds.asList} writes to the
#' serverside. The way that \code{as.list} coerces objects to list depends on the class
#' of the object
#' @author Amadou Gaye, Paul Burton for DataSHIELD Development Team
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
#' @export
asListDS <- function (x.name, newobj){
asListDS <- function (x.name){
x <- .loadServersideObject(x.name)

result <- as.list(x)
assign(newobj, result, envir = parent.frame())
as.list(x)
}
# AGGREGATE FUNCTION
# ASSIGN FUNCTION
# asListDS
9 changes: 3 additions & 6 deletions R/aucDS.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
#' the complete cases that are used in the regression model.
#' @return returns the AUC and its standard error
#' @author Demetris Avraam for DataSHIELD Development Team
#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
#' @export
#'
aucDS <- function(pred=pred, y=y){

if(is.character(pred)){
pred <- eval(parse(text = pred), envir = parent.frame())
}
if(is.character(y)){
y <- eval(parse(text = y), envir = parent.frame())
}
pred <- .loadServersideObject(pred)
y <- .loadServersideObject(y)

y <- as.numeric(as.character(y))

Expand Down
Loading
Loading