Refinements in naming and organization.

diff --git a/Triangulate/triangle.cxx b/Triangulate/triangle.cxx
index 4e5265bb27da11bc987efce0fdc2f6a16ef73d17..b1beaa79f6f9802f8837fe281f026a33250f1331 100644 (file)
--- a/Triangulate/triangle.cxx
+++ b/Triangulate/triangle.cxx
@@ -208,11 +208,11 @@ int FGTriangle::run_triangulate() {
     int counter;
 
     // point list
-    trinode_list node_list = in_nodes.get_node_list();
+    point_list node_list = in_nodes.get_node_list();
     in.numberofpoints = node_list.size();
     in.pointlist = (REAL *) malloc(in.numberofpoints * 2 * sizeof(REAL));
 
-    trinode_list_iterator tn_current, tn_last;
+    point_list_iterator tn_current, tn_last;
     tn_current = node_list.begin();
     tn_last = node_list.end();
     counter = 0;
@@ -371,6 +371,9 @@ int FGTriangle::run_triangulate() {
 
 
 // $Log$
+// Revision 1.11  1999/03/23 22:02:51  curt
+// Refinements in naming and organization.
+//
 // Revision 1.10  1999/03/22 23:49:02  curt
 // Modifications to facilitate conversion to output format.
 //

diff --git a/Triangulate/triangle.hxx b/Triangulate/triangle.hxx
index de26cd62515e9d5f9f26fc4ce9d20af2160138b2..ba4fb4cbfa84ff9ca1a2dda5fc0e30e9c7bf5ec5 100644 (file)
--- a/Triangulate/triangle.hxx
+++ b/Triangulate/triangle.hxx
@@ -33,8 +33,6 @@
 
 #include <Include/compiler.h>
 
-#include <vector>
-
 #include <Array/array.hxx>
 #include <Clipper/clipper.hxx>
 #include <Math/point3d.hxx>
@@ -50,17 +48,6 @@ extern "C" {
 #include "tripoly.hxx"
 #include "trisegs.hxx"
 
-FG_USING_STD(vector);
-
-
-typedef vector < FGTriPoly > tripoly_list;
-typedef tripoly_list::iterator tripoly_list_iterator;
-typedef tripoly_list::const_iterator const_tripoly_list_iterator;
-
-typedef vector < FGTriEle > triele_list;
-typedef triele_list::iterator triele_list_iterator;
-typedef triele_list::const_iterator const_triele_list_iterator;
-
 
 class FGTriangle {
 
@@ -95,6 +82,7 @@ public:
     int run_triangulate();
 
     inline FGTriNodes get_out_nodes() const { return out_nodes; }
+    inline triele_list get_elelist() const { return elelist; }
 };
 
 
@@ -102,6 +90,9 @@ public:
 
 
 // $Log$
+// Revision 1.8  1999/03/23 22:02:52  curt
+// Refinements in naming and organization.
+//
 // Revision 1.7  1999/03/22 23:49:03  curt
 // Modifications to facilitate conversion to output format.
 //

diff --git a/Triangulate/trieles.hxx b/Triangulate/trieles.hxx
index 5c4440b723418e56dd7fb2a64a739524e7b055d7..8a867fc0e1e39d3a4960c69a183f206794539582 100644 (file)
--- a/Triangulate/trieles.hxx
+++ b/Triangulate/trieles.hxx
@@ -33,6 +33,10 @@
 
 #include <Include/compiler.h>
 
+#include <vector>
+
+FG_USING_STD(vector);
+
 
 // a segment is two integer pointers into the node list
 class FGTriEle {
@@ -55,10 +59,18 @@ public:
 };
 
 
+typedef vector < FGTriEle > triele_list;
+typedef triele_list::iterator triele_list_iterator;
+typedef triele_list::const_iterator const_triele_list_iterator;
+
+
 #endif // _TRIELES_HXX
 
 
 // $Log$
+// Revision 1.2  1999/03/23 22:02:53  curt
+// Refinements in naming and organization.
+//
 // Revision 1.1  1999/03/22 23:58:57  curt
 // Initial revision.
 //

diff --git a/Triangulate/trinodes.cxx b/Triangulate/trinodes.cxx
index 3acc7775d753c68b20e1b9b57d0632a5154fd475..75b5b302d594ae08976af21c2244e5b7195d8fd3 100644 (file)
--- a/Triangulate/trinodes.cxx
+++ b/Triangulate/trinodes.cxx
@@ -50,7 +50,7 @@ inline bool FGTriNodes::close_enough( const Point3D& p1, const Point3D& p2 ) {
 // Add a point to the point list if it doesn't already exist.  Returns
 // the index (starting at zero) of the point in the list.
 int FGTriNodes::unique_add( const Point3D& p ) {
-    trinode_list_iterator current, last;
+    point_list_iterator current, last;
     int counter = 0;
 
     // cout << p.x() << "," << p.y() << endl;
@@ -83,6 +83,9 @@ int FGTriNodes::simple_add( const Point3D& p ) {
 
 
 // $Log$
+// Revision 1.5  1999/03/23 22:02:54  curt
+// Refinements in naming and organization.
+//
 // Revision 1.4  1999/03/22 23:49:04  curt
 // Modifications to facilitate conversion to output format.
 //

diff --git a/Triangulate/trinodes.hxx b/Triangulate/trinodes.hxx
index cd14e12995912103a39c82f238ebd90a9c088cef..ab1b3650403c8cc2b9491804e0b43d6274451a32 100644 (file)
--- a/Triangulate/trinodes.hxx
+++ b/Triangulate/trinodes.hxx
@@ -43,16 +43,16 @@ FG_USING_STD(vector);
 #define FG_PROXIMITY_EPSILON 0.000001
 
 
-typedef vector < Point3D > trinode_list;
-typedef trinode_list::iterator trinode_list_iterator;
-typedef trinode_list::const_iterator const_trinode_list_iterator;
+typedef vector < Point3D > point_list;
+typedef point_list::iterator point_list_iterator;
+typedef point_list::const_iterator const_point_list_iterator;
 
 
 class FGTriNodes {
 
 private:
 
-    trinode_list node_list;
+    point_list node_list;
 
     // return true of the two points are "close enough" as defined by
     // FG_PROXIMITY_EPSILON
@@ -72,7 +72,7 @@ public:
     int simple_add( const Point3D& p );
 
     // return the master node list
-    inline trinode_list get_node_list() const { return node_list; }
+    inline point_list get_node_list() const { return node_list; }
 
     // return the ith point
     inline Point3D get_node( int i ) const { return node_list[i]; }
@@ -83,6 +83,9 @@ public:
 
 
 // $Log$
+// Revision 1.5  1999/03/23 22:02:55  curt
+// Refinements in naming and organization.
+//
 // Revision 1.4  1999/03/22 23:49:05  curt
 // Modifications to facilitate conversion to output format.
 //

diff --git a/Triangulate/tripoly.hxx b/Triangulate/tripoly.hxx
index 8115a8969ce9a27c5d6de00f2ba5cfb65ad4ef2e..0cd87d00caa5491474af9cd56532956283b5c603 100644 (file)
--- a/Triangulate/tripoly.hxx
+++ b/Triangulate/tripoly.hxx
@@ -76,10 +76,18 @@ public:
 };
 
 
+typedef vector < FGTriPoly > tripoly_list;
+typedef tripoly_list::iterator tripoly_list_iterator;
+typedef tripoly_list::const_iterator const_tripoly_list_iterator;
+
+
 #endif // _TRIPOLY_HXX
 
 
 // $Log$
+// Revision 1.4  1999/03/23 22:02:56  curt
+// Refinements in naming and organization.
+//
 // Revision 1.3  1999/03/21 14:02:07  curt
 // Added a mechanism to dump out the triangle structures for viewing.
 // Fixed a couple bugs in first pass at triangulation.

diff --git a/Triangulate/trisegs.cxx b/Triangulate/trisegs.cxx
index d3ce0eec1a8b11b9d736ed706eaf967ca87cba6b..6d4ac1bb5e527df8b8857532f383138ca993c58e 100644 (file)
--- a/Triangulate/trisegs.cxx
+++ b/Triangulate/trisegs.cxx
@@ -41,14 +41,14 @@ int FGTriSegments::unique_add( const FGTriSeg& s ) {
     triseg_list_iterator current, last;
     int counter = 0;
 
-    cout << s.get_n1() << "," << s.get_n2() << endl;
+    // cout << s.get_n1() << "," << s.get_n2() << endl;
 
     // see if point already exists
     current = seg_list.begin();
     last = seg_list.end();
     for ( ; current != last; ++current ) {
        if ( s == *current ) {
-           cout << "found an existing segment match" << endl;
+           // cout << "found an existing segment match" << endl;
            return counter;
        }
        
@@ -63,6 +63,9 @@ int FGTriSegments::unique_add( const FGTriSeg& s ) {
 
 
 // $Log$
+// Revision 1.3  1999/03/23 22:02:57  curt
+// Refinements in naming and organization.
+//
 // Revision 1.2  1999/03/20 20:32:59  curt
 // First mostly successful tile triangulation works.  There's plenty of tweaking
 // to do, but we are marching in the right direction.