diff --git a/.gitattributes b/.gitattributes
index 7957b93d97d60e347695d38736de61bd7761ee4f..81a439c5071c7a0bc8441fd6a1c0f228619f382d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -452,6 +452,7 @@ CEP/DP3/AOFlagger/include/AOFlagger/test/quality/statisticscollectiontest.h -tex
CEP/DP3/AOFlagger/include/AOFlagger/test/quality/statisticsderivatortest.h -text
CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/algorithmstestgroup.h -text
CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/convolutionstest.h -text
+CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/dilationtest.h -text
CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/eigenvaluetest.h -text
CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/noisestatisticscollectortest.h -text
CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/noisestatisticstest.h -text
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/algorithmstestgroup.h b/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/algorithmstestgroup.h
index 8316a51b562c7e920aa2b1508994894742a7af8b..82d08dd4ccbc91100640f93f052be37d507c40f7 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/algorithmstestgroup.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/algorithmstestgroup.h
@@ -23,6 +23,7 @@
#include <AOFlagger/test/testingtools/testgroup.h>
#include <AOFlagger/test/strategy/algorithms/convolutionstest.h>
+#include <AOFlagger/test/strategy/algorithms/dilationtest.h>
#include <AOFlagger/test/strategy/algorithms/eigenvaluetest.h>
#include <AOFlagger/test/strategy/algorithms/noisestatisticstest.h>
#include <AOFlagger/test/strategy/algorithms/noisestatisticscollectortest.h>
@@ -38,6 +39,7 @@ class AlgorithmsTestGroup : public TestGroup {
virtual void Initialize()
{
Add(new ConvolutionsTest());
+ Add(new DilationTest());
Add(new EigenvalueTest());
Add(new NoiseStatisticsTest());
Add(new NoiseStatisticsCollectorTest());
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/dilationtest.h b/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/dilationtest.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec9a7805b0d58d425d33372d49801b9dd233d6b6
--- /dev/null
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/test/strategy/algorithms/dilationtest.h
@@ -0,0 +1,242 @@
+/***************************************************************************
+ * Copyright (C) 2008 by A.R. Offringa *
+ * offringa@astro.rug.nl *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+#ifndef AOFLAGGER_DILATIONTEST_H
+#define AOFLAGGER_DILATIONTEST_H
+
+#include <AOFlagger/test/testingtools/asserter.h>
+#include <AOFlagger/test/testingtools/unittest.h>
+
+#include <AOFlagger/msio/mask2d.h>
+
+#include <AOFlagger/strategy/algorithms/statisticalflagger.h>
+
+class DilationTest : public UnitTest {
+ public:
+ DilationTest() : UnitTest("Dilation algorithm")
+ {
+ AddTest(TestHorizontalDilation(), "Horizontal dilation");
+ AddTest(TestVerticalDilation(), "Vertical dilation");
+ }
+
+ private:
+ struct TestSingleDilation : public Asserter
+ {
+ template<bool Flip, typename DilateFunction>
+ void testDilation(DilateFunction dilate);
+ };
+ struct TestHorizontalDilation : public DilationTest::TestSingleDilation
+ {
+ void operator()();
+ };
+ struct TestVerticalDilation : public DilationTest::TestSingleDilation
+ {
+ void operator()();
+ };
+
+ static std::string maskToString(Mask2DCPtr mask, bool flip)
+ {
+ std::stringstream s;
+ if(flip)
+ {
+ for(unsigned x=0;x<mask->Width();++x)
+ {
+ for(unsigned y=0;y<mask->Height();++y)
+ s << (mask->Value(x, y) ? 'x' : ' ');
+ s << '\n';
+ }
+ } else
+ {
+ for(unsigned y=0;y<mask->Height();++y)
+ {
+ for(unsigned x=0;x<mask->Width();++x)
+ s << (mask->Value(x, y) ? 'x' : ' ');
+ s << '\n';
+ }
+ }
+ return s.str();
+ }
+
+ static void setMask(Mask2DPtr mask, bool flip, const std::string &str)
+ {
+ std::string::const_iterator i = str.begin();
+ if(flip)
+ {
+ for(unsigned x=0;x<mask->Width();++x)
+ {
+ for(unsigned y=0;y<mask->Height();++y)
+ {
+ mask->SetValue(x, y, (*i) == 'x');
+ ++i;
+ }
+ ++i; // newline
+ }
+ } else
+ {
+ for(unsigned y=0;y<mask->Height();++y)
+ {
+ for(unsigned x=0;x<mask->Width();++x)
+ {
+ mask->SetValue(x, y, (*i) == 'x');
+ ++i;
+ }
+ ++i; // newline
+ }
+ }
+ }
+};
+
+inline void DilationTest::TestHorizontalDilation::operator()()
+{
+ TestSingleDilation::testDilation<false>(StatisticalFlagger::DilateFlagsHorizontally);
+}
+
+inline void DilationTest::TestVerticalDilation::operator()()
+{
+ TestSingleDilation::testDilation<true>(StatisticalFlagger::DilateFlagsVertically);
+}
+
+template<bool Flip, typename DilateFunction>
+inline void DilationTest::TestSingleDilation::testDilation(DilateFunction dilate)
+{
+ std::string expected;
+ Mask2DPtr mask = Mask2D::CreateSetMaskPtr<false>(5, 5);
+ dilate(mask, 0);
+ expected =
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n";
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=0");
+ dilate(mask, 1);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=1");
+ dilate(mask, 2);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=2");
+ dilate(mask, 3);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=3");
+ dilate(mask, 4);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=4");
+ dilate(mask, 5);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=5");
+ dilate(mask, 6);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with size=6");
+
+ expected =
+ " \n"
+ " \n"
+ " x \n"
+ " \n"
+ " \n";
+ setMask(mask, Flip, expected);
+ dilate(mask, 0);
+ AssertEquals(maskToString(mask, Flip), expected, "Empty dilation with single flag");
+
+ dilate(mask, 1);
+ expected =
+ " \n"
+ " \n"
+ " xxx \n"
+ " \n"
+ " \n";
+ AssertEquals(maskToString(mask, Flip), expected, "Dilation with single flag, size=1");
+
+ dilate(mask, 1);
+ expected =
+ " \n"
+ " \n"
+ "xxxxx\n"
+ " \n"
+ " \n";
+ AssertEquals(maskToString(mask, Flip), expected, "Dilation with three flags, size=1");
+ dilate(mask, 1);
+ AssertEquals(maskToString(mask, Flip), expected, "Dilation with five flags at the borders, size=1");
+ dilate(mask, 100);
+ AssertEquals(maskToString(mask, Flip), expected, "Dilation with five flags at the borders, size=100");
+
+ setMask(mask, Flip,
+ " x \n"
+ " x \n"
+ "x \n"
+ " x\n"
+ " x x \n");
+ dilate(mask, 2);
+ expected =
+ "xxxx \n"
+ " xxxx\n"
+ "xxx \n"
+ " xxx\n"
+ "xxxxx\n";
+ AssertEquals(maskToString(mask, Flip), expected, "Somewhat random input");
+
+ setMask(mask, Flip,
+ "x \n"
+ " x \n"
+ " x \n"
+ " x \n"
+ " x\n");
+ dilate(mask, 6);
+ expected =
+ "xxxxx\n"
+ "xxxxx\n"
+ "xxxxx\n"
+ "xxxxx\n"
+ "xxxxx\n";
+ AssertEquals(maskToString(mask, Flip), expected, "Fully flagged");
+
+ if(Flip)
+ mask = Mask2D::CreateSetMaskPtr<false>(4, 6);
+ else
+ mask = Mask2D::CreateSetMaskPtr<false>(6, 4);
+ dilate(mask, 0);
+ expected =
+ " \n"
+ " \n"
+ " \n"
+ " \n";
+ AssertEquals(maskToString(mask, Flip), expected, "(6,4) empty");
+
+ setMask(mask, Flip,
+ "x \n"
+ " x \n"
+ " x \n"
+ " x\n");
+ dilate(mask, 4);
+ expected =
+ "xxxxx \n"
+ "xxxxxx\n"
+ "xxxxxx\n"
+ " xxxxx\n";
+ AssertEquals(maskToString(mask, Flip), expected, "(6,4) large size");
+
+ setMask(mask, Flip,
+ "x \n"
+ " \n"
+ " x \n"
+ " x\n");
+ dilate(mask, 7);
+ expected =
+ "xxxxxx\n"
+ " \n"
+ "xxxxxx\n"
+ "xxxxxx\n";
+ AssertEquals(maskToString(mask, Flip), expected, "(6,4) full size");
+}
+
+#endif
diff --git a/CEP/DP3/AOFlagger/src/strategy/algorithms/statisticalflagger.cpp b/CEP/DP3/AOFlagger/src/strategy/algorithms/statisticalflagger.cpp
index f340853eebd00f6cebfff4e2883c4598df8713d2..d86b44d442879e424261690435d952ebbc2941af 100644
--- a/CEP/DP3/AOFlagger/src/strategy/algorithms/statisticalflagger.cpp
+++ b/CEP/DP3/AOFlagger/src/strategy/algorithms/statisticalflagger.cpp
@@ -77,7 +77,7 @@ void StatisticalFlagger::EnlargeFlags(Mask2DPtr mask, size_t timeSize, size_t fr
void StatisticalFlagger::DilateFlagsHorizontally(Mask2DPtr mask, size_t timeSize)
{
Mask2DPtr destination = Mask2D::CreateUnsetMaskPtr(mask->Width(), mask->Height());
- if(2*timeSize > mask->Width()) timeSize = mask->Width()/2;
+ if(timeSize > mask->Width()) timeSize = mask->Width();
const int intSize = (int) timeSize;
for(size_t y=0;y<mask->Height();++y)
@@ -118,7 +118,7 @@ void StatisticalFlagger::DilateFlagsHorizontally(Mask2DPtr mask, size_t timeSize
void StatisticalFlagger::DilateFlagsVertically(Mask2DPtr mask, size_t frequencySize)
{
Mask2DPtr destination = Mask2D::CreateUnsetMaskPtr(mask->Width(), mask->Height());
- if(2*frequencySize > mask->Height()) frequencySize = mask->Height()/2;
+ if(frequencySize > mask->Height()) frequencySize = mask->Height();
const int intSize = (int) frequencySize;
for(size_t x=0;x<mask->Width();++x)
@@ -142,7 +142,7 @@ void StatisticalFlagger::DilateFlagsVertically(Mask2DPtr mask, size_t frequencyS
destination->SetValue(x, y, false);
}
}
- for(size_t y=mask->Height() - frequencySize;y<mask->Width();++y)
+ for(size_t y=mask->Height() - frequencySize;y<mask->Height();++y)
{
if(dist <= intSize)
{