[GRASS-SVN] r44407 - in grass/branches/releasebranch_6_4: . raster/r.li raster/r.li/r.li.daemon

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-11-24 08:48:28 -0800 (Wed, 24 Nov 2010)
New Revision: 44407

Modified:
   grass/branches/releasebranch_6_4/contributors_extra.csv
   grass/branches/releasebranch_6_4/raster/r.li/Makefile
   grass/branches/releasebranch_6_4/raster/r.li/description.html
   grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/index.h
Log:
Luca Delucchi + Duccio Rocchini: two new indices

Modified: grass/branches/releasebranch_6_4/contributors_extra.csv
===================================================================
--- grass/branches/releasebranch_6_4/contributors_extra.csv	2010-11-24 16:43:45 UTC (rev 44406)
+++ grass/branches/releasebranch_6_4/contributors_extra.csv	2010-11-24 16:48:28 UTC (rev 44407)
@@ -11,6 +11,7 @@
 Bruce Byars,<Bruce_Byars baylor.edu>,-
 Angus Carr,<apcarr flash lakeheadu.ca>,-
 Otto Dassau,<otto.dassau gmx de>,yes
+Luca Delucchi,<lucadeluge gmail.com>,-
 Charles Ehlschlaeger,<cre111 wiu.edu>,-
 Pierre de Mouveaux,<pierre polaris-technologies.com>,-
 Roberto Flor,<flor fbk.eu>,-
@@ -27,6 +28,7 @@
 Lorenzo Moretti,<lorenzo moretti bologna.enea.it>,-
 Tomas Paudits,<tpaudits mailbox.sk>,-
 Francesco Pirotti,<francesco.pirotti unipd.it>,-
+Duccio Rocchini,<ducciorocchini gmail.com>,-
 Phisan Santitamnont,<fsvpss eng.chula.ac.th>,-
 Christoph Simon,<ciccio kiosknet.com.br>,-
 Job Spijker,<spijker geo.uu.nl>,-

Modified: grass/branches/releasebranch_6_4/raster/r.li/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.li/Makefile	2010-11-24 16:43:45 UTC (rev 44406)
+++ grass/branches/releasebranch_6_4/raster/r.li/Makefile	2010-11-24 16:48:28 UTC (rev 44407)
@@ -14,6 +14,8 @@
 	r.li.patchdensity \
 	r.li.patchnum \
 	r.li.richness \
+	r.li.pielou \
+	r.li.renyi \
 	r.li.setup \
 	r.li.shannon \
 	r.li.shape \

Modified: grass/branches/releasebranch_6_4/raster/r.li/description.html
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.li/description.html	2010-11-24 16:43:45 UTC (rev 44406)
+++ grass/branches/releasebranch_6_4/raster/r.li/description.html	2010-11-24 16:48:28 UTC (rev 44407)
@@ -154,10 +154,12 @@
 
 <b>Diversity indices</b>:
 <ul>
-  <li> <a href="r.li.dominance.html">r.li.dominance</a>: Calculates dominance's diversity index on a raster map</li>
-  <li> <a href="r.li.richness.html">r.li.richness</a>: Calculates dominance's diversity index on a raster map</li>
-  <li> <a href="r.li.shannon.html">r.li.shannon</a>: Calculates Shannon's diversity index on a raster map</li>
-  <li> <a href="r.li.simpson.html">r.li.simpson</a>: Calculates Simpson's diversity index on a raster map</li>
+  <li> <a href="r.li.dominance.html">r.li.dominance</a>: Calculates dominance diversity index on a raster map</li>
+  <li> <a href="r.li.pielou.html">r.li.pielou</a>: Calculates Pielou eveness index on a raster map</li>
+  <li> <a href="r.li.renyi.html">r.li.renyi</a>: Calculates Renyi entropy on a raster map</li>
+  <li> <a href="r.li.richness.html">r.li.richness</a>: Calculates richness diversity index on a raster map</li>
+  <li> <a href="r.li.shannon.html">r.li.shannon</a>: Calculates Shannon diversity index on a raster map</li>
+  <li> <a href="r.li.simpson.html">r.li.simpson</a>: Calculates Simpson diversity index on a raster map</li>
 </ul>
 
 <h2>ADDING NEW INDICES</h2>

Modified: grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/index.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/index.h	2010-11-24 16:43:45 UTC (rev 44406)
+++ grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/index.h	2010-11-24 16:48:28 UTC (rev 44407)
@@ -5,6 +5,7 @@
  *  
  * \author Claudio Porta, Lucio Davide Spano, Serena Pallecchi students of Computer Science University of Pisa (Italy)
  *                      Commission from Faunalia Pontedera (PI) www.faunalia.it
+  *        Luca Delucchi and Duccio Rocchini, Fondazione Edmund Mach, Italy: r.li.pielou, r.li.renyi
  *
  *
  * This program is free software under the GPL (>=v2)
@@ -12,7 +13,6 @@
  * 
  * \version 1.1
  *
- * BUGS: please send bugs reports to spano at cli.di.unipi.it porta at cli.di.unipi.it pallecch at cli.di.unipi.it
  */
 
 
@@ -31,6 +31,10 @@
 int patch_number(int fd, char **par, area_des ad, double *result);
 int shape_index(int fd, char **par, area_des ad, double *result);
 int shannon(int fd, char **par, area_des ad, double *result);
+
+int pielou(int fd, char **par, area_des ad, double *result);
+int renyi(int fd, char **par, area_des ad, double *result);
+
 int simpson(int fd, char **par, area_des ad, double *result);
 int meanPatchSize(int fd, char **par, area_des ad, double *result);
 int meanPixelAttribute(int fd, char **par, area_des ad, double *result);