[GRASS-SVN] r70846 - in grass-addons/grass7/raster/r.pi: . r.pi.corr.mw

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Apr 6 14:02:30 PDT 2017


Author: mmetz
Date: 2017-04-06 14:02:30 -0700 (Thu, 06 Apr 2017)
New Revision: 70846

Added:
   grass-addons/grass7/raster/r.pi/r.pi.corr.mw/
   grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html
Removed:
   grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corrwin.html
   grass-addons/grass7/raster/r.pi/r.pi.corrwin/
Modified:
   grass-addons/grass7/raster/r.pi/description.html
   grass-addons/grass7/raster/r.pi/r.pi.corr.mw/Makefile
   grass-addons/grass7/raster/r.pi/r.pi.corr.mw/main.c
Log:
r.pi.corrwin -> r.pi.corr.mw

Modified: grass-addons/grass7/raster/r.pi/description.html
===================================================================
--- grass-addons/grass7/raster/r.pi/description.html	2017-04-06 20:56:05 UTC (rev 70845)
+++ grass-addons/grass7/raster/r.pi/description.html	2017-04-06 21:02:30 UTC (rev 70846)
@@ -27,7 +27,6 @@
 <h2>OVERVIEW</h2>
 
 <li><em>r.pi.rectangle</em>  - Performs statistical analysis on values of patches from the given raster map.
-<li><em>r.pi.corrwindow</em>  - Calculates correlation of two raster maps by calculating correlation function of two corresponding rectangular areas for each raster point and writing the result into a new raster map.
 <li><em>r.pi.energy</em>  - Individual-based dispersal model for connectivity analysis - energy based.
 <li><em>r.pi.energy.iter</em>  - Individual-based dispersal model for connectivity analysis (energy based) using iterative patch removal.
 <li><em>r.pi.fragment.dist</em>  - Calculates correlation of two raster maps by calculating correlation function of two corresponding rectangular areas for each raster point and writing the result into a new raster map.
@@ -40,7 +39,7 @@
 <li><em>r.pi.nlm.circ</em>  - Creates a random landscape with defined attributes.
 <li><em>r.pi.nlm.stats</em>  - Neutral Landscape Generator - index statistics
 <li><em>r.pi.corearea</em>  - Variable edge effects and core area analysis
-<li><em>r.pi.corrwin</em>  - Moving window correlation analysis.
+<li><em>r.pi.corr.mw</em>  - Moving window correlation analysis.
 <li><em>r.pi.csr.mw</em>  - Complete Spatial Randomness analysis on moving window.
 <li><em>r.pi.export</em>  - Export of patch based information.
 <li><em>r.pi.graph</em>  - Graph Theory for connectivity analysis.
@@ -104,8 +103,7 @@
 <li><b><a href="r.pi.import.html">r.pi.import</a></b>:Import of values to corresponding patches</li>
 <li><b><a href="r.pi.export.html">r.pi.export</a></b>:Export of values from patches</li>
 <li><b><a href="r.pi.lm.html">r.pi.lm</a></b>:Residuals of a Linear Regression between 2 rasters are provided as raster</li>
-<li><b><a href="r.pi.corrwin.html">r.pi.corrwin</a></b>:A correlation between the pixels of two raster
-files inside a moving analysis is calculated</li>
+<li><b><a href="r.pi.corr.mw.html">r.pi.corr.mw</a></b>:Moving window correlation between two raster maps</li>
  </ul>
 
 <h2>EXAMPLES</h2>
@@ -151,7 +149,7 @@
 
 <em>
 <a href="r.buffer.rect.html">r.buffer.rect</a>,
-<a href="r.corrwindow.html">r.corrwindow</a>,
+<a href="r.corr.mw.html">r.corr.mw</a>,
 <a href="r.energy.html">r.energy</a>,
 <a href="r.energy.iter.html">r.energy.iter</a>,
 <a href="r.fragment.html">r.fragment</a>,
@@ -164,7 +162,6 @@
 <a href="r.nlm.fractal.html">r.nlm.fractal</a>,
 <a href="r.nlm.stats.html">r.nlm.stats</a>,
 <a href="r.pi.corearea.html">r.pi.corearea</a>,
-<a href="r.pi.corrwin.html">r.pi.corrwin</a>,
 <a href="r.pi.csr.mw.html">r.pi.csr.mw</a>,
 <a href="r.pi.export.html">r.pi.export</a>,
 <a href="r.pi.graph.html">r.pi.graph</a>,

