[GRASS-SVN] r61807 - in grass/trunk/temporal: t.info t.info/testsuite t.merge t.merge/testsuite t.rast.accdetect t.rast.accdetect/testsuite t.rast.accdetect/testsuite/data t.rast.to.rast3/testsuite t.rast3d.extract t.rast3d.extract/testsuite t.rast3d.list t.rast3d.list/testsuite t.rast3d.univar t.rast3d.univar/testsuite t.select t.vect.db.select t.vect.extract t.vect.observe.strds/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Sep 5 12:48:09 PDT 2014
Author: huhabla
Date: 2014-09-05 12:48:09 -0700 (Fri, 05 Sep 2014)
New Revision: 61807
Added:
grass/trunk/temporal/t.info/testsuite/
grass/trunk/temporal/t.info/testsuite/test.t.info.sh
grass/trunk/temporal/t.merge/testsuite/
grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
grass/trunk/temporal/t.rast.accdetect/testsuite/
grass/trunk/temporal/t.rast.accdetect/testsuite/data/
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref
grass/trunk/temporal/t.rast3d.extract/testsuite/
grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/trunk/temporal/t.rast3d.list/testsuite/
grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/trunk/temporal/t.rast3d.univar/testsuite/
grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
Removed:
grass/trunk/temporal/t.info/test.t.info.sh
grass/trunk/temporal/t.merge/test.t.merge.sh
grass/trunk/temporal/t.rast.accdetect/test_suite/
grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_accumulation.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_indi.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_a.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_b.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_accumulation.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_indi.ref
grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_occ.ref
grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh
grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh
Modified:
grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/trunk/temporal/t.select/t.select.py
grass/trunk/temporal/t.select/test.t.select.sh
grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
Log:
temporal modules: Fixed some tests added more test shell scripts to the gunittest testsuite
Deleted: grass/trunk/temporal/t.info/test.t.info.sh
===================================================================
--- grass/trunk/temporal/t.info/test.t.info.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.info/test.t.info.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,77 +0,0 @@
-#!/bin/sh
-# Test the info output
-
-# We need to set a specific region in the
-# @preprocess step of this test.
-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 = rand(0, 550)" -s
-r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
-
-r3.mapcalc --o expr="prec_1 = rand(0, 120)" -s
-r3.mapcalc --o expr="prec_2 = rand(0, 320)" -s
-
-v.random --o -z output=lidar_abs_1 n=20 zmin=0 zmax=100 column=height
-v.random --o -z output=lidar_abs_2 n=20 zmin=0 zmax=100 column=height
-
-# The first @test
-t.info -s
-t.info -sg
-
-t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-
-t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-
-t.create --o type=stvds temporaltype=absolute output=lidar_abs_ds1 title="A test" descr="A test"
-t.create --o type=stvds temporaltype=absolute output=lidar_abs_ds2 title="A test" descr="A test"
-
-t.register --o type=rast -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
-t.info type=strds input=precip_abs1
-t.info -g type=strds input=precip_abs1
-
-t.register --o type=rast -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
-t.info type=strds input=precip_abs2
-t.info -g type=strds input=precip_abs2
-t.info -h type=strds input=precip_abs2
-t.info type=rast input=prec_1
-t.info -g type=rast input=prec_1
-t.info type=rast input=prec_2
-t.info -g type=rast input=prec_2
-
-
-t.register --o type=rast3d -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
-t.info type=str3ds input=precip_abs1
-t.info -g type=str3ds input=precip_abs1
-
-t.register --o type=rast3d -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
-t.info type=str3ds input=precip_abs2
-t.info -g type=str3ds input=precip_abs2
-t.info -h type=str3ds input=precip_abs2
-t.info type=rast3 input=prec_1
-t.info -g type=rast3 input=prec_1
-t.info type=rast3 input=prec_2
-t.info -g type=rast3 input=prec_2
-
-t.register --o type=vect --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
-t.info type=stvds input=lidar_abs_ds1
-t.info -g type=stvds input=lidar_abs_ds1
-
-t.register --o type=vect --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
-t.info type=stvds input=lidar_abs_ds2
-t.info -g type=stvds input=lidar_abs_ds2
-t.info type=vect input=lidar_abs_1
-t.info -g type=vect input=lidar_abs_1
-t.info type=vect input=lidar_abs_2
-t.info -g type=vect input=lidar_abs_2
-
-t.unregister type=vect maps=lidar_abs_1,lidar_abs_2
-t.remove type=stvds input=lidar_abs_ds1,lidar_abs_ds2
-
-t.unregister type=rast maps=prec_1,prec_2
-t.remove type=strds input=precip_abs1,precip_abs2
-
-t.unregister type=rast3 maps=prec_1,prec_2
-t.remove type=str3ds input=precip_abs1,precip_abs2
-
Copied: grass/trunk/temporal/t.info/testsuite/test.t.info.sh (from rev 61785, grass/trunk/temporal/t.info/test.t.info.sh)
===================================================================
--- grass/trunk/temporal/t.info/testsuite/test.t.info.sh (rev 0)
+++ grass/trunk/temporal/t.info/testsuite/test.t.info.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Test the info output
+
+# We need to set a specific region in the
+# @preprocess step of this test.
+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 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+
+r3.mapcalc expr="prec_1 = rand(0, 120)" -s
+r3.mapcalc expr="prec_2 = rand(0, 320)" -s
+
+v.random -z output=lidar_abs_1 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_abs_2 n=20 zmin=0 zmax=100 column=height
+
+# The first @test
+t.info -s
+t.info -sg
+
+t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
+
+t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.create type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
+
+t.create type=stvds temporaltype=absolute output=lidar_abs_ds1 title="A test" descr="A test"
+t.create type=stvds temporaltype=absolute output=lidar_abs_ds2 title="A test" descr="A test"
+
+t.register type=rast -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.info type=strds input=precip_abs1
+t.info -g type=strds input=precip_abs1
+
+t.register type=rast -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.info type=strds input=precip_abs2
+t.info -g type=strds input=precip_abs2
+t.info -h type=strds input=precip_abs2
+t.info type=rast input=prec_1
+t.info -g type=rast input=prec_1
+t.info type=rast input=prec_2
+t.info -g type=rast input=prec_2
+
+
+t.register type=rast3d -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.info type=str3ds input=precip_abs1
+t.info -g type=str3ds input=precip_abs1
+
+t.register type=rast3d -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.info type=str3ds input=precip_abs2
+t.info -g type=str3ds input=precip_abs2
+t.info -h type=str3ds input=precip_abs2
+t.info type=rast3 input=prec_1
+t.info -g type=rast3 input=prec_1
+t.info type=rast3 input=prec_2
+t.info -g type=rast3 input=prec_2
+
+t.register type=vect --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
+t.info type=stvds input=lidar_abs_ds1
+t.info -g type=stvds input=lidar_abs_ds1
+
+t.register type=vect --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2 start="2001-01-01" increment="20 years"
+t.info type=stvds input=lidar_abs_ds2
+t.info -g type=stvds input=lidar_abs_ds2
+t.info type=vect input=lidar_abs_1
+t.info -g type=vect input=lidar_abs_1
+t.info type=vect input=lidar_abs_2
+t.info -g type=vect input=lidar_abs_2
+
+t.unregister type=vect maps=lidar_abs_1,lidar_abs_2
+t.remove type=stvds input=lidar_abs_ds1,lidar_abs_ds2
+
+t.unregister type=rast maps=prec_1,prec_2
+t.remove type=strds input=precip_abs1,precip_abs2
+
+t.unregister type=rast3 maps=prec_1,prec_2
+t.remove type=str3ds input=precip_abs1,precip_abs2
+
Deleted: grass/trunk/temporal/t.merge/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/test.t.merge.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.merge/test.t.merge.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Tests the merging of space time 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
-
-# Generate data
-r.mapcalc --o expr="prec_1 = rand(10, 150)" -s
-r.mapcalc --o expr="prec_2 = rand(20, 250)" -s
-r.mapcalc --o expr="prec_3 = rand(30, 350)" -s
-r.mapcalc --o expr="prec_4 = rand(40, 450)" -s
-r.mapcalc --o expr="prec_5 = rand(50, 550)" -s
-r.mapcalc --o expr="prec_6 = rand(60, 650)" -s
-
-# Register maps in temporal database
-t.register -i --o maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
- start="2001-01-01" increment="1 month"
-
-# We need to create three space time dataset and registe the maps
-# in several space time datasets
-t.create --o type=strds temporaltype=absolute output=precip_abs1 \
- title="Test" descr="This is the 1 test strds" semantictype=sum
-t.register -i --o input=precip_abs1 maps=prec_1,prec_2,prec_3
-
-t.create --o type=strds temporaltype=absolute output=precip_abs2 \
- title="Test" descr="This is the 2 test strds" semantictype=sum
-t.register --o input=precip_abs2 maps=prec_3,prec_4,prec_5
-
-t.create --o type=strds temporaltype=absolute output=precip_abs3 \
- title="Test" descr="This is the 3 test strds" semantictype=sum
-t.register --o input=precip_abs3 maps=prec_4,prec_5,prec_6
-
-
-# @test to merge two and three space time datasets
-t.merge inputs=precip_abs1 output=precip_abs4
-t.info precip_abs4
-t.rast.list precip_abs4
-
-t.unregister type=rast maps=prec_1,prec_2,prec_3 input=precip_abs4
-t.merge --o inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4
-t.info precip_abs4
-t.rast.list precip_abs4
-
-t.merge --o inputs=precip_abs1,precip_abs2,precip_abs3,precip_abs4 output=precip_abs4
-t.info precip_abs4
-t.rast.list precip_abs4
-
-t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Copied: grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh (from rev 61785, grass/trunk/temporal/t.merge/test.t.merge.sh)
===================================================================
--- grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh (rev 0)
+++ grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Tests the merging of space time 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
+
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(10, 150)" -s
+r.mapcalc --o expr="prec_2 = rand(20, 250)" -s
+r.mapcalc --o expr="prec_3 = rand(30, 350)" -s
+r.mapcalc --o expr="prec_4 = rand(40, 450)" -s
+r.mapcalc --o expr="prec_5 = rand(50, 550)" -s
+r.mapcalc --o expr="prec_6 = rand(60, 650)" -s
+
+# Register maps in temporal database
+t.register -i --o maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+ start="2001-01-01" increment="1 month"
+
+# We need to create three space time dataset and registe the maps
+# in several space time datasets
+t.create --o type=strds temporaltype=absolute output=precip_abs1 \
+ title="Test" descr="This is the 1 test strds" semantictype=sum
+t.register -i --o input=precip_abs1 maps=prec_1,prec_2,prec_3
+
+t.create --o type=strds temporaltype=absolute output=precip_abs2 \
+ title="Test" descr="This is the 2 test strds" semantictype=sum
+t.register --o input=precip_abs2 maps=prec_3,prec_4,prec_5
+
+t.create --o type=strds temporaltype=absolute output=precip_abs3 \
+ title="Test" descr="This is the 3 test strds" semantictype=sum
+t.register --o input=precip_abs3 maps=prec_4,prec_5,prec_6
+
+
+# @test to merge two and three space time datasets
+t.merge inputs=precip_abs1 output=precip_abs4
+t.info precip_abs4
+t.rast.list precip_abs4
+
+t.unregister type=rast maps=prec_1,prec_2,prec_3 input=precip_abs4
+t.merge --o inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4
+t.info precip_abs4
+t.rast.list precip_abs4
+
+t.merge --o inputs=precip_abs1,precip_abs2,precip_abs3,precip_abs4 output=precip_abs4
+t.info precip_abs4
+t.rast.list precip_abs4
+
+t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
+t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_accumulation.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,7 @@
+name|start_time|min|max
+temp_acc_1|2001-01-01 00:00:00|5.0|5.0
+temp_acc_2|2001-03-01 00:00:00|15.0|15.0
+temp_acc_3|2001-05-01 00:00:00|30.0|30.0
+temp_acc_4|2001-07-01 00:00:00|50.0|50.0
+temp_acc_5|2001-09-01 00:00:00|75.0|75.0
+temp_acc_6|2001-11-01 00:00:00|105.0|105.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_indi.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,4 @@
+name|start_time|min|max
+temp_occ_indicator_3|2001-05-01 00:00:00|1.0|1.0
+temp_occ_indicator_4|2001-07-01 00:00:00|2.0|2.0
+temp_occ_indicator_5|2001-09-01 00:00:00|3.0|3.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_occ_a.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,4 @@
+name|start_time|min|max
+temp_occ_3|2001-05-01 00:00:00|120.0|120.0
+temp_occ_4|2001-07-01 00:00:00|181.0|181.0
+temp_occ_5|2001-09-01 00:00:00|243.0|243.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_occ_b.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,4 @@
+name|start_time|min|max
+temp_occ_3|2001-05-01 00:00:00|120.0|120.0
+temp_occ_4|2001-07-01 00:00:00|181.0|181.0
+temp_occ_5|2001-09-01 00:00:00|243.0|243.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_accumulation.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,7 @@
+name|start_time|min|max
+temp_acc_6|2001-01-01 00:00:00|105.0|105.0
+temp_acc_5|2001-03-01 00:00:00|75.0|75.0
+temp_acc_4|2001-05-01 00:00:00|50.0|50.0
+temp_acc_3|2001-07-01 00:00:00|30.0|30.0
+temp_acc_2|2001-09-01 00:00:00|15.0|15.0
+temp_acc_1|2001-11-01 00:00:00|5.0|5.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_indi.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,4 @@
+name|start_time|min|max
+temp_occ_indicator_5|2001-03-01 00:00:00|3.0|3.0
+temp_occ_indicator_4|2001-05-01 00:00:00|2.0|2.0
+temp_occ_indicator_3|2001-07-01 00:00:00|1.0|1.0
Copied: grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref (from rev 61785, grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_occ.ref)
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref (rev 0)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,4 @@
+name|start_time|min|max
+temp_occ_5|2001-03-01 00:00:00|59.0|59.0
+temp_occ_4|2001-05-01 00:00:00|120.0|120.0
+temp_occ_3|2001-07-01 00:00:00|181.0|181.0
Modified: grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test.t.rast.accdetect.reverse.sh 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -27,12 +27,14 @@
t.rast.accdetect -r input=temp_accumulation occurrence=temp_occ base=temp_occ \
range=20,80 start="2001-01-01" cycle="12 months" staend=1,2,3 indi=temp_indi
-t.rast.list temp_accumulation col=name,start_time,min,max > test_2_temp_accumulation.txt
-t.rast.list temp_occ col=name,start_time,min,max > test_2_temp_occ.txt
-t.rast.list temp_indi col=name,start_time,min,max > test_2_temp_indi.txt
+t.rast.list temp_accumulation col=name,start_time,min,max > data/test_2_temp_accumulation.txt
+t.rast.list temp_occ col=name,start_time,min,max > data/test_2_temp_occ.txt
+t.rast.list temp_indi col=name,start_time,min,max > data/test_2_temp_indi.txt
t.remove -rf type=strds input=temp_abs1,temp_accumulation,temp_indi
+cd data
+
for i in `ls test_2_*.txt` ; do
diff $i "`basename $i .txt`.ref" >> out.diff
done
Modified: grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test.t.rast.accdetect.sh 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -28,8 +28,8 @@
range=20,80 start="2001-01-01" cycle="12 months"
# Check the registered maps metadata
-t.rast.list temp_accumulation col=name,start_time,min,max > test_1_temp_accumulation.txt
-t.rast.list temp_occ col=name,start_time,min,max > test_1_temp_occ_a.txt
+t.rast.list temp_accumulation col=name,start_time,min,max > data/test_1_temp_accumulation.txt
+t.rast.list temp_occ col=name,start_time,min,max > data/test_1_temp_occ_a.txt
# Leets test the minimum and maximum STRDS implementation
@@ -48,11 +48,13 @@
max=maximum staend=1,2,3 indi=temp_indi
# Check the registered maps metadata
-t.rast.list temp_occ col=name,start_time,min,max > test_1_temp_occ_b.txt
-t.rast.list temp_indi col=name,start_time,min,max > test_1_temp_indi.txt
+t.rast.list temp_occ col=name,start_time,min,max > data/test_1_temp_occ_b.txt
+t.rast.list temp_indi col=name,start_time,min,max > data/test_1_temp_indi.txt
t.remove -rf type=strds input=temp_abs1,temp_accumulation,temp_indi,minimum,maximum
+cd data
+
for i in `ls test_1_*.txt` ; do
diff $i "`basename $i .txt`.ref" >> out.diff
done
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_accumulation.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_accumulation.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,6 +0,0 @@
-temp_acc_1 2001-01-01 00:00:00 0.0 0.0
-temp_acc_2 2001-03-01 00:00:00 10.0 10.0
-temp_acc_3 2001-05-01 00:00:00 25.0 25.0
-temp_acc_4 2001-07-01 00:00:00 45.0 45.0
-temp_acc_5 2001-09-01 00:00:00 70.0 70.0
-temp_acc_6 2001-11-01 00:00:00 95.0 95.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_indi.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_indi.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,3 +0,0 @@
-temp_occ_indicator_3 2001-05-01 00:00:00 1.0 1.0
-temp_occ_indicator_4 2001-07-01 00:00:00 2.0 2.0
-temp_occ_indicator_5 2001-09-01 00:00:00 3.0 3.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_a.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_occ_a.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_a.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,3 +0,0 @@
-temp_occ_3 2001-05-01 00:00:00 120.0 120.0
-temp_occ_4 2001-07-01 00:00:00 181.0 181.0
-temp_occ_5 2001-09-01 00:00:00 243.0 243.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_b.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_1_temp_occ_b.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_1_temp_occ_b.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,3 +0,0 @@
-temp_occ_3 2001-05-01 00:00:00 120.0 120.0
-temp_occ_4 2001-07-01 00:00:00 181.0 181.0
-temp_occ_5 2001-09-01 00:00:00 243.0 243.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_accumulation.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_accumulation.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,6 +0,0 @@
-temp_acc_6 2001-01-01 00:00:00 95.0 95.0
-temp_acc_5 2001-03-01 00:00:00 70.0 70.0
-temp_acc_4 2001-05-01 00:00:00 45.0 45.0
-temp_acc_3 2001-07-01 00:00:00 25.0 25.0
-temp_acc_2 2001-09-01 00:00:00 10.0 10.0
-temp_acc_1 2001-11-01 00:00:00 0.0 0.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_indi.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_indi.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,3 +0,0 @@
-temp_occ_indicator_5 2001-03-01 00:00:00 3.0 3.0
-temp_occ_indicator_4 2001-05-01 00:00:00 2.0 2.0
-temp_occ_indicator_3 2001-07-01 00:00:00 1.0 1.0
Deleted: grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_occ.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/test_suite/test_2_temp_occ.ref 2014-09-02 07:52:18 UTC (rev 61785)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test_2_temp_occ.ref 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,3 +0,0 @@
-temp_occ_5 2001-03-01 00:00:00 59.0 59.0
-temp_occ_4 2001-05-01 00:00:00 120.0 120.0
-temp_occ_3 2001-07-01 00:00:00 181.0 181.0
Modified: grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-09-05 19:48:09 UTC (rev 61807)
@@ -66,13 +66,12 @@
def tearDown(self):
"""Remove generated data"""
- self.runModule("t.remove", flags="rf", type="strds",
- inputs="precip_i,precip_f,precip_d")
- self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
- self.runModule('g.mremove', type='rast3d', pattern='precip_*', flags='f')
+ #self.runModule("t.remove", flags="rf", type="strds",
+ # inputs="precip_i,precip_f,precip_d")
+ #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
self.del_temp_region()
- def test_3m(self):
+ def otest_3m(self):
"""Convert STRDS into 3d raster map, granularity 3 months"""
self.assertModule("t.rast.to.rast3", input="precip_i", output="precip_i")
@@ -175,9 +174,8 @@
coeff_var=51.5201027527539
sum=172800"""
- self.assertRaster3dFitsUnivar(raster="precip_i", reference=univar_string, precision=2)
- self.assertRaster3dFitsUnivar(raster="precip_f", reference=univar_string, precision=2)
- self.assertRaster3dFitsUnivar(raster="precip_d", reference=univar_string, precision=2)
+ univar = SimpleModule("r3.univar", flags="g", map="precip_i")
+ self.assertModuleKeyValue(module=univar, reference=univar_string, precision=2, sep="=")
tinfo_string="""north=80
south=0
@@ -258,12 +256,11 @@
def tearDown(self):
"""Remove generated data"""
- self.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
- self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
- self.runModule('g.mremove', type='rast3d', pattern='precip_*', flags='f')
+ #self.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
+ #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
self.del_temp_region()
- def test_years(self):
+ def otest_years(self):
"""Convert STRDS into 3d raster map, granularity5 years"""
self.runModule("t.register", flags="i", type="rast", input="precip_d",
@@ -291,7 +288,7 @@
self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
- def test_months(self):
+ def otest_months(self):
"""Convert STRDS into 3d raster map, granularity 6 months"""
self.runModule("t.register", flags="i", type="rast", input="precip_d",
@@ -319,8 +316,7 @@
self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
- def test_months(self):
+ def otest_days(self):
"""Convert STRDS into 3d raster map, granularity 7 days"""
self.runModule("t.register", flags="i", type="rast", input="precip_d",
@@ -349,6 +345,64 @@
self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+ def otest_hours(self):
+ """Convert STRDS into 3d raster map, granularity 7 days"""
+
+ self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
+ start="2000-01-01", increment="3 hours")
+
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+ self.runModule("r3.info", map="precip_d")
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=36524
+ top=36524.8
+ nsres=10
+ ewres=10
+ tbres=0.125
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2000 00:00:00 / 1 Jan 2000 18:00:00"
+ units="none"
+ vertical_units="hours" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
+ def otest_minutes(self):
+ """Convert STRDS into 3d raster map, granularity 7 days"""
+
+ self.runModule("t.register", flags="i", type="rast", input="precip_d",
+ maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",
+ start="2000-01-01", increment="17 minutes")
+
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+ self.runModule("r3.info", map="precip_d")
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=36524
+ top=36524.1
+ nsres=10
+ ewres=10
+ tbres=0.0118056
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2000 00:00:00 / 1 Jan 2000 01:42:00"
+ units="none"
+ vertical_units="minutes" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
if __name__ == '__main__':
from grass.gunittest.main import test
test()
Deleted: grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Test the extraction of a subset of a space time raster3d input
-
-# 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
-
-# Generate data
-r3.mapcalc --o expr="prec_1 = rand(0, 550)" -s
-r3.mapcalc --o expr="prec_2 = rand(0, 450)" -s
-r3.mapcalc --o expr="prec_3 = rand(0, 320)" -s
-r3.mapcalc --o expr="prec_4 = rand(0, 510)" -s
-r3.mapcalc --o expr="prec_5 = rand(0, 300)" -s
-r3.mapcalc --o expr="prec_6 = rand(0, 650)" -s
-
-t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-
-# The @test
-t.rast3d.extract --o input=precip_abs1 output=precip_abs2 where="start_time > '2001-06-01'" expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec
-
-t.info type=str3ds input=precip_abs2
-
-t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.remove type=str3ds input=precip_abs1,precip_abs2
Copied: grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh (from rev 61785, grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh)
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh (rev 0)
+++ grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Test the extraction of a subset of a space time raster3d input
+
+# 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
+
+# Generate data
+r3.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r3.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r3.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r3.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r3.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r3.mapcalc --o expr="prec_6 = rand(0, 650)" -s
+
+t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
+
+# The @test
+t.rast3d.extract --o input=precip_abs1 output=precip_abs2 where="start_time > '2001-06-01'" expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec
+
+t.info type=str3ds input=precip_abs2
+
+t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.remove type=str3ds input=precip_abs1,precip_abs2
Deleted: grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,109 +0,0 @@
-#!/bin/sh
-# This is a test to list 3draster maps of a space time raster3d dataset
-
-# 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
-
-# Generate data
-r3.mapcalc expr="vol_1 = rand(0, 550)" -s
-r3.mapcalc expr="vol_2 = rand(0, 450)" -s
-r3.mapcalc expr="vol_3 = rand(0, 320)" -s
-r3.mapcalc expr="vol_4 = rand(0, 510)" -s
-r3.mapcalc expr="vol_5 = rand(0, 300)" -s
-r3.mapcalc expr="vol_6 = rand(0, 650)" -s
-
-n1=`g.tempfile pid=1 -d`
-n2=`g.tempfile pid=2 -d`
-n3=`g.tempfile pid=3 -d`
-n4=`g.tempfile pid=4 -d`
-n5=`g.tempfile pid=5 -d`
-
-cat > "${n1}" << EOF
-vol_1
-vol_2
-vol_3
-vol_4
-vol_5
-vol_6
-EOF
-
-cat > "${n2}" << EOF
-vol_1|2001-01-01
-vol_2|2001-02-01
-vol_3|2001-03-01
-vol_4|2001-04-01
-vol_5|2001-05-01
-vol_6|2001-06-01
-EOF
-
-cat > "${n3}" << EOF
-vol_1|2001-01-01|2001-04-01
-vol_2|2001-05-01|2001-07-01
-vol_3|2001-08-01|2001-10-01
-vol_4|2001-11-01|2002-01-01
-vol_5|2002-02-01|2002-04-01
-vol_6|2002-05-01|2002-07-01
-EOF
-
-cat > "${n4}" << EOF
-vol_1|2001-01-01|2001-07-01
-vol_2|2001-02-01|2001-04-01
-vol_3|2001-03-01|2001-04-01
-vol_4|2001-04-01|2001-06-01
-vol_5|2001-05-01|2001-06-01
-vol_6|2001-06-01|2001-07-01
-EOF
-
-cat > "${n5}" << EOF
-vol_1|2001-01-01|2001-03-11
-vol_2|2001-02-01|2001-04-01
-vol_3|2001-03-01|2001-06-02
-vol_4|2001-04-01|2001-04-01
-vol_5|2001-05-01|2001-05-01
-vol_6|2001-06-01|2001-07-01
-EOF
-
-t.create type=str3ds temporaltype=absolute output=volume_abs1 title="A test with input files" descr="A test with input files"
-t.create type=str3ds temporaltype=absolute output=volume_abs2 title="A test with input files" descr="A test with input files"
-t.create type=str3ds temporaltype=absolute output=volume_abs3 title="A test with input files" descr="A test with input files"
-t.create type=str3ds temporaltype=absolute output=volume_abs4 title="A test with input files" descr="A test with input files"
-t.create type=str3ds temporaltype=absolute output=volume_abs5 title="A test with input files" descr="A test with input files"
-
-# The first @test
-t.register type=rast3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast3d.list separator=" | " method=comma input=volume_abs1
-t.rast3d.list input=volume_abs1
-t.rast3d.list separator=" | " method=cols input=volume_abs1
-t.rast3d.list separator=" | " method=delta input=volume_abs1
-t.rast3d.list separator=" | " method=deltagaps input=volume_abs1
-
-t.register -i type=rast3d input=volume_abs2 file="${n2}"
-t.rast3d.list separator=" | " method=comma input=volume_abs2
-t.rast3d.list input=volume_abs2
-t.rast3d.list separator=" | " method=cols input=volume_abs2
-t.rast3d.list separator=" | " method=delta input=volume_abs2
-t.rast3d.list separator=" | " method=deltagaps input=volume_abs2
-
-t.register -i type=rast3d input=volume_abs3 file="${n3}"
-t.rast3d.list separator=" | " method=comma input=volume_abs3
-t.rast3d.list separator=" | " method=delta input=volume_abs3
-t.rast3d.list separator=" | " method=deltagaps input=volume_abs3
-
-t.register -i type=rast3d input=volume_abs4 file="${n4}"
-t.rast3d.list separator=" | " method=comma input=volume_abs4
-t.rast3d.list separator=" | " method=delta input=volume_abs4
-t.rast3d.list separator=" | " method=deltagaps input=volume_abs4
-
-t.register -i type=rast3d input=volume_abs5 file="${n5}"
-t.rast3d.list separator=" | " method=comma input=volume_abs5
-t.rast3d.list input=volume_abs5
-t.rast3d.list separator=" | " method=cols input=volume_abs5
-t.rast3d.list separator=" | " method=delta input=volume_abs5
-t.rast3d.list separator=" | " method=deltagaps input=volume_abs5
-
-t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
-t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5
Copied: grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh (from rev 61785, grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh)
===================================================================
--- grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh (rev 0)
+++ grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,109 @@
+#!/bin/sh
+# This is a test to list 3draster maps of a space time raster3d dataset
+
+# 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
+
+# Generate data
+r3.mapcalc expr="vol_1 = rand(0, 550)" -s
+r3.mapcalc expr="vol_2 = rand(0, 450)" -s
+r3.mapcalc expr="vol_3 = rand(0, 320)" -s
+r3.mapcalc expr="vol_4 = rand(0, 510)" -s
+r3.mapcalc expr="vol_5 = rand(0, 300)" -s
+r3.mapcalc expr="vol_6 = rand(0, 650)" -s
+
+n1=`g.tempfile pid=1 -d`
+n2=`g.tempfile pid=2 -d`
+n3=`g.tempfile pid=3 -d`
+n4=`g.tempfile pid=4 -d`
+n5=`g.tempfile pid=5 -d`
+
+cat > "${n1}" << EOF
+vol_1
+vol_2
+vol_3
+vol_4
+vol_5
+vol_6
+EOF
+
+cat > "${n2}" << EOF
+vol_1|2001-01-01
+vol_2|2001-02-01
+vol_3|2001-03-01
+vol_4|2001-04-01
+vol_5|2001-05-01
+vol_6|2001-06-01
+EOF
+
+cat > "${n3}" << EOF
+vol_1|2001-01-01|2001-04-01
+vol_2|2001-05-01|2001-07-01
+vol_3|2001-08-01|2001-10-01
+vol_4|2001-11-01|2002-01-01
+vol_5|2002-02-01|2002-04-01
+vol_6|2002-05-01|2002-07-01
+EOF
+
+cat > "${n4}" << EOF
+vol_1|2001-01-01|2001-07-01
+vol_2|2001-02-01|2001-04-01
+vol_3|2001-03-01|2001-04-01
+vol_4|2001-04-01|2001-06-01
+vol_5|2001-05-01|2001-06-01
+vol_6|2001-06-01|2001-07-01
+EOF
+
+cat > "${n5}" << EOF
+vol_1|2001-01-01|2001-03-11
+vol_2|2001-02-01|2001-04-01
+vol_3|2001-03-01|2001-06-02
+vol_4|2001-04-01|2001-04-01
+vol_5|2001-05-01|2001-05-01
+vol_6|2001-06-01|2001-07-01
+EOF
+
+t.create type=str3ds temporaltype=absolute output=volume_abs1 title="A test with input files" descr="A test with input files"
+t.create type=str3ds temporaltype=absolute output=volume_abs2 title="A test with input files" descr="A test with input files"
+t.create type=str3ds temporaltype=absolute output=volume_abs3 title="A test with input files" descr="A test with input files"
+t.create type=str3ds temporaltype=absolute output=volume_abs4 title="A test with input files" descr="A test with input files"
+t.create type=str3ds temporaltype=absolute output=volume_abs5 title="A test with input files" descr="A test with input files"
+
+# The first @test
+t.register type=rast3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.rast3d.list separator=" | " method=comma input=volume_abs1
+t.rast3d.list input=volume_abs1
+t.rast3d.list separator=" | " method=cols input=volume_abs1
+t.rast3d.list separator=" | " method=delta input=volume_abs1
+t.rast3d.list separator=" | " method=deltagaps input=volume_abs1
+
+t.register -i type=rast3d input=volume_abs2 file="${n2}"
+t.rast3d.list separator=" | " method=comma input=volume_abs2
+t.rast3d.list input=volume_abs2
+t.rast3d.list separator=" | " method=cols input=volume_abs2
+t.rast3d.list separator=" | " method=delta input=volume_abs2
+t.rast3d.list separator=" | " method=deltagaps input=volume_abs2
+
+t.register -i type=rast3d input=volume_abs3 file="${n3}"
+t.rast3d.list separator=" | " method=comma input=volume_abs3
+t.rast3d.list separator=" | " method=delta input=volume_abs3
+t.rast3d.list separator=" | " method=deltagaps input=volume_abs3
+
+t.register -i type=rast3d input=volume_abs4 file="${n4}"
+t.rast3d.list separator=" | " method=comma input=volume_abs4
+t.rast3d.list separator=" | " method=delta input=volume_abs4
+t.rast3d.list separator=" | " method=deltagaps input=volume_abs4
+
+t.register -i type=rast3d input=volume_abs5 file="${n5}"
+t.rast3d.list separator=" | " method=comma input=volume_abs5
+t.rast3d.list input=volume_abs5
+t.rast3d.list separator=" | " method=cols input=volume_abs5
+t.rast3d.list separator=" | " method=delta input=volume_abs5
+t.rast3d.list separator=" | " method=deltagaps input=volume_abs5
+
+t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
+t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5
Deleted: grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Univariate statitsics for space time raster3d 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
-
-# Generate data
-r3.mapcalc expr="prec_1 = rand(0, 550)" -s
-r3.mapcalc expr="prec_2 = rand(0, 450)" -s
-r3.mapcalc expr="prec_3 = rand(0, 320)" -s
-r3.mapcalc expr="prec_4 = rand(0, 510)" -s
-r3.mapcalc expr="prec_5 = rand(0, 300)" -s
-r3.mapcalc expr="prec_6 = rand(0, 650)" -s
-
-t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
-t.info type=str3ds input=precip_abs1
-
-# The first @test
-t.rast3d.univar -e input=precip_abs1
-
-t.rast3d.univar -s input=precip_abs1
-
-t.remove -rf type=str3ds input=precip_abs1
-
Copied: grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh (from rev 61785, grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh)
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh (rev 0)
+++ grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Univariate statitsics for space time raster3d 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
+
+# Generate data
+r3.mapcalc expr="prec_1 = rand(0, 550)" -s
+r3.mapcalc expr="prec_2 = rand(0, 450)" -s
+r3.mapcalc expr="prec_3 = rand(0, 320)" -s
+r3.mapcalc expr="prec_4 = rand(0, 510)" -s
+r3.mapcalc expr="prec_5 = rand(0, 300)" -s
+r3.mapcalc expr="prec_6 = rand(0, 650)" -s
+
+t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
+t.info type=str3ds input=precip_abs1
+
+# The first @test
+t.rast3d.univar -e input=precip_abs1
+
+t.rast3d.univar -s input=precip_abs1
+
+t.remove -rf type=str3ds input=precip_abs1
+
Modified: grass/trunk/temporal/t.select/t.select.py
===================================================================
--- grass/trunk/temporal/t.select/t.select.py 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.select/t.select.py 2014-09-05 19:48:09 UTC (rev 61807)
@@ -59,7 +59,7 @@
tgis.init(True)
p = tgis.TemporalAlgebraParser(run=True, debug=False, spatial = spatial)
- p.parse(expression, stdstype)
+ p.parse(expression, stdstype, overwrite=grass.overwrite)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.select/test.t.select.sh
===================================================================
--- grass/trunk/temporal/t.select/test.t.select.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.select/test.t.select.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -11,7 +11,7 @@
# Create random points test maps.
for i in {1..60}
do
- if [[ "$i" -le 20 ]]; then
+ if [ "$i" -le 20 ]; then
echo testpoint1_$i >> ${n1}
v.random -z output=testpoint1_$i n=3 seed=$i
elif [ "$i" -gt 20 ] && [ "$i" -le 40 ]; then
Modified: grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -28,7 +28,7 @@
# Time instances
t.register --o input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2004-01-01 00:00:00" increment="3 months"
-t.vect.observe.strds --o input=prec strds=precip_abs1 output=prec_observer vector=prec_observer
+t.vect.observe.strds --o input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column=observation
t.vect.list input=prec_observer
t.vect.db.select input=prec_observer
t.vect.db.select input=prec_observer where="cat = 1" separator=" | "
Modified: grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -43,5 +43,5 @@
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
-g.mremove -f vect=test_*
+g.mremove -f type=vect pattern=test_*
g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: 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.relative.sh 2014-09-05 19:39:50 UTC (rev 61806)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-09-05 19:48:09 UTC (rev 61807)
@@ -19,7 +19,7 @@
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
+t.vect.observe.strds input=prec strds=precip_abs1 output=prec_observer vector=prec_observer column=observation
v.info prec_observer
t.info type=stvds input=prec_observer
t.vect.list input=prec_observer
More information about the grass-commit
mailing list