X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2Ftests%2Ftestthat%2Ftest.clustering.R;h=9333876aa4fcb4e640ee942d74c8b7bc8b3b0a09;hp=b6231e2889dde9c3a74d4703625fea5b88632197;hb=4bcfdbee4e2157f232427a5bfdf240f34760110d;hpb=4efef8ccd1522278f53aa5ce265f3a6cfb6fbd9f

diff --git a/epclust/tests/testthat/test.clustering.R b/epclust/tests/testthat/test.clustering.R
index b6231e2..9333876 100644
--- a/epclust/tests/testthat/test.clustering.R
+++ b/epclust/tests/testthat/test.clustering.R
@@ -7,7 +7,8 @@ I = function(i, base)
 test_that("computeClusters1 behave as expected",
 {
 	require("MASS", quietly=TRUE)
-	library("clue", quietly=TRUE)
+	if (!require("clue", quietly=TRUE))
+		skip("'clue' package not available")
 
 	# 3 gaussian clusters, 300 items; and then 7 gaussian clusters, 490 items
 	n = 300
@@ -126,8 +127,9 @@ test_that("clusteringTask + computeClusters2 behave as expected",
 		if (length(indices)>0) series[indices,] else NULL
 	}
 	wf = "haar"
-	getCoefs = function(indices) curvesToCoefs(series[indices,],wf)
-	medoids_K1 = getSeries( clusteringTask(1:n, getCoefs, K1, 75, 4) )
+	ctype = "absolute"
+	getContribs = function(indices) curvesToContribs(series[indices,],wf,ctype)
+	medoids_K1 = getSeries( clusteringTask(1:n, getContribs, K1, 75, 4) )
 	medoids_K2 = computeClusters2(medoids_K1, K2, getSeries, 120)
 
 	expect_equal(dim(medoids_K1), c(K1,L))