v0.2.52..v0.2.53 changeset UnifyingConflator.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/UnifyingConflator.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/UnifyingConflator.cpp
index b2a735d..4acb755 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/UnifyingConflator.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/UnifyingConflator.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "UnifyingConflator.h"
 
@@ -43,6 +43,10 @@
 #include <hoot/core/conflate/matching/MatchClassification.h>
 #include <hoot/core/elements/ElementId.h>
 #include <hoot/core/util/Log.h>
+#include <hoot/core/util/StringUtils.h>
+#include <hoot/core/criterion/NotCriterion.h>
+#include <hoot/core/criterion/ElementInIdListCriterion.h>
+#include <hoot/core/ops/CopyMapSubsetOp.h>
 
 // standard
 #include <algorithm>
@@ -274,7 +278,8 @@ void UnifyingConflator::apply(OsmMapPtr& map)
   for (size_t i = 0; i < matchSets.size(); ++i)
   {
     PROGRESS_INFO(
-      "Converting match set " << i + 1 << " / " << matchSets.size() << " to a merger...");
+      "Converting match set " << StringUtils::formatLargeNumber(i + 1) << " / " <<
+      StringUtils::formatLargeNumber(matchSets.size()) << " to a merger...");
     _mergerFactory->createMergers(map, matchSets[i], _mergers);
   }
 
@@ -294,7 +299,9 @@ void UnifyingConflator::apply(OsmMapPtr& map)
   {
     if (i % 10 == 0)
     {
-      PROGRESS_INFO("Applying merger: " << i + 1 << " / " << _mergers.size());
+      PROGRESS_INFO(
+        "Applying merger: " << StringUtils::formatLargeNumber(i + 1) << " / " <<
+        StringUtils::formatLargeNumber(_mergers.size()));
     }
     _mergers[i]->apply(map, replaced);
     LOG_VART(replaced);