Skip to content

v0.2.55..v0.2.56 changeset ConflationAlgsOverview.md

Garret Voltz edited this page Aug 14, 2020 · 3 revisions
diff --git a/docs/algorithms/ConflationAlgsOverview.md b/docs/algorithms/ConflationAlgsOverview.md
index 2640850..89424f1 100644
--- a/docs/algorithms/ConflationAlgsOverview.md
+++ b/docs/algorithms/ConflationAlgsOverview.md
@@ -3,24 +3,22 @@
 
 ## Specific Algorithms
 * **[Area Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#area-to-area-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/AreaToAreaConflation.asciidoc)) conflates non-building polygons supporting an
-area geometry (e.g. park, parking lot, etc.; also includes area=yes and derivatives) and uses a machine learning based approach that extends 
+area geometry (e.g. park, parking lot, etc.; also includes area=yes and derivatives) using a machine learning based approach that extends 
 [Generic Polygon Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
-* **[Building Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#building-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/BuildingConflation.asciidoc)) uses a machine learning based approach to conflate building polygons.
-* **[POI Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#poi-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/PoiToPoiConflation.asciidoc)) conflates Points of Interest (named points or those falling
-into a POI schema category) and uses a machine learning based approach that extends [Generic Point Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
-* **[POI to Polygon Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#poi-to-polygon-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/PoiToPolygonConflation.asciidoc)) conflates POIs with either building or area related polygons with a rules based approach.
+* **[Building Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#building-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/BuildingConflation.asciidoc)) conflates building polygons using a machine learning based approach.
+* **[POI Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#poi-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/PoiToPoiConflation.asciidoc)) conflates points falling into a Point of Interest (POI) schema category or points with names using a machine learning based approach that extends [Generic Point Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
+* **[POI to Polygon Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#poi-to-polygon-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/PoiToPolygonConflation.asciidoc)) conflates points falling into a Point of Interest (POI) schema category or points with names with either buildings, areas, or polygons that fall into either a building or POI related schema category using a rules based approach.
 * **[Power Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/GenericLineConflation.asciidoc#power-line-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#power-line-conflation)) conflates linear power
-line features and uses a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
-* **Railway Conflation** conflates linear railway features and uses a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
-* **[River Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/GenericLineConflation.asciidoc#river-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#river-conflation)) conflates linear waterway features and 
-uses a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
+line features using a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
+* **Railway Conflation** conflates linear railway features using a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
+* **[River Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/GenericLineConflation.asciidoc#river-conflation)** ([detail](https://github.com/ngageoint/hootenanny/blob/master/docs/user/OldDocs.asciidoc#river-conflation)) conflates linear waterway features using a machine learning based approach that extends [Generic Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc).
 * **[Road Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/RoadConflation.asciidoc#road-conflation)** conflates
 linear road features with one of the following algorithms:
-  * The **[2nd Generation (aka Unifying) Roads Algorithm](https://github.com/ngageoint/hootenanny/blob/develop/docs/algorithms/UnifyingConflation.asciidoc)** uses machine learning techniques based on manually matched training data to match linear roads.
-  * The **[Network Roads Algorithm](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/NetworkConflation.asciidoc)** (default) uses a graph theory derived approach to match linear roads.
+  * The **[Unifying (aka 2nd Generation) Roads Algorithm](https://github.com/ngageoint/hootenanny/blob/develop/docs/algorithms/UnifyingConflation.asciidoc)**, which uses machine learning techniques based on manually matched training data.
+  * The **[Network Roads Algorithm](https://github.com/ngageoint/hootenanny/blob/master/docs/algorithms/NetworkConflation.asciidoc)**, which uses a graph theory derived approach.
 
 ## General Algorithms
-* **[Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc)** is a bare bones algorithm extending used to match generic linear features for which Hootenanny has no custom matching algorithm available. 
+* **[Line Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc)** is a bare bones algorithm used to match generic linear features for which Hootenanny has no custom matching algorithm available. 
 * **[Point Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc)** is a bare bones algorithm used to match generic point features for which Hootenanny has no custom matching algorithm available.
 * **[Point to Polygon Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc)** is a bare bones algorithm used to match generic point features with generic polygon features both of which Hootenanny has no custom matching algorithm available. 
 * **[Polygon Conflation](https://github.com/ngageoint/hootenanny/blob/master/docs/developer/HootenannyConflatingANewFeatureTypeWithGenericConflation.asciidoc)** is a bare bones algorithm used to match generic polygon features for which Hootenanny has no custom matching algorithm available. 
Clone this wiki locally