Added new weighting option to r.series and created weighting tests and reference files.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49946 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.series/main.c

@@ -59,6 +59,7 @@ struct input
     const char *name;
     int fd;
     DCELL *buf;
+    DCELL weight;
 };
 
 struct output
@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
     struct GModule *module;
     struct
     {
-	struct Option *input, *file, *output, *method, *quantile, *range;
+	struct Option *input, *file, *output, *method, *weights, *quantile, *range;
     } parm;
     struct
     {
@@ -115,6 +116,7 @@ int main(int argc, char *argv[])
     } flag;
     int i;
     int num_inputs;
+    int num_weights;
     struct input *inputs = NULL;
     int num_outputs;
     struct output *outputs = NULL;
@@ -139,7 +141,7 @@ int main(int argc, char *argv[])
 
     parm.file = G_define_standard_option(G_OPT_F_INPUT);
     parm.file->key = "file";
-    parm.file->description = _("Input file with raster map names, one per line");
+    parm.file->description = _("Input file with raster map names and optional weights per line, field separator between name and weight is |");
     parm.file->required = NO;
 
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
@@ -161,6 +163,13 @@ int main(int argc, char *argv[])
     parm.quantile->options = "0.0-1.0";
     parm.quantile->multiple = YES;
 
+    parm.weights = G_define_option();
+    parm.weights->key = "weights";
+    parm.weights->type = TYPE_DOUBLE;
+    parm.weights->required = NO;
+    parm.weights->description = _("Weighting factor for each input map, default value is 1.0 for each input map");
+    parm.weights->multiple = YES;
+    
     parm.range = G_define_option();
     parm.range->key = "range";
     parm.range->type = TYPE_DOUBLE;
