v0.2.52..v0.2.53 changeset MatchFactory.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp
index 4e54165..63cd42a 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.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 "MatchFactory.h"
 
@@ -58,11 +58,13 @@ MatchPtr MatchFactory::createMatch(const ConstOsmMapPtr& map, ElementId eid1, El
 {
   LOG_VART(eid1);
   LOG_VART(eid2);
+  LOG_VART(_creators.size());
 
   for (size_t i = 0; i < _creators.size(); ++i)
   {
+    const QString name = _creators[i]->getName();
+    LOG_VART(name);
     MatchPtr m = _creators[i]->createMatch(map, eid1, eid2);
-
     if (m)
     {
       return m;
@@ -76,9 +78,9 @@ void MatchFactory::createMatches(const ConstOsmMapPtr& map, std::vector<ConstMat
   const Envelope& bounds, std::shared_ptr<const MatchThreshold> threshold) const
 {
   for (size_t i = 0; i < _creators.size(); ++i)
-  {
-    LOG_DEBUG("Launching match creator " << i + 1 << " / " << _creators.size() << "...");
+  { 
     std::shared_ptr<MatchCreator> matchCreator = _creators[i];
+    LOG_STATUS("Launching matcher: " << i + 1 << " / " << _creators.size() << "...");
     _checkMatchCreatorBoundable(matchCreator, bounds);
     if (threshold.get())
     {
@@ -270,8 +272,8 @@ MatchFactory& MatchFactory::getInstance()
 
   const QStringList matchCreators = ConfigOptions().getMatchCreators();
   const QStringList mergerCreators = ConfigOptions().getMergerCreators();
-  LOG_VARD(matchCreators);
-  LOG_VARD(mergerCreators);
+  LOG_VART(matchCreators);
+  LOG_VART(mergerCreators);
 
   if (matchCreators.size() != mergerCreators.size())
   {
@@ -316,4 +318,17 @@ void MatchFactory::reset()
   _tagFilter = "";
 }
 
+QString MatchFactory::getCreatorsStr() const
+{
+  QString str;
+  for (size_t i = 0; i < _creators.size(); ++i)
+  {
+    const QString name = _creators[i]->getName();
+    str += name + ";";
+  }
+  str.chop(1);
+  return str;
+}
+
+
 }