Changeset 4519

Timestamp:

May 30, 2007, 1:54:07 PM (18 years ago)

Author:

nick

Message:

cleaned up store_parameters and added 3 tests

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (9 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5189 +5189 @@
 def store_parameters(verbose=False,**kwargs):
     """
+    Store "kwargs" into a temp csv file, if "completed" is a kwargs csv file is
+    kwargs[file_name] else it is kwargs[output_dir] + details_temp.csv
+    
     Must have a file_name keyword arg, this is what is writing to.
     might be a better way to do this using CSV module Writer and writeDict
@@ -5194 +5197 @@
     writes file to "output_dir" unless "completed" is in kwargs, then it writes to 
     "file_name" kwargs 
-     Returns a object which is a subset of the original
-        and the data points and attributes in this new object refer to
-        the indices provided
-        
-        Input
-            indices- a list of integers that represent the new object
-        Output
-            New geospatial data object representing points specified by 
-            the indices 
+
     """
     import types
@@ -5211 +5206 @@
         raise TypeError
     
+    #is completed is kwargs?
     try:
         kwargs['completed']
@@ -5220 +5216 @@
     if completed:
         try:
-            file = str(kwargs.pop('file_name'))
+            file = str(kwargs['file_name'])
         except:
             raise 'kwargs must have file_name'
     else:
+        #write temp file in output directory
         try:
-            file = str(kwargs.pop('output_dir'))+'detail_temp.csv'
+            file = str(kwargs['output_dir'])+'detail_temp.csv'
         except:
             raise 'kwargs must have output_dir'
@@ -5236 +5233 @@
     keys.sort()
     
-#    for k in kwargs.keys():
     #used the sorted keys to create the header and line data
     for k in keys:
-        print "%s = %s" %(k, kwargs[k]) 
+#        print "%s = %s" %(k, kwargs[k]) 
         header = header+str(k)
         line = line+str(kwargs[k])
@@ -5246 +5242 @@
             header = header+','
             line = line+','
-
+    header+='\n'
+    line+='\n'
 
     # checks the header info, if the same, then write, if not create a new file
     #try to open!
-#    print'file name',file
     try:
         fid = open(file,"r")
@@ -5263 +5259 @@
         try:
             fid = open(file,"w")
-            fid.writelines(header+'\n')
+            fid.write(header)
             fid.close()
             file_header=header
@@ -5271 +5267 @@
             
     #if header is same or this is a new file
-    if file_header.strip('\n')==str(header):
+    if file_header==str(header):
         fid=open(file,"a")
         #write new line
-        fid.writelines(line+'\n')
+        fid.write(line)
         fid.close()
     else:
@@ -5281 +5277 @@
         file = str(kwargs['output_dir'])+'detail_temp.csv'
         fid=open(file,"a")
-        fid.writelines(header+'\n')
-        fid.writelines(line+'\n')
+        fid.write(header)
+        fid.write(line)
         fid.close()
-        print 'file',file_header.strip('\n')
-        print 'head',header.strip('\n')
+        if verbose: print 'file',file_header.strip('\n')
+        if verbose: print 'head',header.strip('\n')
+        if file_header.strip('\n')==str(header): print 'they equal'
         msg = 'WARNING: File header does not match input info, the input variables have changed, suggest to change file name'
         print msg

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6744 +6744 @@
         assert allclose(x[:,0], [1.3, 0.0,4.5, 1.0])
         
-    def xxxtest_store_parameters(self):
+    def test_store_parameters(self):
         
         from os import sep, getenv
         
-        home = getenv('INUNDATIONHOME')
-        output_dir=home+sep+'data'
-        
-        kwargs = {'file_name':'new2.txt','output_dir':output_dir,'who':'me', 'what':'detail', 'how':2, 'why':241,'Completed':'yes'}
-#        {'data_origin': data_georef.get_origin(),
-#                  'mesh_origin': mesh_georef.get_origin(),
-#                  'alpha': alpha,
-#                  'verbose': verbose}
-        
-#        fileName = tempfile.mktemp(".csv")
-#        store_parameters(kwargs,fileName)
-#        file_name='temp.csv'
-        store_parameters(**kwargs)
-#        store_parameters(file_name=file_name, scenario_name='dampier',\
-#                         who="me", time_thining=12,tide=2.6)
-
-        
-        fid = open(str(kwargs.pop('file_name')))
-        header = fid.readline()
-        line = fid.readline()
-        fid.close()
-        print'header',header,'lines',line
+        output_dir=''
+        file_name='details.csv'
+        
+        kwargs = {'file_name':'new2.txt',
+                  'output_dir':output_dir,
+                  'file_name':file_name,
+                  'who':'me',
+                  'what':'detail',
+                  'how':2,
+                  'why':241,
+#                  'completed':345
+                  }
+        store_parameters(verbose=False,**kwargs)
+
+        temp='detail_temp.csv'
+        fid = open(temp)
+        file_header = fid.readline()
+        file_line = fid.readline()
+        fid.close()
+        
+        
+        keys = kwargs.keys()
+        keys.sort()
+        line=''
+        header=''
+        count=0
+        #used the sorted keys to create the header and line data
+        for k in keys:
+#            print "%s = %s" %(k, kwargs[k]) 
+            header = header+str(k)
+            line = line+str(kwargs[k])
+            count+=1
+            if count <len(kwargs):
+                header = header+','
+                line = line+','
+        header+='\n'
+        line+='\n'
+        
         
         #file exists
-#        assert access(file_name,F_OK)
-        a=['who,time']
-#        assert allclose(header, a)
-#        assert allclose(header, [who,time])
-#        assert header=='who,time1
-#        assert allclose(line,['me',12])
+        assert access(temp,F_OK)
+        assert header == file_header
+        assert line == file_line
+        
+        os.remove(temp)
+        
+    def test_store_parameters1(self):
+        
+        from os import sep, getenv
+        
+        output_dir=''
+        file_name='details.csv'
+        
+        kwargs = {'file_name':'new2.txt',
+                  'output_dir':output_dir,
+                  'file_name':file_name,
+                  'who':'me',
+                  'what':'detail',
+                  'how':2,
+                  'why':241,
+#                  'completed':345
+                  }
+        store_parameters(verbose=False,**kwargs)
+        
+        kwargs['how']=55
+        kwargs['completed']=345
+
+        keys = kwargs.keys()
+        keys.sort()
+        line=''
+        header=''
+        count=0
+        #used the sorted keys to create the header and line data
+        for k in keys:
+#            print "%s = %s" %(k, kwargs[k]) 
+            header = header+str(k)
+            line = line+str(kwargs[k])
+            count+=1
+            if count <len(kwargs):
+                header = header+','
+                line = line+','
+        header+='\n'
+        line+='\n'
+        
+        kwargs['how']=55
+        kwargs['completed']=345
+        
+        store_parameters(verbose=False,**kwargs)
+        
+#        temp='detail_temp.csv'
+        fid = open(file_name)
+        file_header = fid.readline()
+        file_line1 = fid.readline()
+        file_line2 = fid.readline()
+        fid.close()
+        
+        
+        #file exists
+#        print 'header',header,'line',line
+#        print 'file_header',file_header,'file_line1',file_line1,'file_line2',file_line2
+        assert access(file_name,F_OK)
+        assert header == file_header
+        assert line == file_line1
+        
+        temp='detail_temp.csv'
+        os.remove(temp)
+        os.remove(file_name)        
+        
+    def test_store_parameters2(self):
+        
+        from os import sep, getenv
+        
+        output_dir=''
+        file_name='details.csv'
+        
+        kwargs = {'file_name':'new2.txt',
+                  'output_dir':output_dir,
+                  'file_name':file_name,
+                  'who':'me',
+                  'what':'detail',
+                  'how':2,
+                  'why':241,
+                  'completed':345
+                  }
+        store_parameters(verbose=False,**kwargs)
+        
+        kwargs['how']=55
+        kwargs['completed']=23.54532
+        
+        store_parameters(verbose=False,**kwargs)
+        
+        keys = kwargs.keys()
+        keys.sort()
+        line=''
+        header=''
+        count=0
+        #used the sorted keys to create the header and line data
+        for k in keys:
+#            print "%s = %s" %(k, kwargs[k]) 
+            header = header+str(k)
+            line = line+str(kwargs[k])
+            count+=1
+            if count <len(kwargs):
+                header = header+','
+                line = line+','
+        header+='\n'
+        line+='\n'
+        
+        fid = open(file_name)
+        file_header = fid.readline()
+        file_line1 = fid.readline()
+        file_line2 = fid.readline()
+        fid.close()
+        
+        assert access(file_name,F_OK)
+        assert header == file_header
+        assert line == file_line2
+        
+        os.remove(file_name)        
+        
 
 
@@ -6786 +6916 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_header')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_export_grid_parallel')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_export_grid')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_store_parameters')
     if len(sys.argv) > 1 and sys.argv[1][0].upper() == 'V':
         Test_Data_Manager.verbose=True