v0.2.55..v0.2.56 changeset AlphaShapeGeneratorTest.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/algorithms/alpha-shape/AlphaShapeGeneratorTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/algorithms/alpha-shape/AlphaShapeGeneratorTest.cpp
index 6b90264..ab81ee2 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/algorithms/alpha-shape/AlphaShapeGeneratorTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/algorithms/alpha-shape/AlphaShapeGeneratorTest.cpp
@@ -47,17 +47,22 @@ namespace hoot
 class AlphaShapeGeneratorTest : public HootTestFixture
 {
   CPPUNIT_TEST_SUITE(AlphaShapeGeneratorTest);
-  // TODO: need test for auto alpha retry when initial value is too small
   CPPUNIT_TEST(runBasicTest);
   CPPUNIT_TEST(runBufferTest);
   CPPUNIT_TEST(runNegativeBufferTest);
+  // TODO: need a good test dataset for this one; can't find the original data used. The dataset
+  // should result in a successful retry of the alpha shape calculation after the starting alpha
+  // value is too small.
+  //CPPUNIT_TEST(runAutoRetryTest);
+  CPPUNIT_TEST(runManualCoverTest);
   CPPUNIT_TEST_SUITE_END();
 
 public:
 
-  AlphaShapeGeneratorTest()
-    : HootTestFixture("test-files/algorithms/alpha-shape/",
-                      "test-output/algorithms/alpha-shape/")
+  AlphaShapeGeneratorTest() :
+  HootTestFixture(
+    "test-files/algorithms/alpha-shape/AlphaShapeGeneratorTest/",
+    "test-output/algorithms/alpha-shape/AlphaShapeGeneratorTest/")
   {
     setResetType(ResetAll);
   }
@@ -69,15 +74,16 @@ public:
     reader.setDefaultStatus(Status::Unknown1);
     reader.read("test-files/DcTigerRoads.osm", map);
 
-    OsmMapPtr cutShapeMap = AlphaShapeGenerator(1000.0, 0.0).generateMap(map);
+    AlphaShapeGenerator uut(1000.0, 0.0);
+    uut.setManuallyCoverSmallPointClusters(false);
+    uut.setRetryOnTooSmallInitialAlpha(false);
+    OsmMapPtr cutShapeMap = uut.generateMap(map);
 
     MapProjector::projectToWgs84(cutShapeMap);
+    OsmXmlWriter().write(cutShapeMap, _outputPath + "AlphaShapeGeneratorBasicTest-out.osm");
 
-    OsmXmlWriter writer;
-    writer.write(cutShapeMap, _outputPath + "AlphaShapeGeneratorBasicTest.osm");
-
-    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorBasicTest.osm",
-                    _outputPath + "AlphaShapeGeneratorBasicTest.osm");
+    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorBasicTest-out.osm",
+                     _outputPath + "AlphaShapeGeneratorBasicTest-out.osm");
   }
 
   void runBufferTest()
@@ -87,15 +93,16 @@ public:
     reader.setDefaultStatus(Status::Unknown1);
     reader.read("test-files/DcTigerRoads.osm", map);
 
-    OsmMapPtr cutShapeMap = AlphaShapeGenerator(1000.0, 500.0).generateMap(map);
+    AlphaShapeGenerator uut(1000.0, 500.0);
+    uut.setManuallyCoverSmallPointClusters(false);
+    uut.setRetryOnTooSmallInitialAlpha(false);
+    OsmMapPtr cutShapeMap = uut.generateMap(map);
 
     MapProjector::projectToWgs84(cutShapeMap);
+    OsmXmlWriter().write(cutShapeMap, _outputPath + "AlphaShapeGeneratorBufferTest-out.osm");
 
-    OsmXmlWriter writer;
-    writer.write(cutShapeMap, _outputPath + "AlphaShapeGeneratorBufferTest.osm");
-
-    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorBufferTest.osm",
-                    _outputPath + "AlphaShapeGeneratorBufferTest.osm");
+    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorBufferTest-out.osm",
+                     _outputPath + "AlphaShapeGeneratorBufferTest-out.osm");
   }
 
   void runNegativeBufferTest()
