Changeset 9244

Timestamp:

Jul 4, 2014, 3:12:11 PM (10 years ago)

Author:

davies

Message:

Changing interface to composite_quantity_setting_function for consistency with other functions

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• quantity_setting_functions.py (modified) (5 diffs)
• test_quantity_setting_functions.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/utilities/quantity_setting_functions.py

@@ -74 +74 @@
 ###################################################################################################
 
-def composite_quantity_setting_function(fun_poly_pairs, domain):
+def composite_quantity_setting_function(poly_fun_pairs, domain):
     """
         Make a 'composite function' to set quantities -- applies different functions inside different polygon regions.
              
-        fun_poly_pairs = [ [f0, p0], [f1, p1], ...] 
+        poly_fun_pairs = [ [p0, f0], [p1, f1], ...] 
                     where fi is a function, or a constant, or the name of a gdal-compatible rasterFile; 
                     and pi is a polygon, or None, or 'All' (or it can be 'Extent' in the case that fi is a rasterFile name)
@@ -90 +90 @@
 
         INPUT: 
-              fun_poly_pairs = [ [f0, p0], [f1, p1], ...]
+              poly_fun_pairs = [ [p0, f0], [p1, f1], ...]
 
                   where fi(x,y) are functions returning quantity values at
@@ -123 +123 @@
         isSet=scipy.zeros(len(x)) # Record if each point has been set
         quantityVal=x*0 # F value
-        lfp=len(fun_poly_pairs)
+        lfp=len(poly_fun_pairs)
         if(lfp<=0):
             raise Exception, 'Must have at least 1 fun-poly-pair'
@@ -135 +135 @@
         # Test that none of the pi polygons [except perhaps the last] is 'All'
         for i in range(lfp-1):
-            if (fun_poly_pairs[i][1]=='All'):
-                # This is only ok if all the othe fun_poly_pairs are None
-                remaining_fun_poly_pairs_are_None=[ fun_poly_pairs[j][1] is None for j in range(i+1,lfp)]
-                if(not all(remaining_fun_poly_pairs_are_None)):
+            if (poly_fun_pairs[i][0]=='All'):
+                # This is only ok if all the othe poly_fun_pairs are None
+                remaining_poly_fun_pairs_are_None=[ poly_fun_pairs[j][0] is None for j in range(i+1,lfp)]
+                if(not all(remaining_poly_fun_pairs_are_None)):
                     raise Exception, 'Can only have the last polygon = All'
 
         # Apply the fi inside the pi
         for i in range(lfp):
-            fi = fun_poly_pairs[i][0] # The function
-            pi = fun_poly_pairs[i][1] # The polygon
+            fi = poly_fun_pairs[i][1] # The function
+            pi = poly_fun_pairs[i][0] # The polygon
 
             # Quick exit
@@ -246 +246 @@
     for i in range(len(Pt_Pol_Data)):
         qFunChanList.append([
-             make_nearestNeighbour_quantity_function(Pt_Pol_Data[i][1], domain), 
-             Pt_Pol_Data[i][0]
+             Pt_Pol_Data[i][0],
+             make_nearestNeighbour_quantity_function(Pt_Pol_Data[i][1], domain) 
                               ])
 
     #
-    qFun=composite_quantity_setting_function(qFunChanList+[[qFun1, 'All']], domain)
+    qFun=composite_quantity_setting_function(qFunChanList+[['All', qFun1]], domain)
 
     return qFun

trunk/anuga_core/source/anuga/utilities/test_quantity_setting_functions.py

@@ -161 +161 @@
  
         # This example uses a constant, and a raster, to set the quantity           
-        F=qs.composite_quantity_setting_function([[-1000., trenchPoly], ['PointData_ElevTest.tif', 'Extent']],\
+        F=qs.composite_quantity_setting_function([[trenchPoly, -1000.], ['Extent', 'PointData_ElevTest.tif']],\
                                                 domain) 
 
@@ -183 +183 @@
         def f0(x,y):
             return x/10.
-        F=qs.composite_quantity_setting_function([[f0, trenchPoly], ['PointData_ElevTest.tif', 'Extent']],\
+        F=qs.composite_quantity_setting_function([[trenchPoly, f0], ['Extent', 'PointData_ElevTest.tif']],\
                                                 domain) 
         fitted=F(testPts_X,testPts_Y)
@@ -196 +196 @@
 
         # This example uses 'All' as a polygon
-        F=qs.composite_quantity_setting_function([[f0, 'All'], ['PointData_ElevTest.tif', None]],\
+        F=qs.composite_quantity_setting_function([['All', f0 ], [None, 'PointData_ElevTest.tif']],\
                                                 domain) 
         fitted=F(testPts_X,testPts_Y)
@@ -206 +206 @@
         # This example should fail
         try:
-            F=qs.composite_quantity_setting_function([[f0, 'All'], ['PointData_ElevTest.tif', 'All']],\
+            F=qs.composite_quantity_setting_function([['All', f0], ['All', 'PointData_ElevTest.tif']],\
                                                     domain) 
             raise Exception, 'The last command should fail'