[GRASS-SVN] r63925 - in grass/branches/releasebranch_7_0/temporal: t.vect.algebra/testsuite t.vect.univar t.vect.univar/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 1 14:53:48 PST 2015
Author: neteler
Date: 2015-01-01 14:53:48 -0800 (Thu, 01 Jan 2015)
New Revision: 63925
Added:
grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
Removed:
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh
grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh
Log:
t.*: testsuites backported
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh 2015-01-01 22:49:11 UTC (rev 63924)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh 2015-01-01 22:53:48 UTC (rev 63925)
@@ -1,96 +0,0 @@
-#!/usr/bin/sh
-
-g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 -p
-
-export GRASS_OVERWRITE=1
-
-# Test for temporal algebra in LatLon location.
-if test -f vinput1_point_test ; then
- rm vinput1_point_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput2_point_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput3_point_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput4_point_test.txt
-fi
-
-if test -f vinput1_point_test ; then
- rm vinput1_area_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput2_area_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput3_area_test.txt
-fi
-if test -f vinput1_point_test ; then
- rm vinput4_area_test.txt
-fi
-
-LIST="1 2 3 4 5 6 7 8 9 0 10 11 12 13 14 15 16 17 18 19 20"
-
-# Create random area test maps.
-for i in ${LIST}
- do
- if test "$i" -le 10 ; then
- echo vtestpoint1_$i >> vinput1_point_test.txt
- echo vtestarea1_$i >> vinput1_area_test.txt
- v.random --o -z output=vtestpoint1_$i n=3 seed=$i+1
- v.voronoi --o input=vtestpoint1_$i output=vtestarea1_$i
- elif test "$i" -gt 10 && test "$i" -le 15 ; then
- echo vtestpoint2_$i >> vinput2_point_test.txt
- echo vtestarea2_$i >> vinput2_area_test.txt
- v.random --o -z output=vtestpoint2_$i n=3 seed=$i+1
- v.voronoi --o input=vtestpoint2_$i output=vtestarea2_$i
- else
- echo vtestpoint3_$i >> vinput3_point_test.txt
- echo vtestpoint4_$i >> vinput4_point_test.txt
- echo vtestarea3_$i >> vinput3_area_test.txt
- echo vtestarea4_$i >> vinput4_area_test.txt
- v.random --o -z output=vtestpoint3_$i n=3 seed=$i+1
- v.voronoi --o input=vtestpoint3_$i output=vtestarea3_$i
- v.random --o -z output=vtestpoint4_$i n=3 seed=$i+1
- v.voronoi --o input=vtestpoint4_$i output=vtestarea4_$i
- fi
- done
-
-# Create STVDS and register test maps.
-t.create output=A1 type=stvds title="Area test dataset" descr="Area test dataset"
-t.create output=A2 type=stvds title="Area test dataset" descr="Area test dataset"
-t.create output=A3 type=stvds title="Area test dataset" descr="Area test dataset"
-t.create output=A4 type=stvds title="Area test dataset" descr="Area test dataset"
-t.create output=P1 type=stvds title="Point test dataset" descr="Point test dataset"
-t.create output=P2 type=stvds title="Point test dataset" descr="Point test dataset"
-t.create output=P3 type=stvds title="Point test dataset" descr="Point test dataset"
-t.create output=P4 type=stvds title="Point test dataset" descr="Point test dataset"
-
-t.register -i type=vector input=A1 file=vinput1_area_test.txt increment="1 days" start="2013-01-01"
-t.register -i type=vector input=A2 file=vinput2_area_test.txt increment="1 days" start="2013-01-10"
-t.register -i type=vector input=A3 file=vinput3_area_test.txt increment="3 days" start="2013-01-01"
-t.register -i type=vector input=A4 file=vinput4_area_test.txt increment="3 days" start="2013-01-10"
-t.register -i type=vector input=P1 file=vinput1_point_test.txt increment="1 days" start="2013-01-01"
-t.register -i type=vector input=P2 file=vinput2_point_test.txt increment="1 days" start="2013-01-10"
-t.register -i type=vector input=P3 file=vinput3_point_test.txt increment="3 days" start="2013-01-01"
-t.register -i type=vector input=P4 file=vinput4_point_test.txt increment="3 days" start="2013-01-10"
-
-# Test different options.
-t.vect.algebra expression='B1 = A1 & A2' basename="bmap1"
-t.vect.list input=B1 column=name,start_time,end_time
-t.vect.algebra expression='B2 = A1 {+,equal|during,i} A3' basename="bmap2"
-t.vect.list input=B2 column=name,start_time,end_time
-t.vect.algebra expression='B3 = buff_p(P1,10)' basename="bmap3"
-t.vect.list input=B3 column=name,start_time,end_time
-t.vect.algebra expression='B4 = buff_p(P2,30) {|,equal|during} A4' basename="bmap4"
-t.vect.list input=B4 column=name,start_time,end_time
-t.vect.algebra expression='B5 = if(td(A1) == 1 || start_date(A1) >= "2010-01-10", A2)' basename="bmap5"
-t.vect.list input=B5 column=name,start_time,end_time
-t.vect.algebra expression='B6 = buff_p(P2,30) {&,equal|during|started,d} buff_p(P3,30)' basename="bmap6"
-t.vect.list input=B6 column=name,start_time,end_time
-t.vect.algebra expression='B7 = buff_p(P2,30) {&,starts,d} buff_p(P3,30)' basename="bmap7"
-t.vect.list input=B8 column=name,start_time,end_time
-t.vect.algebra expression='B8 = buff_p(P2,30) {|,starts,d} buff_p(P3,30)' basename="bmap8"
-t.vect.list input=B8 column=name,start_time,end_time
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh 2015-01-01 22:49:11 UTC (rev 63924)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh 2015-01-01 22:53:48 UTC (rev 63925)
@@ -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=vector --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=vector maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
-t.remove type=stvds input=random_data
-g.remove -f type=vector name=rpoints1,rpoints2,rvoronoi1,rvoronoi2
-
Added: grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2015-01-01 22:53:48 UTC (rev 63925)
@@ -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=vector --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=vector maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+t.remove type=stvds input=random_data
+g.remove -f type=vector name=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+
Property changes on: grass/branches/releasebranch_7_0/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:eol-style
+ native
More information about the grass-commit
mailing list