[GRASS-SVN] r46083 - in grass/branches/releasebranch_6_4: raster raster/r.regression.line scripts

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-04-22 07:07:05 -0700 (Fri, 22 Apr 2011)
New Revision: 46083

Added:
   grass/branches/releasebranch_6_4/raster/r.regression.line/
Removed:
   grass/branches/releasebranch_6_4/scripts/r.regression.line/
Modified:
   grass/branches/releasebranch_6_4/raster/Makefile
   grass/branches/releasebranch_6_4/raster/r.regression.line/description.html
   grass/branches/releasebranch_6_4/raster/r.regression.line/main.c
   grass/branches/releasebranch_6_4/scripts/Makefile
Log:
backport of fast C version of module

Modified: grass/branches/releasebranch_6_4/raster/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/raster/Makefile	2011-04-22 12:58:58 UTC (rev 46082)
+++ grass/branches/releasebranch_6_4/raster/Makefile	2011-04-22 14:07:05 UTC (rev 46083)
@@ -72,6 +72,7 @@
 	r.reclass \
 	r.recode \
 	r.region \
+	r.regression.line \
 	r.report \
 	r.resample \
 	r.resamp.interp \

Modified: grass/branches/releasebranch_6_4/raster/r.regression.line/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.regression.line/description.html	2011-04-22 11:05:50 UTC (rev 46081)
+++ grass/branches/releasebranch_6_4/raster/r.regression.line/description.html	2011-04-22 14:07:05 UTC (rev 46083)
@@ -12,6 +12,9 @@
 <H2>NOTES</H2>
 The results for offset/intercept (a) and gain/slope (b) are 
 identical to that obtained from R-stats's lm() function. 
+<p>
+The flag <em>-s</em> is inactive as always high precision is
+calculated (kept for backward compatibility). 
 
 <H2>EXAMPLE</H2>
 

Modified: grass/branches/releasebranch_6_4/raster/r.regression.line/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.regression.line/main.c	2011-04-22 11:05:50 UTC (rev 46081)
+++ grass/branches/releasebranch_6_4/raster/r.regression.line/main.c	2011-04-22 14:07:05 UTC (rev 46083)
@@ -32,7 +32,7 @@
     DCELL *map1_buf, *map2_buf, map1_val, map2_val;
     char *name, *mapset;
     struct Option *input_map1, *input_map2, *output_opt;
-    struct Flag *shell_style;
+    struct Flag *shell_style, *slow;
     struct Cell_head region;
     struct GModule *module;
 
@@ -62,6 +62,10 @@
     shell_style->key = 'g';
     shell_style->description = _("Print in shell script style");
 
+    slow = G_define_flag();
+    slow->key = 's';
+    slow->description = _("Slower but accurate (applies to FP maps only");
+
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/branches/releasebranch_6_4/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/scripts/Makefile	2011-04-22 12:58:58 UTC (rev 46082)
+++ grass/branches/releasebranch_6_4/scripts/Makefile	2011-04-22 14:07:05 UTC (rev 46083)
@@ -49,7 +49,6 @@
 	r.out.xyz \
 	r.plane \
 	r.reclass.area \
-	r.regression.line \
 	r.shaded.relief \
 	r.tileset \
 	r.univar.sh \