Working towards completely depricating the previous insanely stupid array fit

algorithm.

src/Lib/Array/array.cxx

@@ -27,23 +27,6 @@
 
 #include <simgear/compiler.h>
 
-// #include <ctype.h>    // isspace()
-// #include <stdlib.h>   // atoi()
-// #include <math.h>     // rint()
-// #include <stdio.h>
-// #include <string.h>
-// #ifdef HAVE_SYS_STAT_H
-// #  include <sys/stat.h> // stat()
-// #endif
-// #ifdef SG_HAVE_STD_INCLUDES
-// #  include <cerrno>
-// #else
-// #  include <errno.h>
-// #endif
-// #ifdef HAVE_UNISTD_H
-// # include <unistd.h>   // stat()
-// #endif
-
 #include STL_STRING
 
 #include <simgear/constants.h>
@@ -96,6 +79,10 @@ bool TGArray::open( const string& file_base ) {
     string fitted_name = file_base + ".fit.gz";
     fitted_in = new sg_gzifstream( fitted_name );
     if ( ! fitted_in->is_open() ) {
+        // not having a .fit file is unfortunate, but not fatal.  We
+        // can do a really stupid/crude fit on the fly, but it will
+        // not be nearly as nice as what the offline terrafit utility
+        // would have produced.
         cout << "  Cannot open " << fitted_name << endl;
     } else {
         cout << "  Opening fitted data file: " << fitted_name << endl;
@@ -140,8 +127,58 @@ TGArray::parse( SGBucket& b ) {
 	}
 
 	cout << "    Done parsing\n";
+    } else {
+	// file not open (not found?), fill with zero'd data
 
-#if 0
+	originx = ( b.get_center_lon() - 0.5 * b.get_width() ) * 3600.0;
+	originy = ( b.get_center_lat() - 0.5 * b.get_height() ) * 3600.0;
+
+	double max_x = ( b.get_center_lon() + 0.5 * b.get_width() ) * 3600.0;
+	double max_y = ( b.get_center_lat() + 0.5 * b.get_height() ) * 3600.0;
+
+	cols = 3;
+	col_step = (max_x - originx) / (cols - 1);
+	rows = 3;
+	row_step = (max_y - originy) / (rows - 1);
+
+	cout << "    origin  = " << originx << "  " << originy << endl;
+	cout << "    cols = " << cols << "  rows = " << rows << endl;
+	cout << "    col_step = " << col_step 
+	     << "  row_step = " << row_step <<endl;
+
+	for ( int i = 0; i < cols; i++ ) {
+	    for ( int j = 0; j < rows; j++ ) {
+		in_data[i][j] = 0;
+	    }
+	}
+
+	cout << "    File not open, so using zero'd data" << endl;
+    }
+
+    // Parse/load the fitted data file
+    if ( fitted_in->is_open() ) {
+        int fitted_size;
+        double x, y, z, error;
+        *fitted_in >> fitted_size;
+        for ( int i = 0; i < fitted_size; ++i ) {
+            *fitted_in >> x >> y >> z;
+            if ( i < 4 ) {
+                // skip first 4 corner nodes
+            } else {
+                fitted_list.push_back( Point3D(x, y, z) );
+                cout << " loading fitted = " << Point3D(x, y, z) << endl;
+            }
+        }
+    }
+
+    return true;
+}
+
+
+
+
+// do our best to remove voids by picking data from the nearest neighbor.
+void TGArray::remove_voids( ) {
     // need two passes to ensure that all voids are removed (unless entire
     // array is a void.)
     bool have_void = true;
@@ -217,60 +254,9 @@ TGArray::parse( SGBucket& b ) {
             }
         }
     }
