[GRASS-SVN] r61667 - in grass/branches/develbranch_6/raster/r.li: . r.li.cwed r.li.daemon 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.pielou r.li.renyi r.li.richness r.li.setup r.li.shannon r.li.shape r.li.simpson

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Aug 17 11:35:41 PDT 2014


Author: neteler
Date: 2014-08-17 11:35:41 -0700 (Sun, 17 Aug 2014)
New Revision: 61667

Modified:
   grass/branches/develbranch_6/raster/r.li/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.cwed/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.dominance/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.mpa/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.mps/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.padcv/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.padrange/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.padsd/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.patchnum/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.pielou/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.renyi/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.richness/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.shannon/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.shape/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.simpson/description.html
Log:
r.li manual: describe where config files are stored; minor cleanup

Modified: grass/branches/develbranch_6/raster/r.li/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -22,10 +22,12 @@
 <h2>DESCRIPTION</h2>
 
 The <em>r.li</em> suite is a toolset for multiscale analysis of landscape structure.
-<!-- rephrase reference to r.le which is long time ago ...-->
+<!-- rephrase reference to r.le which is long time ago ...
 It aims at replacing the <em>r.le</em> suite of modules through a client-server,
-multiprocess implementation. External software for quantitative measures of landscape
-structure is for example FRAGSTATS (McGarigal and Marks 1995).
+multiprocess implementation.
+-->
+It aims at implementing metrics as found in external software for quantitative
+measures of landscape structure like FRAGSTATS (McGarigal and Marks 1995).
 <p>
 The <em>r.li</em> suite offers a set of patch and diversity indices.
 It supports analysis of landscapes composed of a mosaic of
@@ -47,30 +49,29 @@
 (e.g. frequency distribution of patch sizes in the sampling area). The
 results are stored as raster maps.
 
-<p>
+<h2>NOTES</h2>
+
 The general procedure to calculate an index from a raster map is two-fold:
 
 <ol>
-<li>run <em>r.li.setup</em>: create a configuration file selecting the parts of
-    raster to analyze.
+<li>run <em>r.li.setup</em>: create a configuration file selecting
+    the parts of raster map to be analyzed. This file allows to re-run
+    an analysis easily. It is stored on MS-Windows in the directory 
+    <tt>C:\Users\normal\.r.li\history\</tt>, on GNU/Linux in
+    <tt>$HOME/.r.li/history/</tt>. <!-- TODO: and Mac OSX? -->
 
 <li>run one or more of the <em>r.li.<b>[index]</b></em> modules (e.g.,
     <em>r.li.<b>patchdensity</b></em>) to calculate the selected index
     using on the areas selected on configuration file.
 </ol>
 
-
-<h2>NOTE</h2>
-
-The <em>r.li.daemon</em> module also has a "main" function front-end
+<!-- mhh ??: 
+The <em>r.li.daemon</em> source code has a "main" function front-end
 which can be run, but it is only a template for development of new
-indices so not built by default.
-<!-- mhh ??: 
-The function itself has no meaning, it is only useful as an example and 
-for debugging.
+indices.
 -->
 
-<h2>EXAMPLE</h2>
+<h2>EXAMPLES</h2>
 
 Calculate a patch density index on the entire 'geology' raster map
 in the Spearfish sample dataset, using a 5x5 moving window:

Modified: grass/branches/develbranch_6/raster/r.li/r.li.cwed/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.cwed/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.cwed/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -22,10 +22,13 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
+
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the sample area contains only NULL values it is considered to
@@ -67,7 +70,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz
 
 <p>
 <i>Last changed: $Date$</i></p>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -87,7 +87,8 @@
 Claudio Porta and Lucio Davide Spano, students of Computer Science 
 University of Pisa (Italy).<br>
 Commission from Faunalia Pontedera (PI)<br>
-Rewritten from "r.le.setup" by William L. Baker
+Rewritten from "r.le.setup" by William L. Baker<br>
+Various bug fixes by Markus Metz<br>
 This program is free software under the GPL (>=v2)
 Read the COPYING file that comes with GRASS for details.
 

Modified: grass/branches/develbranch_6/raster/r.li/r.li.dominance/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.dominance/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.dominance/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -6,16 +6,18 @@
 <ul>
 <li><b>i</b>: patch type</li>
 <li><b>m</b>: number of different patch types</li>
-<li><b>p<small><small>i</small></small></b>: proportion of the landscape
-  occupied by patch type <i>i</i> </li>
+<li><b>p<small><small>i</small></small></b>: proportional abundance of 
+patch type <i>i</i> </li>
 </ul>
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.dominance</em>
@@ -56,7 +58,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz
 
 <p>
 <i>Last changed: $Date$</i></p>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.edgedensity/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -19,13 +19,17 @@
 the landscape involving patch type k</li>
 <li> <b>Area</b>: total landscape area</li>
 </ul>
+<p>
+The unit is meters per hectare.
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.edgedensity</em>
@@ -75,7 +79,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.mpa/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.mpa/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.mpa/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -13,10 +13,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.mpa</em> considers to
@@ -59,7 +61,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.mps/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.mps/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.mps/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -23,10 +23,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster contains NULL value cells, <em>r.li.mps</em>
@@ -67,7 +69,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.padcv/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.padcv/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.padcv/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -14,10 +14,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 If input raster is not full of null values <em>r.li.padcv</em> returns a value >=0 that is PADcv. <br>
 If the input raster map contains only NULL values then <em>r.li.padcv</em> returns -1. <br>
@@ -57,7 +59,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.padrange/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.padrange/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.padrange/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -15,10 +15,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.padrange</em>
@@ -59,7 +61,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i></p>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.padsd/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.padsd/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.padsd/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -16,10 +16,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 If input raster is not full of null values <em>r.li.padsd</em> returns a
 value >=0 that is PADsd. <br>
