[GRASS-SVN] r70865 - in grass-addons/grass7/raster/r.pi: r.pi.corearea r.pi.corr.mw r.pi.csr.mw r.pi.energy r.pi.energy.pr r.pi.export r.pi.fnn r.pi.graph r.pi.graph.dec r.pi.graph.pr r.pi.graph.red r.pi.grow r.pi.import r.pi.index r.pi.lm r.pi.nlm r.pi.nlm.circ r.pi.nlm.stats r.pi.odc r.pi.prob.mw r.pi.prox r.pi.rectangle r.pi.searchtime r.pi.searchtime.mw r.pi.searchtime.pr
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Apr 12 00:26:09 PDT 2017
Author: mmetz
Date: 2017-04-12 00:26:09 -0700 (Wed, 12 Apr 2017)
New Revision: 70865
Modified:
grass-addons/grass7/raster/r.pi/r.pi.corearea/r.pi.corearea.html
grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html
grass-addons/grass7/raster/r.pi/r.pi.csr.mw/r.pi.csr.mw.html
grass-addons/grass7/raster/r.pi/r.pi.energy.pr/search.c
grass-addons/grass7/raster/r.pi/r.pi.energy/r.pi.energy.html
grass-addons/grass7/raster/r.pi/r.pi.energy/search.c
grass-addons/grass7/raster/r.pi/r.pi.export/r.pi.export.html
grass-addons/grass7/raster/r.pi/r.pi.fnn/r.pi.fnn.html
grass-addons/grass7/raster/r.pi/r.pi.graph.dec/r.pi.graph.dec.html
grass-addons/grass7/raster/r.pi/r.pi.graph.pr/r.pi.graph.pr.html
grass-addons/grass7/raster/r.pi/r.pi.graph.red/r.pi.graph.red.html
grass-addons/grass7/raster/r.pi/r.pi.graph/r.pi.graph.html
grass-addons/grass7/raster/r.pi/r.pi.grow/r.pi.grow.html
grass-addons/grass7/raster/r.pi/r.pi.import/r.pi.import.html
grass-addons/grass7/raster/r.pi/r.pi.index/r.pi.index.html
grass-addons/grass7/raster/r.pi/r.pi.lm/r.pi.lm.html
grass-addons/grass7/raster/r.pi/r.pi.nlm.circ/r.pi.nlm.circ.html
grass-addons/grass7/raster/r.pi/r.pi.nlm.stats/r.pi.nlm.stats.html
grass-addons/grass7/raster/r.pi/r.pi.nlm/r.pi.nlm.html
grass-addons/grass7/raster/r.pi/r.pi.odc/r.pi.odc.html
grass-addons/grass7/raster/r.pi/r.pi.prob.mw/r.pi.prob.mw.html
grass-addons/grass7/raster/r.pi/r.pi.prox/r.pi.prox.html
grass-addons/grass7/raster/r.pi/r.pi.rectangle/r.pi.rectangle.html
grass-addons/grass7/raster/r.pi/r.pi.searchtime.mw/r.pi.searchtime.mw.html
grass-addons/grass7/raster/r.pi/r.pi.searchtime.pr/search.c
grass-addons/grass7/raster/r.pi/r.pi.searchtime/r.pi.searchtime.html
grass-addons/grass7/raster/r.pi/r.pi.searchtime/search.c
Log:
r.pi: more bug fixes, clean up manuals
Modified: grass-addons/grass7/raster/r.pi/r.pi.corearea/r.pi.corearea.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corearea/r.pi.corearea.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.corearea/r.pi.corearea.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,10 +1,20 @@
<h2>DESCRIPTION</h2>
-Edge effects and core area analysis of landcover fragments. This module can compute static edge effects (defined edge depth) and dynamic edge effects (based on surrounding landscape). The impact of the surrounding landscape can be accounted for and the resulting core area is provided.
+Edge effects and core area analysis of landcover fragments. This module
+can compute static edge effects (defined edge depth) and dynamic edge
+effects (based on surrounding landscape). The impact of the surrounding
+landscape can be accounted for and the resulting core area is provided.
<h2>NOTES</h2>
-This module is generating core areas based on defined edge depths. The edge depths can be increased by the values of a <em>costmap</em> (e.g. urban areas could have a more severe impact than secondary forest on forest fragments). Moreover a friction map (<em> propmap</em> within the fragments can lower the impact of surrounding landcover types and hence an increased edge depth (e.g. a river or escarpment which might lower the edge effects). Moreover a <em> dist_weight</em> can be assigned in order to increase the weight of closer pixel values.
+This module is generating core areas based on defined edge depths. The
+edge depths can be increased by the values of a <em>costmap</em> (e.g.
+urban areas could have a more severe impact than secondary forest on
+forest fragments). Moreover a friction map (<em> propmap</em> within
+the fragments can lower the impact of surrounding landcover types and
+hence an increased edge depth (e.g. a river or escarpment which might
+lower the edge effects). Moreover a <em> dist_weight</em> can be
+assigned in order to increase the weight of closer pixel values.
<h3>Distance weight</h3>
@@ -13,32 +23,48 @@
where:<br>
-d = Distance of the respective cell
-d_max - the defined maximum distance
-dist_weight - the parameter how to weight the pixel values in the landscape depending on the distance <br>
+<ul>
+<li>d = Distance of the respective cell
+<li>d_max - the defined maximum distance
+<li>dist_weight - the parameter how to weight the pixel values in the landscape depending on the distance <br>
+</ul>
-the <em>dist_weight</em> has a range between 0 and 1 and results in:<br>
+the <em>dist_weight</em> has a range between 0 and 1 and results in:
-0 < dist_weight < 0.5: the weighting curve decreases at low distances to the fragment and lowers to a weight of 0 at d=d_max <br>
+<ul>
+<li>0 < dist_weight < 0.5: the weighting curve decreases at low
+distances to the fragment and lowers to a weight of 0 at d=d_max
-dist_weight = 0.5: linear decrease of weight until weight of 0 at d = d_max <br>
+<li>dist_weight = 0.5: linear decrease of weight until weight of 0 at d = d_max
-0.5 < dist_weight < 1: the weighting curve decreases slowly at low distances and approaches weight value of 0 at higher distances from the fragment, the weight value 0 is reached at d = d_max <br>
+<li>0.5 < dist_weight < 1: the weighting curve decreases slowly
+at low distances and approaches weight value of 0 at higher distances
+from the fragment, the weight value 0 is reached at d = d_max
-dist_weight = 1: no distance weight applied, common static edge depth used
+<li>dist_weight = 1: no distance weight applied, common static edge
+depth used
+</ul>
-
<h3>propmap</h3>
-The <em>propmap</em> minimizes the effect of the edge depth and the surrounding matrix. This has an ecological application if certain landscape features inside a e.g. forest fragment hamper the human impact (edge effects). <br>
+The <em>propmap</em> minimizes the effect of the edge depth and the
+surrounding matrix. This has an ecological application if certain
+landscape features inside a e.g. forest fragment hamper the human
+impact (edge effects). <br>
-two method exist:<br>
+two methods exist:<br>
-propmethod=linear: propagated value = actual value - (propmap value at this position)<br>
-propmethod=exponential: propagated value = actual value / (propmap value at this position) <br>
+<ul>
+<li>propmethod=linear: propagated value = actual value - (propmap value at this position)<br>
+<li>propmethod=exponential: propagated value = actual value / (propmap value at this position) <br>
+</ul>
-If 0 is chosen using the linear method, then propagated value=actual value which results in a buffering of the whole region. In order to minimize the impact the value must be larger than 1. For the exponential method a value of below 1 should not be chosen, otherwise it will be propagated infinitely.
+If 0 is chosen using the linear method, then propagated value=actual
+value which results in a buffering of the whole region. In order to
+minimize the impact the value must be larger than 1. For the
+exponential method a value of below 1 should not be chosen, otherwise
+it will be propagated infinitely.
Modified: grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>r.corr.mw</em> provides information concerning the correlation
+<em>r.pi.corr.mw</em> provides information concerning the correlation
of pixels inside a moving window between two raster files.
<p>
It calculates correlation of two raster maps by calculating correlation
@@ -22,7 +22,7 @@
precision
<div class="code"><pre>
g.region rast=elevation -p
-r.pi.corrwin input1=slope input2=elevation output=corrwin1 size=7 max=10000
+r.pi.corr.mw input1=slope input2=elevation output=corrwin1 size=7 max=10000
r.colors corrwin1 col=bgyr
</pre></div>
Modified: grass-addons/grass7/raster/r.pi/r.pi.csr.mw/r.pi.csr.mw.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.csr.mw/r.pi.csr.mw.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.csr.mw/r.pi.csr.mw.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -12,7 +12,8 @@
An example for the North Carolina sample dataset:
-Compute the CSR for the whole landscape of <em>landclass96</em> using class 5 (1000 iteration) using the Clark Evans method:<br>
+Compute the CSR for the whole landscape of <em>landclass96</em> using
+class 5 (1000 iteration) using the Clark Evans method:<br>
<div class="code"><pre>
v.random output=randompoints n=100 zmin=0.0 zmax=0.0
v.to.rast input=randompoints output=randompoints use=val val=1
@@ -20,7 +21,9 @@
</pre></div>
The results for the whole landscape is prompted to the console.
-Compute the CSR for a defined moving window size of <em>landclass96</em> using class 5 (1000 iteration, Clark Evans method):<br>
+Compute the CSR for a defined moving window size of
+<em>landclass96</em> using class 5 (1000 iteration, Clark Evans
+method):<br>
<div class="code"><pre>
r.pi.csr.mw input=randompoints keyval=5 n=1000 method=clark_evans size=7 output=csr1
</pre></div>
@@ -30,7 +33,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
<a href="r.pi.graph.dec.html">r.pi.graph.dec</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.energy/r.pi.energy.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.energy/r.pi.energy.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.energy/r.pi.energy.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,20 +1,34 @@
<h2>DESCRIPTION</h2>
-Isolation or connectivity of singular patches of a defined landcover class using individual-based dispersal models. This function is based on a maximum amount of energy for each individuals dispersing through the landscape which is deminished by a fricition or cost map. Unlike the related function <em>r.pi.energy</em> does this function allows individuals to stay or move within a patch until the energy is depleted.
+Isolation or connectivity of singular patches of a defined landcover
+class using individual-based dispersal models. This function is based
+on a maximum amount of energy for each individuals dispersing through
+the landscape which is deminished by a fricition or cost map. Unlike
+the related function <em>r.pi.energy</em> does this function allows
+individuals to stay or move within a patch until the energy is
+depleted.
<h2>NOTES</h2>
-Amount of successful immigrants or emigrants are not taken individual into account which emigrated from and immigrated into the same patch (pseudo immigration).
+Amount of successful immigrants or emigrants are not taken individual
+into account which emigrated from and immigrated into the same patch
+(pseudo immigration).
+<p>
+The suitability matrix impacts the step direction, while the costmap
+relates to the depletion of assigned energy.
+<p>
+If individuals are moving beyond the mapset borders the indivuals are
+set back to their original source patches.
-The suitability matrix impacts the step direction, while the costmap relates to the depletion of assigned energy.
-
-If individuals are moving beyond the mapset borders the indivuals are set back to their original source patches.
-
<h2>EXAMPLE</h2>
An example for the North Carolina sample dataset:
-The amount of successful emigrants (*_emi), immigrants (*_imi), the percentage of immigrants per patch (*_imi_percent), the amount of lost indivuals (*_lost), the amount of migrants (*_mig), successful (*_mig_succ) and unsuccessful migrants (_mig_unsucc) can be retrieved using this command:
+The amount of successful emigrants (*_emi), immigrants (*_imi), the
+percentage of immigrants per patch (*_imi_percent), the amount of lost
+indivuals (*_lost), the amount of migrants (*_mig), successful
+(*_mig_succ) and unsuccessful migrants (_mig_unsucc) can be retrieved
+using this command:
<div class="code"><pre>
r.pi.energy input=landclass96 output=energy1 keyval=5 n=1000 step_length=5 energy=10 percent=80
</pre></div>
@@ -28,7 +42,11 @@
introducing a suitability for the movement:
<div class="code"><pre>
-# the suitability for the next step selection is defined as: class 5 and 3 (forest and grassland) have a high suitability, while shrubland (class 4) only a moderate and water and developed areas (class 6 and 1) have a very low suitability:
+# the suitability for the next step selection is defined as: class 5
+# and 3 (forest and grassland) have a high suitability, while shrubland
+# (class 4) only a moderate and water and developed areas (class 6 and 1)
+# have a very low suitability:
+
r.mapcalc "suit_raster = if(landclass96==5,100,if(landclass96 == 3, 100, if (landclass96==1,1, if(landclass96==6,1,if(landclass96==4,50)))))"
r.pi.energy input=landclass96 output=energyiter3 keyval=5 n=1000 step_length=5 energy=10 percent=80 suitability=suit_raster
</pre></div>
@@ -45,17 +63,16 @@
r.pi.energy input=landclass96 output=energyiter keyval=5 n=1000 step_length=5 energy=10 percent=80 stats=average multiplicator=10
</pre></div>
-output of each movement location for a defined step frequency. Here every 10th step is provided as output raster:
+output of each movement location for a defined step frequency. Here
+every 10th step is provided as output raster:
<div class="code"><pre>
r.pi.energy input=landclass96 output=energyiter keyval=5 n=1000 step_length=5 energy=10 percent=80 stats=average out_freq=10
</pre></div>
-
-
<h2>SEE ALSO</h2>
<em>
-<a href="r.pi.energy.iter.html">r.pi.energy.iter</a>,
+<a href="r.pi.energy.pr.html">r.pi.energy.pr</a>,
<a href="r.pi.energy.html">r.pi.energy</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.energy/search.c
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.energy/search.c 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.energy/search.c 2017-04-12 07:26:09 UTC (rev 70865)
@@ -119,11 +119,11 @@
if (x < sx - 1 && map[x + 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.0;
- if (y > 0 && map[x + (y + 1) * sx] == TYPE_NOTHING)
+ if (y < sy - 1 && map[x + (y + 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.25;
if (x > 0 && map[x - 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.5;
- if (y < sy - 1 && map[x + (y - 1) * sx] == TYPE_NOTHING)
+ if (y > 0 && map[x + (y - 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.75;
pick = count * Randomf();
Modified: grass-addons/grass7/raster/r.pi/r.pi.energy.pr/search.c
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.energy.pr/search.c 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.energy.pr/search.c 2017-04-12 07:26:09 UTC (rev 70865)
@@ -119,11 +119,11 @@
if (x < sx - 1 && map[x + 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.0;
- if (y > 0 && map[x + (y + 1) * sx] == TYPE_NOTHING)
+ if (y < sy - 1 && map[x + (y + 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.25;
if (x > 0 && map[x - 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.5;
- if (y < sy - 1 && map[x + (y - 1) * sx] == TYPE_NOTHING)
+ if (y > 0 && map[x + (y - 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.75;
pick = count * Randomf();
Modified: grass-addons/grass7/raster/r.pi/r.pi.export/r.pi.export.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.export/r.pi.export.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.export/r.pi.export.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,6 +1,9 @@
<h2>DESCRIPTION</h2>
-This module exports raster patch values (no single pixels, but single individual patch values), which can be used for subsequent analysis in R and later import into GRASS again, using <a href="r.pi.import.html">r.pi.import</a>.
+This module exports raster patch values (no single pixels, but single
+individual patch values), which can be used for subsequent analysis in
+R and later import into GRASS again, using
+<a href="r.pi.import.html">r.pi.import</a>.
<h2>NOTES</h2>
@@ -21,17 +24,27 @@
</pre></div>
various resulting files are generated:<br>
-<em>patch_area_out</em>: a text file with the <em>average</em>, <em>variance</em> and <em>minimum</em> statistics as defined above and additionally informaton about the percentage coverage (<em>landcover</em>) and the number of fragments (<em>number</em>) of the analysed landcover.
+<em>patch_area_out</em>: a text file with the <em>average</em>,
+<em>variance</em> and <em>minimum</em> statistics as defined above and
+additionally informaton about the percentage coverage
+(<em>landcover</em>) and the number of fragments (<em>number</em>) of
+the analysed landcover.
<br>
-<em>patch_area_values</em>: a text file with the actual patch values not the statistics. The first column is providing the corresponding patch ID, which is also existing in the <em>forestclass5_ID</em> raster map (here:0-878). The second column is providing the percentage cover of each patch (sum is equal the overall coverage: 0.506). The third column is holding the actual patch index value (here area; e.g. patch 0: 12).
+<em>patch_area_values</em>: a text file with the actual patch values
+not the statistics. The first column is providing the corresponding
+patch ID, which is also existing in the <em>forestclass5_ID</em> raster
+map (here:0-878). The second column is providing the percentage cover
+of each patch (sum is equal the overall coverage: 0.506). The third
+column is holding the actual patch index value (here area; e.g. patch
+0: 12).
<h2>SEE ALSO</h2>
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
<a href="r.pi.graph.dec.html">r.pi.graph.dec</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.fnn/r.pi.fnn.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.fnn/r.pi.fnn.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.fnn/r.pi.fnn.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -2,8 +2,10 @@
Determine the functional nearest-neighbor distance analysis.
-<em>r.pi.fnn</em> is a patch based ecological/functional nearest
-neighbour analysis module. It computes distance based on a friction map. This module is related to <em>r.pi.enn</em> but more adequat if the ecological connectivity should be analysed.
+<em>r.pi.fnn</em> is a patch based ecological/functional nearest
+neighbour analysis module. It computes distance based on a friction
+map. This module is related to <em>r.pi.enn</em> but more adequate if
+the ecological connectivity should be analysed.
<h2>NOTES</h2>
@@ -101,7 +103,8 @@
An example for the North Carolina sample dataset:
-Computing the functional or ecological distance to the first to nth nearest neighrbours using a cost matrix:
+Computing the functional or ecological distance to the first to nth
+nearest neighrbours using a cost matrix:
<div class="code"><pre>
r.mapcalc "cost_raster = if(landclass96==5,1,if(landclass96 == 1, 10, if (landclass96==3,2, if(landclass96==4,1,if(landclass96==6,100)))))"
r.pi.fnn input=landclass96 keyval=5 costmap=cost_raster output=fnn1 method=distance number=10 statmethod=average
Modified: grass-addons/grass7/raster/r.pi/r.pi.graph/r.pi.graph.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.graph/r.pi.graph.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.graph/r.pi.graph.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -10,14 +10,19 @@
An example for the North Carolina sample dataset using class 5 (forest):
-Computing a graph of all patches (4 neighbourhood rule) using a maximum distance of 10 pixel, the Gabriel method and as resulting index the <em> largest patch diameter</em>:
+Computing a graph of all patches (4 neighbourhood rule) using a maximum
+distance of 10 pixel, the Gabriel method and as resulting index the
+<em> largest patch diameter</em>:
<div class="code"><pre>
r.pi.graph input=landclass96 output=landclass96_graph keyval=5 distance=10 neighborhood=gabriel index=largest_patch_diameter
</pre></div>
-the results are 2 files:
-landclass96_graph: the information of the index are provided (here a range of 3-589 of patch diameter)
-landclass96_graph_clusters: the generated cluster IDs are provided (here 16 clusters are identified), doing it with a distance of 5 pixel is resulting in a total of 66 cluster.
+the results are 2 files: <br>
+landclass96_graph: the information of the index are provided (here a
+range of 3-589 of patch diameter)<br>
+landclass96_graph_clusters: the generated cluster IDs are provided
+(here 16 clusters are identified), doing it with a distance of 5 pixel
+is resulting in a total of 66 clusters.
@@ -26,7 +31,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.dec.html">r.pi.graph.dec</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.graph.dec/r.pi.graph.dec.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.graph.dec/r.pi.graph.dec.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.graph.dec/r.pi.graph.dec.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.graph.pr/r.pi.graph.pr.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.graph.pr/r.pi.graph.pr.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.graph.pr/r.pi.graph.pr.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.graph.red/r.pi.graph.red.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.graph.red/r.pi.graph.red.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.graph.red/r.pi.graph.red.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.grow/r.pi.grow.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.grow/r.pi.grow.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.grow/r.pi.grow.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.import/r.pi.import.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.import/r.pi.import.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.import/r.pi.import.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,6 +1,7 @@
<h2>DESCRIPTION</h2>
-Import and generation of patch raster data based on individual patch based raster data.
+Import and generation of patch raster data based on individual patch
+based raster data.
<h2>NOTES</h2>
@@ -10,7 +11,8 @@
An example for the North Carolina sample dataset:
-In order to run <em>r.pi.import</em> we need an exported patch index raster:
+In order to run <em>r.pi.import</em> we need an exported patch index
+raster:
<div class="code"><pre>
r.pi.index input=landclass96 output=landclass96_forestclass5_area keyval=5 method=area
</pre></div>
@@ -26,7 +28,8 @@
r.pi.import input=patch_area_values raster=landclass96 output=imported_values keyval=5 id_col=1 val_col=2
</pre></div>
-if you want to export the patch values to R and do e.g. a linear regression of two patch values and import them again in GRASS, do:<br>
+if you want to export the patch values to R and do e.g. a linear
+regression of two patch values and import them again in GRASS, do:<br>
apply r.pi.export with two indices (A and B), in R do:
Modified: grass-addons/grass7/raster/r.pi/r.pi.index/r.pi.index.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.index/r.pi.index.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.index/r.pi.index.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>r.fragment</em> is a patch based fragmentation analysis package.
+<em>r.pi.index</em> is a patch based fragmentation analysis package.
Computation of basic fragmentation indices can be accomplished.
<p>
@@ -12,12 +12,13 @@
<h2>NOTES</h2>
-The <em>Nearest Neighbour Index</em> (ENN) analyse the Euclidean Nearest
-Neighbour to the first neighbouring patch. The output value is in pixel and can
-be converted to a distance values using g.region resolution information.
-<em>r.pi.enn</em> and <em>r.fragment.fnn</em> provide the same analysis concerning the
- first nearest neighbour (NN), but are extended to the n-th NN. However due to
-code construction does the <em>r.pi.index</em> distance analysis to first ENN perform faster.
+The <em>Nearest Neighbour Index</em> (ENN) analyse the Euclidean
+Nearest Neighbour to the first neighbouring patch. The output value is
+in pixel and can be converted to a distance values using g.region
+resolution information. <em>r.pi.enn</em> and <em>r.pi.fnn</em>
+provide the same analysis concerning the first nearest neighbour (NN),
+but are extended to the n-th NN. However due to code construction does
+the <em>r.pi.index</em> distance analysis to first ENN perform faster.
<em>Methods:</em>
@@ -71,7 +72,8 @@
<h2>EXAMPLE</h2>
-Examples based on the North Carolina sample dataset are provided below. Indices are calculated for the landscape class 5 (forest).
+Examples based on the North Carolina sample dataset are provided below.
+Indices are calculated for the landscape class 5 (forest).
set region settings to used landcover class map:
Modified: grass-addons/grass7/raster/r.pi/r.pi.lm/r.pi.lm.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.lm/r.pi.lm.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.lm/r.pi.lm.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.nlm/r.pi.nlm.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.nlm/r.pi.nlm.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.nlm/r.pi.nlm.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,24 +1,35 @@
<h2>DESCRIPTION</h2>
-Creates a random generated map with values 0 or 1" "by given landcover and agglomeration value.
+Creates a random generated map with values 0 or 1" "by given landcover
+and agglomeration value.
<h2>NOTES</h2>
-Related to r.pi.nlm.circ but using fractal landscapes instead of circular growth. Per default the size of the whole region is used for generating a random landscape, this can be constraint by assigning a class in a raster map with acts as mask for the generation of the random landscape (<em>nullval</em>).
-The landcover can be set manually, randomly or be taken from the input class coverage. The agglomeration level (<em>sharpness</em>) can be set manually or randomly. If similar random landscape with differing e.g. percentage coverage should be generated, then the <em>seed</em> can be set using any number and reused for any subsequent analysis.
+Related to r.pi.nlm.circ but using fractal landscapes instead of
+circular growth. Per default the size of the whole region is used for
+generating a random landscape, this can be constraint by assigning a
+class in a raster map with acts as mask for the generation of the
+random landscape (<em>nullval</em>). The landcover can be set manually,
+randomly or be taken from the input class coverage. The agglomeration
+level (<em>sharpness</em>) can be set manually or randomly. If similar
+random landscape with differing e.g. percentage coverage should be
+generated, then the <em>seed</em> can be set using any number and
+reused for any subsequent analysis.
<h2>EXAMPLE</h2>
An example for the North Carolina sample dataset:
-A random landscape with random percentage coverage and agglomeration factor:<br>
+A random landscape with random percentage coverage and agglomeration
+factor:<br>
<div class="code"><pre>
r.pi.nlm output=nlm.1 landcover=50 --o
</pre></div>
-A random landscape is generated using the percentage coverage of class 5. The agglomeration factor is set randomly:<br>
+A random landscape is generated using the percentage coverage of class
+5. The agglomeration factor is set randomly:<br>
<div class="code"><pre>
r.pi.nlm input=landclass96 output=nlm.2 keyval=5 --o
@@ -27,8 +38,8 @@
<h2>SEE ALSO</h2>
<em>
-<a href="r.nlm.html">r.nlm</a>,
-<a href="r.nlm.stats.html">r.nlm.stats</a>,
+<a href="r.pi.nlm.circ.html">r.pi.nlm.circ</a>,
+<a href="r.pi.nlm.stats.html">r.pi.nlm.stats</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.nlm.circ/r.pi.nlm.circ.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.nlm.circ/r.pi.nlm.circ.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.nlm.circ/r.pi.nlm.circ.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,16 +1,14 @@
<h2>DESCRIPTION</h2>
-<em>r.nlm</em> is a random patch generator. It creates a random landscape
-with defined attributes.
+<em>r.pi.nlm.circ</em> is a random patch generator. It creates a random
+landscape with defined attributes.
<h2>NOTES</h2>
-The user must specify the names of the raster map layers to
-be used for <em>input</em> and <em>output</em>, the
-<em>landcover</em>, the
-<em>size</em>, the
-<em>count</em> used, the <em>keyval</em>
-of the class of interest of the input raster map.
+The user must specify the names of the raster map layers to be used for
+<em>input</em> and <em>output</em>, the <em>landcover</em>, the
+<em>size</em>, the <em>count</em> used, the <em>keyval</em> of the
+class of interest of the input raster map.
<dl>
<dt><b>Input</b>
@@ -67,8 +65,8 @@
<h2>SEE ALSO</h2>
<em>
-<a href="r.nlm.fractal.html">r.nlm.fractal</a>,
-<a href="r.nlm.stats.html">r.nlm.stats</a>,
+<a href="r.pi.nlm.html">r.pi.nlm</a>,
+<a href="r.pi.nlm.stats.html">r.pi.nlm.stats</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.nlm.stats/r.pi.nlm.stats.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.nlm.stats/r.pi.nlm.stats.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.nlm.stats/r.pi.nlm.stats.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -18,7 +18,7 @@
<h2>SEE ALSO</h2>
<em>
-<a href="r.pi.nlm.html">r.nlm</a>,
+<a href="r.pi.nlm.html">r.pi.nlm</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.odc/r.pi.odc.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.odc/r.pi.odc.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.odc/r.pi.odc.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -6,19 +6,24 @@
<h2>NOTES</h2>
-Several output raster are generated with the defined <em>output</em> file name and a suffix of the information provided. All files named *.FP.* are providing information concerning the focus patch. All files named *.TP.* are providing informaton about the target patches.<br>
+Several output raster are generated with the defined <em>output</em>
+file name and a suffix of the information provided. All files named
+*.FP.* are providing information concerning the focus patch. All files
+named *.TP.* are providing informaton about the target patches.<br>
TODO: ???<p>
-The user must specify the names of the raster map layers to
-be used for <em>input</em> and <em>output</em>, the <em>keyval</em> the
-<em>ratio</em> (area/odd or odd/area) and <em>stats</em> used (i.e., average).
+The user must specify the names of the raster map layers to be used for
+<em>input</em> and <em>output</em>, the <em>keyval</em> the
+<em>ratio</em> (area/odd or odd/area) and <em>stats</em> used (i.e.,
+average).
<p>
Within <em>r.pi.odc</em> the following setting have to be set:
<h3>keyval setting:</h3>
-The <em>keyval</em> operator determines which category value is taken for the Patch Index analysis.
+The <em>keyval</em> operator determines which category value is taken
+for the Patch Index analysis.
<h3>Ratio setting:</h3>
@@ -26,7 +31,12 @@
<h3>Neighbourhood level:</h3>
-The <em>neighbor_level</em> operator determines which neighbourhood level is used. <em>0</em> produces output for the focus patch itself, <em>1</em> assigns the connectivity information of the first omnidirectional neighbours to the focus patch, hence the connectivity of the surrouding fragments. This value can be increased for analysing the more distant neighbours.
+The <em>neighbor_level</em> operator determines which neighbourhood
+level is used. <em>0</em> produces output for the focus patch itself,
+<em>1</em> assigns the connectivity information of the first
+omnidirectional neighbours to the focus patch, hence the connectivity
+of the surrouding fragments. This value can be increased for analysing
+the more distant neighbours.
<h3>Output:</h3>
@@ -34,9 +44,12 @@
The<br>
-<em>FP</em> describes attributes of the fokus patch (area and area of the odd)
+<em>FP</em> describes attributes of the fokus patch (area and area of
+the odd)
-<em>TP</em> describes attributes of the target patch (all neighbouring patches around the FP) - separated by the statsmethod (average, median, variance, stddev)
+<em>TP</em> describes attributes of the target patch (all neighbouring
+patches around the FP) - separated by the statsmethod (average, median,
+variance, stddev)
<em>ratio</em> describes which ratio is taken for all TPs.
Modified: grass-addons/grass7/raster/r.pi/r.pi.prob.mw/r.pi.prob.mw.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.prob.mw/r.pi.prob.mw.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.prob.mw/r.pi.prob.mw.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -19,7 +19,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.prox/r.pi.prox.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.prox/r.pi.prox.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.prox/r.pi.prox.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -17,8 +17,8 @@
<h2>SEE ALSO</h2>
<em>
-<a href="r.pi.index.html">r.fragment</a>,
-<a href="r.pi.neigh.html">r.pi.enn</a>,
+<a href="r.pi.index.html">pi.index</a>,
+<a href="r.pi.neigh.html">r.pi.neigh</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.rectangle/r.pi.rectangle.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.rectangle/r.pi.rectangle.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.rectangle/r.pi.rectangle.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,19 +1,20 @@
<h2>DESCRIPTION</h2>
-<em>r.pi.rectangle</em> converts sampling points (e.g. GPS coordinates)
-of the corner of a sampling site into an area by generating a defined rectangle.
+<em>r.pi.rectangle</em> converts sampling points (e.g. GPS coordinates)
+of the corner of a sampling site into an area by generating a defined
+rectangle.
Generates a rectangle based on a corner coordinate.
<p>
-This modules aims at generating sampling areas which are only known by the
-coordinate of one corner. The input are single points, while the output are
-areas representing the corresponding area for each of the single
-points/coordinates.
+This modules aims at generating sampling areas which are only known by
+the coordinate of one corner. The input are single points, while the
+output are areas representing the corresponding area for each of the
+single points/coordinates.
<h2>NOTES</h2>
-The areas can only be generated horizontally, not diagonal. This can
-be added as wish and might be implemented in the future.
+The areas can only be generated horizontally, not diagonal. This can be
+added as wish and might be implemented in the future.
<h2>EXAMPLE</h2>
@@ -28,7 +29,7 @@
<em>
<a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
+<a href="r.pi.corr.mw.html">r.pi.corr.mw</a>,
<a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
<a href="r.pi.export.html">r.pi.export</a>,
<a href="r.pi.graph.html">r.pi.graph</a>,
Modified: grass-addons/grass7/raster/r.pi/r.pi.searchtime/r.pi.searchtime.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.searchtime/r.pi.searchtime.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.searchtime/r.pi.searchtime.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,20 +1,31 @@
-Individual-based dispersal model for connectivity analysis (time-based)
<h2>DESCRIPTION</h2>
-This modules provides information about the isolation or connectivity of individual fragments derived of a landcover classification. Unlike <em>r.pi.energy</em> this module provides information about the time from emigration to immigration. The individual based dispersal model results are based on the step length and range, the perception distance and the attractivity to move towards patches.
+Individual-based dispersal model for connectivity analysis (time-based)
+<p>
+This module provides information about the isolation or connectivity
+of individual fragments derived of a landcover classification. Unlike
+<em>r.pi.energy</em> this module provides information about the time
+from emigration to immigration. The individual based dispersal model
+results are based on the step length and range, the perception distance
+and the attractivity to move towards patches.
-
<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.
+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>
An example for the North Carolina sample dataset:
-
-
-The connectivity of patches of the <em>landclass96</em> class 5 are computed using the time from emigration to immigration. The step length is set to 5 pixel, the output statistics are set to <em>average</em> time and <em>variance</em> of searchtime. For each patch 1000 individuals were released and the model stopped when at least 80% of all individuals sucessfully immigrated:<br>
+<p>
+The connectivity of patches of the <em>landclass96</em> class 5 are
+computed using the time from emigration to immigration. The step length
+is set to 5 pixel, the output statistics are set to <em>average</em>
+time and <em>variance</em> of searchtime. For each patch 1000
+individuals were released and the model stopped when at least 80% of
+all individuals sucessfully immigrated:
<div class="code"><pre>
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000
</pre></div>
@@ -39,7 +50,8 @@
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 maxsteps=10
</pre></div>
-output of each movement location for a defined step frequency. Here every 10th step is provided as output raster:
+output of each movement location for a defined step frequency. Here
+every 10th step is provided as output raster:
<div class="code"><pre>
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 out_freq=10
</pre></div>
@@ -49,7 +61,8 @@
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 out_immi=immi_counts
</pre></div>
-output of a binary immigration matrix. Each patch emigration and immigration for all patch combinations is recorded as 0 or 1:
+output of a binary immigration matrix. Each patch emigration and
+immigration for all patch combinations is recorded as 0 or 1:
<div class="code"><pre>
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 binary_matrix=binary_matrix.txt
</pre></div>
@@ -59,9 +72,15 @@
r.pi.searchtime input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 immi_matrix=immi_counts.txt
</pre></div>
-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):
+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):
+# 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 "suit_raster = if(landclass96==5,1,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>
@@ -70,7 +89,7 @@
<h2>SEE ALSO</h2>
<em>
-<a href="r.pi.searchtime.iter.html">r.pi.searchtime.iter</a>,
+<a href="r.pi.searchtime.pr.html">r.pi.searchtime.pr</a>,
<a href="r.pi.searchtime.mw.html">r.pi.searchtime.mw</a>,
<a href="r.pi.html">r.pi</a>
</em>
Modified: grass-addons/grass7/raster/r.pi/r.pi.searchtime/search.c
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.searchtime/search.c 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.searchtime/search.c 2017-04-12 07:26:09 UTC (rev 70865)
@@ -116,13 +116,13 @@
int y = frag->y;
int count = 0;
- if (x >= sx || map[x + 1 + y * sx] == TYPE_NOTHING)
+ if (x < sx - 1 && map[x + 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.0;
- if (y <= 0 || map[x + (y + 1) * sx] == TYPE_NOTHING)
+ if (y < sy - 1 && map[x + (y + 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.25;
- if (x <= 0 || map[x - 1 + y * sx] == TYPE_NOTHING)
+ if (x > 0 && map[x - 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.5;
- if (y >= sy || map[x + (y - 1) * sx] == TYPE_NOTHING)
+ if (y > 0 && map[x + (y - 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.75;
/* G_message("Picks for (%d, %d): %0.2f, %0.2f, %0.2f, %0.2f, cnt=%d", x, y, dirs[0], dirs[1], dirs[2], dirs[3], count); */
Modified: grass-addons/grass7/raster/r.pi/r.pi.searchtime.mw/r.pi.searchtime.mw.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.searchtime.mw/r.pi.searchtime.mw.html 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.searchtime.mw/r.pi.searchtime.mw.html 2017-04-12 07:26:09 UTC (rev 70865)
@@ -1,24 +1,38 @@
-Analysis of landscape connectivity using individual-based dispersal model inside a moving window.
<h2>DESCRIPTION</h2>
-This modules provides information about the patch connectivity within a moving window
+Analysis of landscape connectivity using individual-based dispersal
+model inside a moving window.
+This module provides information about the patch connectivity within a
+moving window.
+
<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.
+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>
An example for the North Carolina sample dataset:
-The patch relevance concerning connectivity are based on patches of the <em>landclass96</em> raster class 5 amd the time (amount of steps) from emigration to immigration is computed. The step length is set to 5 pixel, the output statistics are set to <em>average</em> time and <em>variance</em> of searchtime. For each patch 1000 individuals were released and the model stopped when at least 80% of all individuals sucessfully immigrated. The command below is computing the time for the whole landscape and the result is prompted to the screen<br>
+The patch relevance concerning connectivity are based on patches of the
+<em>landclass96</em> raster class 5 amd the time (amount of steps) from
+emigration to immigration is computed. The step length is set to 5
+pixel, the output statistics are set to <em>average</em> time and
+<em>variance</em> of searchtime. For each patch 1000 individuals were
+released and the model stopped when at least 80% of all individuals
+sucessfully immigrated. The command below is computing the time for the
+whole landscape and the result is prompted to the screen<br>
<div class="code"><pre>
r.pi.searchtime.mw input=landclass96 output=searchtime_mw1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000
</pre></div>
-for a graphical output a moving window size needs to be defined (here 7x7 pixel) and the amount of steps until immigration per moving window is provided in the output raster:
+for a graphical output a moving window size needs to be defined (here
+7x7 pixel) and the amount of steps until immigration per moving window
+is provided in the output raster:
<div class="code"><pre>
r.pi.searchtime.mw input=landclass96 output=searchtime_mw1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 size=7
</pre></div>
@@ -34,9 +48,14 @@
r.pi.searchtime.mw input=landclass96 output=searchtime_mw1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 size=7 multiplicator=10
</pre></div>
-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):
+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):
+# 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 "suit_raster = if(landclass96==5,1,if(landclass96 == 1, 10, if (landclass96==3,2, if(landclass96==4,1,if(landclass96==6,100)))))"
r.pi.searchtime.mw input=landclass96 output=searchtime1 keyval=5 step_length=5 stats=average,variance percent=80 n=1000 size=7 suitability=suit_raster
</pre></div>
Modified: grass-addons/grass7/raster/r.pi/r.pi.searchtime.pr/search.c
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.searchtime.pr/search.c 2017-04-11 21:46:32 UTC (rev 70864)
+++ grass-addons/grass7/raster/r.pi/r.pi.searchtime.pr/search.c 2017-04-12 07:26:09 UTC (rev 70865)
@@ -116,14 +116,13 @@
int y = frag->y;
int count = 0;
- /* ! compare to r.pi.energy.iter ! */
- if (x >= sx || map[x + 1 + y * sx] == TYPE_NOTHING)
+ if (x < sx - 1 && map[x + 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.0;
- if (y <= 0 || map[x + (y + 1) * sx] == TYPE_NOTHING)
+ if (y < sy - 1 && map[x + (y + 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.25;
- if (x <= 0 || map[x - 1 + y * sx] == TYPE_NOTHING)
+ if (x > 0 && map[x - 1 + y * sx] == TYPE_NOTHING)
dirs[count++] = 0.5;
- if (y >= sy || map[x + (y - 1) * sx] == TYPE_NOTHING)
+ if (y > 0 && map[x + (y - 1) * sx] == TYPE_NOTHING)
dirs[count++] = 0.75;
/* G_message("Picks for (%d, %d): %0.2f, %0.2f, %0.2f, %0.2f, cnt=%d", x, y, dirs[0], dirs[1], dirs[2], dirs[3], count); */
More information about the grass-commit
mailing list