[Analogue-commits] r373 - pkg/inst/tests

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2013-10-07 02:16:29 +0200 (Mon, 07 Oct 2013)
New Revision: 373

Modified:
   pkg/inst/tests/test-new-distance.R
Log:
now checks all dissimilarity methods in x-only and x and y cases

Modified: pkg/inst/tests/test-new-distance.R
===================================================================
--- pkg/inst/tests/test-new-distance.R	2013-10-07 00:09:14 UTC (rev 372)
+++ pkg/inst/tests/test-new-distance.R	2013-10-07 00:16:29 UTC (rev 373)
@@ -4,7 +4,7 @@
 library("testthat")
 library_if_available("analogue")
 
-context("Testing new distance compiled code functions")
+context("Testing distance compiled code")
 
 ## simple example using dummy data
 train <- data.frame(matrix(abs(runif(200)), ncol = 10))
@@ -14,6 +14,12 @@
 colnames(fossil) <- as.character(1:10)
 rownames(fossil) <- letters[1:10]
 
+## Distance methods to check
+METHODS <- c("euclidean", "SQeuclidean","chord", "SQchord",
+             "bray", "chi.square", "SQchi.square", "information",
+             "chi.distance", "manhattan", "kendall", "gower",
+             "alt.gower", "mixed")
+
 ## test methods for x and y
 test_that("distance matches compiled versions for x and y", {
 
@@ -21,9 +27,26 @@
     expect_equal(distance(train, fossil),
                  oldDistance(train, fossil))
 
-    ## euclidean
-    method <- "euclidean"
-    expect_equal(distance(train, fossil, method = method),
-                 oldDistance(train, fossil, method = method))
+    ## check all the methods
+    for (m in METHODS) {
+        ##writeLines(paste("Method:", m))
+        expect_equal(distance(train, fossil, method = m),
+                     oldDistance(train, fossil, method = m))
+    }
 
 })
+
+## test methods for x only
+test_that("distance matches compiled versions for x only", {
+
+    ## default settings
+    expect_equal(distance(train), oldDistance(train))
+
+    ## check all the methods
+    for (m in METHODS) {
+        ##writeLines(paste("Method:", m))
+        expect_equal(distance(train, method = m),
+                     oldDistance(train, method = m))
+    }
+
+})