Changeset 3625

Timestamp:

17/03/08 14:20:36 (13 years ago)

Author:

astephen

Message:

Cleaned up some of the data files and improved unit tests and comparison code.

Location:

nappy/trunk

Files:

• data_files/1001.na (modified) (1 diff)
• data_files/1010.na (modified) (1 diff)
• data_files/1010a.na (modified) (1 diff)
• nappy/unit_tests/make_na_file_unit_tests.py (modified) (1 diff)
• nappy/unit_tests/test_na_file_1001.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_1010.py (modified) (3 diffs)
• nappy/unit_tests/test_na_file_1020.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_2010.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_2110.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_2160.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_2310.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_3010.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_4010.py (modified) (2 diffs)
• nappy/unit_tests/test_na_file_template.tmpl (moved) (moved from nappy/trunk/nappy/unit_tests/test_na_file_template.txt) (2 diffs)
• nappy/utils/common_utils.py (modified) (4 diffs)
• nappy/utils/compare_na.py (modified) (12 diffs)

nappy/trunk/data_files/1001.na

@@ -27 +27 @@
  79210    44    74 10125  
  79220    37   105 10088  
-
-
-
-
-
-
-

nappy/trunk/data_files/1010.na

@@ -82 +82 @@
            100       3.2E-04          11.9
            1.9           1.7       3.2E+07          1200
-

nappy/trunk/data_files/1010a.na

@@ -82 +82 @@
            100       3.2E-04          11.9
            1.9           1.7       3.2E+07          1200
-

nappy/trunk/nappy/unit_tests/make_na_file_unit_tests.py

@@ -20 +20 @@
             "2310", "3010", "4010")
 
-    template = open("test_na_file_template.txt").read()
+    template = open("test_na_file_template.tmpl").read()
 
     for ffi in ffis:

