[GRASS-SVN] r41753 - in grass/trunk/raster/r.li: r.li.cwed
r.li.dominance r.li.edgedensity r.li.mpa r.li.mps r.li.padcv
r.li.padrange r.li.padsd r.li.patchdensity r.li.patchnum
r.li.richness r.li.shannon r.li.shape r.li.simpson
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Apr 8 04:24:36 EDT 2010
Author: neteler
Date: 2010-04-08 04:24:34 -0400 (Thu, 08 Apr 2010)
New Revision: 41753
Modified:
grass/trunk/raster/r.li/r.li.cwed/cwed.c
grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html
grass/trunk/raster/r.li/r.li.dominance/dominance.c
grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html
grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
grass/trunk/raster/r.li/r.li.mpa/mpa.c
grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html
grass/trunk/raster/r.li/r.li.mps/mps.c
grass/trunk/raster/r.li/r.li.mps/r.li.mps.html
grass/trunk/raster/r.li/r.li.padcv/padcv.c
grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html
grass/trunk/raster/r.li/r.li.padrange/padrange.c
grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html
grass/trunk/raster/r.li/r.li.padsd/padsd.c
grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html
grass/trunk/raster/r.li/r.li.patchdensity/main.c
grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html
grass/trunk/raster/r.li/r.li.patchnum/main.c
grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html
grass/trunk/raster/r.li/r.li.richness/r.li.richness.html
grass/trunk/raster/r.li/r.li.richness/richness.c
grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html
grass/trunk/raster/r.li/r.li.shannon/shannon.c
grass/trunk/raster/r.li/r.li.shape/main.c
grass/trunk/raster/r.li/r.li.shape/r.li.shape.html
grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html
grass/trunk/raster/r.li/r.li.simpson/simpson.c
Log:
parameter name consistency fixes
Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -51,7 +51,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
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 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.cwed/r.li.cwed.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -23,7 +23,7 @@
my_conf configuration file and saving results in
my_out file run:<BR>
<div class="code"><pre>
-r.li.cwed map=my_map conf=my_conf path=my_file output=my_out
+r.li.cwed input=my_map conf=my_conf path=my_file output=my_out
</pre></div>
<BR>Example of input file:<BR>
Modified: grass/trunk/raster/r.li/r.li.dominance/dominance.c
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/dominance.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.dominance/dominance.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -46,7 +46,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -14,7 +14,7 @@
To calculate dominance's diversity index on map my_map, using
my_conf configuration file and saving results in my_out file run:<br>
<div class="code"><pre>
-r.li.dominance map=my_map conf=my_conf output=my_out
+r.li.dominance input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -43,7 +43,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -26,12 +26,16 @@
To calculate edge density index on map my_map, using
my_conf configuration file and saving results in
my_out file run:<br>
-<B>r.li.edgedensity map=</B>my_map <B>conf=</B>my_conf <B>output=</B>my_out <br><br>
+<div class="code"><pre>
+r.li.edgedensity input=my_map conf=my_conf output=my_out
+</pre></div>
+
To calculate edge density index of patch_type 34, using
my_conf configuration file and on map my_map, saving results in my_out
file run:<br>
-<B>r.li.edgedensity map=</B>my_map <B>conf=</B>my_conf <B>output=</B>my_out <B>patch_type=</B>34
-<br>
+<div class="code"><pre>
+r.li.edgedensity input=my_map conf=my_conf output=my_out patch_type=34
+</pre></div>
<h2>NOTES</h2>
Do not use absolute path names for output files. They are raster if
@@ -43,7 +47,9 @@
If area is 0 r.li.edgedensity returns -1; this is possible only if input
raster is masked.
If you want to have null values instead run <br>
-<B>r.null setnull=-1 map=</B>my_map <br>
+<div class="code"><pre>
+r.null setnull=-1 map=my_map
+</pre></div>
after index calculation.
<h2>SEE ALSO</h2>
Modified: grass/trunk/raster/r.li/r.li.mpa/mpa.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/mpa.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.mpa/mpa.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -43,7 +43,7 @@
G_add_keyword(_("patch index"));
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -18,7 +18,7 @@
my_conf configuration file and saving results in
my_out file run:<br>
<div class="code"><pre>
-r.li.mpa map=my_map conf=my_conf output=my_out
+r.li.mpa input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -44,7 +44,7 @@
G_add_keyword(_("patch index"));
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.mps/r.li.mps.html
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/r.li.mps.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.mps/r.li.mps.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -16,7 +16,7 @@
my_conf configuration file and saving results in
my_out file run:<br>
<div class="code"><pre>
-r.li.mps map=my_map conf=my_conf output=my_out
+r.li.mps input=my_map conf=my_conf output=my_out
</pre></div>
Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -41,14 +41,17 @@
G_add_keyword(_("patch index"));
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
+
conf = G_define_option();
conf->key = "conf";
conf->description = _("Configuration file");
conf->gisprompt = "old_file,file,input";
conf->type = TYPE_STRING;
conf->required = YES;
+
output = G_define_standard_option(G_OPT_R_OUTPUT);
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
return calculateIndex(conf->answer, patchAreaDistributionCV, NULL,
Modified: grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -23,7 +23,7 @@
my_conf configuration file and saving results in
my_out file run:<br>
<div class="code"><pre>
-r.li.padcv map=my_map conf=my_conf output=my_out
+r.li.padcv input=my_map conf=my_conf output=my_out
</pre></div>
Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -43,14 +43,17 @@
G_add_keyword(_("patch index"));
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
+
conf = G_define_option();
conf->key = "conf";
conf->description = _("Configuration file");
conf->gisprompt = "old_file,file,input";
conf->type = TYPE_STRING;
conf->required = YES;
+
output = G_define_standard_option(G_OPT_R_OUTPUT);
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
return calculateIndex(conf->answer, patchAreaDistributionRANGE, NULL,
Modified: grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -14,7 +14,7 @@
my_conf configuration file and saving results in
my_out file run:<br>
<div class="code"><pre>
-r.li.padrange map=my_map conf=my_conf output=my_out
+r.li.padrange input=my_map conf=my_conf output=my_out
</pre></div>
Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -41,14 +41,17 @@
G_add_keyword(_("patch index"));
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
+
conf = G_define_option();
conf->key = "conf";
conf->description = _("Configuration file");
conf->gisprompt = "old_file,file,input";
conf->type = TYPE_STRING;
conf->required = YES;
+
output = G_define_standard_option(G_OPT_R_OUTPUT);
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
return calculateIndex(conf->answer, patchAreaDistributionSD, NULL,
Modified: grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -13,14 +13,14 @@
my_conf configuration file and saving results in
my_out file run:<br>
<div class="code"><pre>
-r.li.padsd map=my_map conf=my_conf output=my_out
+r.li.padsd input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Do not use absolute path names for output files. They are raster if
moving window disposition was selected, otherwise they are in
~/.r.li/output folder.<br>
-If input raster is not full of null values r.li.padsd returns a value >=0 that is PADsd. <br>
+If input raster is not full of null values r.li.padsd returns a value >=0 that is PADsd. <br>
If input raster is full of null values r.li.padsd returns -1. <br>
If you want to have null values instead run <br>
<div class="code"><pre>
Modified: grass/trunk/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/main.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.patchdensity/main.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -37,7 +37,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -15,7 +15,7 @@
results in the raster map <em>my_out</em>, run:
<div class="code"><pre>
-r.li.patchdensity map=my_map conf=my_conf out=my_out
+r.li.patchdensity input=my_map conf=my_conf out=my_out
</pre></div>
<p>
Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -38,7 +38,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -9,7 +9,7 @@
<em>my_conf</em> configuration file and saving results in
my_out file run:
<div class="code"><pre>
-r.li.patchnumber map=my_map conf=my_conf out=my_out
+r.li.patchnumber input=my_map conf=my_conf out=my_out
</pre></div>
<H2>NOTES</H2>
Modified: grass/trunk/raster/r.li/r.li.richness/r.li.richness.html
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/r.li.richness.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.richness/r.li.richness.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -10,7 +10,7 @@
To calculate richness's diversity index on map my_map, using
my_conf configuration file and saving results in my_out file run:<br>
<div class="code"><pre>
-r.li.richness map=my_map conf=my_conf output=my_out
+r.li.richness input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -44,7 +44,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -18,7 +18,7 @@
To calculate shannon's diversity index on map my_map, using
my_conf configuration file and saving results in my_out file run:<br>
<div class="code"><pre>
-r.li.shannon map=my_map conf=my_conf output=my_out
+r.li.shannon input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Modified: grass/trunk/raster/r.li/r.li.shannon/shannon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/shannon.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.shannon/shannon.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -43,7 +43,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.shape/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/main.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.shape/main.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -38,7 +38,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
Modified: grass/trunk/raster/r.li/r.li.shape/r.li.shape.html
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/r.li.shape.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.shape/r.li.shape.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -8,7 +8,7 @@
<em>my_conf</em> configuration file and saving results in
my_out file run:
<div class="code"><pre>
-r.li.shape map=my_map conf=my_conf out=my_out
+r.li.shape input=my_map conf=my_conf out=my_out
</pre></div>
<H2>SEE ALSO</H2>
Modified: grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html 2010-04-08 08:24:34 UTC (rev 41753)
@@ -19,7 +19,7 @@
To calculate simpson's diversity index on map my_map, using
my_conf configuration file and saving results in my_out file run:<br>
<div class="code"><pre>
-r.li.simpson map=my_map conf=my_conf output=my_out
+r.li.simpson input=my_map conf=my_conf output=my_out
</pre></div>
<h2>NOTES</h2>
Modified: grass/trunk/raster/r.li/r.li.simpson/simpson.c
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/simpson.c 2010-04-08 08:24:01 UTC (rev 41752)
+++ grass/trunk/raster/r.li/r.li.simpson/simpson.c 2010-04-08 08:24:34 UTC (rev 41753)
@@ -44,7 +44,7 @@
/* define options */
- raster = G_define_standard_option(G_OPT_R_MAP);
+ raster = G_define_standard_option(G_OPT_R_INPUT);
conf = G_define_option();
conf->key = "conf";
More information about the grass-commit
mailing list