Skip to content

v0.2.48..v0.2.49 changeset PoiPolygonMatch.h

Garret Voltz edited this page Oct 2, 2019 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.h b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.h
index 3e4025c..1d2045c 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.h
@@ -68,29 +68,29 @@ public:
     const std::set<ElementId>& polyNeighborIds = std::set<ElementId>(),
     const std::set<ElementId>& poiNeighborIds = std::set<ElementId>());
 
-  virtual void setConfiguration(const Settings& conf);
+  virtual void setConfiguration(const Settings& conf) override;
 
   void calculateMatch(const ElementId& eid1, const ElementId& eid2);
 
-  virtual const MatchClassification& getClassification() const { return _class; }
+  virtual const MatchClassification& getClassification() const override { return _class; }
 
-  virtual MatchMembers getMatchMembers() const { return MatchMembers::Poi | MatchMembers::Polygon; }
+  virtual MatchMembers getMatchMembers() const override { return MatchMembers::Poi | MatchMembers::Polygon; }
 
-  virtual QString getMatchName() const { return _matchName; }
+  virtual QString getMatchName() const override { return _matchName; }
 
-  virtual std::set<std::pair<ElementId, ElementId>> getMatchPairs() const;
+  virtual std::set<std::pair<ElementId, ElementId>> getMatchPairs() const override;
 
-  virtual double getProbability() const { return _class.getMatchP(); }
+  virtual double getProbability() const override { return _class.getMatchP(); }
 
   // Is the right implementation for this?
-  virtual bool isConflicting(const Match& /*other*/, const ConstOsmMapPtr& /*map*/) const
+  virtual bool isConflicting(const Match& /*other*/, const ConstOsmMapPtr& /*map*/) const override
   { return false; }
 
-  virtual bool isWholeGroup() const { return true; }
+  virtual bool isWholeGroup() const override { return true; }
 
-  virtual QString toString() const;
+  virtual QString toString() const override;
 
-  virtual std::map<QString, double> getFeatures(const ConstOsmMapPtr& m) const;
+  virtual std::map<QString, double> getFeatures(const ConstOsmMapPtr& m) const override;
 
   /**
    * Pass through to the same method in PoiPolygonDistanceTruthRecorder
@@ -102,9 +102,11 @@ public:
    */
   static void resetMatchDistanceInfo();
 
-  virtual QString explain() const { return _explainText; }
+  virtual QString explain() const override { return _explainText; }
 
-  virtual QString getDescription() const { return "Matches POIs with polygons"; }
+  virtual QString getDescription() const override { return "Matches POIs with polygons"; }
+
+  virtual MatchType getType() const override;
 
   void setMatchDistanceThreshold(const double distance);
   void setReviewDistanceThreshold(const double distance);
Clone this wiki locally