[GRASS-SVN] r50004 - in grass/trunk/raster/r.series: . test

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Dec 31 08:15:54 EST 2011


Author: huhabla
Date: 2011-12-31 05:15:54 -0800 (Sat, 31 Dec 2011)
New Revision: 50004

Added:
   grass/trunk/raster/r.series/test/
   grass/trunk/raster/r.series/test/test.r.series.sh
   grass/trunk/raster/r.series/test/test_1_prec_count.ref
   grass/trunk/raster/r.series/test/test_1_prec_count_weight.ref
   grass/trunk/raster/r.series/test/test_1_prec_max.ref
   grass/trunk/raster/r.series/test/test_1_prec_max_weight.ref
   grass/trunk/raster/r.series/test/test_1_prec_mean.ref
   grass/trunk/raster/r.series/test/test_1_prec_mean_weight.ref
   grass/trunk/raster/r.series/test/test_1_prec_min.ref
   grass/trunk/raster/r.series/test/test_1_prec_min_weight.ref
   grass/trunk/raster/r.series/test/test_1_prec_range.ref
   grass/trunk/raster/r.series/test/test_1_prec_range_weight.ref
   grass/trunk/raster/r.series/test/test_1_prec_sum.ref
   grass/trunk/raster/r.series/test/test_1_prec_sum_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_count.ref
   grass/trunk/raster/r.series/test/test_2_prec_count_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_max.ref
   grass/trunk/raster/r.series/test/test_2_prec_max_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_mean.ref
   grass/trunk/raster/r.series/test/test_2_prec_mean_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_min.ref
   grass/trunk/raster/r.series/test/test_2_prec_min_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_range.ref
   grass/trunk/raster/r.series/test/test_2_prec_range_weight.ref
   grass/trunk/raster/r.series/test/test_2_prec_sum.ref
   grass/trunk/raster/r.series/test/test_2_prec_sum_weight.ref
   grass/trunk/raster/r.series/test/test_3_prec_max.ref
   grass/trunk/raster/r.series/test/test_3_prec_mean.ref
   grass/trunk/raster/r.series/test/test_3_prec_min.ref
   grass/trunk/raster/r.series/test/test_4_prec_max.ref
   grass/trunk/raster/r.series/test/test_4_prec_mean.ref
   grass/trunk/raster/r.series/test/test_4_prec_min.ref
Removed:
   grass/trunk/raster/r.series/test.r.series.sh
   grass/trunk/raster/r.series/test_1_prec_count.ref
   grass/trunk/raster/r.series/test_1_prec_count_weight.ref
   grass/trunk/raster/r.series/test_1_prec_max.ref
   grass/trunk/raster/r.series/test_1_prec_max_weight.ref
   grass/trunk/raster/r.series/test_1_prec_mean.ref
   grass/trunk/raster/r.series/test_1_prec_mean_weight.ref
   grass/trunk/raster/r.series/test_1_prec_min.ref
   grass/trunk/raster/r.series/test_1_prec_min_weight.ref
   grass/trunk/raster/r.series/test_1_prec_range.ref
   grass/trunk/raster/r.series/test_1_prec_range_weight.ref
   grass/trunk/raster/r.series/test_1_prec_sum.ref
   grass/trunk/raster/r.series/test_1_prec_sum_weight.ref
   grass/trunk/raster/r.series/test_2_prec_count.ref
   grass/trunk/raster/r.series/test_2_prec_count_weight.ref
   grass/trunk/raster/r.series/test_2_prec_max.ref
   grass/trunk/raster/r.series/test_2_prec_max_weight.ref
   grass/trunk/raster/r.series/test_2_prec_mean.ref
   grass/trunk/raster/r.series/test_2_prec_mean_weight.ref
   grass/trunk/raster/r.series/test_2_prec_min.ref
   grass/trunk/raster/r.series/test_2_prec_min_weight.ref
   grass/trunk/raster/r.series/test_2_prec_range.ref
   grass/trunk/raster/r.series/test_2_prec_range_weight.ref
   grass/trunk/raster/r.series/test_2_prec_sum.ref
   grass/trunk/raster/r.series/test_2_prec_sum_weight.ref
   grass/trunk/raster/r.series/test_3_prec_max.ref
   grass/trunk/raster/r.series/test_3_prec_mean.ref
   grass/trunk/raster/r.series/test_3_prec_min.ref
   grass/trunk/raster/r.series/test_4_prec_max.ref
   grass/trunk/raster/r.series/test_4_prec_mean.ref
   grass/trunk/raster/r.series/test_4_prec_min.ref
