diff --git a/Combine/Makefile.am b/Combine/Makefile.am index ea8702955..c8c640202 100644 --- a/Combine/Makefile.am +++ b/Combine/Makefile.am @@ -1,6 +1,6 @@ -noinst_LIBRARIES = libGenFans.a +noinst_LIBRARIES = libCombine.a -libGenFans_a_SOURCES = genfans.cxx genfans.hxx +libCombine_a_SOURCES = genfans.cxx genfans.hxx INCLUDES += \ -I$(top_builddir) \ diff --git a/Combine/genfans.cxx b/Combine/genfans.cxx index be2ba6822..57aa05f46 100644 --- a/Combine/genfans.cxx +++ b/Combine/genfans.cxx @@ -169,9 +169,9 @@ fan_list FGGenFans::greedy_build( triele_list tris ) { } ++counter; } - cout << "triangle pool = " << tris.size() << endl; - cout << "biggest_group = " << biggest_group.size() << endl; - cout << "center node = " << index << endl; + // cout << "triangle pool = " << tris.size() << endl; + // cout << "biggest_group = " << biggest_group.size() << endl; + // cout << "center node = " << index << endl; // make the best fan we can out of this group int_list best_fan = make_best_fan( tris, index, biggest_group ); @@ -191,7 +191,7 @@ fan_list FGGenFans::greedy_build( triele_list tris ) { } node_list.push_back( t.get_n3() ); } - cout << "best list size = " << node_list.size() << endl; + // cout << "best list size = " << node_list.size() << endl; // add this fan to the fan list fans.push_back( node_list ); @@ -238,6 +238,9 @@ double FGGenFans::ave_size() { // $Log$ +// Revision 1.5 1999/03/31 23:46:49 curt +// Debugging output tweaks. +// // Revision 1.4 1999/03/31 13:26:39 curt // Debugging output tweeaks. // diff --git a/GenOutput/genobj.cxx b/GenOutput/genobj.cxx index 4b12bfe29..fc3cc3b68 100644 --- a/GenOutput/genobj.cxx +++ b/GenOutput/genobj.cxx @@ -194,8 +194,6 @@ int FGGenOutput::build( const FGArray& array, const FGTriangle& t ) { cout << "total triangles = " << tri_elements.size() << endl; FGGenFans f; for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) { - cout << "generating fans for area = " << i << endl; - triele_list area_tris; area_tris.erase( area_tris.begin(), area_tris.end() ); @@ -208,6 +206,7 @@ int FGGenOutput::build( const FGArray& array, const FGTriangle& t ) { } if ( (int)area_tris.size() > 0 ) { + cout << "generating fans for area = " << i << endl; fans[i] = f.greedy_build( area_tris ); } } @@ -433,6 +432,9 @@ int FGGenOutput::write( const string& base, const FGBucket& b ) { // $Log$ +// Revision 1.10 1999/03/31 23:46:57 curt +// Debugging output tweaks. +// // Revision 1.9 1999/03/31 13:26:40 curt // Debugging output tweeaks. // diff --git a/GenOutput/genobj.hxx b/GenOutput/genobj.hxx index e6ffd1dae..55f984452 100644 --- a/GenOutput/genobj.hxx +++ b/GenOutput/genobj.hxx @@ -40,7 +40,7 @@ #include #include -#include +#include #include
#include @@ -131,6 +131,9 @@ public: // $Log$ +// Revision 1.9 1999/03/31 23:46:58 curt +// Debugging output tweaks. +// // Revision 1.8 1999/03/30 23:50:44 curt // Modifications to fanify by attribute. // diff --git a/Main/Makefile.am b/Main/Makefile.am index ffc387243..95e1e4f14 100644 --- a/Main/Makefile.am +++ b/Main/Makefile.am @@ -6,7 +6,7 @@ construct_LDADD = \ $(top_builddir)/Tools/Construct/Array/libArray.a \ $(top_builddir)/Tools/Construct/Clipper/libClipper.a \ $(top_builddir)/Tools/Construct/GenOutput/libGenOutput.a \ - $(top_builddir)/Tools/Construct/GenFans/libGenFans.a \ + $(top_builddir)/Tools/Construct/Combine/libCombine.a \ $(top_builddir)/Tools/Construct/Triangulate/libTriangulate.a \ $(top_builddir)/Tools/Lib/Polygon/libPolygon.a \ $(top_builddir)/Tools/Lib/Triangle/libTriangle.a \ diff --git a/Main/construct.cxx b/Main/construct.cxx index ad578622c..d5b93c5e8 100644 --- a/Main/construct.cxx +++ b/Main/construct.cxx @@ -197,21 +197,22 @@ main(int argc, char **argv) { string output_base = argv[2]; // lon = -146.248360; lat = 61.133950; // PAVD (Valdez, AK) - // lon = -110.664244; lat = 33.352890; // P13 + 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 = -112.012175; lat = 41.195944; // KOGD // lon = -90.757128; lat = 46.790212; // WI32 + // lon = -122.220717; lat = 37.721291; // KOAK double min_x = lon - 1; double min_y = lat - 1; FGBucket b_min( min_x, min_y ); FGBucket b_max( lon + 1, lat + 1 ); - // FGBucket b(566664L); + FGBucket b_omit(550314L); // FGBucket b(-146.248360, 61.133950); // construct_tile( work_base, output_base, b ); // exit(0); @@ -230,9 +231,9 @@ main(int argc, char **argv) { for ( i = 0; i <= dx; i++ ) { b_cur = fgBucketOffset(min_x, min_y, i, j); - // if ( b_cur != b ) { - construct_tile( work_base, output_base, b_cur ); - // } + if ( b_cur != b_omit ) { + construct_tile( work_base, output_base, b_cur ); + } } } // string answer; cin >> answer; @@ -241,6 +242,9 @@ main(int argc, char **argv) { // $Log$ +// Revision 1.15 1999/03/31 23:47:02 curt +// Debugging output tweaks. +// // Revision 1.14 1999/03/31 13:26:41 curt // Debugging output tweeaks. // diff --git a/Triangulate/triangle.cxx b/Triangulate/triangle.cxx index dba74d102..6265237b0 100644 --- a/Triangulate/triangle.cxx +++ b/Triangulate/triangle.cxx @@ -70,7 +70,7 @@ FGTriangle::build( const point_list& corner_list, cout << "prepairing node list and polygons" << endl; for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) { - cout << "area type = " << i << endl; + // cout << "area type = " << i << endl; current = gpc_polys.polys[i].begin(); last = gpc_polys.polys[i].end(); for ( ; current != last; ++current ) { @@ -140,7 +140,7 @@ FGTriangle::build( const point_list& corner_list, int i1, i2; point_list node_list = in_nodes.get_node_list(); for ( int i = 0; i < FG_MAX_AREA_TYPES; ++i ) { - cout << "area type = " << i << endl; + // cout << "area type = " << i << endl; tripoly_list_iterator tp_current, tp_last; tp_current = polylist[i].begin(); tp_last = polylist[i].end(); @@ -398,6 +398,9 @@ int FGTriangle::run_triangulate() { // $Log$ +// Revision 1.14 1999/03/31 23:47:09 curt +// Debugging output tweaks. +// // Revision 1.13 1999/03/29 13:11:07 curt // Shuffled stl type names a bit. // Began adding support for tri-fanning (or maybe other arrangments too.)