Skip to content

v0.2.49..v0.2.50 changeset PoiPolygonMatchTest.cpp

Jump to bottom
Garret Voltz edited this page Nov 6, 2019 · 1 revision 
diff --git a/hoot-core-test/src/test/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchTest.cpp
index 2034fd0..b3ff81e 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchTest.cpp
@@ -81,7 +81,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -101,7 +102,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -135,7 +137,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -155,7 +158,8 @@ public:
     n1->setX(-8);
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -189,7 +193,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -208,7 +213,8 @@ public:
     n1->setX(-5);
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -228,7 +234,8 @@ public:
     n1->setX(-7);
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -265,7 +272,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -287,7 +295,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -309,7 +318,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -333,7 +343,8 @@ public:
   {
     OsmMapPtr map;
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
 
     QString exceptionMsg1("");
     try
@@ -364,7 +375,8 @@ public:
   {
     OsmMapPtr map;
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
 
     QString exceptionMsg1("");
     try
@@ -395,7 +407,8 @@ public:
   {
     OsmMapPtr map;
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
 
     QString exceptionMsg1("");
     try
@@ -426,7 +439,8 @@ public:
   {
     OsmMapPtr map;
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
 
     QString exceptionMsg1("");
     try
@@ -457,7 +471,8 @@ public:
   {
     OsmMapPtr map;
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
 
     QString exceptionMsg1("");
     QStringList badKvp1;
@@ -546,7 +561,8 @@ public:
       n1->getTags()["source"] = "mySource:a";
 
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -569,7 +585,8 @@ public:
       n1->getTags()["source"] = "mySource:b";
 
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -610,7 +627,8 @@ public:
       n1->getTags()["source"] = "mySource:b";
 
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -633,7 +651,8 @@ public:
       n1->getTags()["source"] = "mySource1:a";
 
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -674,7 +693,8 @@ public:
       n1->getTags()["source"] = "mySource:a";
 
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -713,7 +733,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+        PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -733,7 +754,8 @@ public:
 
     {
       PoiPolygonMatch uut(
-        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+        map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+       PoiPolygonCachePtr(new PoiPolygonCache(map)));
       uut.setEnableAdvancedMatching(false);
       uut.setEnableReviewReduction(true);
       uut.setMatchDistanceThreshold(0.0);
@@ -765,7 +787,8 @@ public:
     map->addNode(n1);
 
     PoiPolygonMatch uut(
-      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>());
+      map, std::shared_ptr<MatchThreshold>(), std::shared_ptr<PoiPolygonRfClassifier>(),
+      PoiPolygonCachePtr(new PoiPolygonCache(map)));
     uut.setEnableAdvancedMatching(false);
     uut.setEnableReviewReduction(true);
     uut.setMatchDistanceThreshold(0.0);
Clone this wiki locally