Changeset 1394

Timestamp:

May 16, 2005, 11:06:22 AM (19 years ago)

Author:

duncan

Message:

refactoring dealing with point files

Location:

inundation/ga/storm_surge/pmesh/load_mesh

Files:

• loadASCII.py (modified) (6 diffs)
• test_loadASCII.py (modified) (4 diffs)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -5 +5 @@
 
 for example:
-elevation
-0.6 0.7 4.9
-1.9 2.8 5
-2.7 2.4 5.2
+elevation, friction
+0.6, 0.7, 4.9, 0.3
+1.9, 2.8, 5, 0.3
+2.7, 2.4, 5.2, 0.3
 
 The first two columns are always implicitly assumed to be x, y coordinates.
-
+Use the same delimiter for the attribute names and the data
 
 The format for a Points dictionary is:
@@ -97 +97 @@
     Note: This might throw a can't load file error
     """
-    
-    if ofile[-4:]== ".tsh":
-        dict = _read_tsh_file(ofile)
-    elif ofile[-4:]== ".msh":
-        dict = _read_msh_file(ofile)
-    else:      
-        msg = 'Extension %s is unknown' %ofile[-4:]
-        raise IOError, msg        
+    try:
+        if ofile[-4:]== ".tsh":
+            dict = _read_tsh_file(ofile)
+        elif ofile[-4:]== ".msh":
+            dict = _read_msh_file(ofile)
+        else:      
+            msg = 'Extension %s is unknown' %ofile[-4:]
+            raise IOError, msg
+    except SyntaxError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+    except IndexError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+        
     return dict
 
@@ -1052 +1059 @@
             msg = 'Could not open file %s ' %ofile
             raise IOError, msg
+        except SyntaxError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+        except IndexError:
+            msg = 'File could not be opened'
+            raise IOError, msg
         
     elif ofile[-4:]== ".pts":
@@ -1260 +1273 @@
                 if len(att_names) != len(numbers):
                     fd.close()
-                    raise TitleAmountError
-                    
+                    # It might not be a problem with the title
+                    #raise TitleAmountError
+                    raise IOError
                 for i,num in enumerate(numbers):
                     num.strip()
@@ -1311 +1325 @@
     
 #FIXME (DSG) need an export_points_file method..                
-def export_xya_file( file_name, xya_dict, title, delimiter = ','):
+def _write_xya_file( file_name, xya_dict, delimiter = ','):
     """
     export a file, ofile, with the format
@@ -1324 +1338 @@
     #FIXME, move the test for this from meshharness to loadasciiharness
     points = xya_dict['pointlist'] 
-    pointattributes = xya_dict['pointattributelist']
+    pointattributes = xya_dict['attributelist']
     
     fd = open(file_name,'w')
-    
-    fd.write(title+"\n")
+ 
+    titlelist = ""
+    for title in pointattributes.keys():
+        titlelist = titlelist + title + delimiter
+    titlelist = titlelist[0:-len(delimiter)] # remove the last delimiter
+    fd.write(titlelist+"\n")
     #<vertex #> <x> <y> [attributes]
-    for vert, vertatts in map(None, points, pointattributes):
+    for i,vert in enumerate( points):
+        
         attlist = ""
-        for att in vertatts:
-            attlist = attlist + str(att)+ delimiter
+        for att in pointattributes.keys():
+            attlist = attlist + str(pointattributes[att][i])+ delimiter
         attlist = attlist[0:-len(delimiter)] # remove the last delimiter
         attlist.strip()

inundation/ga/storm_surge/pmesh/load_mesh/test_loadASCII.py

@@ -163 +163 @@
         pass
 
