[GRASS-CVS] markus: grass6/scripts/r.regression.line description.html, 1.2, 1.2.4.1 r.regression.line, 1.12.4.2, 1.12.4.3

[grass at intevation.de]

Author: markus

Update of /grassrepository/grass6/scripts/r.regression.line
In directory doto:/tmp/cvs-serv8208

Modified Files:
      Tag: releasebranch_6_2
	description.html r.regression.line 
Log Message:
fix to suppress no data; fix for FP maps; example added (merge from HEAD)

Index: description.html
===================================================================
RCS file: /grassrepository/grass6/scripts/r.regression.line/description.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- description.html	30 Aug 2005 14:57:07 -0000	1.2
+++ description.html	4 Dec 2007 20:44:26 -0000	1.2.4.1
@@ -2,20 +2,26 @@
 
 <EM>r.regression.line</EM> Calculates linear regression from two raster maps, 
 according to the formula y = a + b*x, where x and y represent raster maps. 
-Optionally saves regression coefficients to an ASCII file.
+Optionally saves regression coefficients to an ASCII file. 
+The result includes the following coefficients:
+offset (a) and gain (b), residuals (R),
+number of elements (N), medians (medX, medY), standard deviations
+(sdX, sdY), and the F test for testing the significance of the
+regression model as a whole (F).
 <br>
 
 <H2>EXAMPLE</H2>
 
 Comparison of the old and the new DEM in Spearfish:
-<PRE>
-g.region rast=elevation.10m
-r.regression.line elevation.dem map2=elevation.10m
-</PRE>
+<div class="code"><pre>
+g.region rast=elevation.10m -p
+r.regression.line map1=elevation.dem map2=elevation.10m
+</pre></div>
+<p>
 
 <H2>AUTHOR</H2>
 
-Dr. Agustin Lobo - alobo at ija.csic.es<BR>
+Dr. Agustin Lobo - alobo at ija.csic.es<BR>
 Updated to GRASS 5.7 Michael Barton, Arizona State University
 
 <p><i>Last changed: $Date$</i>

Index: r.regression.line
===================================================================
RCS file: /grassrepository/grass6/scripts/r.regression.line/r.regression.line,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -d -r1.12.4.2 -r1.12.4.3
--- r.regression.line	24 Nov 2006 10:01:56 -0000	1.12.4.2
+++ r.regression.line	4 Dec 2007 20:44:26 -0000	1.12.4.3
@@ -71,7 +71,7 @@
 
 
 #calculate regression equation
-r.stats -c input=$GIS_OPT_MAP1,$GIS_OPT_MAP2  > "$TMP"
+r.stats -cnA input=$GIS_OPT_MAP1,$GIS_OPT_MAP2  > "$TMP"
 awk '{tot += $3;sumX +=$1 * $3; sumsqX +=$1*$1*$3;sumY +=$2 * $3; sumsqY +=$2*$2*$3;\
  sumXY +=$1*$2*$3;\
 }\