@@ -59,7 +61,8 @@
 
 <h2>AUTHORS</h2>
 Serena Pallecchi student of Computer Science University of Pisa (Italy).<br>
-Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)
+Commission from Faunalia Pontedera (PI), Italy (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.patchdensity/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -18,10 +18,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 A map of NULL values is considered to have zero patches. <br>
@@ -74,6 +76,7 @@
 Claudio Porta and Lucio Davide Spano, students of Computer Science 
 University of Pisa (Italy).<br>
 Commission from Faunalia Pontedera (PI) (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.patchnum/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.patchnum/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.patchnum/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -9,10 +9,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO verify: -->
 If the input raster map contains only NULL values then it is considered to have zero patch. <br>
@@ -54,6 +56,7 @@
 Claudio Porta and Lucio Davide Spano, students of Computer Science 
 University of Pisa (Italy).<br>
 Commission from Faunalia Pontedera (PI) (www.faunalia.it)<br>
+Markus Metz (statistics)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.pielou/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.pielou/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.pielou/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -11,10 +11,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster contains NULL value cells, <em>r.li.pielou</em>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.renyi/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.renyi/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.renyi/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -6,17 +6,20 @@
 <ul>
   <li><b>H</b>: Renyi entropy</li>
   <li><b>alpha</b>: order of the generalized entropy</li>
-  <li><b>i</b>: ith class</li>
-  <li><b>S</b>: number of classes</li>
-  <li><b>p<small>i</small></b>: proportion of the landscape occupied by class i</li>
+  <li><b>i</b>: patch type</li>
+  <li><b>S</b>: number of different patch types</li>
+  <li><b>p<small><small>i</small></small></b>: proportional abundance of 
+patch type <i>i</i> </li>
 </ul>
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.renyi</em>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.richness/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.richness/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.richness/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -12,10 +12,12 @@
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.richness</em>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -48,12 +48,15 @@
 <li><em><b>Load a file</b></em>: the configuration is printed using 
  rectangles with differents colors (green for the raster map, red for 
  the sample frame and blue for the sample areas), and other notes 
- (disposition of sample areas etc). The configuration file is saved 
- in <tt>~/.r.li/history/my_conf</tt> (the file name can be defined by 
- the user). The output can either be a new raster map (in case of 
+ (disposition of sample areas etc). The configuration file is saved in
+ the folder <tt>C:\Users\normal\.r.li\history\my_conf</tt> (MS-Windows) or 
+ <tt>$HOME/.r.li/history/my_conf</tt> (GNU/Linux) (the file name can 
+ be defined by the user).
+ The output can either be a new raster map (in case of 
  using a "moving window" analysis) or be an ASCII text file (when not 
  performing a "moving window" analysis) containing the result which 
- is then saved to the folder <tt>$HOME/.r.li/output/</tt>.
+ is then saved to the folder <tt>C:\Users\normal\.r.li\output\</tt>
+ (MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
  <br>
  <!-- TODO: applies to all output or only ASCII output?? -->
  All dimensions are percentages of raster rows or columns.</li>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.shannon/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.shannon/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.shannon/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -5,17 +5,19 @@
 with:
 <ul>
 <li><b>i</b>: patch type</li>
-<li><b>m</b>: number of patch types</li>
-<li><b>p<small><small>i</small></small></b>: proportion of the landscape
-  occupied by patch type <i>i</i> </li>
+<li><b>m</b>: number of different patch types</li>
+<li><b>p<small><small>i</small></small></b>: proportional abundance of 
+patch type <i>i</i> </li>
 </ul>
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.shannon</em>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.shape/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.shape/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.shape/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -1,14 +1,24 @@
 <h2>DESCRIPTION</h2>
 
-<em>r.li.shape</em> calculates the "shape index" as:<br>
-<I> f(sample_area)= Area </I><br>
+<em>r.li.shape</em> calculates the landscape shape index as:
+<div class="code"><pre>
+LSI = 0.25 * E / sqrt(A)
+</pre></div>
 
+with:
+<ul>
+  <li><b>E</b>: sum of all edges</li>
+  <li><b>A</b>: sum of all patch areas</li>
+</ul>
+
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.shape</em>

Modified: grass/branches/develbranch_6/raster/r.li/r.li.simpson/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.simpson/description.html	2014-08-17 18:02:29 UTC (rev 61666)
+++ grass/branches/develbranch_6/raster/r.li/r.li.simpson/description.html	2014-08-17 18:35:41 UTC (rev 61667)
@@ -5,17 +5,19 @@
 with:
 <ul>
 <li><b>i</b>: patch type</li>
-<li><b>m</b>: number of patch types</li>
-<li><b>p<small><small>i</small></small></b>: proportion of the landscape
-  occupied by patch type <i>i</i> </li>
+<li><b>m</b>: number of different patch types</li>
+<li><b>p<small><small>i</small></small></b>: proportional abundance of 
+patch type <i>i</i> </li>
 </ul>
 
 <h2>NOTES</h2>
 
-Do not use absolute path names for the <b>output</b> map/file.
+Do not use absolute path names for the <b>config</b> and <b>output</b>
+file/map parameters.
 If the "moving window" method was selected in <b>r.li.setup</b>, then the
 output will be a raster map, otherwise an ASCII file will be generated in
-the <tt>$HOME/.r.li/output/</tt> folder.
+the folder <tt>C:\Users\normal\.r.li\output\</tt>
+(MS-Windows) or <tt>$HOME/.r.li/output/</tt> (GNU/Linux).
 <p>
 <!-- TODO: verify next: -->
 If the input raster map contains only NULL values then <em>r.li.simpson</em>



More information about the grass-commit mailing list