Changeset 429

Timestamp:

Oct 20, 2004, 2:26:43 PM (20 years ago)

Author:

duncan

Message:

added test for bug in writting .tsh file

File:

• inundation/ga/storm_surge/pyvolution/test_least_squares.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -117 +117 @@
         
 
-           
-    def teszt_more_triangles(self):
+    # this causes a memory error in scipy.sparce       
+    def bad_test_more_triangles(self):
         print "dd"
         a = [-1.0, 0.0]
@@ -146 +146 @@
 
 
-    def test_smooth_attributes_to_mesh(self):
+    def teszt_smooth_attributes_to_mesh(self):
         print "ee"
         a = [0.0, 0.0]
@@ -162 +162 @@
         data_coords = [d1, d2, d3] 
         
-        interp = Interpolation(points, triangles, data_coords, alpha=0.0000005)
+        interp = Interpolation(points, triangles, data_coords, alpha=5.0e-7)
         z = [z1, z2, z3]
         f = interp.fit(z)
         answer = [0, 5., 5.]
-        
         assert allclose(f, answer)
         
@@ -562 +561 @@
 
     def test_fit_to_mesh_file(self):
+        from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+             export_trianglulation_file    
+        import tempfile
+        import os
+        
+        # create a .tsh file, no user outline
+        mesh_dic = {}
+        mesh_dic['generatedpointlist'] = [[0.0, 0.0],
+                                          [0.0, 5.0],
+                                          [5.0, 0.0]]
+        mesh_dic['generatedtrianglelist'] =  [[0, 2, 1]]
+        mesh_dic['generatedsegmentlist'] = [[0, 1], [2, 0], [1, 2]]
+        mesh_dic['generatedtriangleattributelist'] = [['']]
+        mesh_dic['generatedpointattributelist'] = [[], [], []]
+        mesh_dic['generatedpointattributetitlelist'] = []
+        mesh_dic['generatedtriangleneighborlist'] = [[-1, -1, -1]]
+        mesh_dic['generatedsegmentmarkerlist'] = ['external',
+                                                  'external',
+                                                  'external']       
+        mesh_file = tempfile.mktemp(".tsh")
+        export_trianglulation_file(mesh_file,mesh_dic)
+        
+        # create an .xya file
+        point_file = tempfile.mktemp(".xya")
+        fd = open(point_file,'w')
+        fd.write("elevation, stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        fd.close()
+        
+        mesh_output_file = "new_trianlge.tsh"
+        fit_to_mesh_file(mesh_file,
+                         point_file,
+                         mesh_output_file,
+                         alpha = 0.0)  
+        # load in the .tsh file we just wrote
+        mesh_dic = mesh_file_to_mesh_dictionary(mesh_output_file)
+
+        assert allclose(mesh_dic['generatedpointattributelist'],
+                        [[0.0, 0.0],
+                         [5.0, 10.0],
+                         [5.0,10.0]])
+        
+        self.failUnless(mesh_dic['generatedpointattributetitlelist']  ==
+                        ['elevation','stage'],
+                        'test_fit_to_mesh_file failed')
+        
+        #clean up
+        os.remove(mesh_file)
+        os.remove(point_file)
+        
+    def test_fit_to_mesh_fileII(self):
         from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
              export_trianglulation_file    
@@ -613 +662 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'test')
+    suite = unittest.makeSuite(TestCase,'teszt')
     runner = unittest.TextTestRunner()
     runner.run(suite)