[GRASS-SVN] r70363 - grass-addons/grass7/raster/r.series.lwr

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-01-13 06:23:35 -0800 (Fri, 13 Jan 2017)
New Revision: 70363

Modified:
   grass-addons/grass7/raster/r.series.lwr/main.c
   grass-addons/grass7/raster/r.series.lwr/r.series.lwr.html
Log:
r.series.lwr: + order=0 (weighted average)

Modified: grass-addons/grass7/raster/r.series.lwr/main.c
===================================================================
--- grass-addons/grass7/raster/r.series.lwr/main.c	2017-01-13 14:10:15 UTC (rev 70362)
+++ grass-addons/grass7/raster/r.series.lwr/main.c	2017-01-13 14:23:35 UTC (rev 70363)
@@ -276,7 +276,7 @@
     parm.suffix->key = "suffix";
     parm.suffix->type = TYPE_STRING;
     parm.suffix->required = NO;
-    parm.suffix->answer = "lwr";
+    parm.suffix->answer = "_lwr";
     parm.suffix->label = _("Suffix for output maps");
     parm.suffix->description = _("The suffix will be appended to input map names");
 
@@ -284,9 +284,10 @@
     parm.order->key = "order";
     parm.order->type = TYPE_INTEGER;
     parm.order->required = NO;
-    parm.order->options = "1,2,3";
+    parm.order->options = "0,1,2,3";
     parm.order->answer = "2";
-    parm.order->description = _("order number");
+    parm.order->label = _("order number");
+    parm.order->description = _("Order of the polynomial fitting function, 0 means weighted average");
 
     parm.weight = G_define_option();
     parm.weight->key = "weight";
@@ -360,8 +361,8 @@
         G_fatal_error(_("Please specify input= or file="));
 
     order = atoi(parm.order->answer);
-    if (order < 1)
-	G_fatal_error(_("The order number must be > 0"));
+    if (order < 0)
+	G_fatal_error(_("The order number must be >= 0"));
     if (order > 3)
 	G_fatal_error(_("The order number must be <= 3"));
 

Modified: grass-addons/grass7/raster/r.series.lwr/r.series.lwr.html
===================================================================
--- grass-addons/grass7/raster/r.series.lwr/r.series.lwr.html	2017-01-13 14:10:15 UTC (rev 70362)
+++ grass-addons/grass7/raster/r.series.lwr/r.series.lwr.html	2017-01-13 14:23:35 UTC (rev 70363)
@@ -14,10 +14,11 @@
 
 <p>
 The option <b>order</b> determines the order of the polynomial function 
-used to fit the observations. An order of 1 is a linear regression, 
-recommended and default is <em>order=2</em>. An order of 3 might cause 
-over-fitting, resulting in no smoothing, and should only be used with 
-data that show high fluctuations.
+used to fit the observations. An order of 0 is a weighted average, an 
+order of 1 is a linear regression. Recommended and default is 
+<em>order=2</em>. An order of 3 might cause over-fitting, resulting in 
+no smoothing, and should only be used with data that show high 
+fluctuations.
 
 <p>
 The <em>delta</em> option is experimental. It smoothes the polynomial