-#endif
-    } else {
-	// file not open (not found?), fill with zero'd data
-
-	originx = ( b.get_center_lon() - 0.5 * b.get_width() ) * 3600.0;
-	originy = ( b.get_center_lat() - 0.5 * b.get_height() ) * 3600.0;
-
-	double max_x = ( b.get_center_lon() + 0.5 * b.get_width() ) * 3600.0;
-	double max_y = ( b.get_center_lat() + 0.5 * b.get_height() ) * 3600.0;
-
-	cols = 3;
-	col_step = (max_x - originx) / (cols - 1);
-	rows = 3;
-	row_step = (max_y - originy) / (rows - 1);
-
-	cout << "    origin  = " << originx << "  " << originy << endl;
-	cout << "    cols = " << cols << "  rows = " << rows << endl;
-	cout << "    col_step = " << col_step 
-	     << "  row_step = " << row_step <<endl;
-
-	for ( int i = 0; i < cols; i++ ) {
-	    for ( int j = 0; j < rows; j++ ) {
-		in_data[i][j] = 0;
-	    }
-	}
-
-	cout << "    File not open, so using zero'd data" << endl;
-    }
-
-    // Parse/load the array data file
-    if ( fitted_in->is_open() ) {
-        fit_on_the_fly = false;
-        int fitted_size;
-        double x, y, z, error;
-        *fitted_in >> fitted_size;
-        for ( int i = 0; i < fitted_size; ++i ) {
-            *fitted_in >> x >> y >> z >> error;
-            if ( i < 4 ) {
-                // skip first 4 corner nodes
-            } else {
-                fitted_list.push_back( Point3D(x, y, z) );
-                cout << " loading fitted = " << Point3D(x, y, z) << endl;
-            }
-        }
-    } else {
-        fit_on_the_fly = true;
-    }
-
-    return true;
 }
 
 
-
-
 // add a node to the output corner node list
 void TGArray::add_corner_node( int i, int j, double val ) {
     
@@ -291,6 +277,7 @@ void TGArray::add_fit_node( int i, int j, double val ) {
 }
 
 
+#if 0
 // Use least squares to fit a simpler data set to dem data.  Return
 // the number of fitted nodes.  This is a horrible approach that
 // doesn't really work, but it's better than nothing if you've got
@@ -453,6 +440,7 @@ int TGArray::fit( double error ) {
     // return fit nodes + 4 corners
     return fitted_list.size() + 4;
 }
+#endif
 
 
 // Return the elevation of the closest non-void grid point to lon, lat

src/Lib/Array/array.hxx

@@ -77,7 +77,7 @@ private:
     point_list fitted_list;
 
     // bool
-    bool fit_on_the_fly;
+    // CLO 8/18/2003 // bool fit_on_the_fly;
 
 public:
 
@@ -97,13 +97,17 @@ public:
     // parse a Array file
     bool parse( SGBucket& b );
 
+    // do our best to remove voids by picking data from the nearest
+    // neighbor.
+    void remove_voids();
+
     // Use least squares to fit a simpler data set to dem data.
     // Return the number of fitted nodes.  This is a horrible approach
     // that doesn't really work, but it's better than nothing if
     // you've got nothing.  Using src/Prep/ArrayFit to create .fit
     // files from the .arr files is a *much* better approach, but it
     // is slower which is why it needs to be done "offline".
-    int fit( double error );
+    // CLO 8/18/2003 // int fit( double error );
 
     // add a node to the output corner node list
     void add_corner_node( int i, int j, double val );

src/Lib/Array/testarray.cxx

@@ -32,7 +32,5 @@ int main( int argc, char **argv ) {
     lat *= 3600;
     cout << "  " << a.altitude_from_grid(lon, lat) << endl;
 
-    a.fit( 100 );
-
     return 0;
 }

src/Lib/Array/testgts.cxx

@@ -92,10 +92,10 @@ int main( int argc, char **argv ) {
     a.parse( b );
 
     // Old fit
-    cout << "Old fit(200) = " << a.fit(200) << endl;
+    // cout << "Old fit(200) = " << a.fit(200) << endl;
-    cout << "Old fit(100) = " << a.fit(100) << endl;
+    // cout << "Old fit(100) = " << a.fit(100) << endl;
-    cout << "Old fit(50) = " << a.fit(50) << endl;
+    // cout << "Old fit(50) = " << a.fit(50) << endl;
-    cout << "Old fit(25) = " << a.fit(25) << endl;
+    // cout << "Old fit(25) = " << a.fit(25) << endl;
 
     // Test libgts (gnu triangulation library functions)