[GRASS-SVN] r66761 - grass-addons/grass7/raster/r.futures/r.futures.calib

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-11-06 15:05:13 -0800 (Fri, 06 Nov 2015)
New Revision: 66761

Modified:
   grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py
Log:
r.futures: fix calling PGA in calibration and sync PGA and calibration parameters

Modified: grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py
===================================================================
--- grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py	2015-11-06 14:21:23 UTC (rev 66760)
+++ grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py	2015-11-06 23:05:13 UTC (rev 66761)
@@ -98,7 +98,7 @@
 #%option G_OPT_R_INPUT
 #% key: development_pressure
 #% required: yes
-#% description: Files containing the information to read in
+#% description: Raster map of development pressure
 #% guisection: PGA
 #%end
 #%option G_OPT_R_INPUT
@@ -142,6 +142,7 @@
 #% required: yes
 #% multiple: no
 #% options: 4,8
+#% answer: 4
 #% description: The number of neighbors to be used for patch generation (4 or 8)
 #% guisection: PGA
 #%end
@@ -151,7 +152,8 @@
 #% required: yes
 #% multiple: no
 #% options: 1,2
-#% description: The way that the location of a seed is determined
+#% answer: 2
+#% description: The way location of a seed is determined (1: uniform distribution 2: development probability)
 #% guisection: PGA
 #%end
 #%option
@@ -277,7 +279,7 @@
 
 
 def run_simulation(development_start, development_end, compactness_mean, compactness_range, discount_factor, patches_file, fut_options):
-    parameters = dict(patch_mean=compactness_mean, patch_range=compactness_range,
+    parameters = dict(compactness_mean=compactness_mean, compactness_range=compactness_range,
                       discount_factor=discount_factor, patch_sizes=patches_file,
                       developed=development_start)
     futures_parameters = dict(development_pressure=fut_options['development_pressure'],