[geos-commits] r3591 - in trunk: include/geos/noding src/noding

[svn_geos at osgeo.org]

Author: strk
Date: 2012-04-05 04:07:44 -0700 (Thu, 05 Apr 2012)
New Revision: 3591

Modified:
   trunk/include/geos/noding/IteratedNoder.h
   trunk/src/noding/IteratedNoder.cpp
Log:
Update port info and cleanup IteratedNoder

Modified: trunk/include/geos/noding/IteratedNoder.h
===================================================================
--- trunk/include/geos/noding/IteratedNoder.h	2012-04-05 10:30:39 UTC (rev 3590)
+++ trunk/include/geos/noding/IteratedNoder.h	2012-04-05 11:07:44 UTC (rev 3591)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/IteratedNoder.java rev. 1.6 (JTS-1.9)
+ * Last port: noding/IteratedNoder.java r591 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -40,12 +40,13 @@
 namespace geos {
 namespace noding { // geos::noding
 
-/**
+/** \brief
  * Nodes a set of SegmentStrings completely.
+ * 
  * The set of segmentStrings is fully noded;
  * i.e. noding is repeated until no further
  * intersections are detected.
- * <p>
+ * 
  * Iterated noding using a FLOATING precision model is not guaranteed to converge,
  * due to roundoff error.   This problem is detected and an exception is thrown.
  * Clients can choose to rerun the noding using a lower precision model.

Modified: trunk/src/noding/IteratedNoder.cpp
===================================================================
--- trunk/src/noding/IteratedNoder.cpp	2012-04-05 10:30:39 UTC (rev 3590)
+++ trunk/src/noding/IteratedNoder.cpp	2012-04-05 11:07:44 UTC (rev 3591)
@@ -13,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: noding/IteratedNoder.java rev. 1.6 (JTS-1.9)
+ * Last port: noding/IteratedNoder.java r591 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -37,10 +37,7 @@
 namespace geos {
 namespace noding { // geos.noding
 
-/*
- * Node the input segment strings once
- * and create the split edges between the nodes
- */
+/* private */
 void
 IteratedNoder::node(vector<SegmentString*> *segStrings,
 		int *numInteriorIntersections)
@@ -54,6 +51,7 @@
 //System.out.println("# intersection tests: " + si.numTests);
 }
 
+/* public */
 void
 IteratedNoder::computeNodes(SegmentString::NonConstVect* segStrings)
 	// throw(GEOSException);
@@ -91,77 +89,3 @@
 } // namespace geos.noding
 } // namespace geos
 
-/**********************************************************************
- * $Log$
- * Revision 1.20  2006/03/15 09:51:12  strk
- * streamlined headers usage
- *
- * Revision 1.19  2006/03/06 19:40:47  strk
- * geos::util namespace. New GeometryCollection::iterator interface, many cleanups.
- *
- * Revision 1.18  2006/03/03 10:46:21  strk
- * Removed 'using namespace' from headers, added missing headers in .cpp files, removed useless includes in headers (bug#46)
- *
- * Revision 1.17  2006/03/02 12:12:00  strk
- * Renamed DEBUG macros to GEOS_DEBUG, all wrapped in #ifndef block to allow global override (bug#43)
- *
- * Revision 1.16  2006/02/19 19:46:49  strk
- * Packages <-> namespaces mapping for most GEOS internal code (uncomplete, but working). Dir-level libs for index/ subdirs.
- *
- * Revision 1.15  2006/02/14 13:28:26  strk
- * New SnapRounding code ported from JTS-1.7 (not complete yet).
- * Buffer op optimized by using new snaprounding code.
- * Leaks fixed in XMLTester.
- *
- * Revision 1.14  2006/02/09 15:52:47  strk
- * GEOSException derived from std::exception; always thrown and cought by const ref.
- *
- * Revision 1.13  2005/06/24 11:09:43  strk
- * Dropped RobustLineIntersector, made LineIntersector a concrete class.
- * Added LineIntersector::hasIntersection(Coordinate&,Coordinate&,Coordinate&)
- * to avoid computing intersection point (Z) when it's not necessary.
- *
- * Revision 1.12  2005/02/01 13:44:59  strk
- * More profiling labels.
- *
- * Revision 1.11  2004/11/04 19:08:07  strk
- * Cleanups, initializers list, profiling.
- *
- * Revision 1.10  2004/11/01 16:43:04  strk
- * Added Profiler code.
- * Temporarly patched a bug in DoubleBits (must check drawbacks).
- * Various cleanups and speedups.
- *
- * Revision 1.9  2004/07/02 13:28:27  strk
- * Fixed all #include lines to reflect headers layout change.
- * Added client application build tips in README.
- *
- * Revision 1.8  2004/05/03 22:56:44  strk
- * leaks fixed, exception specification omitted.
- *
- * Revision 1.7  2004/04/30 09:15:28  strk
- * Enlarged exception specifications to allow for AssertionFailedException.
- * Added missing initializers.
- *
- * Revision 1.6  2004/04/23 00:02:18  strk
- * const-correctness changes
- *
- * Revision 1.5  2004/04/19 16:14:52  strk
- * Some memory leaks plugged in noding algorithms.
- *
- * Revision 1.4  2004/04/19 12:51:01  strk
- * Memory leaks fixes. Throw specifications added.
- *
- * Revision 1.3  2004/04/16 12:48:07  strk
- * Leak fixes.
- *
- * Revision 1.2  2004/04/14 09:30:48  strk
- * Private iterated noding funx now use int* instead of vector to know
- * when it's time to stop.
- *
- * Revision 1.1  2004/03/26 07:48:30  ybychkov
- * "noding" package ported (JTS 1.4)
- *
- *
- **********************************************************************/
-