@@ -105,15 +112,62 @@ public:
     reader.setDefaultStatus(Status::Unknown1);
     reader.read("test-files/DcTigerRoads.osm", map);
 
-    OsmMapPtr cutShapeMap = AlphaShapeGenerator(1000.0, -500.0).generateMap(map);
+    AlphaShapeGenerator uut(1000.0, -500.0);
+    uut.setManuallyCoverSmallPointClusters(false);
+    uut.setRetryOnTooSmallInitialAlpha(false);
+    OsmMapPtr cutShapeMap = uut.generateMap(map);
 
     MapProjector::projectToWgs84(cutShapeMap);
+    OsmXmlWriter().write(
+      cutShapeMap, _outputPath + "AlphaShapeGeneratorNegativeBufferTest-out.osm");
+
+    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorNegativeBufferTest-out.osm",
+                     _outputPath + "AlphaShapeGeneratorNegativeBufferTest-out.osm");
+  }
+
+  void runAutoRetryTest()
+  {
+    OsmXmlReader reader;
+    OsmMapPtr map(new OsmMap());
+    reader.setDefaultStatus(Status::Unknown1);
+    reader.read(_inputPath + "AlphaShapeGeneratorAutoRetryTest-in.osm", map);
 
-    OsmXmlWriter writer;
-    writer.write(cutShapeMap, _outputPath + "AlphaShapeGeneratorNegativeBufferTest.osm");
+    AlphaShapeGenerator uut(1000.0, 0.0);
+    uut.setManuallyCoverSmallPointClusters(false);
+    uut.setRetryOnTooSmallInitialAlpha(true);
+    OsmMapPtr cutShapeMap = uut.generateMap(map);
 
-    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorNegativeBufferTest.osm",
-                    _outputPath + "AlphaShapeGeneratorNegativeBufferTest.osm");
+    MapProjector::projectToWgs84(cutShapeMap);
+    OsmXmlWriter().write(cutShapeMap, _outputPath + "AlphaShapeGeneratorAutoRetryTest-out.osm");
+
+    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorAutoRetryTest-out.osm",
+                     _outputPath + "AlphaShapeGeneratorAutoRetryTest-out.osm");
+  }
+
+  void runManualCoverTest()
+  {
+    OsmXmlReader reader;
+    OsmMapPtr map(new OsmMap());
+    reader.setDefaultStatus(Status::Unknown1);
+    reader.read(_inputPath + "AlphaShapeGeneratorManualCoverTest-in.osm", map);
+
+    AlphaShapeGenerator uut(10000.0, 500.0);
+    uut.setManuallyCoverSmallPointClusters(true);
+    uut.setRetryOnTooSmallInitialAlpha(false);
+    //Tgs::Random::instance()->seed(1);
+    OsmMapPtr cutShapeMap = uut.generateMap(map);
+
+    // I think the randomness used in AlphaShape is causing the output comparison to fail every time
+    // here. I tried seeding the use of Tgs::Random as seen in other tests, but it didn't help (its
+    // a Singleton, so seems like that shouldn't be being done anyway anymore after the conversion
+    // over to mt tests). So, simply comparing the element count instead. The expected output is
+    // still in source control for comparison purposes.
+//    MapProjector::projectToWgs84(cutShapeMap);
+//    OsmXmlWriter().write(cutShapeMap, _outputPath + "AlphaShapeGeneratorManualCoverTest-out.osm");
+
+//    HOOT_FILE_EQUALS(_inputPath + "AlphaShapeGeneratorManualCoverTest-out.osm",
+//                     _outputPath + "AlphaShapeGeneratorManualCoverTest-out.osm");
+    CPPUNIT_ASSERT_EQUAL((int)cutShapeMap->getElementCount(), 1441);
   }
 };