-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.54..v0.2.55 changeset MatchConflicts.h
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchConflicts.h b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchConflicts.h
index f9b18f5..215206e 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchConflicts.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchConflicts.h
@@ -22,7 +22,7 @@
* This will properly maintain the copyright information. DigitalGlobe
* copyrights will be updated automatically.
*
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
#ifndef MATCHCONFLICTS_H
#define MATCHCONFLICTS_H
@@ -51,20 +51,21 @@ public:
MatchConflicts(const ConstOsmMapPtr& map);
- EidIndexMap calculateEidIndexMap(const std::vector<ConstMatchPtr>& matches) const;
-
/**
* Calculates all the conflicts between matches and puts the indexes to the conflicting pairs in
* the provided conflicts set. conflicts is cleared before inserting conflicts.
*/
void calculateMatchConflicts(const std::vector<ConstMatchPtr>& matches, ConflictMap& conflicts);
- void calculateSubsetConflicts(const std::vector<ConstMatchPtr>& matches, ConflictMap& conflicts,
- const std::vector<int>& matchSet);
-
private:
const ConstOsmMapPtr& _map;
+
+ void _calculateSubsetConflicts(
+ const std::vector<ConstMatchPtr>& matches, ConflictMap& conflicts,
+ const std::vector<int>& matchSet, const QHash<QString, ConstMatchPtr>& idIndexedMatches);
+
+ EidIndexMap _calculateEidIndexMap(const std::vector<ConstMatchPtr>& matches) const;
};
}