Log:
Moved all test related files into the test directory


Copied: grass/trunk/raster/r.series/test/test.r.series.sh (from rev 49997, grass/trunk/raster/r.series/test.r.series.sh)
===================================================================
--- grass/trunk/raster/r.series/test/test.r.series.sh	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test.r.series.sh	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,124 @@
+# Test r.series basic aggregation functions with map and file inputs
+# We need to set a specific region in the
+# @preprocess step of this test. We generate
+# raster with r.mapcalc 
+# The region setting should work for UTM and LL test locations
+g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
+r.mapcalc --o expr="prec_1 = 100"
+r.mapcalc --o expr="prec_2 = 200"
+r.mapcalc --o expr="prec_3 = 300"
+r.mapcalc --o expr="prec_4 = 400"
+r.mapcalc --o expr="prec_5 = 500"
+r.mapcalc --o expr="prec_6 = 600"
+
+TMP_FILE=`g.tempfile pid=1`
+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
+prec_3
+
+prec_4
+
+prec_5
+
+
+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
+r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_min method=minimum
+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
+#r.out.ascii --o input=test_1_prec_count output=test_1_prec_count.ref dp=3
+#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.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
+#r.out.ascii --o input=test_2_prec_min output=test_2_prec_min.ref dp=3
+#r.out.ascii --o input=test_2_prec_count output=test_2_prec_count.ref dp=3
+#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.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

Copied: grass/trunk/raster/r.series/test/test_1_prec_count.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_count.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_count.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_count.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_count_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_count_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_count_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_count_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_max.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_max.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_max.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_max_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_max_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_max_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_max_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_mean.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_mean.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_mean.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 

Copied: grass/trunk/raster/r.series/test/test_1_prec_mean_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_mean_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_mean_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_mean_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_min.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_min.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_min.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 

Copied: grass/trunk/raster/r.series/test/test_1_prec_min_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_min_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_min_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_min_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_range.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_range.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_range.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_range.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 

Copied: grass/trunk/raster/r.series/test/test_1_prec_range_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_range_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_range_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_range_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_1_prec_sum.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_sum.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_sum.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_sum.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 

Copied: grass/trunk/raster/r.series/test/test_1_prec_sum_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_1_prec_sum_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_1_prec_sum_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_1_prec_sum_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_count.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_count.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_count.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_count.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_count_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_count_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_count_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_count_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_max.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_max.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_max.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_max_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_max_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_max_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_max_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_mean.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_mean.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_mean.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 

Copied: grass/trunk/raster/r.series/test/test_2_prec_mean_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_mean_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_mean_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_mean_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_min.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_min.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_min.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 

Copied: grass/trunk/raster/r.series/test/test_2_prec_min_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_min_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_min_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_min_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_range.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_range.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_range.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_range.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 
+500 500 500 500 500 500 500 500 500 500 500 500 

Copied: grass/trunk/raster/r.series/test/test_2_prec_range_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_range_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_range_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_range_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_2_prec_sum.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_sum.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_sum.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_sum.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
+2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 