@@ -203,14 +212,27 @@ int main(int argc, char *argv[])
 	max_inputs = 0;
 
 	for (;;) {
-	    char buf[GNAME_MAX];
+	    char buf[GNAME_MAX + 50]; /* Name and weight*/
+            char tok_buf[GNAME_MAX + 50];
 	    char *name;
+            int ntokens;
+            char **tokens;
 	    struct input *p;
+            double weight = 1.0;
 
 	    if (!G_getl2(buf, sizeof(buf), in))
 		break;
 
-	    name = G_chop(buf);
+            strcpy(tok_buf, buf);
+            tokens = G_tokenize(tok_buf, "|");
+            ntokens = G_number_of_tokens(tokens);
+
+            if(ntokens > 1) {
+	        name = G_chop(tokens[0]);
+	        weight = atof(G_chop(tokens[1]));
+            } else {
+	        name = G_chop(buf);
+            }
 
 	    /* Ignore empty lines */
 	    if (!*name)
@@ -223,7 +245,8 @@ int main(int argc, char *argv[])
 	    p = &inputs[num_inputs++];
 
 	    p->name = G_store(name);
-	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
+            p->weight = weight;
+	    G_verbose_message(_("Reading raster map <%s> using weight %f..."), p->name, p->weight);
 	    p->buf = Rast_allocate_d_buf();
 	    if (!flag.lazy->answer)
 		p->fd = Rast_open_old(p->name, "");
@@ -231,7 +254,7 @@ int main(int argc, char *argv[])
 
 	if (num_inputs < 1)
 	    G_fatal_error(_("No raster map name found in input file"));
-
+        
 	fclose(in);
     }
     else {
@@ -242,13 +265,31 @@ int main(int argc, char *argv[])
     	if (num_inputs < 1)
 	    G_fatal_error(_("Raster map not found"));
 
+        /* count weights */
+        if(parm.weights->answers) {
+            for (i = 0; parm.weights->answers[i]; i++)
+                    ;
+            num_weights = i;
+        } else {
+            num_weights = 0;
+        }
+    
+        if (num_weights && num_weights != num_inputs)
+                G_fatal_error(_("input= and weights= must have the same number of values"));
+        
     	inputs = G_malloc(num_inputs * sizeof(struct input));
 
     	for (i = 0; i < num_inputs; i++) {
 	    struct input *p = &inputs[i];
 
 	    p->name = parm.input->answers[i];
-	    G_verbose_message(_("Reading raster map <%s>..."), p->name);
+
+            if(num_weights)
+                p->weight = (DCELL)atof(parm.weights->answers[i]);
+            else
+                p->weight = 1.0;
+
+	    G_verbose_message(_("Reading raster map <%s> using weight %f..."), p->name, p->weight);
 	    p->buf = Rast_allocate_d_buf();
 	    if (!flag.lazy->answer)
 		p->fd = Rast_open_old(p->name, "");
@@ -321,8 +362,7 @@ int main(int argc, char *argv[])
 		    Rast_set_d_null_value(&v, 1);
 		    null = 1;
 		}
-
-		values[i] = v;
+		values[i] = v * inputs[i].weight;
 	    }
 
 	    for (i = 0; i < num_outputs; i++) {

raster/r.series/r.series.html

@@ -63,13 +63,20 @@ your_username  hard    nofile          1500
 This would raise the hard limit to 1500 file. Be warned that more
 files open need more RAM.
 
+For each map a weighting factor can be specified using the <em>weights</em> option.
+Using weights can be meaningful when computing sum or average of maps with different 
+temporal extent. The default weight is 1.0. The number of weights must be identical 
+with the number of input maps and must have the same order. Weights can also be specified in the
+input file.
+
 <p>Use the <em>file</em> option to analyze large amount of raster maps without 
 hitting open files limit and the size limit of command line arguments. 
 The computation is slower than the <em>input</em> option method. 
 For every sinlge row in the output map(s) 
 all input maps are opened and closed. The amount of RAM will rise linear
-with the number of specified input maps. The input and file options are mutual exclusive.
-Input is a text file with a new line separatetd list of raster map names. 
+with the number of specified input maps. The input and file options are mutually exclusive.
+Input is a text file with a new line separated list of raster map names and optional weights.
+As separator between the map name and the weight the charachter | must be used.
 
 <h2>EXAMPLES</h2>
 
@@ -105,6 +112,19 @@ EOF
 r.series2 file=input.txt out=result_sum meth=sum
 </pre></div>
 
+<p>Example to use the file option of r.series including weights. The weight 0.75
+should be assigned to map2. As the other maps do not have weights we can leave it out:
+<div class="code"><pre>
+cat > input.txt << EOF
+map1
+map2|0.75
+map3
+EOF
+
+r.series2 file=input.txt out=result_sum meth=sum
+</pre></div>
+
+
 <h2>SEE ALSO</h2>
 
 <em><a href="g.mlist.html">g.mlist</a></em>,

raster/r.series/test.r.series.sh

@@ -13,9 +13,10 @@ r.mapcalc --o expr="prec_5 = 500"
 r.mapcalc --o expr="prec_6 = 600"
 
 TMP_FILE=`g.tempfile pid=1`
-# We create an input file containing errors. However, r.series should process the 
-# valid raster maps listed in this file.
-cat > $TMP_FILE << EOF
+TMP_FILE_WEIGHTS=`g.tempfile pid=2`
+# We create an input files containing empty lines. However, r.series should process the 
+# valid raster maps listed in the files.
+cat > "${TMP_FILE}" << EOF
 prec_1
 
 prec_2
@@ -31,6 +32,25 @@ prec_6
 
 EOF
 
+# The second file includes weights. The deafult weight pf 1.0 
+# must not be specified
+cat > "${TMP_FILE_WEIGHTS}" << EOF
+prec_1|3
+
+prec_2|1.5
+prec_3
+
+prec_4|0.75
+
+prec_5|0.6
+
+
+prec_6|0.5
+
+
+EOF
+
+
 # The first @test with map input and @precision=3
 r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_mean method=average
 r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_max method=maximum
@@ -38,6 +58,7 @@ r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_
 r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_count method=count
 r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_range method=range
 r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_sum method=sum
+
 #r.out.ascii --o input=test_1_prec_mean output=test_1_prec_mean.ref dp=3
 #r.out.ascii --o input=test_1_prec_max output=test_1_prec_max.ref dp=3
 #r.out.ascii --o input=test_1_prec_min output=test_1_prec_min.ref dp=3
@@ -45,13 +66,29 @@ r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_
 #r.out.ascii --o input=test_1_prec_range output=test_1_prec_range.ref dp=3
 #r.out.ascii --o input=test_1_prec_sum output=test_1_prec_sum.ref dp=3
 
+# Now @test the weighting option 
+r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_mean_weight method=average
+r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_max_weight method=maximum
+r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_min_weight method=minimum
+r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_count_weight method=count
+r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_range_weight method=range
+r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 weights=6,3,2,1.5,1.2,1 output=test_1_prec_sum_weight method=sum
+
+#r.out.ascii --o input=test_1_prec_mean_weight output=test_1_prec_mean_weight.ref dp=3
+#r.out.ascii --o input=test_1_prec_max_weight output=test_1_prec_max_weight.ref dp=3
+#r.out.ascii --o input=test_1_prec_min_weight output=test_1_prec_min_weight.ref dp=3
+#r.out.ascii --o input=test_1_prec_count_weight output=test_1_prec_count_weight.ref dp=3
+#r.out.ascii --o input=test_1_prec_range_weight output=test_1_prec_range_weight.ref dp=3
+#r.out.ascii --o input=test_1_prec_sum_weight output=test_1_prec_sum_weight.ref dp=3
+
+
 # The second @test with file input and @precision=3
-r.series -z --o --v file=$TMP_FILE output=test_2_prec_mean method=average
-r.series    --o --v file=$TMP_FILE output=test_2_prec_max method=maximum
-r.series -z --o --v file=$TMP_FILE output=test_2_prec_min method=minimum
-r.series    --o --v file=$TMP_FILE output=test_2_prec_count method=count
-r.series -z --o --v file=$TMP_FILE output=test_2_prec_range method=range
-r.series    --o --v file=$TMP_FILE output=test_2_prec_sum method=sum
+r.series -z --o --v file="${TMP_FILE}" output=test_2_prec_mean method=average
+r.series    --o --v file="${TMP_FILE}" output=test_2_prec_max method=maximum
+r.series -z --o --v file="${TMP_FILE}" output=test_2_prec_min method=minimum
+r.series    --o --v file="${TMP_FILE}" output=test_2_prec_count method=count
+r.series -z --o --v file="${TMP_FILE}" output=test_2_prec_range method=range
+r.series    --o --v file="${TMP_FILE}" output=test_2_prec_sum method=sum
 
 #r.out.ascii --o input=test_2_prec_mean output=test_2_prec_mean.ref dp=3
 #r.out.ascii --o input=test_2_prec_max output=test_2_prec_max.ref dp=3
@@ -60,14 +97,28 @@ r.series    --o --v file=$TMP_FILE output=test_2_prec_sum method=sum
 #r.out.ascii --o input=test_2_prec_range output=test_2_prec_range.ref dp=3
 #r.out.ascii --o input=test_2_prec_sum output=test_2_prec_sum.ref dp=3
 
+# Now @test the weighting 
+r.series -z --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_mean_weight method=average
+r.series    --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_max_weight method=maximum
+r.series -z --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_min_weight method=minimum
+r.series    --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_count_weight method=count
+r.series -z --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_range_weight method=range
+r.series    --o --v file="${TMP_FILE_WEIGHTS}" output=test_2_prec_sum_weight method=sum
+
+#r.out.ascii --o input=test_2_prec_mean_weight output=test_2_prec_mean_weight.ref dp=3
+#r.out.ascii --o input=test_2_prec_max_weight output=test_2_prec_max_weight.ref dp=3
+#r.out.ascii --o input=test_2_prec_min_weight output=test_2_prec_min_weight.ref dp=3
+#r.out.ascii --o input=test_2_prec_count_weight output=test_2_prec_count_weight.ref dp=3
+#r.out.ascii --o input=test_2_prec_range_weight output=test_2_prec_range_weight.ref dp=3
+#r.out.ascii --o input=test_2_prec_sum_weight output=test_2_prec_sum_weight.ref dp=3
 
 # The third @test with multiple methods and outputs
 r.series    --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_3_prec_mean,test_3_prec_max,test_3_prec_min method=average,maximum,minimum
-r.series -z --o --v file=$TMP_FILE output=test_4_prec_mean,test_4_prec_max,test_4_prec_min method=average,maximum,minimum
+r.series -z --o --v file="${TMP_FILE}" output=test_4_prec_mean,test_4_prec_max,test_4_prec_min method=average,maximum,minimum
 
 #r.out.ascii --o input=test_1_prec_mean output=test_3_prec_mean.ref dp=3
 #r.out.ascii --o input=test_1_prec_max output=test_3_prec_max.ref dp=3
 #r.out.ascii --o input=test_1_prec_min output=test_3_prec_min.ref dp=3
 #r.out.ascii --o input=test_2_prec_mean output=test_4_prec_mean.ref dp=3
 #r.out.ascii --o input=test_2_prec_max output=test_4_prec_max.ref dp=3
-#r.out.ascii --o input=test_2_prec_min output=test_4_prec_min.ref dp=3
+#r.out.ascii --o input=test_2_prec_min output=test_4_prec_min.ref dp=3

raster/r.series/test_1_prec_count.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_count_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 

raster/r.series/test_1_prec_max.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_max_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 

raster/r.series/test_1_prec_mean.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_mean_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 

raster/r.series/test_1_prec_min.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_min_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 
+600 600 600 600 600 600 600 600 600 600 600 600 

raster/r.series/test_1_prec_range.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_range_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 

raster/r.series/test_1_prec_sum.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_1_prec_sum_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 
+3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 

raster/r.series/test_2_prec_count.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_count_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 
+6 6 6 6 6 6 6 6 6 6 6 6 

raster/r.series/test_2_prec_max.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_max_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 

raster/r.series/test_2_prec_mean.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_mean_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 

raster/r.series/test_2_prec_min.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_min_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 
+300 300 300 300 300 300 300 300 300 300 300 300 

raster/r.series/test_2_prec_range.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_range_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 

raster/r.series/test_2_prec_sum.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_2_prec_sum_weight.ref

@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 
+1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 1800 

raster/r.series/test_3_prec_max.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_3_prec_mean.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_3_prec_min.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_4_prec_max.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_4_prec_mean.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12

raster/r.series/test_4_prec_min.ref

@@ -1,6 +1,6 @@
-north: 80N
+north: 80
 south: 0
-east: 120E
+east: 120
 west: 0
 rows: 8
 cols: 12