Debugging output tweeaks.

diff --git a/Combine/genfans.cxx b/Combine/genfans.cxx
index 2dcab97fcb0384d699a61f0b9f1c8b9ca8fcb7b4..be2ba682278947e39d4096ca2fc982c2c4fcde7d 100644 (file)
--- a/Combine/genfans.cxx
+++ b/Combine/genfans.cxx
@@ -202,12 +202,12 @@ fan_list FGGenFans::greedy_build( triele_list tris ) {
        counter = 0;
        while ( t_current != t_last ) {
            if ( in_fan(counter, best_fan) ) {
-               cout << "erasing " 
-                    << t_current->get_n1() << ","
-                    << t_current->get_n2() << ","
-                    << t_current->get_n3()
-                    << " from master tri pool"
-                    << endl;
+               // cout << "erasing " 
+               //      << t_current->get_n1() << ","
+               //      << t_current->get_n2() << ","
+               //      << t_current->get_n3()
+               //      << " from master tri pool"
+               //      << endl;
                tris.erase( t_current );
            } else {
                ++t_current;
@@ -238,6 +238,9 @@ double FGGenFans::ave_size() {
 
 
 // $Log$
+// Revision 1.4  1999/03/31 13:26:39  curt
+// Debugging output tweeaks.
+//
 // Revision 1.3  1999/03/31 05:35:04  curt
 // Fixed bug in genfans (deleting the wrong triangles from the available pool.)
 //

diff --git a/GenOutput/genobj.cxx b/GenOutput/genobj.cxx
index 9716cd617ec5cb7a791703650544204466609e25..4b12bfe29b329be5ddb4225e835ce26f30d420ac 100644 (file)
--- a/GenOutput/genobj.cxx
+++ b/GenOutput/genobj.cxx
@@ -256,7 +256,7 @@ void FGGenOutput::calc_group_bounding_sphere( const fan_list& fans,
     // find average of point list
     Point3D c( 0.0 );
     point_list points = nodes.get_node_list();
-    cout << "found " << points.size() << " unique nodes" << endl;
+    // cout << "found " << points.size() << " unique nodes" << endl;
     point_list_iterator p_current = points.begin();
     point_list_iterator p_last = points.end();
     for ( ; p_current != p_last; ++p_current ) {
@@ -393,6 +393,7 @@ int FGGenOutput::write( const string& base, const FGBucket& b ) {
            fan_list_iterator f_last = fans[i].end();
            for ( ; f_current != f_last; ++f_current ) {
                fprintf( fp, "tf" );
+               total_tris += f_current->size() - 2;
                int_list_iterator i_current = f_current->begin();
                int_list_iterator i_last = f_current->end();
                for ( ; i_current != i_last; ++i_current ) {
@@ -411,7 +412,6 @@ int FGGenOutput::write( const string& base, const FGBucket& b ) {
                    for ( ; i_current != i_last; ++i_current ) {
                        int n3 = *i_current;
                        fprintf( fp, "f %d %d %d\n", center, n2, n3 );
-                       ++total_tris;
                        n2 = n3;
                    }
                }
@@ -433,6 +433,9 @@ int FGGenOutput::write( const string& base, const FGBucket& b ) {
 
 
 // $Log$
+// Revision 1.9  1999/03/31 13:26:40  curt
+// Debugging output tweeaks.
+//
 // Revision 1.8  1999/03/31 05:35:05  curt
 // Fixed bug in genfans (deleting the wrong triangles from the available pool.)
 //

diff --git a/Main/construct.cxx b/Main/construct.cxx
index 224fa1bd3eb1fe6c32ef29b86e04b2ca1dfc41b3..ad578622c5a0ee392ac1d5e793f531ac5d83eb46 100644 (file)
--- a/Main/construct.cxx
+++ b/Main/construct.cxx
@@ -199,10 +199,10 @@ main(int argc, char **argv) {
     // lon = -146.248360; lat = 61.133950;     // PAVD (Valdez, AK)
     // lon = -110.664244; lat = 33.352890;     // P13
     // lon = -93.211389; lat = 45.145000;      // KANE
-    // lon = -92.486188; lat = 44.590190;      // KRGK
+    lon = -92.486188; lat = 44.590190;      // KRGK
     // lon = -89.744682312011719; lat= 29.314495086669922;
     // lon = -122.488090; lat = 42.743183;     // 64S
-    lon = -114.861097; lat = 35.947480;     // 61B
+    // lon = -114.861097; lat = 35.947480;     // 61B
     // lon = -112.012175; lat = 41.195944;     // KOGD
     // lon = -90.757128; lat = 46.790212;      // WI32
 
@@ -241,6 +241,9 @@ main(int argc, char **argv) {
 
 
 // $Log$
+// Revision 1.14  1999/03/31 13:26:41  curt
+// Debugging output tweeaks.
+//
 // Revision 1.13  1999/03/31 05:35:06  curt
 // Fixed bug in genfans (deleting the wrong triangles from the available pool.)
 //