Skip to content

Commit d20f1ec

Browse files
Merge pull request #234 from StuartWheater/v6.1-dev_glm
Update to 'ds.glmSLMA', the its tests
2 parents dcaed04 + 156b5a0 commit d20f1ec

6 files changed

Lines changed: 602 additions & 234 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dsBaseClient
22
Title: DataSHIELD Client Functions
3-
Version: 6.1.0
3+
Version: 6.1.0-3
44
Author: DataSHIELD Developers <datashield@newcastle.ac.uk>
55
Maintainer: DataSHIELD Developers <datashield@newcastle.ac.uk>
66
Description: DataSHIELD client functions for the client side.

R/ds.glmSLMA.R

Lines changed: 313 additions & 108 deletions
Large diffs are not rendered by default.

man/ds.glmSLMA.Rd

Lines changed: 166 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-expt-ds.glmerSLMA.R

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ connect.studies.dataset.cluster.int(list('idChild','idSurgery','trtGrp','s0','nD
1818
'idDoctor','c0','nPatients','Male','age','BMI',
1919
'diabetes','incid_rate','private'))
2020

21-
2221
test_that("setup", {
2322
ds_expect_variables(c("D"))
2423
})
@@ -74,9 +73,15 @@ test_that("linear mixed model with 2 levels of hierarchy",
7473
)
7574

7675
#
77-
# Done
76+
# Shutdown
7877
#
7978

79+
context("ds.lmerSLMA::expt::shutdown")
80+
8081
disconnect.studies.dataset.cluster.int()
8182

83+
#
84+
# Done
85+
#
86+
8287
context("ds.lmerSLMA::expt::done")

0 commit comments

Comments
 (0)