nappy/trunk/nappy/unit_tests/test_na_file_1001.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_1001.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_1001.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_1001_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV1001(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV1001(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles1001(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV1001(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_1010.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_1010.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_1010.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_1010_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV1010(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV1010(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
@@ -49 +56 @@
         res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV1010(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_1020.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_1020.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_1020.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_1020_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV1020(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV1020(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles1020(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV1020(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_2010.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_2010.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_2010.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_2010_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV2010(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV2010(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles2010(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV2010(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_2110.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_2110.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_2110.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_2110_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV2110(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV2110(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles2110(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV2110(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_2160.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_2160.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_2160.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_2160_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV2160(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV2160(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles2160(self):
         "Tests comparison of written and original files for equivalence."
-        print self.infile, self.outfile
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV2160(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_2310.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_2310.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_2310.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_2310_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV2310(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV2310(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles2310(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV2310(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_3010.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_3010.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_3010.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_3010_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV3010(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV3010(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles3010(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV3010(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_4010.py

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_4010.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_4010.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_4010_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV4010(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2d")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV4010(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles4010(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV4010(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/unit_tests/test_na_file_template.tmpl

@@ -25 +25 @@
         self.outfile = os.path.join(base_dir, "test_outputs", "test_<FFI>.na")
         self.out_csv = os.path.join(base_dir, "test_outputs", "test_<FFI>.csv")
+        self.out_csv_annotated = os.path.join(base_dir, "test_outputs", "test_<FFI>_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
@@ -39 +40 @@
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
+    def test_writeCSV<FFI>(self):
+        "Tests conversion to CSV."
+        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", float_format="%.2f")
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+
     def test_writeAnnotatedCSV<FFI>(self):
-        "Tests conversion to NetCDF."
-        fobj = nappy.openNAFile(self.out_csv, mode="w", na_dict=self.na_dict)
-        fobj.write(delimiter=",", float_format="%.2d", annotation=True)
+        "Tests conversion to Annotated CSV."
+        fobj = nappy.openNAFile(self.out_csv_annotated, mode="w", na_dict=self.na_dict)
+        fobj.write(delimiter=",", annotation=True)
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
  
     def test_compareFiles<FFI>(self):
         "Tests comparison of written and original files for equivalence."
-        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile)
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.outfile, approx_equal=True)
         self.assertEqual(res, True)
-        
+       
+    def test_compareNAToCSV<FFI>(self):
+        "Tests comparison of original and CSV version written." 
+        res = nappy.utils.compare_na.compNAFiles(self.infile, self.out_csv, delimiter_2=",")
+        self.assertEqual(res, True)
+
 
 if __name__ ==  "__main__":

nappy/trunk/nappy/utils/common_utils.py

@@ -12 +12 @@
 
 # Imports from local package
-import nappy.utils.parse_config
+import parse_config
+
 
 def getNAFileClass(ffi):
@@ -117 +118 @@
     Gets config dict for version.
     """
-    version = nappy.utils.parse_config.getConfigDict()["main"]["version"]
+    version = parse_config.getConfigDict()["main"]["version"]
     return version
 
@@ -125 +126 @@
     Returns true or false for DEBUG status.
     """
-    DEBUG = nappy.utils.parse_config.getConfigDict()["main"]["DEBUG"]
+    DEBUG = parse_config.getConfigDict()["main"]["DEBUG"]
     return eval(DEBUG)
 
@@ -149 +150 @@
     """
     
-    dict = nappy.utils.parse_config.getAnnotationsConfigDict()
+    dict = parse_config.getAnnotationsConfigDict()
     if annotation: return dict[item] + delimiter
     else: return ''

nappy/trunk/nappy/utils/compare_na.py

@@ -12 +12 @@
 
     compare_na.py [-h | --header-only]  [-b | --body-only]
-                  [-n | --number-strict] 
+                  [-n | --number-strict] [-a | --approx-equal] 
                   [-1 <delimiter_1> | --delimiter-1=<delimiter_1>]
                   [-2 <delimiter_2> | --delimiter-2=<delimiter_2>]
@@ -26 +26 @@
     -n | --number-strict        compares exact formatting of numbers in data block
                                 (default is to compare them by value).
+    -a | --approx-equal         considers any two numbers being compared the same as long
+                                as the difference between them is less than 1%.
     <delimiter_1>               delimiter to use for file 1.
     <delimiter_2>               delimiter to use for file 2. 
@@ -40 +42 @@
 from compare import *
 
+equality_threshold = 0.01 # i.e. within 1% of each other
 file_exclusion_patterns = (".*CSV.*", ".*svn.*", "\..*", ".*\.pyc$", ".*~$") 
 file_exclusions = [re.compile(pattn) for pattn in file_exclusion_patterns]
@@ -67 +70 @@
 
 
-def compareSections(l1, l2, number_clever=True, delimiter_1=None, delimiter_2=None):
+def compareSections(l1, l2, number_clever=True, approx_equal=False, 
+                   delimiter_1=None, delimiter_2=None):
     """
     Compares sections of NASA Ames files (i.e. headers and bodies).
@@ -83 +87 @@
         same = True
         if len(items1) != len(items2):
-            same = False
+            # Check that space delimiter hasn't just split identical lines to different lengths
+            if len(items1) == 1 and items1[0].split() == items2:
+                continue
+            elif len(items2) == 1 and items2[0].split() == items1:
+                continue
+            else:
+                same = False
         else: 
             if number_clever == False:
@@ -96 +106 @@
                         a = items1[count]
                         b = items2[count]
+
                     if a != b:
-                        same = False
-                        break 
+                        
+                        if approx_equal:
+                        # Check to see if testing for approximate equality
+                            if a == 0:  a = 0.000000001
+                            if b == 0:  b = 0.000000001
+                            divided = a/b
+                            if divided < 1:
+                                divided = b/a
+                            if (1 - divided) > equality_threshold:
+                                same = False
+                                break  
+                        else: 
+                            same = False
+                            break 
               
         if same == False:
@@ -109 +132 @@
 
 
-def compNAFiles(f1, f2, header=True, body=True, number_clever=True, delimiter_1=None,
-                delimiter_2=None):
+def compNAFiles(f1, f2, header=True, body=True, number_clever=True, approx_equal=False,
+                delimiter_1=None, delimiter_2=None):
     """
     Compares contents of two NASA Ames files f1 and f2.
     header=False or body=False will not compare these sections of the files.
     number_clever=True will compare 5.00000 and 5 making them equal in the body.
+    If approx_equal is True then approximate equality is good enough to return two
+    numbers as being equal (within equality_threshold set at top of this module).
     If f1_delimiter and f2_delimiter are provided then the comparer will consider
     two lines identical if they have the delimiters sent in as arguments.
@@ -134 +159 @@
     l1 = open(f1).readlines()
     l2 = open(f2).readlines()
-
     head_len1 = int(l1[0].split(delimiter_1)[0])
     head_len2 = int(l2[0].split(delimiter_2)[0])
@@ -148 +172 @@
         print ">>> %s header:" % f1
         print "<<< %s header:" % f2
-        same = compareSections(header1, header2, number_clever, delimiter_1, delimiter_2) 
+        same = compareSections(header1, header2, number_clever, approx_equal, delimiter_1, delimiter_2) 
         if same == True:
             print "HEADERS ARE IDENTICAL."
@@ -158 +182 @@
         print ">>> %s body:" % f1
         print "<<< %s body:" % f2
-        same = compareSections(body1, body2, number_clever, delimiter_1, delimiter_2)
+        same = compareSections(body1, body2, number_clever, approx_equal, delimiter_1, delimiter_2)
         if same == True:
             print "BODIES ARE IDENTICAL."
@@ -176 +200 @@
     a["body"] = True
     a["number_clever"] = True
+    a["approx_equal"] = False
     a["delimiter_1"] = None
     a["delimiter_2"] = None
 
-    (arg_list, files) = getopt.getopt(args, "hbn1:2:", ["header-only", "body-only",
-                         "number-strict", "delimiter-1=", "delimiter-2="])
+    (arg_list, files) = getopt.getopt(args, "hbna1:2:", ["header-only", "body-only",
+                    "number-strict", "approx-equal", "delimiter-1=", "delimiter-2="])
 
     for arg, value in arg_list:
@@ -189 +214 @@
         elif arg in ("--number-strict", "-n"):
             a["number_clever"] = False
+        elif arg in ("--approx-equal", "-a"):
+            a["approx_equal"] = True
         elif arg in ("--delimiter-1", "-1"):
             a["delimiter_1"] = value