[GRASS-SVN] r49393 - grass-addons/raster/r.pi/r.pi.searchtime

[svn_grass at osgeo.org]

Author: wegmann
Date: 2011-11-27 07:56:21 -0800 (Sun, 27 Nov 2011)
New Revision: 49393

Modified:
   grass-addons/raster/r.pi/r.pi.searchtime/description.html
   grass-addons/raster/r.pi/r.pi.searchtime/main.c
Log:
changed costmap to suitability -> congruent with r.pi.energy and more intuitive

Modified: grass-addons/raster/r.pi/r.pi.searchtime/description.html
===================================================================
--- grass-addons/raster/r.pi/r.pi.searchtime/description.html	2011-11-27 15:45:55 UTC (rev 49392)
+++ grass-addons/raster/r.pi/r.pi.searchtime/description.html	2011-11-27 15:56:21 UTC (rev 49393)
@@ -7,6 +7,7 @@
 
 <h2>NOTES</h2>
 
+The suitability matrix impacts the step direction of individuals. If individuals are moving beyond the mapset borders the indivuals are set back to their original source patches.
 
 <h2>EXAMPLE</h2>
 
@@ -61,8 +62,8 @@
 the previous examples assumed a homogeneous matrix, a heterogenous matrix can be included using a raster file which values are taken as costs for movement (0-100):
 <div class="code"><pre>
 # it is assumed that our species is a forest species and cannot move through water, hence a cost of 100, does not like urban areas (class: 6, cost: 10) but can disperse through shrubland (class 4, cost=1) better than through grassland (class 3, cost: 2):
-r.mapcalc "cost_raster = if(landclass96==5,0,if(landclass96 == 1, 10, if (landclass96==3,2, if(landclass96==4,1,if(landclass96==6,100)))))"
-r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 costmap=cost_raster
+r.mapcalc "suit_raster = if(landclass96==5,0,if(landclass96 == 1, 10, if (landclass96==3,2, if(landclass96==4,1,if(landclass96==6,100)))))"
+r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 suitability=suit_raster
 </pre></div>
 
 

Modified: grass-addons/raster/r.pi/r.pi.searchtime/main.c
===================================================================
--- grass-addons/raster/r.pi/r.pi.searchtime/main.c	2011-11-27 15:45:55 UTC (rev 49392)
+++ grass-addons/raster/r.pi/r.pi.searchtime/main.c	2011-11-27 15:56:21 UTC (rev 49393)
@@ -100,7 +100,7 @@
     parm.input = G_define_standard_option(G_OPT_R_INPUT);
 
     parm.costmap = G_define_option();
-    parm.costmap->key = "costmap";
+    parm.costmap->key = "suitability";
     parm.costmap->type = TYPE_STRING;
     parm.costmap->required = NO;
     parm.costmap->gisprompt = "old,cell,raster";