[GRASS-SVN] r59300 - in grass/trunk/raster/r.li: r.li.cwed r.li.mpa r.li.padsd r.li.patchnum r.li.renyi r.li.richness r.li.shape
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 24 04:30:11 PDT 2014
Author: neteler
Date: 2014-03-24 04:30:10 -0700 (Mon, 24 Mar 2014)
New Revision: 59300
Modified:
grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html
grass/trunk/raster/r.li/r.li.mpa/mpa.c
grass/trunk/raster/r.li/r.li.padsd/padsd.c
grass/trunk/raster/r.li/r.li.patchnum/main.c
grass/trunk/raster/r.li/r.li.renyi/renyi.c
grass/trunk/raster/r.li/r.li.richness/richness.c
grass/trunk/raster/r.li/r.li.shape/main.c
Log:
r.li: header standardization; example fix
Modified: grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html 2014-03-24 11:30:10 UTC (rev 59300)
@@ -42,7 +42,7 @@
<em>my_conf</em> configuration file (previously defined with
<em>g.gui.rlisetup</em>) and saving results in <em>my_out</em>, run:
<div class="code"><pre>
-r.li.cwed input=my_map conf=my_conf path=my_file output=my_out \
+r.li.cwed map=my_map conf=my_conf output=my_out \
path=/path/to/weights.csv
</pre></div>
Modified: grass/trunk/raster/r.li/r.li.mpa/mpa.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/mpa.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.mpa/mpa.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -1,14 +1,19 @@
-
-/*
- * \brief calculates mean pixel attribute index
+/****************************************************************************
*
- * \AUTHOR: Serena Pallecchi student of Computer Science University of Pisa (Italy)
- * Commission from Faunalia Pontedera (PI) www.faunalia.it
+ * MODULE: r.li.mpa
+ * AUTHOR(S): Serena Pallecchi (original contributor)
+ * student of Computer Science University of Pisa (Italy)
+ * Commission from Faunalia Pontedera (PI) www.faunalia.it
+ * Rewrite: Markus Metz
*
- * This program is free software under the GPL (>=v2)
- * Read the COPYING file that comes with GRASS for details.
+ * PURPOSE: calculates mean pixel attribute index
+ * COPYRIGHT: (C) 2007-2014 by the GRASS Development Team
*
- */
+ * This program is free software under the GNU General Public
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ *****************************************************************************/
#include <grass/gis.h>
#include <grass/raster.h>
Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -191,7 +191,7 @@
if (read(mask_fd, mask_buf, (ad->cl * sizeof(int))) < 0)
return 0;
}
-
+
ltmp = pid_sup;
pid_sup = pid_corr;
pid_corr = ltmp;
Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -1,4 +1,3 @@
-
/****************************************************************************
*
* MODULE: r.li.patchnum
@@ -53,7 +52,6 @@
G_add_keyword(_("patch index"));
/* define options */
-
raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_standard_option(G_OPT_F_INPUT);
@@ -70,7 +68,6 @@
output->answer);
}
-
int patch_number(int fd, char **par, struct area_entry *ad, double *result)
{
int ris = RLI_OK;
Modified: grass/trunk/raster/r.li/r.li.renyi/renyi.c
===================================================================
--- grass/trunk/raster/r.li/r.li.renyi/renyi.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.renyi/renyi.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -3,7 +3,7 @@
*
* MODULE: r.li.renyi
*
- * PURPOSE: brief calculates renyi's diversity index
+ * PURPOSE: calculates renyi's diversity index
*
* AUTHOR(S): Luca Delucchi, Fondazione Edmund Mach
* Serena Pallecchi student of Computer Science University of Pisa (Italy)
Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -1,14 +1,18 @@
-
-/*
- * \brief calculates richness diversity index
+/****************************************************************************
*
- * \AUTHOR: Serena Pallecchi student of Computer Science University of Pisa (Italy)
- * Commission from Faunalia Pontedera (PI) www.faunalia.it
+ * MODULE: r.li.ritchness
*
- * This program is free software under the GPL (>=v2)
- * Read the COPYING file that comes with GRASS for details.
+ * PURPOSE: calculates richness diversity index
*
- */
+ * AUTHOR(S): Serena Pallecchi student of Computer Science University of Pisa (Italy)
+ * Commission from Faunalia Pontedera (PI) www.faunalia.it
+ * Rewrite: Markus Metz
+ *
+ * COPYRIGHT:
+ * This program is free software under the GPL (>=v2)
+ * Read the COPYING file that comes with GRASS for details.
+ *
+ ***************************************************************************/
#include <stdlib.h>
#include <fcntl.h>
Modified: grass/trunk/raster/r.li/r.li.shape/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/main.c 2014-03-24 06:57:18 UTC (rev 59299)
+++ grass/trunk/raster/r.li/r.li.shape/main.c 2014-03-24 11:30:10 UTC (rev 59300)
@@ -6,10 +6,11 @@
* students of Computer Science University of Pisa (Italy)
* Commission from Faunalia Pontedera (PI) www.faunalia.it
* Fixes: Markus Neteler <neteler itc.it>
- *
- * PURPOSE: calculates shape index
- * COPYRIGHT: (C) 2006-2007 by the GRASS Development Team
+ * Rewrite: Markus Metz
*
+ * PURPOSE: calculates patch number index
+ * COPYRIGHT: (C) 2007-2014 by the GRASS Development Team
+ *
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
* for details.
More information about the grass-commit
mailing list