[GRASS-SVN] r58619 - in grass-addons/grass7/raster: . r.diversity

Sun Jan 5 15:37:25 PST 2014

Author: neteler
Date: 2014-01-05 15:37:25 -0800 (Sun, 05 Jan 2014)
New Revision: 58619

Added:
   grass-addons/grass7/raster/r.diversity/
   grass-addons/grass7/raster/r.diversity/r.diversity.html
Removed:
   grass-addons/grass7/raster/r.diversity/description.html
Modified:
   grass-addons/grass7/raster/Makefile
   grass-addons/grass7/raster/r.diversity/Makefile
Log:
r.diversity: added to G7 Addons

Modified: grass-addons/grass7/raster/Makefile
===================================================================

--- grass-addons/grass7/raster/Makefile	2014-01-05 18:55:31 UTC (rev 58618)
+++ grass-addons/grass7/raster/Makefile	2014-01-05 23:37:25 UTC (rev 58619)
@@ -5,6 +5,7 @@
 	r.clump2 \
 	r.convergence \
 	r.crater \
+	r.diversity \
 	r.flip \
 	r.fuzzy \
 	r.geomorphon \

Modified: grass-addons/grass7/raster/r.diversity/Makefile
===================================================================
--- grass-addons/grass6/raster/r.diversity/Makefile	2014-01-05 18:55:31 UTC (rev 58618)
+++ grass-addons/grass7/raster/r.diversity/Makefile	2014-01-05 23:37:25 UTC (rev 58619)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-PGM = r.diversity.py
+PGM = r.diversity
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

Deleted: grass-addons/grass7/raster/r.diversity/description.html
===================================================================
--- grass-addons/grass6/raster/r.diversity/description.html	2014-01-05 18:55:31 UTC (rev 58618)
+++ grass-addons/grass7/raster/r.diversity/description.html	2014-01-05 23:37:25 UTC (rev 58619)
@@ -1,58 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>r.diversity</em> calculates selected diversity indices by calling various
-<em>r.li</em> commands.
-<p>
-This script uses the Pielou, Renyi, Shannon and Simpson indices. The output is a
-map for each index.
-
-<h2>NOTES</h2>
-The user does not need to create a "conf" file with <em>r.li.setup</em> because this file 
-will be created automatically by the script.<br> 
-In size option it is possible use more values: the user can set more values with comma (,) and a range with minus (-)<br> 
-If you calculate Renyi entropy remember to add the alpha option. Alpha option support single and multi values but not a range<br>
-If the input raster contains NULL value cells, <em>r.diversity</em> 
-returns -1 for these cells.<br> 
-If the user wants to keep NULL values instead, run subsequently on the resulting map:
-<br> 
-<div class="code"><pre> 
-r.null setnull=-1 map=my_map
-</pre></div> 
-
-<h2>EXAMPLES</h2>
-
-To calculate the set of indices from a NDVI map, with a moving window of 3 x 3 pixel, run:
-<div class="code"><pre>
-r.diversity input=ndvi_map out=test alpha=0.5
-</pre></div>
-
-To calculate the set of indices from a NDVI map, with a moving window of 7 x 7 pixel, run:
-<div class="code"><pre>
-r.diversity input=ndvi_map out=test alpha=0.5 size=7
-</pre></div>
-
-To calculate only Pielou and Simpson indices from a NDVI map, with several moving window (3 x 3, 5 x 5, 7 x 7, 9 x 9), run:
-<div class="code"><pre>
-r.diversity input=ndvi_map out=test size=3-9 method=pielou,simpson
-</pre></div>
-
-To calculate all methods excluding Pielou from a NDVI map, with two moving window (3 x 3, 9 x 9), run:
-<div class="code"><pre>
-r.diversity input=ndvi_map out=test size=3,9 exclude=pielou alpha=2
-</pre></div>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="r.li.html">r.li</a>,
-<a href="r.li.pielou.html">r.li.pielou</a>,
-<a href="r.li.renyi.html">r.li.renyi</a>,
-<a href="r.li.shannon.html">r.li.shannon</a>,
-<a href="r.li.simpson.html">r.li.simpson</a>
-</em> 
-
-<h2>AUTHOR</h2>
-
-Luca Delucchi and Duccio Rocchini, Fondazione E. Mach (Italy)
-
-<p><i>Last changed: $Date$</i>

Copied: grass-addons/grass7/raster/r.diversity/r.diversity.html (from rev 58618, grass-addons/grass6/raster/r.diversity/description.html)
===================================================================
--- grass-addons/grass7/raster/r.diversity/r.diversity.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.diversity/r.diversity.html	2014-01-05 23:37:25 UTC (rev 58619)
@@ -0,0 +1,67 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.diversity</em> calculates selected diversity indices by 
+calling various <em>r.li</em> commands.
+
+<p>
+This script uses the Pielou, Renyi, Shannon and Simpson indices. The 
+output is a map for each index.
+
+<h2>NOTES</h2>
+
+The user does not need to create a "conf" file with <em>r.li.setup
+</em> because this file will be created automatically by the script.<br>
+
+In size option it is possible use more values: the user can set more 
+values with comma (,) and a range with minus (-).<br>
+
+If you calculate Renyi entropy remember to add the alpha option. 
+Alpha option support single and multi values but not a range.<br>
+
+If the input raster contains NULL value cells, <em>r.diversity</em> 
+returns -1 for these cells.<br> 
+If the user wants to keep NULL values instead, run subsequently on the
+resulting map:<br> 
+
+<div class="code"><pre> 
+r.null setnull=-1 map=my_map
+</pre></div> 
+
+<h2>EXAMPLES</h2>
+
+To calculate the set of indices from a NDVI map, with a moving window of 3 x 3 pixel, run:
+<div class="code"><pre>
+r.diversity input=ndvi_map out=test alpha=0.5
+</pre></div>
+
+To calculate the set of indices from a NDVI map, with a moving window of 7 x 7 pixel, run:
+<div class="code"><pre>
+r.diversity input=ndvi_map out=test alpha=0.5 size=7
+</pre></div>
+
+To calculate only Pielou and Simpson indices from a NDVI map, with several moving window (3 x 3, 5 x 5, 7 x 7, 9 x 9), run:
+<div class="code"><pre>
+r.diversity input=ndvi_map out=test size=3-9 method=pielou,simpson
+</pre></div>
+
+To calculate all methods excluding Pielou from a NDVI map, with two moving window (3 x 3, 9 x 9), run:
+<div class="code"><pre>
+r.diversity input=ndvi_map out=test size=3,9 exclude=pielou alpha=2
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.li.html">r.li</a>,
+<a href="r.li.pielou.html">r.li.pielou</a>,
+<a href="r.li.renyi.html">r.li.renyi</a>,
+<a href="r.li.shannon.html">r.li.shannon</a>,
+<a href="r.li.simpson.html">r.li.simpson</a>
+</em> 
+
+<h2>AUTHOR</h2>
+
+Luca Delucchi and Duccio Rocchini, Fondazione E. Mach (Italy)
+
+<p>
+<i>Last changed: $Date$</i>

