X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2Ftests%2Ftestthat%2Ftest.computeFilaments.R;h=34e07f766dc1ac0d68c233dfc4b423d2c045f193;hp=ca2fb692746fd8e042e42c3733b8d7454017ecf7;hb=98e958cab563866f8e00886b54336018a2e8bc97;hpb=af3b84f4cacade7d83221ca0249b546c50ddf340

diff --git a/pkg/tests/testthat/test.computeFilaments.R b/pkg/tests/testthat/test.computeFilaments.R
index ca2fb69..34e07f7 100644
--- a/pkg/tests/testthat/test.computeFilaments.R
+++ b/pkg/tests/testthat/test.computeFilaments.R
@@ -37,44 +37,44 @@ test_that("output is as expected on simulated series",
 
 	# index 143 : serie type 2
 	f = computeFilaments(data, 143, limit=60, plot=FALSE)
-	# Expected output: 23 series of type 3 (closer), then 50-3-10 series of type 2, then 143
-	expect_identical(length(f$indices), as.integer(61)) #61 because result also contain today
-	expect_identical(length(f$colors),  as.integer(61))
-	expect_true(all(I(f$indices) >= 2))
-	for (i in 1:23)
+
+	# Expected output: 50-3-10 series of type 2, then 23 series of type 3 (closest next)
+	expect_identical(length(f$neighb_indices), as.integer(60))
+	expect_identical(length(f$colors), as.integer(60))
+	expect_equal(f$index, 143)
+	expect_true(all(I(f$neighb_indices) >= 2))
+	for (i in 1:37)
 	{
-		expect_equal(I(f$indices[i]), 3)
+		expect_equal(I(f$neighb_indices[i]), 2)
 		expect_match(f$colors[i], f$colors[1])
 	}
-	for (i in 24:60)
+	for (i in 38:60)
 	{
-		expect_equal(I(f$indices[i]), 2)
-		expect_match(f$colors[i], f$colors[24])
+		expect_equal(I(f$neighb_indices[i]), 3)
+		expect_match(f$colors[i], f$colors[38])
 	}
-	expect_equal(f$indices[61], 143)
-	expect_match(f$colors[61], "#FF0000") #special color: current day in red
-	expect_match(f$colors[1], "#E*")
-	expect_match(f$colors[24], "#1*")
+	expect_match(f$colors[1], "#1*")
+	expect_match(f$colors[38], "#E*")
 
 	# index 142 : serie type 1
 	f = computeFilaments(data, 142, limit=50, plot=FALSE)
-	# Expected output: 13 series of type 3 (closer), then 50-10-3 series of type 1, then 142
+
+	# Expected output: 50-10-3 series of type 1, then 13 series of type 3 (closest next)
 	# NOTE: -10 because only past days with no-NAs tomorrow => exclude type 1 in [60,90[
-	expect_identical(length(f$indices), as.integer(51))
-	expect_identical(length(f$colors), as.integer(51))
-	expect_true(all(I(f$indices) != 2))
-	for (i in 1:13)
+	expect_identical(length(f$neighb_indices), as.integer(50))
+	expect_identical(length(f$colors), as.integer(50))
+	expect_equal(f$index, 142)
+	expect_true(all(I(f$neighb_indices) != 2))
+	for (i in 1:37)
 	{
-		expect_equal(I(f$indices[i]), 3)
+		expect_equal(I(f$neighb_indices[i]), 1)
 		expect_match(f$colors[i], f$colors[1])
 	}
-	for (i in 14:50)
+	for (i in 38:50)
 	{
-		expect_equal(I(f$indices[i]), 1)
-		expect_match(f$colors[i], f$colors[14])
+		expect_equal(I(f$neighb_indices[i]), 3)
+		expect_match(f$colors[i], f$colors[38])
 	}
-	expect_equal(f$indices[51], 142)
-	expect_match(f$colors[51], "#FF0000")
-	expect_match(f$colors[1], "#E*")
-	expect_match(f$colors[14], "#1*")
+	expect_match(f$colors[1], "#1*")
+	expect_match(f$colors[38], "#E*")
 })