From 3e79e0bfaa0f79626d75e340601932d9057ad39d Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Thu, 22 Nov 2012 22:23:07 +0000 Subject: [PATCH] Fix LowPassFilter test The implicit default kernel size for the non-SAT version was 3 but the SAT version was using an explicit kernel of 5 which caused a discrepancy. Now just use a kernel of 3. --- tests/TestLowPassFilter.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/TestLowPassFilter.cpp b/tests/TestLowPassFilter.cpp index 4ace36eb..902c26d6 100644 --- a/tests/TestLowPassFilter.cpp +++ b/tests/TestLowPassFilter.cpp @@ -58,7 +58,7 @@ void TestLowPassFilter::testExecute() RawVolume resultVolume(reg); - LowPassFilter< RawVolume, RawVolume, Density16 > lowPassfilter(&volData, reg, &resultVolume, reg, 5); + LowPassFilter< RawVolume, RawVolume, Density16 > lowPassfilter(&volData, reg, &resultVolume, reg, 3); //Test the normal implementation QBENCHMARK { @@ -74,16 +74,17 @@ void TestLowPassFilter::testExecute() QCOMPARE(resultVolume.getVoxelAt(7,7,7), Density8(4)); //Test the SAT implmentation - //FIXME - Shouldn't the results be the same as the normal case? - lowPassfilter.executeSAT(); + QBENCHMARK { + lowPassfilter.executeSAT(); + } QCOMPARE(resultVolume.getVoxelAt(0,0,0), Density8(4)); - QCOMPARE(resultVolume.getVoxelAt(1,1,1), Density8(8)); - QCOMPARE(resultVolume.getVoxelAt(2,2,2), Density8(19)); - QCOMPARE(resultVolume.getVoxelAt(3,3,3), Density8(12)); - QCOMPARE(resultVolume.getVoxelAt(4,4,4), Density8(19)); - QCOMPARE(resultVolume.getVoxelAt(5,5,5), Density8(12)); - QCOMPARE(resultVolume.getVoxelAt(6,6,6), Density8(8)); - QCOMPARE(resultVolume.getVoxelAt(7,7,7), Density8(2)); + QCOMPARE(resultVolume.getVoxelAt(1,1,1), Density8(21)); + QCOMPARE(resultVolume.getVoxelAt(2,2,2), Density8(10)); + QCOMPARE(resultVolume.getVoxelAt(3,3,3), Density8(21)); + QCOMPARE(resultVolume.getVoxelAt(4,4,4), Density8(10)); + QCOMPARE(resultVolume.getVoxelAt(5,5,5), Density8(21)); + QCOMPARE(resultVolume.getVoxelAt(6,6,6), Density8(10)); + QCOMPARE(resultVolume.getVoxelAt(7,7,7), Density8(4)); } QTEST_MAIN(TestLowPassFilter)