[GRASS-SVN] r67805 - in grass-addons/grass7/raster/r.futures: r.futures.calib r.futures.demand r.futures.pga
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Feb 10 15:11:48 PST 2016
Author: annakrat
Date: 2016-02-10 15:11:48 -0800 (Wed, 10 Feb 2016)
New Revision: 67805
Modified:
grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.html
grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py
grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.html
grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.py
grass-addons/grass7/raster/r.futures/r.futures.pga/r.futures.pga.html
Log:
r.futures: update man pages and fix r.futures.calib after changes in the interface of PGA
Modified: grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.html
===================================================================
--- grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.html 2016-02-10 18:00:30 UTC (rev 67804)
+++ grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.html 2016-02-10 23:11:48 UTC (rev 67805)
@@ -93,16 +93,17 @@
<em><a href="r.futures.pga.html">r.futures.pga</a></em>,
<em><a href="r.futures.devpressure.html">r.futures.devpressure</a></em>,
<em><a href="r.futures.demand.html">r.futures.demand</a></em>,
+<em><a href="r.futures.potential.html">r.futures.potential</a></em>,
<em><a href="r.sample.category.html">r.sample.category</a></em>
<h2>REFERENCES</h2>
<ul>
<li>
- Meentemeyer, R. K., Tang, W., Dorning, M. A., Vogler, J. B., Cunniffe, N. J., & Shoemaker, D. A. (2013).
+ Meentemeyer, R. K., Tang, W., Dorning, M. A., Vogler, J. B., Cunniffe, N. J., & Shoemaker, D. A. (2013).
<a href="http://dx.doi.org/10.1080/00045608.2012.707591">FUTURES: Multilevel Simulations of Emerging
Urban-Rural Landscape Structure Using a Stochastic Patch-Growing Algorithm</a>.
Annals of the Association of American Geographers, 103(4), 785-807.
-<li>Dorning, M. A., Koch, J., Shoemaker, D. A., & Meentemeyer, R. K. (2015).
+<li>Dorning, M. A., Koch, J., Shoemaker, D. A., & Meentemeyer, R. K. (2015).
<a href="http://dx.doi.org/10.1016/j.landurbplan.2014.11.011">Simulating urbanization scenarios reveals
tradeoffs between conservation planning strategies</a>.
Landscape and Urban Planning, 136, 28-39.</li>
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 2016-02-10 18:00:30 UTC (rev 67804)
+++ grass-addons/grass7/raster/r.futures/r.futures.calib/r.futures.calib.py 2016-02-10 23:11:48 UTC (rev 67805)
@@ -102,7 +102,7 @@
#% guisection: PGA
#%end
#%option G_OPT_R_INPUT
-#% key: cons_weight
+#% key: constrain_weight
#% required: no
#% label: Name of raster map representing development potential constraint weight for scenarios
#% description: Values must be between 0 and 1, 1 means no constraint
@@ -183,11 +183,11 @@
#% guisection: PGA
#%end
#%option
-#% key: num_regions
+#% key: num_steps
#% type: integer
-#% required: yes
+#% required: no
#% multiple: no
-#% description: Number of sub-regions (e.g., counties) to be simulated
+#% description: Number of steps to be simulated
#% guisection: PGA
#%end
#%option G_OPT_R_INPUT
@@ -294,11 +294,11 @@
devpot_params=fut_options['devpot_params'], incentive_table=fut_options['incentive_table'],
num_neighbors=fut_options['num_neighbors'], seed_search=fut_options['seed_search'],
development_pressure_approach=fut_options['development_pressure_approach'], gamma=fut_options['gamma'],
- scaling_factor=fut_options['scaling_factor'], num_regions=fut_options['num_regions'],
+ scaling_factor=fut_options['scaling_factor'],
subregions=fut_options['subregions'], demand=fut_options['demand'],
output=development_end)
parameters.update(futures_parameters)
- for not_required in ('cons_weight',):
+ for not_required in ('constrain_weight', 'num_steps'):
if options[not_required]:
parameters.update({not_required: options[not_required]})
Modified: grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.html
===================================================================
--- grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.html 2016-02-10 18:00:30 UTC (rev 67804)
+++ grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.html 2016-02-10 23:11:48 UTC (rev 67805)
@@ -13,7 +13,8 @@
in parameter <b>observed_population</b> as a CSV file.
The format is as follows. First column is time
(matching the time of rasters used in parameter <b>development</b>) and
-first row is the category of the subregion.
+first row is the category of the subregion. The separator can be set
+with parameter <b>separator</b>.
<pre>
year 1 2 ...
1985 19860 10980 ...
@@ -51,7 +52,6 @@
<p>
The format of the output <b>demand</b> table is:
<pre>
-Years_to_simulate: 24
year 1 2 ...
2016 2900 243 ...
2017 2790 240 ...
@@ -69,6 +69,7 @@
<p>
An optional output <b>plot</b> is a plot of the relations for each subregion.
It allows to more effectively assess the relation suitable for each subregion.
+Format of the file is determined from the extension and can be for example PNG, PDF, SVG.
<center>
<img src="r_futures_demand_plot.png">
@@ -93,8 +94,26 @@
<h2>SEE ALSO</h2>
-<em><a href="r.futures.pga.html">r.futures.pga</a></em>
+<a href="r.futures.html">FUTURES</a>,
+<em><a href="r.futures.pga.html">r.futures.pga</a></em>,
+<em><a href="r.futures.devpressure.html">r.futures.devpressure</a></em>,
+<em><a href="r.futures.potential.html">r.futures.potential</a></em>,
+<em><a href="r.futures.calib.html">r.futures.calib</a></em>,
+<em><a href="r.sample.category.html">r.sample.category</a></em>
+<h2>REFERENCES</h2>
+<ul>
+<li>
+ Meentemeyer, R. K., Tang, W., Dorning, M. A., Vogler, J. B., Cunniffe, N. J., & Shoemaker, D. A. (2013).
+ <a href="http://dx.doi.org/10.1080/00045608.2012.707591">FUTURES: Multilevel Simulations of Emerging
+ Urban-Rural Landscape Structure Using a Stochastic Patch-Growing Algorithm</a>.
+ Annals of the Association of American Geographers, 103(4), 785-807.
+<li>Dorning, M. A., Koch, J., Shoemaker, D. A., & Meentemeyer, R. K. (2015).
+ <a href="http://dx.doi.org/10.1016/j.landurbplan.2014.11.011">Simulating urbanization scenarios reveals
+ tradeoffs between conservation planning strategies</a>.
+ Landscape and Urban Planning, 136, 28-39.</li>
+</ul>
+
<h2>AUTHOR</h2>
Anna Petrasova, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU OSGeoREL</a><br>
Modified: grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.py
===================================================================
--- grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.py 2016-02-10 18:00:30 UTC (rev 67804)
+++ grass-addons/grass7/raster/r.futures/r.futures.demand/r.futures.demand.py 2016-02-10 23:11:48 UTC (rev 67805)
@@ -64,7 +64,8 @@
#%option G_OPT_F_OUTPUT
#% key: plot
#% required: no
-#% description: Save plotted relationship between developed cells and population into a file
+#% label: Save plotted relationship between developed cells and population into a file
+#% description: File type is given by extension (.pfd, .png, .svg)
#% guisection: Output
#%end
#%option G_OPT_F_OUTPUT
@@ -75,6 +76,7 @@
#%option G_OPT_F_SEP
#% label: Separator used in input CSV files
#% guisection: Input population
+#% answer: comma
#%end
@@ -216,7 +218,6 @@
# write demand
with open(options['demand'], 'w') as f:
- f.write('Years_to_simulate: {sim}\n'.format(sim=len(simulation_times)))
header = observed_popul.dtype.names # the order is kept here
f.write('\t'.join(header))
f.write('\n')
Modified: grass-addons/grass7/raster/r.futures/r.futures.pga/r.futures.pga.html
===================================================================
--- grass-addons/grass7/raster/r.futures/r.futures.pga/r.futures.pga.html 2016-02-10 18:00:30 UTC (rev 67804)
+++ grass-addons/grass7/raster/r.futures/r.futures.pga/r.futures.pga.html 2016-02-10 23:11:48 UTC (rev 67805)
@@ -107,7 +107,7 @@
compactness_mean=0.4 compactness_range=0.08 num_neighbors=4 seed_search=2 \
patch_sizes=patch_sizes.txt development_pressure=gdp n_dev_neighbourhood=10 \
development_pressure_approach=gravity gamma=2 scaling_factor=1 \
- subregions=subregions num_regions=9 incentive_table=probLookup.csv \
+ subregions=subregions incentive_table=probLookup.csv \
constrain_weight=weight_1 output=final_results output_series=development
</pre></div>
@@ -141,9 +141,11 @@
<em><a href="r.futures.devpressure.html">r.futures.devpressure</a></em>,
<em><a href="r.futures.calib.html">r.futures.calib</a></em>,
<em><a href="r.futures.demand.html">r.futures.demand</a></em>,
+<em><a href="r.futures.potential.html">r.futures.potential</a></em>,
<em><a href="r.sample.category.html">r.sample.category</a></em>
+
<h2>AUTHORS</h2>
<p>
More information about the grass-commit
mailing list