Skip to content

Commit 53eb538

Browse files
davraamdavraam
authored
Merge pull request #30 from datashield/v6.3.1-dev
V6.3.1 dev
2 parents 60feb93 + 89b148a commit 53eb538

12 files changed

Lines changed: 53 additions & 51 deletions

‎DESCRIPTION‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Imports:
1919
gamlss.dist,
2020
mice,
2121
childsds
22+
Suggests:
23+
testthat
2224
AggregateMethods:
2325
asFactorDS1,
2426
asListDS,
@@ -194,5 +196,5 @@ Options:
194196
default.nfilter.noise=0.25,
195197
default.nfilter.levels.density=0.33,
196198
default.nfilter.levels.max=40
197-
RoxygenNote: 7.2.3
199+
RoxygenNote: 7.3.1
198200
Encoding: UTF-8

‎R/lexisDS2.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ lexisDS2 <- function(datatext=NULL, intervalWidth, maxmaxtime, idCol, entryCol,
129129

130130

131131
#intervalWidth IS A SINGLE VALUE
132-
if(is.null(intervalWidth)||any(is.na(intervalWidth))||any(intervalWidth==0)){
132+
if(any(is.null(intervalWidth))||any(is.na(intervalWidth))||any(intervalWidth==0)){
133133
return("A VALID NON-ZERO intervalWidth ARGUMENT MUST BE SPECIFIED")
134134
}
135135

‎tests/testthat/test-smk-asDataMatrixDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_that("simple asDataMatrixDS", {
2525
res <- asDataMatrixDS("input")
2626

2727
res.class <- class(res)
28-
if (base::getRversion() < 4.0)
28+
if (base::getRversion() < '4.0.0')
2929
{
3030
expect_length(res.class, 1)
3131
expect_true("matrix" %in% res.class)

‎tests/testthat/test-smk-asFactorDS2.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test_that("simple asFactorDS2, fixed.dummy.vars is TRUE", {
5555

5656
res.class <- class(res)
5757

58-
if (base::getRversion() < 4.0)
58+
if (base::getRversion() < '4.0.0')
5959
{
6060
expect_length(res.class, 1)
6161
expect_true("matrix" %in% res.class)

‎tests/testthat/test-smk-asMatrixDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_that("simple asMatrixDS", {
2525
res <- asMatrixDS("input")
2626

2727
res.class <- class(res)
28-
if (base::getRversion() < 4.0)
28+
if (base::getRversion() < '4.0.0')
2929
{
3030
expect_length(res.class, 1)
3131
expect_true("matrix" %in% res.class)

‎tests/testthat/test-smk-changeRefGroupDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ test_that("simple changeRefGroupDS, reorderByRef is TRUE", {
6363

6464
res <- changeRefGroupDS(xf, ref, reorderByRef)
6565

66-
if (base::getRversion() < 4.1)
66+
if (base::getRversion() < '4.1.0')
6767
{
6868
expect_equal(class(res), "integer")
6969
expect_length(res, 6)

‎tests/testthat/test-smk-classDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ test_that("simple classDS, matrix", {
141141
res <- classDS("input")
142142

143143
expect_equal(class(res), "character")
144-
if (base::getRversion() < 4.0)
144+
if (base::getRversion() < '4.0.0')
145145
{
146146
expect_length(res, 1)
147147
expect_true("matrix" %in% res)
@@ -161,7 +161,7 @@ test_that("simple classDS, data.matrix", {
161161
res <- classDS("input")
162162

163163
expect_equal(class(res), "character")
164-
if (base::getRversion() < 4.0)
164+
if (base::getRversion() < '4.0.0')
165165
{
166166
expect_length(res, 1)
167167
expect_true("matrix" %in% res)

‎tests/testthat/test-smk-completeCasesDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ test_that("simple completeCasesDS, data.matrix, with no NAs", {
127127
res <- completeCasesDS("input")
128128

129129
res.class <- class(res)
130-
if (base::getRversion() < 4.0)
130+
if (base::getRversion() < '4.0.0')
131131
{
132132
expect_length(res.class, 1)
133133
expect_true("matrix" %in% res.class)
@@ -164,7 +164,7 @@ test_that("simple completeCasesDS, data.matrix, with NAs", {
164164
res <- completeCasesDS("input")
165165

166166
res.class <- class(res)
167-
if (base::getRversion() < 4.0)
167+
if (base::getRversion() < '4.0.0')
168168
{
169169
expect_length(res.class, 1)
170170
expect_true("matrix" %in% res.class)

‎tests/testthat/test-smk-corDS.R‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set.standard.disclosure.settings()
3131
# expect_equal(class(res), "list")
3232
# expect_length(res, 5)
3333
#
34-
# if (base::getRversion() < 4.0)
34+
# if (base::getRversion() < '4.0.0')
3535
# {
3636
# expect_length(class(res$sums.of.products), 1)
3737
# expect_true("matrix" %in% class(res$sums.of.products))
@@ -49,7 +49,7 @@ set.standard.disclosure.settings()
4949
# expect_equal(res$sums.of.products[3], 140.0)
5050
# expect_equal(res$sums.of.products[4], 140.0)
5151
#
52-
# if (base::getRversion() < 4.0)
52+
# if (base::getRversion() < '4.0.0')
5353
# {
5454
# expect_length(class(res$sums), 1)
5555
# expect_true("matrix" %in% class(res$sums))
@@ -67,7 +67,7 @@ set.standard.disclosure.settings()
6767
# expect_equal(res$sums[3], 28.0)
6868
# expect_equal(res$sums[4], 28.0)
6969
#
70-
# if (base::getRversion() < 4.0)
70+
# if (base::getRversion() < '4.0.0')
7171
# {
7272
# expect_length(class(res$complete.counts), 1)
7373
# expect_true("matrix" %in% class(res$complete.counts))
@@ -88,7 +88,7 @@ set.standard.disclosure.settings()
8888
# expect_equal(class(res$na.counts), "list")
8989
# expect_length(res$na.counts, 2)
9090
#
91-
# if (base::getRversion() < 4.0)
91+
# if (base::getRversion() < '4.0.0')
9292
# {
9393
# expect_length(class(res$sums.of.squares), 1)
9494
# expect_true("matrix" %in% class(res$sums.of.squares))
@@ -117,7 +117,7 @@ set.standard.disclosure.settings()
117117
# expect_equal(class(res), "list")
118118
# expect_length(res, 5)
119119
#
120-
# if (base::getRversion() < 4.0)
120+
# if (base::getRversion() < '4.0.0')
121121
# {
122122
# expect_length(class(res$sums.of.products), 1)
123123
# expect_true("matrix" %in% class(res$sums.of.products))
@@ -135,7 +135,7 @@ set.standard.disclosure.settings()
135135
# expect_equal(res$sums.of.products[3], 56.0)
136136
# expect_equal(res$sums.of.products[4], 140.0)
137137
#
138-
# if (base::getRversion() < 4.0)
138+
# if (base::getRversion() < '4.0.0')
139139
# {
140140
# expect_length(class(res$sums), 1)
141141
# expect_true("matrix" %in% class(res$sums))
@@ -153,7 +153,7 @@ set.standard.disclosure.settings()
153153
# expect_equal(res$sums[3], 28.0)
154154
# expect_equal(res$sums[4], 28.0)
155155
#
156-
# if (base::getRversion() < 4.0)
156+
# if (base::getRversion() < '4.0.0')
157157
# {
158158
# expect_length(class(res$complete.counts), 1)
159159
# expect_true("matrix" %in% class(res$complete.counts))
@@ -174,7 +174,7 @@ set.standard.disclosure.settings()
174174
# expect_equal(class(res$na.counts), "list")
175175
# expect_length(res$na.counts, 2)
176176
#
177-
# if (base::getRversion() < 4.0)
177+
# if (base::getRversion() < '4.0.0')
178178
# {
179179
# expect_length(class(res$sums.of.squares), 1)
180180
# expect_true("matrix" %in% class(res$sums.of.squares))
@@ -203,7 +203,7 @@ set.standard.disclosure.settings()
203203
# expect_equal(class(res), "list")
204204
# expect_length(res, 5)
205205
#
206-
# if (base::getRversion() < 4.0)
206+
# if (base::getRversion() < '4.0.0')
207207
# {
208208
# expect_length(class(res$sums.of.products), 1)
209209
# expect_true("matrix" %in% class(res$sums.of.products))
@@ -221,7 +221,7 @@ set.standard.disclosure.settings()
221221
# expect_equal(res$sums.of.products[3], 140.8)
222222
# expect_equal(res$sums.of.products[4], 141.06)
223223
#
224-
# if (base::getRversion() < 4.0)
224+
# if (base::getRversion() < '4.0.0')
225225
# {
226226
# expect_length(class(res$sums), 1)
227227
# expect_true("matrix" %in% class(res$sums))
@@ -240,7 +240,7 @@ set.standard.disclosure.settings()
240240
# expect_equal(res$sums[3], 28.1)
241241
# expect_equal(res$sums[4], 28.2)
242242
#
243-
# if (base::getRversion() < 4.0)
243+
# if (base::getRversion() < '4.0.0')
244244
# {
245245
# expect_length(class(res$complete.counts), 1)
246246
# expect_true("matrix" %in% class(res$complete.counts))
@@ -261,7 +261,7 @@ set.standard.disclosure.settings()
261261
# expect_equal(class(res$na.counts), "list")
262262
# expect_length(res$na.counts, 2)
263263
#
264-
# if (base::getRversion() < 4.0)
264+
# if (base::getRversion() < '4.0.0')
265265
# {
266266
# expect_length(class(res$sums.of.squares), 1)
267267
# expect_true("matrix" %in% class(res$sums.of.squares))
@@ -291,7 +291,7 @@ set.standard.disclosure.settings()
291291
# expect_equal(class(res), "list")
292292
# expect_length(res, 5)
293293
#
294-
# if (base::getRversion() < 4.0)
294+
# if (base::getRversion() < '4.0.0')
295295
# {
296296
# expect_length(class(res$sums.of.products), 1)
297297
# expect_true("matrix" %in% class(res$sums.of.products))
@@ -309,7 +309,7 @@ set.standard.disclosure.settings()
309309
# expect_equal(res$sums.of.products[3], 58.0)
310310
# expect_equal(res$sums.of.products[4], 75.0)
311311
#
312-
# if (base::getRversion() < 4.0)
312+
# if (base::getRversion() < '4.0.0')
313313
# {
314314
# expect_length(class(res$sums), 1)
315315
# expect_true("matrix" %in% class(res$sums))
@@ -327,7 +327,7 @@ set.standard.disclosure.settings()
327327
# expect_equal(res$sums[3], 10.0)
328328
# expect_equal(res$sums[4], 15.0)
329329
#
330-
# if (base::getRversion() < 4.0)
330+
# if (base::getRversion() < '4.0.0')
331331
# {
332332
# expect_length(class(res$complete.counts), 1)
333333
# expect_true("matrix" %in% class(res$complete.counts))
@@ -348,7 +348,7 @@ set.standard.disclosure.settings()
348348
# expect_equal(class(res$na.counts), "list")
349349
# expect_length(res$na.counts, 2)
350350
#
351-
# if (base::getRversion() < 4.0)
351+
# if (base::getRversion() < '4.0.0')
352352
# {
353353
# expect_length(class(res$sums.of.squares), 1)
354354
# expect_true("matrix" %in% class(res$sums.of.squares))
@@ -379,7 +379,7 @@ test_that("simple corDS, casewise, full", {
379379
expect_equal(class(res), "list")
380380
expect_length(res, 5)
381381

382-
if (base::getRversion() < 4.0)
382+
if (base::getRversion() < '4.0.0')
383383
{
384384
expect_length(class(res$sums.of.products), 1)
385385
expect_true("matrix" %in% class(res$sums.of.products))
@@ -397,7 +397,7 @@ test_that("simple corDS, casewise, full", {
397397
expect_equal(res$sums.of.products[3], 140.0)
398398
expect_equal(res$sums.of.products[4], 140.0)
399399

400-
if (base::getRversion() < 4.0)
400+
if (base::getRversion() < '4.0.0')
401401
{
402402
expect_length(class(res$sums), 1)
403403
expect_true("matrix" %in% class(res$sums))
@@ -415,7 +415,7 @@ test_that("simple corDS, casewise, full", {
415415
expect_equal(res$sums[3], 28.0)
416416
expect_equal(res$sums[4], 28.0)
417417

418-
if (base::getRversion() < 4.0)
418+
if (base::getRversion() < '4.0.0')
419419
{
420420
expect_length(class(res$complete.counts), 1)
421421
expect_true("matrix" %in% class(res$complete.counts))
@@ -436,7 +436,7 @@ test_that("simple corDS, casewise, full", {
436436
expect_equal(class(res$na.counts), "list")
437437
expect_length(res$na.counts, 2)
438438

439-
if (base::getRversion() < 4.0)
439+
if (base::getRversion() < '4.0.0')
440440
{
441441
expect_length(class(res$sums.of.squares), 1)
442442
expect_true("matrix" %in% class(res$sums.of.squares))
@@ -466,7 +466,7 @@ test_that("simple corDS, casewise, neg. full", {
466466
expect_equal(class(res), "list")
467467
expect_length(res, 5)
468468

469-
if (base::getRversion() < 4.0)
469+
if (base::getRversion() < '4.0.0')
470470
{
471471
expect_length(class(res$sums.of.products), 1)
472472
expect_true("matrix" %in% class(res$sums.of.products))
@@ -484,7 +484,7 @@ test_that("simple corDS, casewise, neg. full", {
484484
expect_equal(res$sums.of.products[3], 56.0)
485485
expect_equal(res$sums.of.products[4], 140.0)
486486

487-
if (base::getRversion() < 4.0)
487+
if (base::getRversion() < '4.0.0')
488488
{
489489
expect_length(class(res$sums), 1)
490490
expect_true("matrix" %in% class(res$sums))
@@ -502,7 +502,7 @@ test_that("simple corDS, casewise, neg. full", {
502502
expect_equal(res$sums[3], 28.0)
503503
expect_equal(res$sums[4], 28.0)
504504

505-
if (base::getRversion() < 4.0)
505+
if (base::getRversion() < '4.0.0')
506506
{
507507
expect_length(class(res$complete.counts), 1)
508508
expect_true("matrix" %in% class(res$complete.counts))
@@ -523,7 +523,7 @@ test_that("simple corDS, casewise, neg. full", {
523523
expect_equal(class(res$na.counts), "list")
524524
expect_length(res$na.counts, 2)
525525

526-
if (base::getRversion() < 4.0)
526+
if (base::getRversion() < '4.0.0')
527527
{
528528
expect_length(class(res$sums.of.squares), 1)
529529
expect_true("matrix" %in% class(res$sums.of.squares))
@@ -553,7 +553,7 @@ test_that("simple corDS, casewise, some", {
553553
expect_equal(class(res), "list")
554554
expect_length(res, 5)
555555

556-
if (base::getRversion() < 4.0)
556+
if (base::getRversion() < '4.0.0')
557557
{
558558
expect_length(class(res$sums.of.products), 1)
559559
expect_true("matrix" %in% class(res$sums.of.products))
@@ -571,7 +571,7 @@ test_that("simple corDS, casewise, some", {
571571
expect_equal(res$sums.of.products[3], 140.8)
572572
expect_equal(res$sums.of.products[4], 141.06)
573573

574-
if (base::getRversion() < 4.0)
574+
if (base::getRversion() < '4.0.0')
575575
{
576576
expect_length(class(res$sums), 1)
577577
expect_true("matrix" %in% class(res$sums))
@@ -589,7 +589,7 @@ test_that("simple corDS, casewise, some", {
589589
expect_equal(res$sums[3], 28.1)
590590
expect_equal(res$sums[4], 28.2)
591591

592-
if (base::getRversion() < 4.0)
592+
if (base::getRversion() < '4.0.0')
593593
{
594594
expect_length(class(res$complete.counts), 1)
595595
expect_true("matrix" %in% class(res$complete.counts))
@@ -610,7 +610,7 @@ test_that("simple corDS, casewise, some", {
610610
expect_equal(class(res$na.counts), "list")
611611
expect_length(res$na.counts, 2)
612612

613-
if (base::getRversion() < 4.0)
613+
if (base::getRversion() < '4.0.0')
614614
{
615615
expect_length(class(res$sums.of.squares), 1)
616616
expect_true("matrix" %in% class(res$sums.of.squares))
@@ -641,7 +641,7 @@ test_that("simple corDS, casewise, some", {
641641
expect_equal(class(res), "list")
642642
expect_length(res, 5)
643643

644-
if (base::getRversion() < 4.0)
644+
if (base::getRversion() < '4.0.0')
645645
{
646646
expect_length(class(res$sums.of.products), 1)
647647
expect_true("matrix" %in% class(res$sums.of.products))
@@ -659,7 +659,7 @@ test_that("simple corDS, casewise, some", {
659659
expect_equal(res$sums.of.products[3], 58.0)
660660
expect_equal(res$sums.of.products[4], 58.0)
661661

662-
if (base::getRversion() < 4.0)
662+
if (base::getRversion() < '4.0.0')
663663
{
664664
expect_length(class(res$sums), 1)
665665
expect_true("matrix" %in% class(res$sums))
@@ -677,7 +677,7 @@ test_that("simple corDS, casewise, some", {
677677
expect_equal(res$sums[3], 10.0)
678678
expect_equal(res$sums[4], 10.0)
679679

680-
if (base::getRversion() < 4.0)
680+
if (base::getRversion() < '4.0.0')
681681
{
682682
expect_length(class(res$complete.counts), 1)
683683
expect_true("matrix" %in% class(res$complete.counts))
@@ -698,7 +698,7 @@ test_that("simple corDS, casewise, some", {
698698
expect_equal(class(res$na.counts), "list")
699699
expect_length(res$na.counts, 2)
700700

701-
if (base::getRversion() < 4.0)
701+
if (base::getRversion() < '4.0.0')
702702
{
703703
expect_length(class(res$sums.of.squares), 1)
704704
expect_true("matrix" %in% class(res$sums.of.squares))

0 commit comments

Comments
 (0)