From a961844f362e16c1a4fd3e45d170615b9e11c27f Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Fri, 17 Mar 2017 16:43:25 +0100 Subject: [PATCH] fix tests: remove 'parll' arg --- epclust/tests/testthat/test-clustering.R | 4 ++-- epclust/tests/testthat/test-computeSynchrones.R | 2 +- epclust/tests/testthat/test-computeWerDists.R | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epclust/tests/testthat/test-clustering.R b/epclust/tests/testthat/test-clustering.R index 2e3a431..98c84c5 100644 --- a/epclust/tests/testthat/test-clustering.R +++ b/epclust/tests/testthat/test-clustering.R @@ -24,7 +24,7 @@ test_that("clusteringTask1 behave as expected", require("cluster", quietly=TRUE) algoClust1 <- function(contribs,K) cluster::pam(t(contribs),K,diss=FALSE)$id.med - indices1 <- clusteringTask1(1:n, getContribs, K1, algoClust1, 140, verbose=TRUE, parll=FALSE) + indices1 <- clusteringTask1(1:n, getContribs, K1, algoClust1, 140, verbose=TRUE) medoids_K1 <- getSeries(indices1) expect_equal(dim(medoids_K1), c(L,K1)) @@ -59,7 +59,7 @@ test_that("clusteringTask2 behave as expected", # Perfect situation: all medoids "after stage 1" are ~good algoClust2 <- function(dists,K) cluster::pam(dists,K,diss=TRUE)$id.med indices2 <- clusteringTask2(1:K1, getSeries, K2, algoClust2, 210, 3, 4, 8, "little", - verbose=TRUE, parll=FALSE) + verbose=TRUE) medoids_K2 <- getSeries(indices2) expect_equal(dim(medoids_K2), c(L,K2)) diff --git a/epclust/tests/testthat/test-computeSynchrones.R b/epclust/tests/testthat/test-computeSynchrones.R index 60d885e..0a13aec 100644 --- a/epclust/tests/testthat/test-computeSynchrones.R +++ b/epclust/tests/testthat/test-computeSynchrones.R @@ -24,7 +24,7 @@ test_that("computeSynchrones behave as expected", if (length(indices)>0) as.matrix(series[,indices]) else NULL } - synchrones <- computeSynchrones(cbind(s1,s2,s3),getSeries,n,100,verbose=TRUE,parll=FALSE) + synchrones <- computeSynchrones(cbind(s1,s2,s3),getSeries,n,100,verbose=TRUE) expect_equal(dim(synchrones), c(L,K)) for (i in 1:K) diff --git a/epclust/tests/testthat/test-computeWerDists.R b/epclust/tests/testthat/test-computeWerDists.R index 0e02413..09ad5c8 100644 --- a/epclust/tests/testthat/test-computeWerDists.R +++ b/epclust/tests/testthat/test-computeWerDists.R @@ -10,7 +10,7 @@ test_that("computeWerDists output correct results", series <- cbind(serie, serie) getSeries <- function(indices) as.matrix(series[,indices]) dists <- computeWerDists(1:2, getSeries, 50, 3, 4, nbytes, endian, - verbose=TRUE, parll=FALSE) + verbose=TRUE) expect_equal(dists, matrix(0.,nrow=2,ncol=2)) # On two constant series -- 2.44.0