[GRASS-SVN] r61660 - in grass/trunk/temporal: t.rast.aggregate t.rast.aggregate/testsuite t.rast.aggregate.ds t.rast.aggregate.ds/testsuite t.vect.observe.strds t.vect.observe.strds/testsuite t.vect.univar t.vect.univar/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 15 14:27:43 PDT 2014
Author: wenzeslaus
Date: 2014-08-15 14:27:43 -0700 (Fri, 15 Aug 2014)
New Revision: 61660
Added:
grass/trunk/temporal/t.rast.aggregate.ds/testsuite/
grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
grass/trunk/temporal/t.rast.aggregate/testsuite/
grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh
grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
grass/trunk/temporal/t.vect.univar/testsuite/
grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
Removed:
grass/trunk/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh
grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh
grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.sh
grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh
grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh
grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh
grass/trunk/temporal/t.vect.univar/test.t.vect.univar.sh
Log:
testing: add more shell scripts to the testing framework
Deleted: grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Space time raster dataset aggregation
-
-# We need to set a specific region in the
-# @preprocess step of this test.
-# 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
-# Data generation
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = null()"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
-
-t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 unit=days increment=3
-
-# The first @test
-
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- granularity=6 method=average sampling=overlaps,overlapped,contains -ns nprocs=2
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2
-
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- granularity=9 method=maximum sampling=contains offset=130 nprocs=3
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2
-
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- granularity=4 method=minimum sampling=contains -s
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2
-
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- granularity=5 method=sum sampling=overlaps,overlapped,contains -n
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2
-
-t.remove -rf type=strds input=precip_abs1,precip_abs2
Deleted: grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Space time raster dataset aggregation
-# We need to set a specific region in the
-# @preprocess step of this test.
-
-export GRASS_OVERWRITE=1
-
-# 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
-# Generate data
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
-r.mapcalc expr="prec_7 = null()"
-
-t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_7 \
- start="2001-01-15 12:05:45" increment="14 days"
-
-# The first @test
-t.rast.aggregate --v input=precip_abs1 output=precip_abs2 \
- base=prec_sum granularity="2 days" method=average \
- sampling=overlaps,overlapped,during nprocs=5 -sn
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs1
-t.rast.list input=precip_abs2
-
-t.rast.aggregate --v input=precip_abs1 output=precip_abs2 \
- base=prec_sum granularity="1 months" method=maximum \
- sampling=contains nprocs=5 -n
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs1
-t.rast.list input=precip_abs2
-
-t.rast.aggregate --v input=precip_abs1 output=precip_abs3 offset=10 \
- base=prec_sum granularity="2 months" method=minimum \
- sampling=contains
-t.info type=strds input=precip_abs3
-t.rast.list input=precip_abs3
-
-t.rast.aggregate --v input=precip_abs1 output=precip_abs4 offset=100 \
- base=prec_sum granularity="3 months" method=sum \
- sampling=contains
-t.info type=strds input=precip_abs4
-t.rast.list input=precip_abs4
-
-#t.remove -rf type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
-t.remove -rf type=strds input=precip_abs1,precip_abs2
Copied: grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh (from rev 61650, grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh)
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh (rev 0)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Space time raster dataset aggregation
+
+# We need to set a specific region in the
+# @preprocess step of this test.
+# 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
+# Data generation
+r.mapcalc --o expr="prec_1 = rand(0, 550)"
+r.mapcalc --o expr="prec_2 = rand(0, 450)"
+r.mapcalc --o expr="prec_3 = rand(0, 320)"
+r.mapcalc --o expr="prec_4 = null()"
+r.mapcalc --o expr="prec_5 = rand(0, 300)"
+r.mapcalc --o expr="prec_6 = rand(0, 650)"
+
+t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
+t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 unit=days increment=3
+
+# The first @test
+
+t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ granularity=6 method=average sampling=overlaps,overlapped,contains -ns nprocs=2
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2
+
+t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ granularity=9 method=maximum sampling=contains offset=130 nprocs=3
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2
+
+t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ granularity=4 method=minimum sampling=contains -s
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2
+
+t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ granularity=5 method=sum sampling=overlaps,overlapped,contains -n
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2
+
+t.remove -rf type=strds input=precip_abs1,precip_abs2
Copied: grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh (from rev 61650, grass/trunk/temporal/t.rast.aggregate/test.t.rast.aggregate.sh)
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh (rev 0)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Space time raster dataset aggregation
+# We need to set a specific region in the
+# @preprocess step of this test.
+
+export GRASS_OVERWRITE=1
+
+# 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
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)"
+r.mapcalc expr="prec_2 = rand(0, 450)"
+r.mapcalc expr="prec_3 = rand(0, 320)"
+r.mapcalc expr="prec_4 = rand(0, 510)"
+r.mapcalc expr="prec_5 = rand(0, 300)"
+r.mapcalc expr="prec_6 = rand(0, 650)"
+r.mapcalc expr="prec_7 = null()"
+
+t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_7 \
+ start="2001-01-15 12:05:45" increment="14 days"
+
+# The first @test
+t.rast.aggregate --v input=precip_abs1 output=precip_abs2 \
+ base=prec_sum granularity="2 days" method=average \
+ sampling=overlaps,overlapped,during nprocs=5 -sn
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs1
+t.rast.list input=precip_abs2
+
+t.rast.aggregate --v input=precip_abs1 output=precip_abs2 \
+ base=prec_sum granularity="1 months" method=maximum \
+ sampling=contains nprocs=5 -n
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs1
+t.rast.list input=precip_abs2
+
+t.rast.aggregate --v input=precip_abs1 output=precip_abs3 offset=10 \
+ base=prec_sum granularity="2 months" method=minimum \
+ sampling=contains
+t.info type=strds input=precip_abs3
+t.rast.list input=precip_abs3
+
+t.rast.aggregate --v input=precip_abs1 output=precip_abs4 offset=100 \
+ base=prec_sum granularity="3 months" method=sum \
+ sampling=contains
+t.info type=strds input=precip_abs4
+t.rast.list input=precip_abs4
+
+#t.remove -rf type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
+t.remove -rf type=strds input=precip_abs1,precip_abs2
Deleted: grass/trunk/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Aggregate a dataset by a second one
-
-export GRASS_OVERWRITE=1
-
-# We need to set a specific region in the
-# @preprocess step of this test.
-# 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 expr="prec_1 = 100"
-r.mapcalc expr="prec_2 = 150"
-r.mapcalc expr="prec_3 = 250"
-r.mapcalc expr="prec_4 = 250"
-r.mapcalc expr="prec_5 = 150"
-r.mapcalc expr="prec_6 = 100"
-
-v.random -z output=soil_1 n=20 zmin=0 zmax=100 column=height
-v.random -z output=soil_2 n=20 zmin=0 zmax=100 column=height
-v.random -z output=soil_3 n=20 zmin=0 zmax=100 column=height
-
-n1=`g.tempfile pid=1 -d`
-
-cat > "${n1}" << EOF
-soil_1|2001-01-01|2001-04-01
-soil_2|2001-05-01|2001-07-01
-soil_3|2001-08-01|2001-12-01
-EOF
-
-t.create type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register type=vect input=soil_abs1 file="${n1}"
-
-t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 \
- maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
- start="2001-03-01 00:00:00" increment="1 months"
-
-# The @test
-
-t.rast.aggregate.ds --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- type=stvds sample=soil_abs1 method=sum sampling=contains offset=33
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2 method=deltagap
-
-t.rast.aggregate.ds --v input=precip_abs1 output=precip_abs2 base=prec_sum \
- type=stvds sample=soil_abs1 method=sum sampling=contains -ns
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2 method=deltagap
-
-# @postprocess
-t.remove -rf type=stvds input=soil_abs1
-t.remove -rf type=strds input=precip_abs1,precip_abs2
Copied: grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh (from rev 61650, grass/trunk/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh)
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh (rev 0)
+++ grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Aggregate a dataset by a second one
+
+export GRASS_OVERWRITE=1
+
+# We need to set a specific region in the
+# @preprocess step of this test.
+# 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 expr="prec_1 = 100"
+r.mapcalc expr="prec_2 = 150"
+r.mapcalc expr="prec_3 = 250"
+r.mapcalc expr="prec_4 = 250"
+r.mapcalc expr="prec_5 = 150"
+r.mapcalc expr="prec_6 = 100"
+
+v.random -z output=soil_1 n=20 zmin=0 zmax=100 column=height
+v.random -z output=soil_2 n=20 zmin=0 zmax=100 column=height
+v.random -z output=soil_3 n=20 zmin=0 zmax=100 column=height
+
+n1=`g.tempfile pid=1 -d`
+
+cat > "${n1}" << EOF
+soil_1|2001-01-01|2001-04-01
+soil_2|2001-05-01|2001-07-01
+soil_3|2001-08-01|2001-12-01
+EOF
+
+t.create type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
+t.register type=vect input=soil_abs1 file="${n1}"
+
+t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register -i type=rast input=precip_abs1 \
+ maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+ start="2001-03-01 00:00:00" increment="1 months"
+
+# The @test
+
+t.rast.aggregate.ds --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ type=stvds sample=soil_abs1 method=sum sampling=contains offset=33
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2 method=deltagap
+
+t.rast.aggregate.ds --v input=precip_abs1 output=precip_abs2 base=prec_sum \
+ type=stvds sample=soil_abs1 method=sum sampling=contains -ns
+t.info type=strds input=precip_abs2
+t.rast.list input=precip_abs2 method=deltagap
+
+# @postprocess
+t.remove -rf type=stvds input=soil_abs1
+t.remove -rf type=strds input=precip_abs1,precip_abs2
Deleted: grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Here we test the limit of the number of layers
-# @preprocess
-# The region setting should work for UTM and LL test locations
-
-# temporary disabled test for performance reason
-exit
-
-g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-
-MAP_LIST="map_list.txt"
-rm ${MAP_LIST}
-
-count=1
-while [ $count -lt 270 ]; do
- name="test_prec_${count}"
- r.mapcalc --o expr="${name} = ${count}"
- echo ${name} >> ${MAP_LIST}
- count=$((count + 1))
-done
-
-v.random --o output=prec n=5 seed=1
-
-t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i --o input=precip_abs1 file=${MAP_LIST} start="2001-01-01 00:00:00" increment="1 hours"
-
-# The @test
-t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column="test_val"
-v.info prec_observer
-t.info type=stvds input=prec_observer
-t.vect.list input=prec_observer
-t.vect.db.select input=prec_observer
-
-# @postprocess
-t.unregister type=rast file=${MAP_LIST}
-t.remove type=strds input=precip_abs1
-t.remove type=stvds input=prec_observer
-
-#g.remove vect=prec_observer
-g.mremove -f type=rast pattern=test_prec_*
Deleted: grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,35 +0,0 @@
-#!/bin/sh
-# Test the temporal and spatial sampling/observation of raster maps by vector point maps
-# using relative time
-# We need to set a specific region in the
-# @preprocess step of this test.
-# 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.0"
-r.mapcalc --o expr="prec_2 = 200.0"
-r.mapcalc --o expr="prec_3 = 300"
-r.mapcalc --o expr="prec_4 = 400"
-r.mapcalc --o expr="prec_5 = 500.0"
-r.mapcalc --o expr="prec_6 = 600.0"
-
-v.random --o -z output=prec n=5 seed=1
-
-t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
-t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 increment=1 unit=months
-
-# The @test
-t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer
-v.info prec_observer
-t.info type=stvds input=prec_observer
-t.vect.list input=prec_observer
-t.vect.db.select input=prec_observer
-
-# @postprocess
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.remove type=strds input=precip_abs1
-t.remove type=stvds input=prec_observer
-t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-
-g.remove vect=prec_observer,test_extract
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Deleted: grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Test the temporal and spatial sampling/observation of raster maps by vector point maps
-# We need to set a specific region in the
-# @preprocess step of this test.
-# 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
-
-export GRASS_OVERWRITE=1
-
-r.mapcalc expr="prec_1 = 100.0"
-r.mapcalc expr="prec_2 = 200.0"
-r.mapcalc expr="prec_3 = 300"
-r.mapcalc expr="prec_4 = 400"
-r.mapcalc expr="prec_5 = 500.0"
-r.mapcalc expr="prec_6 = 600.0"
-
-r.mapcalc expr="prec_7 = 400"
-r.mapcalc expr="prec_8 = 500.0"
-r.mapcalc expr="prec_9 = 600.0"
-
-
-v.random output=prec n=5 seed=1
-v.random -z output=test_1 column=test n=5 seed=1
-
-t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
-
-t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-t.register -i input=precip_abs2 maps=prec_7,prec_8,prec_9 start="2001-05-01 00:00:00" increment="1 months"
-
-# The @test
-t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column="test_val"
-v.info prec_observer
-t.info type=stvds input=prec_observer
-t.vect.list input=prec_observer
-t.vect.db.select input=prec_observer
-
-t.vect.observe.strds columns=test1,test2,test3 input=test_1 \
- strds=precip_abs1,precip_abs1,precip_abs2 output=test_1_observer \
- vector=test_1_observer
-
-v.info test_1_observer
-t.info type=stvds input=test_1_observer
-t.vect.list input=test_1_observer
-t.vect.db.select input=test_1_observer columns=cat,test1,test2,test3
-
-# @postprocess
-t.remove -rf type=strds input=precip_abs1,precip_abs2
-t.remove -rf type=stvds input=prec_observer,test_1_observer
Copied: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh (from rev 61650, grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh)
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh (rev 0)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Here we test the limit of the number of layers
+# @preprocess
+# The region setting should work for UTM and LL test locations
+
+# temporary disabled test for performance reason
+exit
+
+g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
+MAP_LIST="map_list.txt"
+rm ${MAP_LIST}
+
+count=1
+while [ $count -lt 270 ]; do
+ name="test_prec_${count}"
+ r.mapcalc --o expr="${name} = ${count}"
+ echo ${name} >> ${MAP_LIST}
+ count=$((count + 1))
+done
+
+v.random --o output=prec n=5 seed=1
+
+t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register -i --o input=precip_abs1 file=${MAP_LIST} start="2001-01-01 00:00:00" increment="1 hours"
+
+# The @test
+t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column="test_val"
+v.info prec_observer
+t.info type=stvds input=prec_observer
+t.vect.list input=prec_observer
+t.vect.db.select input=prec_observer
+
+# @postprocess
+t.unregister type=rast file=${MAP_LIST}
+t.remove type=strds input=precip_abs1
+t.remove type=stvds input=prec_observer
+
+#g.remove vect=prec_observer
+g.mremove -f type=rast pattern=test_prec_*
Copied: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh (from rev 61650, grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh)
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh (rev 0)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,35 @@
+#!/bin/sh
+# Test the temporal and spatial sampling/observation of raster maps by vector point maps
+# using relative time
+# We need to set a specific region in the
+# @preprocess step of this test.
+# 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.0"
+r.mapcalc --o expr="prec_2 = 200.0"
+r.mapcalc --o expr="prec_3 = 300"
+r.mapcalc --o expr="prec_4 = 400"
+r.mapcalc --o expr="prec_5 = 500.0"
+r.mapcalc --o expr="prec_6 = 600.0"
+
+v.random --o -z output=prec n=5 seed=1
+
+t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
+t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 increment=1 unit=months
+
+# The @test
+t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer
+v.info prec_observer
+t.info type=stvds input=prec_observer
+t.vect.list input=prec_observer
+t.vect.db.select input=prec_observer
+
+# @postprocess
+t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.remove type=strds input=precip_abs1
+t.remove type=stvds input=prec_observer
+t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
+
+g.remove vect=prec_observer,test_extract
+g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Copied: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh (from rev 61650, grass/trunk/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh)
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh (rev 0)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,49 @@
+#!/bin/sh
+# Test the temporal and spatial sampling/observation of raster maps by vector point maps
+# We need to set a specific region in the
+# @preprocess step of this test.
+# 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
+
+export GRASS_OVERWRITE=1
+
+r.mapcalc expr="prec_1 = 100.0"
+r.mapcalc expr="prec_2 = 200.0"
+r.mapcalc expr="prec_3 = 300"
+r.mapcalc expr="prec_4 = 400"
+r.mapcalc expr="prec_5 = 500.0"
+r.mapcalc expr="prec_6 = 600.0"
+
+r.mapcalc expr="prec_7 = 400"
+r.mapcalc expr="prec_8 = 500.0"
+r.mapcalc expr="prec_9 = 600.0"
+
+
+v.random output=prec n=5 seed=1
+v.random -z output=test_1 column=test n=5 seed=1
+
+t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-03-01 00:00:00" increment="1 months"
+
+t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
+t.register -i input=precip_abs2 maps=prec_7,prec_8,prec_9 start="2001-05-01 00:00:00" increment="1 months"
+
+# The @test
+t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column="test_val"
+v.info prec_observer
+t.info type=stvds input=prec_observer
+t.vect.list input=prec_observer
+t.vect.db.select input=prec_observer
+
+t.vect.observe.strds columns=test1,test2,test3 input=test_1 \
+ strds=precip_abs1,precip_abs1,precip_abs2 output=test_1_observer \
+ vector=test_1_observer
+
+v.info test_1_observer
+t.info type=stvds input=test_1_observer
+t.vect.list input=test_1_observer
+t.vect.db.select input=test_1_observer columns=cat,test1,test2,test3
+
+# @postprocess
+t.remove -rf type=strds input=precip_abs1,precip_abs2
+t.remove -rf type=stvds input=prec_observer,test_1_observer
Deleted: grass/trunk/temporal/t.vect.univar/test.t.vect.univar.sh
===================================================================
--- grass/trunk/temporal/t.vect.univar/test.t.vect.univar.sh 2014-08-15 21:11:47 UTC (rev 61659)
+++ grass/trunk/temporal/t.vect.univar/test.t.vect.univar.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Test the univar statistics of space time vector datasets
-
-# We need to set a specific region in the
-# @preprocess step of this test.
-# 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
-
-export GRASS_OVERWRITE=1
-
-# Data generation
-v.random -z output=rpoints1 zmin=0 zmax=100 seed=1 column=height n=100
-v.random -z output=rpoints2 zmin=0 zmax=100 seed=2 column=height n=100
-v.voronoi input=rpoints1 output=rvoronoi1
-v.voronoi input=rpoints2 output=rvoronoi2
-
-t.create type=stvds temporaltype=absolute output=random_data title="A test" descr="A test"
-t.register type=vect --v -i input=random_data maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2 start="2001-01-15 12:05:45" increment="14 days"
-
-# The first @test
-t.vect.univar input=random_data column=height where='height > 50' twhere="start_time > '2000-01-01'" layer=1
-t.vect.univar -e input=random_data column=height where='height > 30' twhere="start_time > '2000-01-01'" layer=1
-t.vect.univar -e type=area input=random_data column=height where='height > 10' twhere="start_time > '2000-01-01'" layer=1
-t.vect.univar -e type=centroid input=random_data column=height where='height > 20' twhere="start_time > '2000-01-01'" layer=1
-t.vect.univar type=line input=random_data column=height where='height > 20' twhere="start_time > '2000-01-01'" layer=1
-
-# @postprocess
-t.unregister type=vect maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
-t.remove type=stvds input=random_data
-g.remove vect=rpoints1,rpoints2,rvoronoi1,rvoronoi2
-
Copied: grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh (from rev 61650, grass/trunk/temporal/t.vect.univar/test.t.vect.univar.sh)
===================================================================
--- grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh (rev 0)
+++ grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2014-08-15 21:27:43 UTC (rev 61660)
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Test the univar statistics of space time vector datasets
+
+# We need to set a specific region in the
+# @preprocess step of this test.
+# 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
+
+export GRASS_OVERWRITE=1
+
+# Data generation
+v.random -z output=rpoints1 zmin=0 zmax=100 seed=1 column=height n=100
+v.random -z output=rpoints2 zmin=0 zmax=100 seed=2 column=height n=100
+v.voronoi input=rpoints1 output=rvoronoi1
+v.voronoi input=rpoints2 output=rvoronoi2
+
+t.create type=stvds temporaltype=absolute output=random_data title="A test" descr="A test"
+t.register type=vect --v -i input=random_data maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2 start="2001-01-15 12:05:45" increment="14 days"
+
+# The first @test
+t.vect.univar input=random_data column=height where='height > 50' twhere="start_time > '2000-01-01'" layer=1
+t.vect.univar -e input=random_data column=height where='height > 30' twhere="start_time > '2000-01-01'" layer=1
+t.vect.univar -e type=area input=random_data column=height where='height > 10' twhere="start_time > '2000-01-01'" layer=1
+t.vect.univar -e type=centroid input=random_data column=height where='height > 20' twhere="start_time > '2000-01-01'" layer=1
+t.vect.univar type=line input=random_data column=height where='height > 20' twhere="start_time > '2000-01-01'" layer=1
+
+# @postprocess
+t.unregister type=vect maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+t.remove type=stvds input=random_data
+g.remove vect=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+
More information about the grass-commit
mailing list