[Greater-commits] r3651 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:36:06 +0200 (Mon, 25 Jul 2011)
New Revision: 3651

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py
Log:
Merged revisions 319 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r319 | aheinecke | 2011-06-30 11:43:33 +0200 (Thu, 30 Jun 2011) | 3 lines
  
  Do not try to call an instance of green_to_red_ramp directly but pass it
  to the generator functions
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315
   + /trunk/GREAT-ER:1-232,310,312-315,319

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py	2011-07-25 13:33:54 UTC (rev 3650)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py	2011-07-25 13:36:06 UTC (rev 3651)
@@ -368,7 +368,7 @@
             _list.sort()
             quantiles, clazz = generate_quantiles(_list,
                                           [ 0.25, 0.50, 0.75, 1.0 ],
-                                          green_to_red_ramp(),
+                                          green_to_red_ramp,
                                           Range(']0;oo['))
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
@@ -467,11 +467,11 @@
         _list.sort()
         if class_ranges[0]:
             quantiles, clazz, upper_class0 = generate_quantiles0(_list, class_ranges,
-                                                           green_to_red_ramp(),
+                                                           green_to_red_ramp,
                                                            Range(']0;oo['))
         else:
             quantiles, clazz = generate_quantiles(_list, class_ranges[1:],
-                                            green_to_red_ramp(),
+                                            green_to_red_ramp,
                                             Range(']0;oo['))
         dg = clazz.GetDefaultGroup()
         dg.GetProperties().SetLineColor(Color(0,0,1))
@@ -533,7 +533,7 @@
         flow_classes = {}
         min, max = rivrestable.ValueRange('q_mean')
         clazz = generate_uniform_distribution(min, max, num_flow_classes,
-                                       green_to_red_ramp())
+                                       green_to_red_ramp)
         for i in range(rivrestable.NumRows()):
             q_mean = rivrestable.ReadValue(i, 'q_mean')
             stretch_id = rivrestable.ReadValue(i, 'stretch_id')
@@ -551,7 +551,7 @@
             _list.append(restable.ReadValue(i, '%s_MEAN' % basename))
         _list.sort()
         quantiles, clazz = generate_quantiles(_list, [ 0.25, 0.50, 0.75, 1.0 ],
-                                        green_to_red_ramp(), Range(']0;oo['))
+                                        green_to_red_ramp, Range(']0;oo['))
         for i in range(restable.NumRows()):
             csim_mean = restable.ReadValue(i, '%s_MEAN' % basename)
             stretch_id = restable.ReadValue(i, 'STRETCH_ID')
@@ -603,7 +603,7 @@
             _list = combined_classes_dict.keys()
             _list.sort()
             clazz = generate_singletons(_list,
-                                        numGroups, green_to_red_ramp())
+                                        numGroups, green_to_red_ramp)
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
             dg.SetVisible(0)
@@ -968,7 +968,7 @@
     
             _list.sort()
             quantiles, clazz = generate_quantiles(_list, [ 0.25, 0.50, 0.75, 1.0 ],
-                                            green_to_red_ramp(), Range(']0;oo['))
+                                            green_to_red_ramp, Range(']0;oo['))
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
             dg.SetLabel('0')
@@ -1035,7 +1035,7 @@
     
             _list.sort()
             quantiles, clazz = generate_quantiles(_list, [ 0.25, 0.50, 0.75, 1.0 ],
-                                            green_to_red_ramp(), Range(']0;oo['))
+                                            green_to_red_ramp, Range(']0;oo['))
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
             dg.SetLabel('0')
@@ -1132,7 +1132,7 @@
             layer.SetGreaterLayerType('RIVERNETRISK')
         
             # attach a classification to the layer
-            clazz = generate_uniform_distribution(1, 10, 2, green_to_red_ramp())
+            clazz = generate_uniform_distribution(1, 10, 2, green_to_red_ramp)
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
             dg.SetVisible(0)