Copied: grass/trunk/raster/r.series/test/test_2_prec_sum_weight.ref (from rev 49997, grass/trunk/raster/r.series/test_2_prec_sum_weight.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_2_prec_sum_weight.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_2_prec_sum_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_3_prec_max.ref (from rev 49997, grass/trunk/raster/r.series/test_3_prec_max.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_3_prec_max.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_3_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_3_prec_mean.ref (from rev 49997, grass/trunk/raster/r.series/test_3_prec_mean.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_3_prec_mean.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_3_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 

Copied: grass/trunk/raster/r.series/test/test_3_prec_min.ref (from rev 49997, grass/trunk/raster/r.series/test_3_prec_min.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_3_prec_min.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_3_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 

Copied: grass/trunk/raster/r.series/test/test_4_prec_max.ref (from rev 49997, grass/trunk/raster/r.series/test_4_prec_max.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_4_prec_max.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_4_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -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 

Copied: grass/trunk/raster/r.series/test/test_4_prec_mean.ref (from rev 49997, grass/trunk/raster/r.series/test_4_prec_mean.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_4_prec_mean.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_4_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 
+350 350 350 350 350 350 350 350 350 350 350 350 

Copied: grass/trunk/raster/r.series/test/test_4_prec_min.ref (from rev 49997, grass/trunk/raster/r.series/test_4_prec_min.ref)
===================================================================
--- grass/trunk/raster/r.series/test/test_4_prec_min.ref	                        (rev 0)
+++ grass/trunk/raster/r.series/test/test_4_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -0,0 +1,14 @@
+north: 80
+south: 0
+east: 120
+west: 0
+rows: 8
+cols: 12
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 
+100 100 100 100 100 100 100 100 100 100 100 100 

Deleted: grass/trunk/raster/r.series/test.r.series.sh
===================================================================
--- grass/trunk/raster/r.series/test.r.series.sh	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test.r.series.sh	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,124 +0,0 @@
-# Test r.series basic aggregation functions with map and file inputs
-# We need to set a specific region in the
-# @preprocess step of this test. We generate
-# raster with r.mapcalc 
-# The region setting should work for UTM and LL test locations
-g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-
-r.mapcalc --o expr="prec_1 = 100"
-r.mapcalc --o expr="prec_2 = 200"
-r.mapcalc --o expr="prec_3 = 300"
-r.mapcalc --o expr="prec_4 = 400"
-r.mapcalc --o expr="prec_5 = 500"
-r.mapcalc --o expr="prec_6 = 600"
-
-TMP_FILE=`g.tempfile pid=1`
-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
-prec_3
-
-prec_4
-
-prec_5
-
-
-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
-r.series -z --o --v input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 output=test_1_prec_min method=minimum
-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
-#r.out.ascii --o input=test_1_prec_count output=test_1_prec_count.ref dp=3
-#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.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
-#r.out.ascii --o input=test_2_prec_min output=test_2_prec_min.ref dp=3
-#r.out.ascii --o input=test_2_prec_count output=test_2_prec_count.ref dp=3
-#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.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

Deleted: grass/trunk/raster/r.series/test_1_prec_count.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_count.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_count.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_count_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_count_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_count_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_max.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_max.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_max_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_max_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_max_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_mean.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_mean.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 

Deleted: grass/trunk/raster/r.series/test_1_prec_mean_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_mean_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_mean_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_min.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_min.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 

Deleted: grass/trunk/raster/r.series/test_1_prec_min_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_min_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_min_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_range.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_range.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_range.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 

Deleted: grass/trunk/raster/r.series/test_1_prec_range_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_range_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_range_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_1_prec_sum.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_sum.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_sum.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 

Deleted: grass/trunk/raster/r.series/test_1_prec_sum_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_1_prec_sum_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_1_prec_sum_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_count.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_count.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_count.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_count_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_count_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_count_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_max.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_max.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_max_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_max_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_max_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_mean.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_mean.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 

Deleted: grass/trunk/raster/r.series/test_2_prec_mean_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_mean_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_mean_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_min.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_min.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 

Deleted: grass/trunk/raster/r.series/test_2_prec_min_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_min_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_min_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_range.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_range.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_range.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 
-500 500 500 500 500 500 500 500 500 500 500 500 

Deleted: grass/trunk/raster/r.series/test_2_prec_range_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_range_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_range_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_2_prec_sum.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_sum.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_sum.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 
-2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 2100 

Deleted: grass/trunk/raster/r.series/test_2_prec_sum_weight.ref
===================================================================
--- grass/trunk/raster/r.series/test_2_prec_sum_weight.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_2_prec_sum_weight.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_3_prec_max.ref
===================================================================
--- grass/trunk/raster/r.series/test_3_prec_max.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_3_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_3_prec_mean.ref
===================================================================
--- grass/trunk/raster/r.series/test_3_prec_mean.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_3_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 

Deleted: grass/trunk/raster/r.series/test_3_prec_min.ref
===================================================================
--- grass/trunk/raster/r.series/test_3_prec_min.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_3_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 

Deleted: grass/trunk/raster/r.series/test_4_prec_max.ref
===================================================================
--- grass/trunk/raster/r.series/test_4_prec_max.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_4_prec_max.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-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 

Deleted: grass/trunk/raster/r.series/test_4_prec_mean.ref
===================================================================
--- grass/trunk/raster/r.series/test_4_prec_mean.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_4_prec_mean.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 
-350 350 350 350 350 350 350 350 350 350 350 350 

Deleted: grass/trunk/raster/r.series/test_4_prec_min.ref
===================================================================
--- grass/trunk/raster/r.series/test_4_prec_min.ref	2011-12-31 13:15:43 UTC (rev 50003)
+++ grass/trunk/raster/r.series/test_4_prec_min.ref	2011-12-31 13:15:54 UTC (rev 50004)
@@ -1,14 +0,0 @@
-north: 80
-south: 0
-east: 120
-west: 0
-rows: 8
-cols: 12
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 
-100 100 100 100 100 100 100 100 100 100 100 100 



More information about the grass-commit mailing list