Modified: grass-addons/grass7/raster/r.pi/r.pi.corr.mw/Makefile
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corrwin/Makefile	2017-04-06 20:56:05 UTC (rev 70845)
+++ grass-addons/grass7/raster/r.pi/r.pi.corr.mw/Makefile	2017-04-06 21:02:30 UTC (rev 70846)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-PGM = r.pi.corrwin
+PGM = r.pi.corr.mw
 
 LIBES = $(STATSLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(STATSDEP) $(RASTERDEP) $(GISDEP)

Modified: grass-addons/grass7/raster/r.pi/r.pi.corr.mw/main.c
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corrwin/main.c	2017-04-06 20:56:05 UTC (rev 70845)
+++ grass-addons/grass7/raster/r.pi/r.pi.corr.mw/main.c	2017-04-06 21:02:30 UTC (rev 70846)
@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       r.pi.corrwin
+ * MODULE:       r.pi.corr.mw
  * AUTHOR(S):    Elshad Shirinov, Dr. Martin Wegmann
  *               Markus Metz (update to GRASS 7)
  * PURPOSE:      Moving window correlation analysis

Copied: grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html (from rev 70845, grass-addons/grass7/raster/r.pi/r.pi.corrwin/r.pi.corrwin.html)
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html	                        (rev 0)
+++ grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corr.mw.html	2017-04-06 21:02:30 UTC (rev 70846)
@@ -0,0 +1,45 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.corr.mw</em> provides information concerning the correlation
+of pixels inside a moving window between two raster files.
+<p>
+It calculates correlation of two raster maps by calculating correlation
+function of two corresponding rectangular areas for each raster point and
+writing the result into a new raster map.
+
+<h2>NOTES</h2>
+
+This module computes the correlation between two raster files but 
+unlike <em>r.pi.lm</em> for moving windows of a specific size. This 
+module is partly based on <em>r.neighbours</em> and <em>r.covar</em>.
+
+<h2>EXAMPLE</h2>
+
+An example for the North Carolina sample dataset:
+
+Correlation of all pixels within a 7x7 sized window of two rasters 
+(elevation and slope). The output is multiplied by 10000 for higher 
+precision
+<div class="code"><pre>
+g.region rast=elevation -p
+r.pi.corrwin input1=slope input2=elevation output=corrwin1 size=7 max=10000
+r.colors corrwin1 col=bgyr
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.pi.index.html">r.pi.index</a>,
+<a href="r.pi.lm.html">r.pi.lm</a>,
+<a href="r.pi.html">r.pi</a>
+</em>
+
+<h2>AUTHORS</h2>
+Programming: Elshad Shirinov<br>
+Scientific concept: Dr. Martin Wegmann<br>
+Department of Remote Sensing<br>
+Remote Sensing and Biodiversity Unit<br>
+University of Wuerzburg, Germany
+
+<p>
+<i>Last changed: $Date$</i>

Deleted: grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corrwin.html
===================================================================
--- grass-addons/grass7/raster/r.pi/r.pi.corrwin/r.pi.corrwin.html	2017-04-06 20:56:05 UTC (rev 70845)
+++ grass-addons/grass7/raster/r.pi/r.pi.corr.mw/r.pi.corrwin.html	2017-04-06 21:02:30 UTC (rev 70846)
@@ -1,45 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>r.corrwin</em> provides information concerning the correlation
-of pixels inside a moving window between two raster files.
-<p>
-It calculates correlation of two raster maps by calculating correlation
-function of two corresponding rectangular areas for each raster point and
-writing the result into a new raster map.
-
-<h2>NOTES</h2>
-
-This module computes the correlation between two raster files but 
-unlike <em>r.pi.lm</em> for moving windows of a specific size. This 
-module is partly based on <em>r.neighbours</em> and <em>r.covar</em>.
-
-<h2>EXAMPLE</h2>
-
-An example for the North Carolina sample dataset:
-
-Correlation of all pixels within a 7x7 sized window of two rasters 
-(elevation and slope). The output is multiplied by 10000 for higher 
-precision
-<div class="code"><pre>
-g.region rast=elevation -p
-r.pi.corrwin input1=slope input2=elevation output=corrwin1 size=7 max=10000
-r.colors corrwin1 col=bgyr
-</pre></div>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="r.pi.index.html">r.pi.index</a>,
-<a href="r.pi.lm.html">r.pi.lm</a>,
-<a href="r.pi.html">r.pi</a>
-</em>
-
-<h2>AUTHORS</h2>
-Programming: Elshad Shirinov<br>
-Scientific concept: Dr. Martin Wegmann<br>
-Department of Remote Sensing<br>
-Remote Sensing and Biodiversity Unit<br>
-University of Wuerzburg, Germany
-
-<p>
-<i>Last changed: $Date$</i>



More information about the grass-commit mailing list