-    
-    def FUNCTION_REMOVEDtest_import_mesh(self):
-        
-        dict = self.dict
-        fileName = tempfile.mktemp(".txt")
-        fd = open(fileName,'w')
-        loadASCII._write_ASCII_outline(fd,dict)
-        fd.close()
-        loaded_dict = import_mesh(fileName) #FIXME function names are wacky
-        os.remove(fileName)
-        
-        #gen_dict = 
-        #print "*********************"
-        #print dict
-        #print "**loaded_dict*******************"
-        #print loaded_dict
-        #print "*********************"
-
-        
-        self.failUnless(array(loaded_dict['points'])  ==
-                        array(dict['points']),
-                         'test_import_mesh failed. Test 1')
-        self.failUnless(array(loaded_dict['point_attributes'])  ==
-                        array(dict['point_attributes']),
-                         'test_import_mesh failed. Test 2')
-        self.failUnless(array(loaded_dict['outline_segments'])  ==
-                        array(dict['outline_segments']),
-                         'test_import_mesh failed. Test 3')
-        self.failUnless(array(loaded_dict['outline_segment_tags'])  ==
-                        array(dict['outline_segment_tags']),
-                         'test_import_mesh failed. Test 4')
-        self.failUnless(array(loaded_dict['regions'])  ==
-                        array(dict['regions']),
-                         'test_import_mesh failed. Test 5')
-        self.failUnless(array(loaded_dict['region_tags'])  ==
-                        array(dict['region_tags']),
-                         'test_import_mesh failed. Test 5')
-        self.failUnless(array(loaded_dict['region_max_areas'])  ==
-                        array(dict['region_max_areas']),
-                         'test_import_mesh failed. Test 5')
-
-        self.failUnless(array(loaded_dict['holes'])  ==
-                        array(dict['holes']),
-                         'test_import_mesh failed. Test 6')
         
     def test_export_mesh_file(self):
@@ -486 +442 @@
                          'test_writepts failed. Test geo_reference')
 
+    def test_write_xya(self):
+        dict = {}
+        att_dict = {}
+        dict['pointlist'] = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = array([10.0, 0.0, 10.4])
+        att_dict['brightness'] = array([10.0, 0.0, 10.4])
+        dict['attributelist'] = att_dict
+        dict['geo_reference'] = Geo_reference(56,1.9,1.9)
+        
+        
+        fileName = tempfile.mktemp(".xya")
+        export_points_file(fileName, dict)
+        dict2 = import_points_file(fileName)
+        #print "fileName",fileName 
+        os.remove(fileName)
+        #print "dict2",dict2 
+        
+        assert allclose(dict2['pointlist'],[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert allclose(dict2['attributelist']['elevation'], [10.0, 0.0, 10.4])
+        answer = [10.0, 0.0, 10.4]
+        assert allclose(dict2['attributelist']['brightness'], answer)
+
         
     def test_half_pts(self):
@@ -615 +593 @@
         try:
             dict = import_points_file(fileName,delimiter = ' ')
-        except TitleAmountError:
+        except IOError:
             pass
         else:
@@ -622 +600 @@
         
         os.remove(fileName)
+       
+    def test_loadxy6(self):
+        import os
+        import tempfile
+       
+        fileName = tempfile.mktemp(".xya")
+        file = open(fileName,"w")
+        file.write("elevation\n\
+1.0 0.0 10.0 \n\
+0.0 1.0\n\
+1.0 \n")
+        file.close()
+        #print fileName
+        try:
+            dict = import_points_file(fileName,delimiter = ' ')
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad xya file did not raise error!')
+        
+        os.remove(fileName)
          
+ 
+    def test_import_tsh(self):
+        import os
+        import tempfile
+       
+        fileName = tempfile.mktemp(".tsh")
+        file = open(fileName,"w")
+        file.write("elevation\n\
+1.0 0.0 10.0 \n\
+0.0 1.0\n\
+1.0 \n")
+        file.close()
+        #print fileName
+        try:
+            dict = import_points_file(fileName,delimiter = ' ')
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad tsh file did not raise error!')
+        
+        os.remove(fileName)
+  
+    def test_import_tsh2(self):
+        import os
+        import tempfile
+       
+        fileName = tempfile.mktemp(".msh")
+        file = open(fileName,"w")
+        file.write("1.0 \n\
+1.0 0.0 10.0 \n\
+0.0 1.0\n\
+13.0 \n")
+        file.close()
+        #print fileName
+        try:
+            dict = import_points_file(fileName,delimiter = ' ')
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad tsh file did not raise error!')
+        
+        os.remove(fileName)         
+ 
+    def test_import_tsh3(self):
+        import os
+        import tempfile
+       
+        fileName = tempfile.mktemp(".tsh")
+        file = open(fileName,"w")
+        file.write("1.0 \n\
+showme1.0 0.0 10.0 \n\
+0.0 1.0\n\
+13.0 \n")
+        file.close()
+        #print fileName
+        try:
+            dict = import_points_file(fileName,delimiter = ' ')
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,
+                        'bad tsh file did not raise error!')
+        
+        os.remove(fileName)         
  
 #-------------------------------------------------------------