[GRASS-SVN] r62867 - in grass/branches/releasebranch_7_0/temporal: . t.connect t.connect/testsuite t.create t.info t.info/testsuite t.list t.merge t.merge/testsuite t.rast.accdetect t.rast.accdetect/testsuite t.rast.accdetect/testsuite/data t.rast.accumulate t.rast.accumulate/testsuite t.rast.accumulate/testsuite/data t.rast.aggregate t.rast.aggregate/testsuite t.rast.aggregate.ds t.rast.aggregate.ds/testsuite t.rast.algebra t.rast.algebra/testsuite t.rast.colors t.rast.extract t.rast.extract/testsuite t.rast.gapfill t.rast.list t.rast.mapcalc t.rast.neighbors t.rast.out.vtk t.rast.series t.rast.to.rast3 t.rast.to.rast3/testsuite t.rast.univar t.rast3d.algebra t.rast3d.algebra/testsuite t.rast3d.extract t.rast3d.extract/testsuite t.rast3d.list t.rast3d.list/testsuite t.rast3d.univar t.rast3d.univar/testsuite t.register t.remove t.sample t.sample/testsuite t.select t.shift t.snap t.support t.topology t.unregister t.unregister/testsuite t.vect.algebra t.vect.algebra/testsuite t.ve ct.db.select t.vect.extract t.vect.import t.vect.import/testsuite t.vect.list t.vect.list/testsuite t.vect.observe.strds t.vect.observe.strds/testsuite t.vect.what.strds
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 22 15:47:46 PST 2014
Author: huhabla
Date: 2014-11-22 15:47:45 -0800 (Sat, 22 Nov 2014)
New Revision: 62867
Added:
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
grass/branches/releasebranch_7_0/temporal/t.info/testsuite/
grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh
grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/
grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/Makefile
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py
grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py
grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/
grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/
grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py
grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
Removed:
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
grass/branches/releasebranch_7_0/temporal/t.info/test.t.info.sh
grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh
grass/branches/releasebranch_7_0/temporal/t.merge/test.t.merge.sh
grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/test_suite/
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/test_suite/
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.sh
grass/branches/releasebranch_7_0/temporal/t.rast.extract/test.t.rast.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc2/
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/test.t.rast3d.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc2/
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
grass/branches/releasebranch_7_0/temporal/t.sample/test.t.sample.sh
grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/
grass/branches/releasebranch_7_0/temporal/t.vect.import/test.t.vect.import.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.sh
grass/branches/releasebranch_7_0/temporal/t.vect.mapcalc/
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh
Modified:
grass/branches/releasebranch_7_0/temporal/Makefile
grass/branches/releasebranch_7_0/temporal/t.create/t.create.py
grass/branches/releasebranch_7_0/temporal/t.info/t.info.py
grass/branches/releasebranch_7_0/temporal/t.list/t.list.py
grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.py
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.py
grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py
grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.py
grass/branches/releasebranch_7_0/temporal/t.rast.list/t.rast.list.html
grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py
grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py
grass/branches/releasebranch_7_0/temporal/t.rast.series/t.rast.series.py
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/branches/releasebranch_7_0/temporal/t.rast.univar/test.t.rast.univar.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.py
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh
grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py
grass/branches/releasebranch_7_0/temporal/t.select/t.select.html
grass/branches/releasebranch_7_0/temporal/t.select/t.select.py
grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.py
grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.py
grass/branches/releasebranch_7_0/temporal/t.support/t.support.py
grass/branches/releasebranch_7_0/temporal/t.topology/t.topology.py
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py
grass/branches/releasebranch_7_0/temporal/t.vect.db.select/t.vect.db.select.py
grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh
grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.html
grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.py
grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/t.vect.observe.strds.py
grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py
Log:
temporal modules: Backport of all changes from trunk to enalbe mapset specific temporal databases. Several modifications are related to changes in the temporal framework API as well as new functions for aggregation.
Modified: grass/branches/releasebranch_7_0/temporal/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/temporal/Makefile 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -33,6 +33,7 @@
t.rast3d.mapcalc \
t.rast3d.univar \
t.rename \
+ t.select \
t.snap \
t.shift \
t.vect.list \
@@ -43,10 +44,6 @@
t.vect.what.strds \
t.vect.observe.strds \
t.vect.univar
-# t.rast.mapcalc2
-# t.rast3d.mapcalc2
-# t.select
-# t.vect.mapcalc
PGM = temporalintro
Deleted: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
===================================================================
--- grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2014-09-15 22:34:24 UTC (rev 61985)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,208 +0,0 @@
-"""Test t.rast.extract
-
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
- at author Soeren Gebbert
-"""
-
-import grass.pygrass.modules as pymod
-import subprocess
-from grass.gunittest.case import TestCase
-from grass.gunittest.gmodules import SimpleModule
-import os
-
-
-mapset_count = 0
-class TestRasterExtraction(TestCase):
-
- @classmethod
- def setUpClass(cls):
- os.putenv("GRASS_OVERWRITE", "1")
- for i in range(1, 5):
- cls.runModule("g.mapset", flags="c", mapset="test%i"%i)
- cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
- # Use always the current mapset as temporal database
- cls.runModule("r.mapcalc", expression="a1 = 100")
- cls.runModule("r.mapcalc", expression="a2 = 200")
- cls.runModule("r.mapcalc", expression="a3 = 300")
-
- cls.runModule("t.create", type="strds", temporaltype="absolute",
- output="A", title="A test", description="A test")
- cls.runModule("t.register", flags="i", type="rast", input="A",
- maps="a1,a2,a3",
- start="2001-01-01", increment="%i months"%i)
-
- def test_tlist(self):
- self.runModule("g.mapset", mapset="test1")
-
- list_string = """A|test1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
- A|test2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
- A|test3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
- A|test4|2001-01-01 00:00:00|2002-01-01 00:00:00|3"""
-
- entries = list_string.split("\n")
-
- t_list = SimpleModule("t.list", quiet=True, columns=["name","mapset,start_time","end_time","number_of_maps"], type="strds")
- self.assertModule(t_list)
-
- out = t_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_trast_list(self):
- self.runModule("g.mapset", mapset="test1")
-
- list_string = """a1|test1|2001-01-01 00:00:00|2001-02-01 00:00:00
- a2|test1|2001-02-01 00:00:00|2001-03-01 00:00:00
- a3|test1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test1")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test2|2001-01-01 00:00:00|2001-03-01 00:00:00
- a2|test2|2001-03-01 00:00:00|2001-05-01 00:00:00
- a3|test2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test2")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test3|2001-01-01 00:00:00|2001-04-01 00:00:00
- a2|test3|2001-04-01 00:00:00|2001-07-01 00:00:00
- a3|test3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test3")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test4|2001-01-01 00:00:00|2001-05-01 00:00:00
- a2|test4|2001-05-01 00:00:00|2001-09-01 00:00:00
- a3|test4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test4")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_strds_info(self):
- self.runModule("g.mapset", mapset="test4")
- tinfo_string="""id=A at test1
- name=A
- mapset=test1
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00
- granularity=1 month"""
-
- info = SimpleModule("t.info", flags="g", input="A at test1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test3")
- tinfo_string="""id=A at test2
- name=A
- mapset=test2
- start_time=2001-01-01 00:00:00
- end_time=2001-07-01 00:00:00
- granularity=2 months"""
-
- info = SimpleModule("t.info", flags="g", input="A at test2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test2")
- tinfo_string="""id=A at test3
- name=A
- mapset=test3
- start_time=2001-01-01 00:00:00
- end_time=2001-10-01 00:00:00
- granularity=3 months"""
-
- info = SimpleModule("t.info", flags="g", input="A at test3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test1")
- tinfo_string="""id=A at test4
- name=A
- mapset=test4
- start_time=2001-01-01 00:00:00
- end_time=2002-01-01 00:00:00
- granularity=4 months"""
-
- info = SimpleModule("t.info", flags="g", input="A at test4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- def test_raster_info(self):
- self.runModule("g.mapset", mapset="test3")
- tinfo_string="""id=a1 at test1
- name=a1
- mapset=test1
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-02-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test2
- name=a1
- mapset=test2
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-03-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test3
- name=a1
- mapset=test3
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test4
- name=a1
- mapset=test4
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-05-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
-if __name__ == '__main__':
- from grass.gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py (from rev 61985, grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,271 @@
+"""test distributed temporal databases with strds
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+import subprocess
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+import os
+import grass.temporal as tgis
+
+mapset_count = 0
+class TestRasterExtraction(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ os.putenv("GRASS_OVERWRITE", "1")
+ for i in range(1, 5):
+ cls.runModule("g.mapset", flags="c", mapset="test%i"%i)
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+ cls.runModule("t.info", flags="s")
+ cls.runModule("r.mapcalc", expression="a1 = 100")
+ cls.runModule("r.mapcalc", expression="a2 = 200")
+ cls.runModule("r.mapcalc", expression="a3 = 300")
+
+ cls.runModule("t.create", type="strds", temporaltype="absolute",
+ output="A", title="A test", description="A test")
+ cls.runModule("t.register", flags="i", type="rast", input="A",
+ maps="a1,a2,a3",
+ start="2001-01-01", increment="%i months"%i)
+
+ # Here we reuse two mapset to share a temporal databse between mapsets
+ tgis.init()
+ ciface = tgis.get_tgis_c_library_interface()
+ cls.runModule("g.mapset", flags="c", mapset="test5")
+ driver = ciface.get_driver_name("test1")
+ database = ciface.get_database_name("test1")
+ cls.runModule("t.connect", driver=driver, database=database)
+
+ cls.runModule("g.mapset", flags="c", mapset="test6")
+ driver = ciface.get_driver_name("test2")
+ database = ciface.get_database_name("test2")
+ cls.runModule("t.connect", driver=driver, database=database)
+
+ for i in range(5, 7):
+ cls.runModule("g.mapset", mapset="test%i"%i)
+ cls.runModule("r.mapcalc", expression="a1 = 100")
+ cls.runModule("r.mapcalc", expression="a2 = 200")
+ cls.runModule("r.mapcalc", expression="a3 = 300")
+
+ cls.runModule("t.create", type="strds", temporaltype="absolute",
+ output="A", title="A test", description="A test")
+ cls.runModule("t.register", flags="i", type="rast", input="A",
+ maps="a1,a2,a3",
+ start="2001-01-01", increment="%i months"%i)
+
+ def test_tlist(self):
+ self.runModule("g.mapset", mapset="test1")
+
+ list_string = """A|test1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
+ A|test2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
+ A|test3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
+ A|test4|2001-01-01 00:00:00|2002-01-01 00:00:00|3
+ A|test5|2001-01-01 00:00:00|2002-04-01 00:00:00|3
+ A|test6|2001-01-01 00:00:00|2002-07-01 00:00:00|3"""
+
+ entries = list_string.split("\n")
+
+ t_list = SimpleModule("t.list", quiet=True,
+ columns=["name","mapset,start_time","end_time","number_of_maps"],
+ type="strds", where='name = "A"')
+ self.assertModule(t_list)
+
+ out = t_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_trast_list(self):
+ self.runModule("g.mapset", mapset="test1")
+
+ list_string = """a1|test1|2001-01-01 00:00:00|2001-02-01 00:00:00
+ a2|test1|2001-02-01 00:00:00|2001-03-01 00:00:00
+ a3|test1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test1")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test2|2001-01-01 00:00:00|2001-03-01 00:00:00
+ a2|test2|2001-03-01 00:00:00|2001-05-01 00:00:00
+ a3|test2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test2")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test3|2001-01-01 00:00:00|2001-04-01 00:00:00
+ a2|test3|2001-04-01 00:00:00|2001-07-01 00:00:00
+ a3|test3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test3")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test4|2001-01-01 00:00:00|2001-05-01 00:00:00
+ a2|test4|2001-05-01 00:00:00|2001-09-01 00:00:00
+ a3|test4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test4")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test5|2001-01-01 00:00:00|2001-06-01 00:00:00
+ a2|test5|2001-06-01 00:00:00|2001-11-01 00:00:00
+ a3|test5|2001-11-01 00:00:00|2002-04-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast.list", quiet=True, flags="s", input="A at test5")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_strds_info(self):
+ self.runModule("g.mapset", mapset="test4")
+ tinfo_string="""id=A at test1
+ name=A
+ mapset=test1
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 month"""
+
+ info = SimpleModule("t.info", flags="g", input="A at test1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test3")
+ tinfo_string="""id=A at test2
+ name=A
+ mapset=test2
+ start_time=2001-01-01 00:00:00
+ end_time=2001-07-01 00:00:00
+ granularity=2 months"""
+
+ info = SimpleModule("t.info", flags="g", input="A at test2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test2")
+ tinfo_string="""id=A at test3
+ name=A
+ mapset=test3
+ start_time=2001-01-01 00:00:00
+ end_time=2001-10-01 00:00:00
+ granularity=3 months"""
+
+ info = SimpleModule("t.info", flags="g", input="A at test3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test1")
+ tinfo_string="""id=A at test4
+ name=A
+ mapset=test4
+ start_time=2001-01-01 00:00:00
+ end_time=2002-01-01 00:00:00
+ granularity=4 months"""
+
+ info = SimpleModule("t.info", flags="g", input="A at test4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=A at test5
+ name=A
+ mapset=test5
+ start_time=2001-01-01 00:00:00
+ end_time=2002-04-01 00:00:00
+ granularity=5 months"""
+
+ info = SimpleModule("t.info", flags="g", input="A at test5")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_raster_info(self):
+ self.runModule("g.mapset", mapset="test3")
+ tinfo_string="""id=a1 at test1
+ name=a1
+ mapset=test1
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-02-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test2
+ name=a1
+ mapset=test2
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-03-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test3
+ name=a1
+ mapset=test3
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test4
+ name=a1
+ mapset=test4
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-05-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test5
+ name=a1
+ mapset=test5
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-06-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast", input="a1 at test5")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Deleted: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
===================================================================
--- grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2014-09-15 22:34:24 UTC (rev 61985)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,205 +0,0 @@
-"""test distributed temporal databases with str3ds
-
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
- at author Soeren Gebbert
-"""
-
-import grass.pygrass.modules as pymod
-from grass.gunittest.case import TestCase
-from grass.gunittest.gmodules import SimpleModule
-import os
-
-class testRaster3dExtraction(TestCase):
-
- @classmethod
- def setUpClass(cls):
- os.putenv("GRASS_OVERWRITE", "1")
- for i in range(1, 5):
- cls.runModule("g.mapset", flags="c", mapset="test3d%i"%i)
- cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
- # Use always the current mapset as temporal database
- cls.runModule("r3.mapcalc", expression="a1 = 100")
- cls.runModule("r3.mapcalc", expression="a2 = 200")
- cls.runModule("r3.mapcalc", expression="a3 = 300")
-
- cls.runModule("t.create", type="str3ds", temporaltype="absolute",
- output="A", title="A test3d", description="A test3d")
- cls.runModule("t.register", flags="i", type="rast3d", input="A",
- maps="a1,a2,a3",
- start="2001-01-01", increment="%i months"%i)
-
- def test_tlist(self):
- self.runModule("g.mapset", mapset="test3d1")
-
- list_string = """A|test3d1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
- A|test3d2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
- A|test3d3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
- A|test3d4|2001-01-01 00:00:00|2002-01-01 00:00:00|3"""
-
- entries = list_string.split("\n")
-
- t_list = SimpleModule("t.list", quiet=True, columns=["name","mapset,start_time","end_time","number_of_maps"], type="str3ds")
- self.assertModule(t_list)
-
- out = t_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_trast_list(self):
- self.runModule("g.mapset", mapset="test3d1")
-
- list_string = """a1|test3d1|2001-01-01 00:00:00|2001-02-01 00:00:00
- a2|test3d1|2001-02-01 00:00:00|2001-03-01 00:00:00
- a3|test3d1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d1")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test3d2|2001-01-01 00:00:00|2001-03-01 00:00:00
- a2|test3d2|2001-03-01 00:00:00|2001-05-01 00:00:00
- a3|test3d2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d2")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test3d3|2001-01-01 00:00:00|2001-04-01 00:00:00
- a2|test3d3|2001-04-01 00:00:00|2001-07-01 00:00:00
- a3|test3d3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d3")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|test3d4|2001-01-01 00:00:00|2001-05-01 00:00:00
- a2|test3d4|2001-05-01 00:00:00|2001-09-01 00:00:00
- a3|test3d4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d4")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_strds_info(self):
- self.runModule("g.mapset", mapset="test3d4")
- tinfo_string="""id=A at test3d1
- name=A
- mapset=test3d1
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00
- granularity=1 month"""
-
- info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test3d3")
- tinfo_string="""id=A at test3d2
- name=A
- mapset=test3d2
- start_time=2001-01-01 00:00:00
- end_time=2001-07-01 00:00:00
- granularity=2 months"""
-
- info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test3d2")
- tinfo_string="""id=A at test3d3
- name=A
- mapset=test3d3
- start_time=2001-01-01 00:00:00
- end_time=2001-10-01 00:00:00
- granularity=3 months"""
-
- info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="test3d1")
- tinfo_string="""id=A at test3d4
- name=A
- mapset=test3d4
- start_time=2001-01-01 00:00:00
- end_time=2002-01-01 00:00:00
- granularity=4 months"""
-
- info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- def test_raster_info(self):
- self.runModule("g.mapset", mapset="test3d3")
- tinfo_string="""id=a1 at test3d1
- name=a1
- mapset=test3d1
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-02-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test3d2
- name=a1
- mapset=test3d2
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-03-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test3d3
- name=a1
- mapset=test3d3
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at test3d4
- name=a1
- mapset=test3d4
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-05-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
-if __name__ == '__main__':
- from grass.gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py (from rev 61985, grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,207 @@
+"""test distributed temporal databases with str3ds
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+import os
+
+class testRaster3dExtraction(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ os.putenv("GRASS_OVERWRITE", "1")
+ for i in range(1, 5):
+ cls.runModule("g.mapset", flags="c", mapset="test3d%i"%i)
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+ # Use always the current mapset as temporal database
+ cls.runModule("r3.mapcalc", expression="a1 = 100")
+ cls.runModule("r3.mapcalc", expression="a2 = 200")
+ cls.runModule("r3.mapcalc", expression="a3 = 300")
+
+ cls.runModule("t.create", type="str3ds", temporaltype="absolute",
+ output="A", title="A test3d", description="A test3d")
+ cls.runModule("t.register", flags="i", type="rast3d", input="A",
+ maps="a1,a2,a3",
+ start="2001-01-01", increment="%i months"%i)
+
+ def test_tlist(self):
+ self.runModule("g.mapset", mapset="test3d1")
+
+ list_string = """A|test3d1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
+ A|test3d2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
+ A|test3d3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
+ A|test3d4|2001-01-01 00:00:00|2002-01-01 00:00:00|3"""
+
+ entries = list_string.split("\n")
+
+ t_list = SimpleModule("t.list", quiet=True,
+ columns=["name","mapset,start_time","end_time","number_of_maps"],
+ type="str3ds", where='name = "A"')
+ self.assertModule(t_list)
+
+ out = t_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_trast_list(self):
+ self.runModule("g.mapset", mapset="test3d1")
+
+ list_string = """a1|test3d1|2001-01-01 00:00:00|2001-02-01 00:00:00
+ a2|test3d1|2001-02-01 00:00:00|2001-03-01 00:00:00
+ a3|test3d1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d1")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test3d2|2001-01-01 00:00:00|2001-03-01 00:00:00
+ a2|test3d2|2001-03-01 00:00:00|2001-05-01 00:00:00
+ a3|test3d2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d2")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test3d3|2001-01-01 00:00:00|2001-04-01 00:00:00
+ a2|test3d3|2001-04-01 00:00:00|2001-07-01 00:00:00
+ a3|test3d3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d3")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|test3d4|2001-01-01 00:00:00|2001-05-01 00:00:00
+ a2|test3d4|2001-05-01 00:00:00|2001-09-01 00:00:00
+ a3|test3d4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.rast3d.list", quiet=True, flags="s", input="A at test3d4")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_strds_info(self):
+ self.runModule("g.mapset", mapset="test3d4")
+ tinfo_string="""id=A at test3d1
+ name=A
+ mapset=test3d1
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 month"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test3d3")
+ tinfo_string="""id=A at test3d2
+ name=A
+ mapset=test3d2
+ start_time=2001-01-01 00:00:00
+ end_time=2001-07-01 00:00:00
+ granularity=2 months"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test3d2")
+ tinfo_string="""id=A at test3d3
+ name=A
+ mapset=test3d3
+ start_time=2001-01-01 00:00:00
+ end_time=2001-10-01 00:00:00
+ granularity=3 months"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="test3d1")
+ tinfo_string="""id=A at test3d4
+ name=A
+ mapset=test3d4
+ start_time=2001-01-01 00:00:00
+ end_time=2002-01-01 00:00:00
+ granularity=4 months"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="A at test3d4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_raster_info(self):
+ self.runModule("g.mapset", mapset="test3d3")
+ tinfo_string="""id=a1 at test3d1
+ name=a1
+ mapset=test3d1
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-02-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test3d2
+ name=a1
+ mapset=test3d2
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-03-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test3d3
+ name=a1
+ mapset=test3d3
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at test3d4
+ name=a1
+ mapset=test3d4
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-05-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="rast3d", input="a1 at test3d4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Deleted: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
===================================================================
--- grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2014-09-15 22:34:24 UTC (rev 61985)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,215 +0,0 @@
-"""test distributed temporal databases with stvds
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
- at author Soeren Gebbert
-"""
-
-import grass.pygrass.modules as pymod
-import subprocess
-from grass.gunittest.case import TestCase
-from grass.gunittest.gmodules import SimpleModule
-import os
-
-
-mapset_count = 0
-class TestRasterExtraction(TestCase):
-
- @classmethod
- def setUpClass(cls):
- os.putenv("GRASS_OVERWRITE", "1")
- for i in range(1, 5):
- cls.runModule("g.mapset", flags="c", mapset="testvect%i"%i)
- cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
- # Use always the current mapset as temporal database
- cls.runModule("v.random", output="a1", n=20)
- cls.runModule("v.random", output="a2", n=20)
- cls.runModule("v.random", output="a3", n=20)
-
- cls.runModule("t.create", type="stvds", temporaltype="absolute",
- output="A", title="A testvect", description="A testvect")
- cls.runModule("t.register", flags="i", type="vect", input="A",
- maps="a1,a2,a3",
- start="2001-01-01", increment="%i months"%i)
-
- def test_tlist(self):
- self.runModule("g.mapset", mapset="testvect1")
-
- list_string = """A|testvect1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
- A|testvect2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
- A|testvect3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
- A|testvect4|2001-01-01 00:00:00|2002-01-01 00:00:00|3"""
-
- entries = list_string.split("\n")
-
- t_list = SimpleModule("t.list", quiet=True, columns=["name","mapset,start_time","end_time","number_of_maps"], type="stvds")
- self.assertModule(t_list)
-
- out = t_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_tvect_list(self):
- self.runModule("g.mapset", mapset="testvect1")
-
- list_string = """a1|testvect1|2001-01-01 00:00:00|2001-02-01 00:00:00
- a2|testvect1|2001-02-01 00:00:00|2001-03-01 00:00:00
- a3|testvect1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
- columns=["name","mapset","start_time","end_time"] ,
- input="A at testvect1")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|testvect2|2001-01-01 00:00:00|2001-03-01 00:00:00
- a2|testvect2|2001-03-01 00:00:00|2001-05-01 00:00:00
- a3|testvect2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
- columns=["name","mapset","start_time","end_time"] ,
- input="A at testvect2")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|testvect3|2001-01-01 00:00:00|2001-04-01 00:00:00
- a2|testvect3|2001-04-01 00:00:00|2001-07-01 00:00:00
- a3|testvect3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
- columns=["name","mapset","start_time","end_time"] ,
- input="A at testvect3")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- list_string = """a1|testvect4|2001-01-01 00:00:00|2001-05-01 00:00:00
- a2|testvect4|2001-05-01 00:00:00|2001-09-01 00:00:00
- a3|testvect4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
-
- entries = list_string.split("\n")
-
- trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
- columns=["name","mapset","start_time","end_time"] ,
- input="A at testvect4")
- self.assertModule(trast_list)
-
- out = trast_list.outputs["stdout"].value
-
- for a, b in zip(list_string.split("\n"), out.split("\n")):
- self.assertEqual(a.strip(), b.strip())
-
- def test_stvds_info(self):
- self.runModule("g.mapset", mapset="testvect4")
- tinfo_string="""id=A at testvect1
- name=A
- mapset=testvect1
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00
- granularity=1 month"""
-
- info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="testvect3")
- tinfo_string="""id=A at testvect2
- name=A
- mapset=testvect2
- start_time=2001-01-01 00:00:00
- end_time=2001-07-01 00:00:00
- granularity=2 months"""
-
- info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="testvect2")
- tinfo_string="""id=A at testvect3
- name=A
- mapset=testvect3
- start_time=2001-01-01 00:00:00
- end_time=2001-10-01 00:00:00
- granularity=3 months"""
-
- info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- self.runModule("g.mapset", mapset="testvect1")
- tinfo_string="""id=A at testvect4
- name=A
- mapset=testvect4
- start_time=2001-01-01 00:00:00
- end_time=2002-01-01 00:00:00
- granularity=4 months"""
-
- info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- def testv_vector_info(self):
- self.runModule("g.mapset", mapset="testvect3")
- tinfo_string="""id=a1 at testvect1
- name=a1
- mapset=testvect1
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-02-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect1")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at testvect2
- name=a1
- mapset=testvect2
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-03-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect2")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at testvect3
- name=a1
- mapset=testvect3
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-04-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect3")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
- tinfo_string="""id=a1 at testvect4
- name=a1
- mapset=testvect4
- creator=soeren
- temporal_type=absolute
- start_time=2001-01-01 00:00:00
- end_time=2001-05-01 00:00:00 """
-
- info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect4")
- self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
-
-if __name__ == '__main__':
- from grass.gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py (from rev 61985, grass/trunk/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.connect/testsuite/test_distr_tgis_db_vector.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,218 @@
+"""test distributed temporal databases with stvds
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+import subprocess
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+import os
+
+
+mapset_count = 0
+class TestRasterExtraction(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ os.putenv("GRASS_OVERWRITE", "1")
+ for i in range(1, 5):
+ cls.runModule("g.mapset", flags="c", mapset="testvect%i"%i)
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+ # Use always the current mapset as temporal database
+ cls.runModule("v.random", output="a1", n=20)
+ cls.runModule("v.random", output="a2", n=20)
+ cls.runModule("v.random", output="a3", n=20)
+
+ cls.runModule("t.create", type="stvds", temporaltype="absolute",
+ output="A", title="A testvect", description="A testvect")
+ cls.runModule("t.register", flags="i", type="vect", input="A",
+ maps="a1,a2,a3",
+ start="2001-01-01", increment="%i months"%i)
+
+ def test_tlist(self):
+ self.runModule("g.mapset", mapset="testvect1")
+
+ list_string = """A|testvect1|2001-01-01 00:00:00|2001-04-01 00:00:00|3
+ A|testvect2|2001-01-01 00:00:00|2001-07-01 00:00:00|3
+ A|testvect3|2001-01-01 00:00:00|2001-10-01 00:00:00|3
+ A|testvect4|2001-01-01 00:00:00|2002-01-01 00:00:00|3"""
+
+ entries = list_string.split("\n")
+
+ t_list = SimpleModule("t.list", quiet=True,
+ columns=["name","mapset,start_time","end_time","number_of_maps"],
+ type="stvds", where='name = "A"')
+ self.assertModule(t_list)
+
+ out = t_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_tvect_list(self):
+ self.runModule("g.mapset", mapset="testvect1")
+
+ list_string = """a1|testvect1|2001-01-01 00:00:00|2001-02-01 00:00:00
+ a2|testvect1|2001-02-01 00:00:00|2001-03-01 00:00:00
+ a3|testvect1|2001-03-01 00:00:00|2001-04-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
+ columns=["name","mapset","start_time","end_time"] ,
+ input="A at testvect1")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|testvect2|2001-01-01 00:00:00|2001-03-01 00:00:00
+ a2|testvect2|2001-03-01 00:00:00|2001-05-01 00:00:00
+ a3|testvect2|2001-05-01 00:00:00|2001-07-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
+ columns=["name","mapset","start_time","end_time"] ,
+ input="A at testvect2")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|testvect3|2001-01-01 00:00:00|2001-04-01 00:00:00
+ a2|testvect3|2001-04-01 00:00:00|2001-07-01 00:00:00
+ a3|testvect3|2001-07-01 00:00:00|2001-10-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
+ columns=["name","mapset","start_time","end_time"] ,
+ input="A at testvect3")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ list_string = """a1|testvect4|2001-01-01 00:00:00|2001-05-01 00:00:00
+ a2|testvect4|2001-05-01 00:00:00|2001-09-01 00:00:00
+ a3|testvect4|2001-09-01 00:00:00|2002-01-01 00:00:00"""
+
+ entries = list_string.split("\n")
+
+ trast_list = SimpleModule("t.vect.list", quiet=True, flags="s",
+ columns=["name","mapset","start_time","end_time"] ,
+ input="A at testvect4")
+ self.assertModule(trast_list)
+
+ out = trast_list.outputs["stdout"].value
+
+ for a, b in zip(list_string.split("\n"), out.split("\n")):
+ self.assertEqual(a.strip(), b.strip())
+
+ def test_stvds_info(self):
+ self.runModule("g.mapset", mapset="testvect4")
+ tinfo_string="""id=A at testvect1
+ name=A
+ mapset=testvect1
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 month"""
+
+ info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="testvect3")
+ tinfo_string="""id=A at testvect2
+ name=A
+ mapset=testvect2
+ start_time=2001-01-01 00:00:00
+ end_time=2001-07-01 00:00:00
+ granularity=2 months"""
+
+ info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="testvect2")
+ tinfo_string="""id=A at testvect3
+ name=A
+ mapset=testvect3
+ start_time=2001-01-01 00:00:00
+ end_time=2001-10-01 00:00:00
+ granularity=3 months"""
+
+ info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ self.runModule("g.mapset", mapset="testvect1")
+ tinfo_string="""id=A at testvect4
+ name=A
+ mapset=testvect4
+ start_time=2001-01-01 00:00:00
+ end_time=2002-01-01 00:00:00
+ granularity=4 months"""
+
+ info = SimpleModule("t.info", flags="g", type="stvds", input="A at testvect4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def testv_vector_info(self):
+ self.runModule("g.mapset", mapset="testvect3")
+ tinfo_string="""id=a1 at testvect1
+ name=a1
+ mapset=testvect1
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-02-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect1")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at testvect2
+ name=a1
+ mapset=testvect2
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-03-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at testvect3
+ name=a1
+ mapset=testvect3
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect3")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ tinfo_string="""id=a1 at testvect4
+ name=a1
+ mapset=testvect4
+ creator=soeren
+ temporal_type=absolute
+ start_time=2001-01-01 00:00:00
+ end_time=2001-05-01 00:00:00 """
+
+ info = SimpleModule("t.info", flags="g", type="vect", input="a1 at testvect4")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Modified: grass/branches/releasebranch_7_0/temporal/t.create/t.create.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.create/t.create.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.create/t.create.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -75,7 +75,7 @@
tgis.init()
- tgis.open_new_space_time_dataset(name, type, temporaltype, title, descr,
+ tgis.open_new_stds(name, type, temporaltype, title, descr,
semantic, None, grass.overwrite())
if __name__ == "__main__":
Modified: grass/branches/releasebranch_7_0/temporal/t.info/t.info.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.info/t.info.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.info/t.info.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -2,15 +2,15 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.info
-# AUTHOR(S): Soeren Gebbert
+# MODULE: t.info
+# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Print information about a space-time dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# PURPOSE: Print information about a space-time dataset
+# COPYRIGHT: (C) 2011 by the GRASS Development Team
#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
@@ -77,7 +77,7 @@
if system and not shellstyle:
# 0123456789012345678901234567890
print " +------------------- Temporal DBMI backend information ----------------------+"
- print " | DBMI Python interface:...... " + str(dbif.dbmi.__name__)
+ print " | DBMI Python interface:...... " + str(dbif.get_dbmi().__name__)
print " | Temporal database string:... " + str(
tgis.get_tgis_database_string())
print " | SQL template path:.......... " + str(
@@ -88,7 +88,7 @@
print " +----------------------------------------------------------------------------+"
return
elif system:
- print "dbmi_python_interface=\'" + str(dbif.dbmi.__name__) + "\'"
+ print "dbmi_python_interface=\'" + str(dbif.get_dbmi().__name__) + "\'"
print "dbmi_string=\'" + str(tgis.get_tgis_database_string()) + "\'"
print "sql_template_path=\'" + str(tgis.get_sql_template_path()) + "\'"
if rows:
@@ -106,10 +106,10 @@
dataset = tgis.dataset_factory(type_, id_)
- if dataset.is_in_db() == False:
+ if dataset.is_in_db(dbif) == False:
grass.fatal(_("Dataset <%s> not found in temporal database") % (id_))
- dataset.select()
+ dataset.select(dbif)
if history == True and type in ["strds", "stvds", "str3ds"]:
dataset.print_history()
Deleted: grass/branches/releasebranch_7_0/temporal/t.info/test.t.info.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.info/test.t.info.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.info/test.t.info.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
-
Deleted: grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh
===================================================================
--- grass/trunk/temporal/t.info/testsuite/test.t.info.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,79 +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
-
-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
-
Copied: grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh (from rev 61807, grass/trunk/temporal/t.info/testsuite/test.t.info.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.info/testsuite/test.t.info.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
+
Modified: grass/branches/releasebranch_7_0/temporal/t.list/t.list.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.list/t.list.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.list/t.list.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -76,7 +76,7 @@
#% guisection: Formatting
#%end
-import grass.script as grass
+import grass.script as gscript
import grass.temporal as tgis
import sys
@@ -91,7 +91,7 @@
columns = options["columns"]
order = options["order"]
where = options["where"]
- separator = grass.separator(options["separator"])
+ separator = gscript.separator(options["separator"])
colhead = flags['c']
# Make sure the temporal database exists
@@ -100,7 +100,8 @@
sp = tgis.dataset_factory(type, None)
first = True
- sys.stderr.write("----------------------------------------------\n")
+ if gscript.verbosity() > 0:
+ sys.stderr.write("----------------------------------------------\n")
for ttype in temporal_type.split(","):
if ttype == "absolute":
@@ -120,12 +121,13 @@
rows = stds_list[key]
if rows:
- if issubclass(sp.__class__, tgis.AbstractMapDataset):
- sys.stderr.write(_("Time stamped %s maps with %s available in mapset <%s>:\n")%\
- (sp.get_type(), time, key))
- else:
- sys.stderr.write(_("Space time %s datasets with %s available in mapset <%s>:\n")%\
- (sp.get_new_map_instance(None).get_type(), time, key))
+ if gscript.verbosity() > 0:
+ if issubclass(sp.__class__, tgis.AbstractMapDataset):
+ sys.stderr.write(_("Time stamped %s maps with %s available in mapset <%s>:\n")%\
+ (sp.get_type(), time, key))
+ else:
+ sys.stderr.write(_("Space time %s datasets with %s available in mapset <%s>:\n")%\
+ (sp.get_new_map_instance(None).get_type(), time, key))
# Print the column names if requested
if colhead == True and first == True:
@@ -153,5 +155,5 @@
print output
if __name__ == "__main__":
- options, flags = grass.parser()
+ options, flags = gscript.parser()
main()
Modified: grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -74,7 +74,7 @@
first = None
for id in input_ids:
- stds = tgis.open_old_space_time_dataset(id, type, dbif)
+ stds = tgis.open_old_stds(id, type, dbif)
if first is None:
first = stds
@@ -100,7 +100,7 @@
(stds.get_new_map_instance(None).get_type(), output_id))
if not output_exists:
- output_stds = tgis.open_new_space_time_dataset(output, type,
+ output_stds = tgis.open_new_stds(output, type,
first.get_temporal_type(),
"Merged space time dataset",
"Merged space time dataset",
Deleted: grass/branches/releasebranch_7_0/temporal/t.merge/test.t.merge.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/test.t.merge.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/test.t.merge.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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 -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Deleted: grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh (from rev 61807, grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -418,7 +418,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", type='rast', name=map.get_name(), quiet=True, flags='f')
+ grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
############################################################################
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,7 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_accumulation.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,4 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_indi.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,4 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_a.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,4 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_1_temp_occ_b.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,7 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_accumulation.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,4 +0,0 @@
-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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_indi.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,4 +0,0 @@
-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
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/data/test_2_temp_occ.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-# Space time raster dataset neighborhood operations
-# 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 -p
-
-export GRASS_OVERWRITE=1
-
-# Generate data
-r.mapcalc expr="temp_6 = 5"
-r.mapcalc expr="temp_5 = 10"
-r.mapcalc expr="temp_4 = 15"
-r.mapcalc expr="temp_3 = 20"
-r.mapcalc expr="temp_2 = 25"
-r.mapcalc expr="temp_1 = 30"
-
-t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
-t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
- start="2001-01-01" increment="2 months"
-
-# The first @test
-
-t.rast.accumulate -r input=temp_abs1 output=temp_accumulation base=temp_acc \
- limits=10,25 start="2001-01-01" gran="2 months" cycle="12 months"
-
-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 > 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
-
-CHAR_NUM=`cat out.diff | wc -c`
-
-# Return as exit status 0 in case no diffs are found
-exit $CHAR_NUM
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,45 @@
+#!/bin/sh -e
+# Space time raster dataset neighborhood operations
+# 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 -p
+
+export GRASS_OVERWRITE=1
+
+# Generate data
+r.mapcalc expr="temp_6 = 5"
+r.mapcalc expr="temp_5 = 10"
+r.mapcalc expr="temp_4 = 15"
+r.mapcalc expr="temp_3 = 20"
+r.mapcalc expr="temp_2 = 25"
+r.mapcalc expr="temp_1 = 30"
+
+t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
+t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
+ start="2001-01-01" increment="2 months"
+
+# The first @test
+
+t.rast.accumulate -r input=temp_abs1 output=temp_accumulation base=temp_acc \
+ limits=10,25 start="2001-01-01" gran="2 months" cycle="12 months"
+
+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 > 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
+
+CHAR_NUM=`cat out.diff | wc -c`
+
+# Return as exit status 0 in case no diffs are found
+exit $CHAR_NUM
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,65 +0,0 @@
-#!/bin/sh -e
-# Space time raster dataset neighborhood operations
-# 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 -p
-
-export GRASS_OVERWRITE=1
-
-# Generate data
-r.mapcalc expr="temp_1 = 5"
-r.mapcalc expr="temp_2 = 10"
-r.mapcalc expr="temp_3 = 15"
-r.mapcalc expr="temp_4 = 20"
-r.mapcalc expr="temp_5 = 25"
-r.mapcalc expr="temp_6 = 30"
-
-t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
-t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
- start="2001-01-01" increment="2 months"
-
-# The first @test
-
-t.rast.accumulate input=temp_abs1 output=temp_accumulation base=temp_acc \
- limits=10,25 start="2001-01-01" gran="2 months" cycle="12 months"
-
-t.rast.accdetect input=temp_accumulation occurrence=temp_occ base=temp_occ \
- 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 > 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
-
-r.mapcalc expr="minimum = 18"
-r.mapcalc expr="maximum = 78"
-
-# We use different
-t.create type=strds temporaltype=absolute output=minimum title="minimum limit" descr="minimum limit"
-t.register -i type=rast input=minimum maps=minimum start="2001-01-01" increment="8 months"
-
-t.create type=strds temporaltype=absolute output=maximum title="maximum limit" descr="maximum limit"
-t.register -i type=rast input=maximum maps=maximum start="2001-01-01" increment="10 months"
-
-t.rast.accdetect input=temp_accumulation occurrence=temp_occ base=temp_occ \
- range=20,80 start="2001-01-01" cycle="12 months" min=minimum \
- 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 > 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
-
-CHAR_NUM=`cat out.diff | wc -c`
-
-# Return as exit status 0 in case no diffs are found
-exit $CHAR_NUM
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh (from rev 61807, grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,65 @@
+#!/bin/sh -e
+# Space time raster dataset neighborhood operations
+# 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 -p
+
+export GRASS_OVERWRITE=1
+
+# Generate data
+r.mapcalc expr="temp_1 = 5"
+r.mapcalc expr="temp_2 = 10"
+r.mapcalc expr="temp_3 = 15"
+r.mapcalc expr="temp_4 = 20"
+r.mapcalc expr="temp_5 = 25"
+r.mapcalc expr="temp_6 = 30"
+
+t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
+t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
+ start="2001-01-01" increment="2 months"
+
+# The first @test
+
+t.rast.accumulate input=temp_abs1 output=temp_accumulation base=temp_acc \
+ limits=10,25 start="2001-01-01" gran="2 months" cycle="12 months"
+
+t.rast.accdetect input=temp_accumulation occurrence=temp_occ base=temp_occ \
+ 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 > 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
+
+r.mapcalc expr="minimum = 18"
+r.mapcalc expr="maximum = 78"
+
+# We use different
+t.create type=strds temporaltype=absolute output=minimum title="minimum limit" descr="minimum limit"
+t.register -i type=rast input=minimum maps=minimum start="2001-01-01" increment="8 months"
+
+t.create type=strds temporaltype=absolute output=maximum title="maximum limit" descr="maximum limit"
+t.register -i type=rast input=maximum maps=maximum start="2001-01-01" increment="10 months"
+
+t.rast.accdetect input=temp_accumulation occurrence=temp_occ base=temp_occ \
+ range=20,80 start="2001-01-01" cycle="12 months" min=minimum \
+ 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 > 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
+
+CHAR_NUM=`cat out.diff | wc -c`
+
+# Return as exit status 0 in case no diffs are found
+exit $CHAR_NUM
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -500,7 +500,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", type='rast', name=map.get_name(), quiet=True, flags='f')
+ grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
if __name__ == "__main__":
options, flags = grass.parser()
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_1.ref 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,39 +0,0 @@
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Name: ...................... precip_abs2
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2002-01-01 00:00:00
- | Granularity:................ 4 months
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 21.5
- | Maximum value max:.......... 60.0
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | t.rast.accumulate input="precip_abs1"
- | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
- | gran="4 months" cycle="12 months"
- |
- +----------------------------------------------------------------------------+
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_1.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_1.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,39 @@
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Name: ...................... precip_abs2
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Semantic type:.............. mean
+ +-------------------- Absolute time -----------------------------------------+
+ | Start time:................. 2001-01-01 00:00:00
+ | End time:................... 2002-01-01 00:00:00
+ | Granularity:................ 4 months
+ | Temporal type of maps:...... interval
+ +-------------------- Spatial extent ----------------------------------------+
+ | North:...................... 80.0
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
+ | Top:........................ 0.0
+ | Bottom:..................... 0.0
+ +-------------------- Metadata information ----------------------------------+
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 0.0
+ | Maximum value min:.......... 21.5
+ | Maximum value max:.......... 60.0
+ |
+ | Title:
+ | A test
+ | Description:
+ | A test
+ | Command history:
+ | t.rast.accumulate input="precip_abs1"
+ | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
+ | gran="4 months" cycle="12 months"
+ |
+ +----------------------------------------------------------------------------+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_2.ref 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,39 +0,0 @@
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Name: ...................... precip_abs2
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2001-09-01 00:00:00
- | Granularity:................ 4 months
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 21.5
- | Maximum value max:.......... 39.5
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | t.rast.accumulate input="precip_abs1"
- | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
- | stop="2002-01-01" gran="4 months" cycle="7 months"
- |
- +----------------------------------------------------------------------------+
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_2.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_2.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,39 @@
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Name: ...................... precip_abs2
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Semantic type:.............. mean
+ +-------------------- Absolute time -----------------------------------------+
+ | Start time:................. 2001-01-01 00:00:00
+ | End time:................... 2001-09-01 00:00:00
+ | Granularity:................ 4 months
+ | Temporal type of maps:...... interval
+ +-------------------- Spatial extent ----------------------------------------+
+ | North:...................... 80.0
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
+ | Top:........................ 0.0
+ | Bottom:..................... 0.0
+ +-------------------- Metadata information ----------------------------------+
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 0.0
+ | Maximum value min:.......... 21.5
+ | Maximum value max:.......... 39.5
+ |
+ | Title:
+ | A test
+ | Description:
+ | A test
+ | Command history:
+ | t.rast.accumulate input="precip_abs1"
+ | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
+ | stop="2002-01-01" gran="4 months" cycle="7 months"
+ |
+ +----------------------------------------------------------------------------+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_3.ref 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,39 +0,0 @@
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Name: ...................... precip_abs2
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2002-01-01 00:00:00
- | Granularity:................ 2 months
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 24.0
- | Maximum value max:.......... 120.0
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | t.rast.accumulate input="precip_abs1"
- | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
- | gran="2 months" cycle="12 months"
- |
- +----------------------------------------------------------------------------+
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_3.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_3.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,39 @@
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Name: ...................... precip_abs2
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Semantic type:.............. mean
+ +-------------------- Absolute time -----------------------------------------+
+ | Start time:................. 2001-01-01 00:00:00
+ | End time:................... 2002-01-01 00:00:00
+ | Granularity:................ 2 months
+ | Temporal type of maps:...... interval
+ +-------------------- Spatial extent ----------------------------------------+
+ | North:...................... 80.0
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
+ | Top:........................ 0.0
+ | Bottom:..................... 0.0
+ +-------------------- Metadata information ----------------------------------+
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 0.0
+ | Maximum value min:.......... 24.0
+ | Maximum value max:.......... 120.0
+ |
+ | Title:
+ | A test
+ | Description:
+ | A test
+ | Command history:
+ | t.rast.accumulate input="precip_abs1"
+ | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
+ | gran="2 months" cycle="12 months"
+ |
+ +----------------------------------------------------------------------------+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_4.ref 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,39 +0,0 @@
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Name: ...................... precip_abs2
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2002-01-01 00:00:00
- | Granularity:................ 1 month
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 24.0
- | Maximum value max:.......... 240.0
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | t.rast.accumulate input="precip_abs1"
- | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
- | stop="2002-01-01" gran="1 months" cycle="12 months"
- |
- +----------------------------------------------------------------------------+
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_4.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_4.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,39 @@
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Name: ...................... precip_abs2
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Semantic type:.............. mean
+ +-------------------- Absolute time -----------------------------------------+
+ | Start time:................. 2001-01-01 00:00:00
+ | End time:................... 2002-01-01 00:00:00
+ | Granularity:................ 1 month
+ | Temporal type of maps:...... interval
+ +-------------------- Spatial extent ----------------------------------------+
+ | North:...................... 80.0
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
+ | Top:........................ 0.0
+ | Bottom:..................... 0.0
+ +-------------------- Metadata information ----------------------------------+
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 0.0
+ | Maximum value min:.......... 24.0
+ | Maximum value max:.......... 240.0
+ |
+ | Title:
+ | A test
+ | Description:
+ | A test
+ | Command history:
+ | t.rast.accumulate input="precip_abs1"
+ | output="precip_abs2" base="prec_acc" limits="10,30" start="2001-01-01"
+ | stop="2002-01-01" gran="1 months" cycle="12 months"
+ |
+ +----------------------------------------------------------------------------+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_5.ref 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,40 +0,0 @@
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Name: ...................... precip_abs2
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2002-01-01 00:00:00
- | Granularity:................ 1 month
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 0.0
- | Minimum value max:.......... 0.0
- | Maximum value min:.......... 24.0
- | Maximum value max:.......... 240.0
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | t.rast.accumulate input="precip_abs1"
- | output="precip_abs2" base="prec_acc" limits="8,33" lower="lower"
- | upper="upper" start="2001-01-01" stop="2002-01-01" gran="1 months"
- | cycle="12 months"
- |
- +----------------------------------------------------------------------------+
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/data/acc_5.ref)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/data/acc_5.ref 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,40 @@
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Name: ...................... precip_abs2
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Semantic type:.............. mean
+ +-------------------- Absolute time -----------------------------------------+
+ | Start time:................. 2001-01-01 00:00:00
+ | End time:................... 2002-01-01 00:00:00
+ | Granularity:................ 1 month
+ | Temporal type of maps:...... interval
+ +-------------------- Spatial extent ----------------------------------------+
+ | North:...................... 80.0
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
+ | Top:........................ 0.0
+ | Bottom:..................... 0.0
+ +-------------------- Metadata information ----------------------------------+
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
+ | Minimum value min:.......... 0.0
+ | Minimum value max:.......... 0.0
+ | Maximum value min:.......... 24.0
+ | Maximum value max:.......... 240.0
+ |
+ | Title:
+ | A test
+ | Description:
+ | A test
+ | Command history:
+ | t.rast.accumulate input="precip_abs1"
+ | output="precip_abs2" base="prec_acc" limits="8,33" lower="lower"
+ | upper="upper" start="2001-01-01" stop="2002-01-01" gran="1 months"
+ | cycle="12 months"
+ |
+ +----------------------------------------------------------------------------+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-09-16 16:47:30 UTC (rev 62000)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,80 +0,0 @@
-#!/bin/sh -e
-# Space time raster dataset neighborhood operations
-# 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 -p
-
-export GRASS_OVERWRITE=1
-
-# Generate data
-r.mapcalc expr="prec_1 = rand(0, 25)" -s
-r.mapcalc expr="prec_2 = rand(0, 24)" -s
-r.mapcalc expr="prec_3 = rand(0, 23)" -s
-r.mapcalc expr="prec_4 = rand(0, 25)" -s
-r.mapcalc expr="prec_5 = rand(0, 23)" -s
-r.mapcalc expr="prec_6 = rand(0, 26)" -s
-
-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-01-01" increment="2 months"
-
-# The first @test
-
-t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
- limits=10,30 start="2001-01-01" gran="4 months" \
- cycle="12 months"
-
-# We need to filter the identifier that may be different on different systems
-# like creation time and mapset
-t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_1.txt
-
-t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
- limits=10,30 start="2001-01-01" stop="2002-01-01" gran="4 months" \
- cycle="7 months"
-
-t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_2.txt
-
-t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
- limits=10,30 start="2001-01-01" gran="2 months" \
- cycle="12 months"
-
-t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_3.txt
-
-t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
- limits=10,30 start="2001-01-01" stop="2002-01-01" gran="1 months" \
- cycle="12 months"
-
-t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_4.txt
-
-# Second test
-
-r.mapcalc expr="lower = 10"
-r.mapcalc expr="upper = 35"
-
-t.create type=strds temporaltype=absolute output=lower title="lower limit" descr="lower limit"
-t.register -i type=rast input=lower maps=lower start="2001-01-01" increment="8 months"
-
-t.create type=strds temporaltype=absolute output=upper title="upper limit" descr="upper limit"
-t.register -i type=rast input=upper maps=upper start="2001-01-01" increment="10 months"
-
-t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
- limits=8,33 lower=lower upper=upper start="2001-01-01" stop="2002-01-01" gran="1 months" \
- cycle="12 months"
-
-t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_5.txt
-
-t.remove -rf type=strds input=precip_abs1,precip_abs2,lower,upper
-
-cd data
-
-for i in `ls acc_*.txt` ; do
- diff $i "`basename $i .txt`.ref" >> out.diff
-done
-
-CHAR_NUM=`cat out.diff | wc -c`
-
-# Return as exit status 0 in case no diffs are found
-exit $CHAR_NUM
-
-
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh (from rev 62000, grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,80 @@
+#!/bin/sh -e
+# Space time raster dataset neighborhood operations
+# 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 -p
+
+export GRASS_OVERWRITE=1
+
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 25)" -s
+r.mapcalc expr="prec_2 = rand(0, 24)" -s
+r.mapcalc expr="prec_3 = rand(0, 23)" -s
+r.mapcalc expr="prec_4 = rand(0, 25)" -s
+r.mapcalc expr="prec_5 = rand(0, 23)" -s
+r.mapcalc expr="prec_6 = rand(0, 26)" -s
+
+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-01-01" increment="2 months"
+
+# The first @test
+
+t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
+ limits=10,30 start="2001-01-01" gran="4 months" \
+ cycle="12 months"
+
+# We need to filter the identifier that may be different on different systems
+# like creation time and mapset
+t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_1.txt
+
+t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
+ limits=10,30 start="2001-01-01" stop="2002-01-01" gran="4 months" \
+ cycle="7 months"
+
+t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_2.txt
+
+t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
+ limits=10,30 start="2001-01-01" gran="2 months" \
+ cycle="12 months"
+
+t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_3.txt
+
+t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
+ limits=10,30 start="2001-01-01" stop="2002-01-01" gran="1 months" \
+ cycle="12 months"
+
+t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_4.txt
+
+# Second test
+
+r.mapcalc expr="lower = 10"
+r.mapcalc expr="upper = 35"
+
+t.create type=strds temporaltype=absolute output=lower title="lower limit" descr="lower limit"
+t.register -i type=rast input=lower maps=lower start="2001-01-01" increment="8 months"
+
+t.create type=strds temporaltype=absolute output=upper title="upper limit" descr="upper limit"
+t.register -i type=rast input=upper maps=upper start="2001-01-01" increment="10 months"
+
+t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
+ limits=8,33 lower=lower upper=upper start="2001-01-01" stop="2002-01-01" gran="1 months" \
+ cycle="12 months"
+
+t.info input=precip_abs2 | grep -v \# | grep -v Creation | grep -v register | grep -v Id | grep -v Mapset > data/acc_5.txt
+
+t.remove -rf type=strds input=precip_abs1,precip_abs2,lower,upper
+
+cd data
+
+for i in `ls acc_*.txt` ; do
+ diff $i "`basename $i .txt`.ref" >> out.diff
+done
+
+CHAR_NUM=`cat out.diff | wc -c`
+
+# Return as exit status 0 in case no diffs are found
+exit $CHAR_NUM
+
+
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -34,6 +34,15 @@
<li><em>granularity minutes</em>: will start at the first second of a minute, hence 14-08-2012 01:30:30 will be shifted to 14-08-2012 01:30:00</li>
</ul>
+<p>
+The specification of the temporal relation between the aggregation intervals and the raster map layers
+is always formulated from the aggregation interval viewpoint. Hence, the relation <em>contains</em>
+has to be specified to aggregate map layer that are temporally located in an aggregation interval.
+<p>
+Parallel processing is supported in case that more than one interval is available for aggregation computation. Internally several
+<em>r.series</em> modules will be started, depending on the number of specified parallel processes (<em>nprocs</em>)
+and the number of intervals to aggregate.
+
<h2>EXAMPLES</h2>
In this example, we create 7 raster maps that will be registered in a
@@ -45,7 +54,8 @@
will be aggregated to weekly precipitation resulting in the output space time raster dataset
<em>precipitation_weekly</em>. The base name of the new generated raster maps is <em>prec_weekly</em>, the
granularity is 1 week. The aggregation method is set to <em>sum</em> to accumulate the precipitation values
-of all raster maps in a week. The sampling option assures that only raster maps that are
+of all raster maps that are temporally <em>contained</em> in a week.
+The sampling option <em>contains</em> assures that only raster maps that are
temporally during a week will be considered for computation:
<div class="code"><pre>
@@ -66,28 +76,40 @@
t.info type=strds input=precipitation_daily
+ +-------------------- Space Time Raster Dataset -----------------------------+
+ | |
+ +-------------------- Basic information -------------------------------------+
+ | Id: ........................ precipitation_daily at PERMANENT
+ | Name: ...................... precipitation_daily
+ | Mapset: .................... PERMANENT
+ | Creator: ................... soeren
+ | Temporal type: ............. absolute
+ | Creation time: ............. 2014-08-25 11:26:43.088786
+ | Modification time:.......... 2014-08-25 11:26:43.533237
+ | Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2012-09-03 00:00:00
- | End time:................... 2012-09-10 00:00:00
+ | Start time:................. 2012-08-20 00:00:00
+ | End time:................... 2012-08-27 00:00:00
| Granularity:................ 1 day
| Temporal type of maps:...... interval
+-------------------- Spatial extent ----------------------------------------+
| North:...................... 80.0
- | South:...................... -1.0
- | East:.. .................... 120.5
- | West:....................... -40.5
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
- | Raster register table:...... precipitation_daily_test_raster_register
- | North-South resolution min:. 1.0
- | North-South resolution max:. 1.0
- | East-west resolution min:... 1.0
- | East-west resolution max:... 1.0
+ | Raster register table:...... raster_map_register_68033ba1bca64b33a49a3b356dcfaf9b
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
| Minimum value min:.......... 1.0
| Minimum value max:.......... 1.0
| Maximum value min:.......... 1.0
| Maximum value max:.......... 1.0
+ | Aggregation type:........... None
| Number of registered maps:.. 7
|
| Title:
@@ -95,11 +117,11 @@
| Description:
| Test dataset with daily precipitation
| Command history:
- | # 2013-07-13 13:10:46
+ | # 2014-08-25 11:26:43
| t.create type="strds" temporaltype="absolute"
| output="precipitation_daily" title="Daily precipitation"
| description="Test dataset with daily precipitation"
- | # 2013-07-13 13:10:47
+ | # 2014-08-25 11:26:43
| t.register -i type="rast" input="precipitation_daily"
| file="map_list.txt" start="2012-08-20" increment="1 days"
|
@@ -108,7 +130,7 @@
t.rast.aggregate input=precipitation_daily \
output=precipitation_weekly \
base=prec_weekly granularity="1 weeks" \
- method=sum sampling=during
+ method=sum sampling=contains
t.support input=precipitation_weekly \
title="Weekly precipitation" \
@@ -119,35 +141,37 @@
+-------------------- Space Time Raster Dataset -----------------------------+
| |
+-------------------- Basic information -------------------------------------+
- | Id: ........................ precipitation_weekly at test
+ | Id: ........................ precipitation_weekly at PERMANENT
| Name: ...................... precipitation_weekly
- | Mapset: .................... test
+ | Mapset: .................... PERMANENT
| Creator: ................... soeren
- | Creation time: ............. 2013-07-13 13:11:23.286982
| Temporal type: ............. absolute
+ | Creation time: ............. 2014-08-25 11:33:25.253525
+ | Modification time:.......... 2014-08-25 11:33:31.015648
| Semantic type:.............. mean
+-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2012-09-03 00:00:00
- | End time:................... 2012-09-10 00:00:00
+ | Start time:................. 2012-08-20 00:00:00
+ | End time:................... 2012-08-27 00:00:00
| Granularity:................ 7 days
| Temporal type of maps:...... interval
+-------------------- Spatial extent ----------------------------------------+
| North:...................... 80.0
- | South:...................... -1.0
- | East:.. .................... 120.5
- | West:....................... -40.5
+ | South:...................... 0.0
+ | East:.. .................... 120.0
+ | West:....................... 0.0
| Top:........................ 0.0
| Bottom:..................... 0.0
+-------------------- Metadata information ----------------------------------+
- | Raster register table:...... precipitation_weekly_test_raster_register
- | North-South resolution min:. 1.0
- | North-South resolution max:. 1.0
- | East-west resolution min:... 1.0
- | East-west resolution max:... 1.0
+ | Raster register table:...... raster_map_register_ea1008db0c374501a340f49e46ab24af
+ | North-South resolution min:. 10.0
+ | North-South resolution max:. 10.0
+ | East-west resolution min:... 10.0
+ | East-west resolution max:... 10.0
| Minimum value min:.......... 7.0
| Minimum value max:.......... 7.0
| Maximum value min:.......... 7.0
| Maximum value max:.......... 7.0
+ | Aggregation type:........... sum
| Number of registered maps:.. 1
|
| Title:
@@ -155,11 +179,11 @@
| Description:
| Aggregated precipitation dataset with weekly resolution
| Command history:
- | # 2013-07-13 13:11:23
+ | # 2014-08-25 11:33:25
| t.rast.aggregate input="precipitation_daily"
| output="precipitation_weekly" base="prec_weekly" granularity="1 weeks"
- | method="sum" sampling="during"
- | # 2013-07-13 13:11:29
+ | method="sum" sampling="contains"
+ | # 2014-08-25 11:33:31
| t.support input="precipitation_weekly"
| title="Weekly precipitation"
| description="Aggregated precipitation dataset with weekly resolution"
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -30,7 +30,7 @@
#% key: basename
#% type: string
#% label: Basename of the new generated output maps
-#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% description: Either a numerical suffix or the start time (s-flag) separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
#% gisprompt:
@@ -63,7 +63,18 @@
#% answer: 0
#%end
+#%option
+#% key: nprocs
+#% type: integer
+#% description: Number of r.mapcalc processes to run in parallel
+#% required: no
+#% multiple: no
+#% answer: 1
+#%end
+
#%option G_OPT_T_SAMPLE
+#% options: equal,overlaps,overlapped,starts,started,finishes,finished,during,contains
+#% answer: contains
#%end
#%option G_OPT_T_WHERE
@@ -74,12 +85,16 @@
#% description: Register Null maps
#%end
-import grass.script as grass
+#%flag
+#% key: s
+#% description: Use start time - truncated accoring to granularity - as suffix. This flag overrides the offset option.
+#%end
+
+import grass.script as gcore
import grass.temporal as tgis
############################################################################
-
def main():
# Get the options
@@ -92,90 +107,89 @@
method = options["method"]
sampling = options["sampling"]
offset = options["offset"]
+ nprocs = options["nprocs"]
+ time_suffix = flags["s"]
+
+ topo_list = sampling.split(",")
- # Make sure the temporal database exists
tgis.init()
- # We need a database interface
+
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
- temporal_type, semantic_type, title, description = sp.get_initial_values()
- new_sp = tgis.open_new_space_time_dataset(output, "strds", temporal_type,
- title, description, semantic_type,
- dbif, grass.overwrite())
+ sp = tgis.open_old_stds(input, "strds", dbif)
- rows = sp.get_registered_maps("id,start_time,end_time", where, "start_time", dbif)
+ map_list = sp.get_registered_maps_as_objects(where=where, order="start_time", dbif=dbif)
- if not rows:
+ if not map_list:
dbif.close()
- grass.fatal(_("Space time raster dataset <%s> is empty") % input)
+ gcore.fatal(_("Space time raster dataset <%s> is empty") % input)
- # Modify the start time to fit the granularity
+ # We will create the strds later, but need to check here
+ tgis.check_new_stds(output, "strds", dbif, gcore.overwrite())
+
+ start_time = map_list[0].temporal_extent.get_start_time()
if sp.is_time_absolute():
- first_start_time = tgis.adjust_datetime_to_granularity(
- rows[0]["start_time"], gran)
- else:
- first_start_time = rows[0]["start_time"]
+ start_time = tgis.adjust_datetime_to_granularity(start_time, gran)
# We use the end time first
- last_start_time = rows[len(rows) - 1]["end_time"]
- is_end_time = True
+ end_time = map_list[-1].temporal_extent.get_end_time()
+ has_end_time = True
- # In case no end time is available, then we use the start time
- if last_start_time is None:
- last_start_time = rows[len(rows) - 1]["start_time"]
- is_end_time = False
+ # In case no end time is available, then we use the start time of the last map layer
+ if end_time is None:
+ end_time = map_list[- 1].temporal_extent.get_start_time()
+ has_end_time = False
- next_start_time = first_start_time
+ granularity_list = []
- count = 0
-
+ # Build the granularity list
while True:
- if is_end_time is True:
- if next_start_time >= last_start_time:
+ if has_end_time is True:
+ if start_time >= end_time:
break
else:
- if next_start_time > last_start_time:
+ if start_time > end_time:
break
- start = next_start_time
+ granule = tgis.RasterDataset(None)
+ start = start_time
if sp.is_time_absolute():
- end = tgis.increment_datetime_by_string(next_start_time, gran)
+ end = tgis.increment_datetime_by_string(start_time, gran)
+ granule.set_absolute_time(start, end)
else:
- end = next_start_time + int(gran)
- next_start_time = end
+ end = start_time + int(gran)
+ granule.set_relative_time(start, end, sp.get_relative_time_unit())
+ start_time = end
+
+ granularity_list.append(granule)
- input_map_names = tgis.collect_map_names(
- sp, dbif, start, end, sampling)
+ output_list = tgis.aggregate_by_topology(granularity_list=granularity_list, granularity=gran,
+ map_list=map_list,
+ topo_list=topo_list, basename=base, time_suffix=time_suffix,
+ offset=offset, method=method, nprocs=nprocs, spatial=None,
+ overwrite=gcore.overwrite())
- if input_map_names:
- new_map = tgis.aggregate_raster_maps(
- input_map_names, base, start, end,
- count, method, register_null, dbif, offset)
+ if output_list:
+ temporal_type, semantic_type, title, description = sp.get_initial_values()
+ output_strds = tgis.open_new_stds(output, "strds", temporal_type,
+ title, description, semantic_type,
+ dbif, gcore.overwrite())
+ if register_null:
+ register_null=False
+ else:
+ register_null=True
+
+ tgis.register_map_object_list("rast", output_list, output_strds, register_null,
+ sp.get_relative_time_unit(), dbif)
- if new_map:
- # Set the time stamp and write it to the raster map
- if sp.is_time_absolute():
- new_map.set_absolute_time(start, end)
- else:
- new_map.set_relative_time(start,
- end, sp.get_relative_time_unit())
+ # Update the raster metadata table entries with aggregation type
+ output_strds.set_aggregation_type(method)
+ output_strds.metadata.update(dbif)
- # Insert map in temporal database
- new_map.insert(dbif)
- new_sp.register_map(new_map, dbif)
-
- count += 1
-
- # Update the spatio-temporal extent and the raster metadata table entries
- new_sp.set_aggregation_type(method)
- new_sp.metadata.update(dbif)
- new_sp.update_from_registered_maps(dbif)
-
dbif.close()
if __name__ == "__main__":
- options, flags = grass.parser()
+ options, flags = gcore.parser()
main()
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,45 +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
-
-# Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
-r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
-r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
-r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
-r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
-r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
-
-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=start,during
-t.info type=strds input=precip_abs2
-r.info prec_sum_0
-r.info prec_sum_1
-r.info prec_sum_2
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum granularity=9 method=maximum sampling=start,during
-t.info type=strds input=precip_abs2
-r.info prec_sum_0
-r.info prec_sum_1
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum granularity=4 method=minimum sampling=start,during
-t.info type=strds input=precip_abs2
-r.info prec_sum_0
-r.info prec_sum_1
-r.info prec_sum_2
-r.info prec_sum_3
-t.rast.aggregate --o --v input=precip_abs1 output=precip_abs2 base=prec_sum granularity=5 method=sum sampling=start,during
-t.info type=strds input=precip_abs2
-r.info prec_sum_0
-r.info prec_sum_1
-r.info prec_sum_2
-r.info prec_sum_3
-
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.remove type=strds input=precip_abs1,precip_abs2
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/test.t.rast.aggregate.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,39 +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)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
-
-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-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=start,during
-t.info type=strds input=precip_abs2
-t.rast.aggregate --v input=precip_abs1 output=precip_abs2 \
- base=prec_sum granularity="1 months" method=maximum sampling=start,during
-t.info type=strds input=precip_abs2
-t.rast.aggregate --v input=precip_abs1 output=precip_abs3 offset=10 \
- base=prec_sum granularity="2 months" method=minimum sampling=start,during
-t.info type=strds input=precip_abs2
-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=start,during
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs4
-
-t.remove -rf type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
Added: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,179 @@
+"""Test t.rast.aggregation
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+import os
+import grass.pygrass.modules as pymod
+import grass.temporal as tgis
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestAggregationAbsolute(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init()
+ cls.use_temp_region()
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0,
+ t=50, res=10, res3=10)
+ cls.runModule("r.mapcalc", expression="a1 = 100", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a2 = 200", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a3 = 300", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a4 = 400", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a5 = 500", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a6 = 600", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a7 = null()", overwrite=True)
+
+ cls.runModule("t.create", type="strds", temporaltype="absolute",
+ output="A", title="A test",
+ description="A test", overwrite=True)
+
+ cls.runModule("t.register", flags="i", type="rast", input="A",
+ maps="a1,a2,a3,a4,a5,a6,a7",
+ start="2001-01-15 12:05:45",
+ increment="14 days",
+ overwrite=True)
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+ cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+
+ def test_disaggregation(self):
+ """Disaggregation with empty maps"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="2 days",
+ method="average",
+ sampling=["overlaps","overlapped","during"],
+ nprocs=2, flags="n")
+
+ tinfo_string="""start_time=2001-01-15 00:00:00
+ end_time=2001-04-25 00:00:00
+ granularity=2 days
+ aggregation_type=average
+ number_of_maps=50
+ map_time=interval
+ min_min=100.0
+ min_max=600.0
+ max_min=100.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_aggregation_1month(self):
+ """Aggregation one month"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="1 months",
+ method="maximum", sampling=["contains"],
+ nprocs=3, flags="s")
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 month
+ map_time=interval
+ aggregation_type=maximum
+ number_of_maps=3
+ min_min=100.0
+ min_max=500.0
+ max_min=100.0
+ max_max=500.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ # Check the map names are correct
+ lister = SimpleModule("t.rast.list", input="B", columns="name",
+ flags="s")
+ self.runModule(lister)
+ #print lister.outputs.stdout
+ maps="b_2001_01" + os.linesep + "b_2001_02" + os.linesep + \
+ "b_2001_03" + os.linesep
+ self.assertEqual(maps, lister.outputs.stdout)
+
+ def test_aggregation_2months(self):
+ """Aggregation two month"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="2 months",
+ method="minimum", sampling=["contains"],
+ nprocs=4, offset=10)
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-05-01 00:00:00
+ granularity=2 months
+ map_time=interval
+ aggregation_type=minimum
+ number_of_maps=2
+ min_min=100.0
+ min_max=500.0
+ max_min=100.0
+ max_max=500.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ # Check the map names are correct
+ lister = SimpleModule("t.rast.list", input="B", columns="name",
+ flags="s")
+ self.runModule(lister)
+ #print lister.outputs.stdout
+ maps="b_11" + os.linesep + "b_12" + os.linesep
+ self.assertEqual(maps, lister.outputs.stdout)
+
+ def test_aggregation_3months(self):
+ """Aggregation three month"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="3 months",
+ method="sum", sampling=["contains"],
+ nprocs=9, offset=100)
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ aggregation_type=sum
+ number_of_maps=1
+ min_min=1500.0
+ min_max=1500.0
+ max_min=1500.0
+ max_max=1500.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ # Check the map names are correct
+ lister = SimpleModule("t.rast.list", input="B", columns="name",
+ flags="s")
+ self.runModule(lister)
+ #print lister.outputs.stdout
+ maps="b_101" + os.linesep
+ self.assertEqual(maps, lister.outputs.stdout)
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Added: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_absolute_parallel.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,165 @@
+"""Test t.rast.aggregation
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+import os
+import grass.pygrass.modules as pymod
+import grass.temporal as tgis
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+from datetime import datetime
+
+class TestAggregationAbsoluteParallel(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init()
+ cls.use_temp_region()
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0,
+ t=50, res=10, res3=10)
+
+ name_list = []
+ for i in range(540):
+ cls.runModule("r.mapcalc", expression="a%i = %i"%(i + 1, i + 1), overwrite=True)
+ name_list.append("a%i"%(i + 1))
+
+ cls.runModule("t.create", type="strds", temporaltype="absolute",
+ output="A", title="A test",
+ description="A test", overwrite=True)
+
+ cls.runModule("t.register", flags="i", type="rast", input="A",
+ maps=name_list,
+ start="2001-01-01",
+ increment="4 hours",
+ overwrite=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+ cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+
+ def test_aggregation_12hours(self):
+ """Aggregation one month"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="12 hours",
+ method="sum", sampling=["contains"],
+ nprocs=9, flags="s")
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=12 hours
+ map_time=interval
+ aggregation_type=sum
+ number_of_maps=180
+ min_min=6.0
+ min_max=1617.0
+ max_min=6.0
+ max_max=1617.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_aggregation_1day_4procs(self):
+ """Aggregation one month"""
+ start = datetime.now()
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="1 day",
+ method="sum", sampling=["contains"],
+ nprocs=4, flags="s")
+ end = datetime.now()
+
+ delta = end - start
+ print "test_aggregation_1day_4procs:", delta.total_seconds()
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 day
+ map_time=interval
+ aggregation_type=sum
+ number_of_maps=90"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_aggregation_1day_3procs(self):
+ """Aggregation one month"""
+ start = datetime.now()
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="1 day",
+ method="sum", sampling=["contains"],
+ nprocs=3, flags="s")
+ end = datetime.now()
+
+ delta = end - start
+ print "test_aggregation_1day_3procs:", delta.total_seconds()
+
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 day
+ map_time=interval
+ aggregation_type=sum
+ number_of_maps=90
+ min_min=21.0
+ min_max=3225.0
+ max_min=21.0
+ max_max=3225.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_aggregation_1day_2procs(self):
+ """Aggregation one month"""
+ start = datetime.now()
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity="1 day",
+ method="sum", sampling=["contains"],
+ nprocs=2, flags="s")
+ end = datetime.now()
+
+ delta = end - start
+ print "test_aggregation_1day_2procs:", delta.total_seconds()
+
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2001-04-01 00:00:00
+ granularity=1 day
+ map_time=interval
+ aggregation_type=sum
+ number_of_maps=90
+ min_min=21.0
+ min_max=3225.0
+ max_min=21.0
+ max_max=3225.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Added: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,163 @@
+"""Test t.rast.aggregation
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+import os
+import grass.pygrass.modules as pymod
+import grass.temporal as tgis
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestAggregationRelative(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init()
+ cls.use_temp_region()
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0,
+ t=50, res=10, res3=10)
+ cls.runModule("r.mapcalc", expression="a1 = 100", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a2 = 200", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a3 = 300", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a4 = 400", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a5 = 500", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a6 = 600", overwrite=True)
+ cls.runModule("r.mapcalc", expression="a7 = null()", overwrite=True)
+
+ cls.runModule("t.create", type="strds", temporaltype="relative",
+ output="A", title="A test",
+ description="A test", overwrite=True)
+
+ cls.runModule("t.register", flags="i", type="rast", input="A",
+ maps="a1,a2,a3,a4,a5,a6,a7",
+ start=0, unit="days", increment=3,
+ overwrite=True)
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+ cls.runModule("t.remove", flags="rf", type="strds", inputs="A")
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("t.remove", flags="rf", type="strds", inputs="B")
+
+ def test_1(self):
+ """Simple test"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity=6,
+ method="average",
+ sampling=["overlaps","overlapped","contains"],
+ nprocs=2)
+
+ tinfo_string="""start_time=0
+ end_time=18
+ unit=days
+ granularity=6
+ map_time=interval
+ aggregation_type=average
+ number_of_maps=3
+ min_min=150.0
+ min_max=550.0
+ max_min=150.0
+ max_max=550.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_2(self):
+ """Simple test register null maps"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity=9,
+ method="maximum",
+ sampling=["contains"],
+ nprocs=4, flags="n")
+
+ tinfo_string="""semantic_type=mean
+ start_time=0
+ end_time=27
+ unit=days
+ granularity=9
+ map_time=interval
+ aggregation_type=maximum
+ number_of_maps=3
+ min_min=300.0
+ min_max=600.0
+ max_min=300.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_3(self):
+ """Simple test"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity=9,
+ method="maximum",
+ sampling=["contains"],
+ nprocs=4)
+
+ tinfo_string="""semantic_type=mean
+ start_time=0
+ end_time=18
+ unit=days
+ granularity=9
+ map_time=interval
+ aggregation_type=maximum
+ number_of_maps=2
+ min_min=300.0
+ min_max=600.0
+ max_min=300.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+ def test_4(self):
+ """Simple test"""
+ self.assertModule("t.rast.aggregate", input="A", output="B",
+ basename="b", granularity=21,
+ method="average",
+ sampling=["contains"],
+ nprocs=4)
+
+ tinfo_string="""semantic_type=mean
+ start_time=0
+ end_time=21
+ unit=days
+ granularity=21
+ map_time=interval
+ aggregation_type=average
+ number_of_maps=2
+ min_min=350.0
+ min_max=350.0
+ max_min=350.0
+ max_max=350.0"""
+
+ info = SimpleModule("t.info", flags="g", input="B")
+ #info.run()
+ #print info.outputs.stdout
+ self.assertModuleKeyValue(module=info, reference=tinfo_string,
+ precision=2, sep="=")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -6,10 +6,10 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011 by the gcore Development Team
#
# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
+# License (version 2). Read the file COPYING that comes with gcore
# for details.
#
#############################################################################
@@ -64,15 +64,34 @@
#% answer: 0
#%end
+#%option
+#% key: nprocs
+#% type: integer
+#% description: Number of r.mapcalc processes to run in parallel
+#% required: no
+#% multiple: no
+#% answer: 1
+#%end
+
#%option G_OPT_T_SAMPLE
+#% options: equal,overlaps,overlapped,starts,started,finishes,finished,during,contains
+#% answer: contains
#%end
+#%option G_OPT_T_WHERE
+#%end
+
#%flag
#% key: n
#% description: Register Null maps
#%end
-import grass.script as grass
+#%flag
+#% key: s
+#% description: Use start time - truncated accoring to granularity - as suffix. This flag overrides the offset option.
+#%end
+
+import grass.script as gcore
import grass.temporal as tgis
############################################################################
@@ -84,78 +103,74 @@
input = options["input"]
output = options["output"]
sampler = options["sample"]
+ where = options["where"]
base = options["basename"]
register_null = flags["n"]
method = options["method"]
- type = options["type"]
sampling = options["sampling"]
offset = options["offset"]
+ nprocs = options["nprocs"]
+ time_suffix = flags["s"]
+ type = options["type"]
+
+ topo_list = sampling.split(",")
- # Make sure the temporal database exists
tgis.init()
- # We need a database interface
+
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
- sampler_sp = tgis.open_old_space_time_dataset(sampler, type, dbif)
+ sp = tgis.open_old_stds(input, "strds", dbif)
+ sampler_sp = tgis.open_old_stds(sampler, type, dbif)
if sampler_sp.get_temporal_type() != sp.get_temporal_type():
dbif.close()
- grass.fatal(_("Input and aggregation dataset must have "
+ gcore.fatal(_("Input and aggregation dataset must have "
"the same temporal type"))
# Check if intervals are present
if sampler_sp.temporal_extent.get_map_time() != "interval":
dbif.close()
- grass.fatal(_("All registered maps of the aggregation dataset "
+ gcore.fatal(_("All registered maps of the aggregation dataset "
"must have time intervals"))
- temporal_type, semantic_type, title, description = sp.get_initial_values()
- new_sp = tgis.open_new_space_time_dataset(output, "strds", temporal_type,
- title, description, semantic_type,
- dbif, grass.overwrite())
+ # We will create the strds later, but need to check here
+ tgis.check_new_stds(output, "strds", dbif, gcore.overwrite())
- rows = sampler_sp.get_registered_maps(
- "id,start_time,end_time", None, "start_time", dbif)
+ map_list = sp.get_registered_maps_as_objects(where=where, order="start_time", dbif=dbif)
- if not rows:
- dbif.close()
- grass.fatal(_("Aggregation dataset <%s> is empty") % id)
+ if not map_list:
+ dbif.close()
+ gcore.fatal(_("Space time raster dataset <%s> is empty") % input)
- count = 0
- for row in rows:
- count += 1
- start = row["start_time"]
- end = row["end_time"]
+ granularity_list = sampler_sp.get_registered_maps_as_objects(where=where, order="start_time", dbif=dbif)
- input_map_names = tgis.collect_map_names(
- sp, dbif, start, end, sampling)
+ if not granularity_list:
+ dbif.close()
+ gcore.fatal(_("Space time raster dataset <%s> is empty") % sampler)
- if input_map_names:
- new_map = tgis.aggregate_raster_maps(input_map_names, base,
- start, end, count, method,
- register_null, dbif, offset)
+ gran = sampler_sp.get_granularity()
- if new_map:
- # Set the time stamp and write it to the raster map
- if sp.is_time_absolute():
- new_map.set_absolute_time(start, end)
- else:
- new_map.set_relative_time(start,
- end, sp.get_relative_time_unit())
+ output_list = tgis.aggregate_by_topology(granularity_list=granularity_list, granularity=gran,
+ map_list=map_list,
+ topo_list=topo_list, basename=base, time_suffix=time_suffix,
+ offset=offset, method=method, nprocs=nprocs, spatial=None,
+ overwrite=gcore.overwrite())
- # Insert map in temporal database
- new_map.insert(dbif)
- new_sp.register_map(new_map, dbif)
+ if output_list:
+ temporal_type, semantic_type, title, description = sp.get_initial_values()
+ output_strds = tgis.open_new_stds(output, "strds", temporal_type,
+ title, description, semantic_type,
+ dbif, gcore.overwrite())
+ tgis.register_map_object_list("rast", output_list, output_strds, register_null,
+ sp.get_relative_time_unit(), dbif)
- # Update the spatio-temporal extent and the raster metadata table entries
- new_sp.set_aggregation_type(method)
- new_sp.metadata.update(dbif)
- new_sp.update_from_registered_maps(dbif)
+ # Update the raster metadata table entries with aggregation type
+ output_strds.set_aggregation_type(method)
+ output_strds.metadata.update(dbif)
dbif.close()
if __name__ == "__main__":
- options, flags = grass.parser()
+ options, flags = gcore.parser()
main()
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/test.t.rast.aggregate.ds.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,50 +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=start,during offset=100
-t.info type=strds input=precip_abs2
-t.rast.list input=precip_abs2 method=deltagap
-
-# @postprocess
-t.unregister type=vect maps=soil_1,soil_2,soil_3
-t.remove type=stvds input=soil_abs1
-
-t.remove -rf type=strds input=precip_abs1,precip_abs2
-g.remove -f type=vect name=soil_1,soil_2,soil_3
Added: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Property changes on: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/Makefile (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ../../
+
+PGM = t.rast.algebra
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+
+default: script
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,477 @@
+<h2>DESCRIPTION</h2>
+
+t.rast.algebra performs temporal and spatial map algebra operations on space time raster datasets (STRDS)
+by using the temporal raster algebra.
+
+<h3>PROGRAM USE</h3>
+The module expects an <b>expression</b> as input parameter in the following form: <br>
+<br>
+<b> "result = expression" </b>
+<br>
+<br>
+
+The statement structure is similar to r.mapcalc, see <a href="r.mapcalc.html">r.mapcalc</a>.
+Where <b>result</b> represents the name of a space time raster dataset (STRDS)that will
+contain the result of the calculation that is given as <b>expression</b>
+on the right side of the equality sign.
+These expression can be any valid or nested combination of temporal
+operations and spatial overlay or buffer functions that are provided by the temporal algebra. <br>
+The temporal raster algebra works with space time raster datasets only (STRDS).
+The algebra provides methods for map selection from STRDS based on their temporal relations.
+It is also possible to temporally shift maps, to create temporal buffer and to snap time
+instances to create a valid temporal topology. Furthermore expressions can be nested and
+evaluated in conditional statements (if, else statements). Within if-statements the algebra
+provides temporal variables like start time, end time, day of year, time differences or
+number of maps per time interval to build up conditions.
+<br>
+In addition the algebra provides
+a subset of the spatial operations from <a href="r.mapcalc.html">r.mapcalc</a>.
+All these operations can be assigned to STRDS or to the resulting map lists of operations between STRDS.
+<br>
+<br>
+As default, topological relationships between space time datasets will be
+evaluated only temporal. Use the <b>s</b> flag to activate the
+additionally evaluate the spatial topology based on the spatial extents of maps.
+<br>
+<br>
+The expression option must be passed as <b>quoted</b>
+expression, for example: <br>
+<div class="code"><pre>t.rast.mapcalc2 expression="C = A + B" basename=result</pre></div>
+Where <b>C</b> is the new space time raster dataset that will contain maps
+with the basename "result" that represent the sum of maps from STRDS <b>A</b> and
+equally temporal related maps from STRDS <b>B</b>.
+<br>
+<br>
+The map basename for the result STRDS must always be specified.
+
+<h2>TEMPORAL RASTER ALGEBRA</h2>
+
+
+The temporal algebra provides a wide range of temporal operators and
+functions that will be presented in the following section. <br>
+<br>
+
+<h3>TEMPORAL RELATIONS</h3>
+
+Several temporal topology relations between registered maps of space
+time datasets are supported: <br>
+<div class="code"><pre>
+equals A ------
+ B ------
+
+during A ----
+ B ------
+
+contains A ------
+ B ----
+
+starts A ----
+ B ------
+
+started A ------
+ B ----
+
+finishs A ----
+ B ------
+
+finished A ------
+ B ----
+
+precedes A ----
+ B ----
+
+follows A ----
+ B ----
+
+overlapped A ------
+ B ------
+
+overlaps A ------
+ B ------
+
+over booth overlaps and overlapped
+
+</pre></div>
+The relations must be read as: A is related to B, like - A equals B - A is
+during B - A contains B <br>
+<br>
+Topological relations must be specified in {} parentheses. <br>
+
+<h3>TEMPORAL OPERATORS</h3>
+
+The temporal algebra defines temporal operators that can be combined with other
+operators to perform spatio-temporal operations.
+The temporal operators process the time instances and intervals of two temporal
+related maps and calculate the result temporal extent by five differnt possibilities.
+<div class="code"><pre>
+LEFT REFERENCE l Use the time stamp of the left space time dataset
+INTERSECTION i Intersection
+DISJOINT UNION d Disjoint union
+UNION u Union
+RIGHT REFERENCE r Use the time stamp of the right space time dataset
+</pre></div>
+
+
+<h3>TEMPORAL SELECTION</h3>
+
+The temporal selection simply selects parts of a space time dataset without
+processing raster or vector data.
+
+The algebra provides a selection operator <b>:</b> that selects parts
+of a space time dataset that are temporally equal to parts of a second one
+by default. The following expression
+<div class="code"><pre>
+C = A : B
+</pre></div>
+means: Select all parts of space time dataset A that are equal to B and store
+it in space time dataset C. The parts are time stamped maps. <br>
+<br>
+In addition the inverse selection operator <b>!:</b> is defined as the complement of
+the selection operator, hence the following expression
+<div class="code"><pre>
+C = A !: B
+</pre></div>
+means: select all parts of space time time dataset A that are not equal to B
+and store it in space time dataset (STDS) C. <br>
+<br>
+To select parts of a STDS by different topological relations to other STDS,
+the temporal topology selection operator can be used. The operator consists of
+the temporal selection operator, the topological relations, that must be separated
+by the logical OR operator <b>|</b> and the temporal extent operator.
+All three parts are separated by comma and surrounded by curly braces:
+{"temporal selection operator", "topological relations", "temporal operator"} <br>
+<br>
+
+Examples:
+<div class="code"><pre>
+C = A {:, equals} B
+C = A {!:, equals} B
+</pre></div>
+We can now define arbitrary topological relations using the OR operator "|"
+to connect them:
+<div class="code"><pre>
+C = A {:,equals|during|overlaps} B
+</pre></div>
+Select all parts of A that are equal to B, during B or overlaps B. <br>
+
+In addition we can define the temporal extent of the result STDS by adding the
+temporal operator.
+<div class="code"><pre>
+C = A {:, during,r} B
+</pre></div>
+Select all parts of A that are during B and use the temporal extents from B for
+C. <br>
+
+<br>
+The selection operator is implicitly contained in the temporal topology
+selection operator, so that the following statements are exactly the same:
+<div class="code"><pre>
+C = A : B
+C = A {:} B
+C = A {:,equal} B
+C = A {:,equal,l} B
+</pre></div>
+
+Same for the complementary selection:
+<div class="code"><pre>
+C = A !: B
+C = A {!:} B
+C = A {!:,equal} B
+C = A {!:,equal,l} B
+</pre></div>
+
+<h3>CONDITIONAL STATEMENTS</h3>
+
+Selection operations can be evaluated within conditional statements.
+<br>
+<div class="code"><pre>
+Note A and B can either be space time datasets or expressions. The temporal
+relationship between the conditions and the conclusions can be defined at the
+beginning of the if statement. The relationship between then and else conclusion
+must be always equal.
+
+if statement decision option temporal relations
+ if(if, then, else)
+ if(conditions, A) A if conditions are True; temporal topological relation between if and then is equal.
+ if(conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is equal.
+ if(topologies, conditions, A) A if conditions are True; temporal topological relation between if and then is explicit specified by topologies.
+ if(topologies, conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is explicit specified by topologies.
+</pre></div>
+The conditions are comparison expressions that are used to evaluate
+space time datasets. Specific values of temporal variables are
+compared by logical operators and evaluated for each map of the STDS.<br>
+<b>Important:</b> The conditions are evaluated from left to right.
+
+<h4>Logical operators</h4>
+<div class="code"><pre>
+Symbol description
+
+ == equal
+ != not equal
+ > greater than
+ >= greater than or equal
+ < less than
+ <= less than or equal
+ && and
+ || or
+</pre></div>
+
+<h4>Temporal functions</h4>
+The following temporal function are evaluated only for the STDS that must be given in parenthesis.
+<div class="code"><pre>
+
+td(A) Returns a list of time intervals of STDS A
+
+start_time(A) Start time as HH::MM:SS
+start_date(A) Start date as yyyy-mm-DD
+start_datetime(A) Start datetime as yyyy-mm-DD HH:MM:SS
+end_time(A) End time as HH:MM:SS
+end_date(A) End date as yyyy-mm-DD
+end_datetime(A) End datetime as yyyy-mm-DD HH:MM
+
+start_doy(A) Day of year (doy) from the start time [1 - 366]
+start_dow(A) Day of week (dow) from the start time [1 - 7], the start of the week is Monday == 1
+start_year(A) The year of the start time [0 - 9999]
+start_month(A) The month of the start time [1 - 12]
+start_week(A) Week of year of the start time [1 - 54]
+start_day(A) Day of month from the start time [1 - 31]
+start_hour(A) The hour of the start time [0 - 23]
+start_minute(A) The minute of the start time [0 - 59]
+start_second(A) The second of the start time [0 - 59]
+end_doy(A) Day of year (doy) from the end time [1 - 366]
+end_dow(A) Day of week (dow) from the end time [1 - 7], the start of the week is Monday == 1
+end_year(A) The year of the end time [0 - 9999]
+end_month(A) The month of the end time [1 - 12]
+end_week(A) Week of year of the end time [1 - 54]
+end_day(A) Day of month from the start time [1 - 31]
+end_hour(A) The hour of the end time [0 - 23]
+end_minute(A) The minute of the end time [0 - 59]
+end_second(A) The second of the end time [0 - 59]
+</pre></div>
+
+<h4>Comparison operator</h4>
+The conditions are comparison expressions that are used to evaluate
+space time datasets. Specific values of temporal variables are
+compared by logical operators and evaluated for each map of the STDS and
+the related maps.
+For complex relations the comparison operator can be used to combine conditions:
+<br>
+The structure is similar to the select operator with the extention of an aggregation operator:
+{"comparison operator", "topological relations", aggregation operator, "temporal operator"}
+<br>
+This aggregation operator (| or &) define the behaviour if a map is related the more
+than one map, e.g for the topological relations 'contains'.
+Should all (&) conditions for the related maps be true or is it sufficient to
+have any (|) condition that is true. The resulting boolean value is then compared
+to the first condition by the comparison operator (|| or &&).
+As default the aggregation operator is related to the comparison operator: <br>
+Comparison operator -> aggregation operator:
+<div class="code"><pre>
+|| -> | and && -> &
+</pre></div>
+Examples:
+<div class="code"><pre>
+Condition 1 {||, equal, r} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2
+Condition 1 {&&, equal|contains, |, l} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2 && Condition 3
+Condition 1 {&&, equal|during, l} Condition 2 {&&,contains, |, r} Condition 3
+</pre></div>
+
+<h4>Hash operator</h4>
+Additionally the number of maps in intervals can be computed and used in
+conditional statements with the hash (#) operator. <br>
+<div class="code"><pre>
+A{#, contains}B
+</pre></div>
+This expression computes the number of maps from space
+time dataset B which are during the time intervals of maps from
+space time dataset A.<br>
+A list of integers (scalars) corresponding to the maps of A
+that contain maps from B will be returned. <br>
+<br>
+<div class="code"><pre>
+C = if({equal}, A {#, contains} B > 2, A {:, contains} B)
+</pre></div>
+This expression selects all maps from A that temporally contains at least 2
+maps from B and stores them in space time dataset C. The leading equal statement
+in the if condition specifies the temporal relation between the if and then part
+of the if expression. This is very important, so we do not need to specify a
+global time reference (a space time dataset) for temporal processing.
+<br>
+<br>
+Furthermore the temporal algebra allows temporal buffering, shifting
+and snapping with the functions buff_t(), tshift() and tsnap()
+respectively.
+<div class="code"><pre>
+buff_t(A, size) Buffer STDS A with granule ("1 month" or 5)
+tshift(A, size) Shift STDS A with granule ("1 month" or 5)
+tsnap(A) Snap time instances and intervals of STDS A
+</pre></div>
+<br>
+<h4>Single map with temporal extent</h4>
+The temporal algebra can also handle single maps with time stamps in the tmap function.
+<div class="code"><pre>
+tmap()
+</pre></div>
+For example:
+<div class="code"><pre>
+ C = A {:,during} tmap(event)
+</pre></div>
+This statement select all maps from space time data set A that are during the temporal extent of single map 'event'
+
+<h3>Spatial raster operators</h3>
+
+The module supports the following raster operations: <br>
+<div class="code"><pre>
+Symbol description precedence
+
+ % modulus 1
+ / division 1
+ * multiplication 1
+ + addition 2
+ - subtraction 2
+</pre></div>
+
+And raster functions:
+<div class="code"><pre>
+abs(x) return absolute value of x
+float(x) convert x to foating point
+int(x) convert x to integer [ truncates ]
+log(x) natural log of x
+sqrt(x) square root of x
+tan(x) tangent of x (x is in degrees)
+round(x) round x to nearest integer
+sin(x) sine of x (x is in degrees)
+sqrt(x) square root of x
+tan(x) tangent of x (x is in degrees)
+isnull(x) check if x = NULL
+isntnull(x) check if x is not NULL
+null set null value
+exist(x) Check if x is in the current mapset
+</pre></div>
+
+<h4>Single raster map </h4>
+
+The temporal raster algebra feature also a function to integrate single raster
+maps without time stamps into the expressions.
+<div class="code"><pre>
+ map()
+</pre></div>
+For example:
+<div class="code"><pre>
+ C = A * map(constant_value)
+</pre></div>
+This statement multiply all raster maps from space time raster data set A with the raster map 'constant_value'
+<h3>Combinations of temporal, raster and select operators</h3>
+
+We combine the temporal topology relations, the temporal operators and the spatial/select operators to create spatio-temporal operators:
+
+<div class="code"><pre>
+{"spatial or select operator", "list of temporal relations", "temporal operator"}
+</pre></div>
+
+For multiple topological relations or several related maps the spatio-temporal
+operators feature implicit aggregation.
+
+The algebra evaluates the stated STDS by their temporal topologies and apply
+the given spatio temporal operators in a aggregated form.
+
+If we have two STDS A and B, B has three maps: b1, b2, b3 that are all during
+the temporal extent of the single map a1 of A, then the following arithmetic
+calculations would implicitly aggregate all maps of B into one result map for
+a1 of A:
+<pre class="code">
+ C = A {+, contains} B --> c1 = a1 + b1 + b2 + b3
+</pre><p>
+Keep attention that the aggregation behaviour is not symmetric:
+<pre class="code">
+ C = B {+, during} A --> c1 = b1 + a1
+ c2 = b2 + a1
+ c3 = b3 + a1
+</pre>
+<h3>Temporal neighbourhood modifier</h3>
+
+The neighbourhood modifier of r.mapcalc is extended for the temporal raster algebra by the temporal dimension.
+The format is strds[t,r,c], where t is the temporal offset, r is the row offset and c is the column offset. <br>
+<pre class="code">
+strds[2]
+</pre>
+Refers to the second successor of the current map
+<pre class="code">
+strds[1,2]
+</pre>
+Refers to the cell one row below and two columns to the right of the current cell in the current map
+<pre class="code">
+strds[1,-2,-1]
+</pre>
+Refers to the cell two rows above and one column to the left of the current cell of the first successor map
+<pre class="code">
+strds[-2,0,1]
+</pre>
+Refers to the cell one column to the right of the current cell in the second predecessor map.
+
+<h3>Examples: </h3>
+Sum maps from space time dataset A with maps from space time dataset
+B which have equal time stamps and are temporary before Jan. 1. 2005 and
+store them in space time dataset D.
+<div class="code"><pre>
+D = if(start_date(A) < "2005-01-01", A + B)
+</pre></div>
+
+Create the sum of all maps from STRDS A and B that have equal time stamps and store the new maps in STRDS C:
+<div class="code"><pre>
+C = A + B
+</pre></div>
+Same expression with explicit definition of the temporal topology relation and temporal operators:
+<div class="code"><pre>
+C = A {+,equal,l} B
+</pre></div>
+Select all cells from STRDS B with equal temporal relations to STRDS A, if the
+cells of A are in the range of [100.0, 1600] of time intervals that have more
+then 30 days (Jan, Mar, Mai, Jul, Aug, Oct, Dec):
+<div class="code"><pre>
+C = if(A > 100 && A < 1600 && td(A) > 30, B)
+</pre></div>
+Same expression with explicit definition of the temporal topology relation and temporal operators:
+<div class="code"><pre>
+C = if({equal}, A > 100 && A < 1600 {&&,equal} td(A) > 30, B)
+</pre></div>
+Compute the recharge in meter per second for all cells of precipitation STRDS "Prec" if the mean temperature specified in STRDS "Temp" is higher than 10 degrees. Computation is performed if STRDS "Prec" and "Temp" have equal time stamps. The number of days or fraction of days per interval is computed using the td() function that has as argument the STRDS "Prec":
+<div class="code"><pre>
+C = if(Temp > 10.0, Prec / 3600.0 /24.0 / td(Prec))
+</pre></div>
+Same expression with explicit definition of the temporal topology relation and temporal operators:
+<div class="code"><pre>
+C = if({equal}, Temp > 10.0, Prec / 3600.0 / 24.0 {/,equal,l} td(Prec))
+</pre></div>
+Compute the mean value of all maps from STRDS A that are located during time intervals of STRDS B if more than one map of A is contained in an interval of B, use A otherwise, the resulting time intervals are either from B or A:
+<div class="code"><pre>
+C = if(B {#,contain} A > 1, (B {+,contain,l} A - B) / (B {#,contain} A), A)
+</pre></div>
+Same expression with explicit definition of the temporal topology relation and temporal operators:
+<div class="code"><pre>
+C = if({equal}, B {#,contain} A > 1, (B {+,contain,l} A {-,equal,l} B) {equal,=/} (B {#,contain} A), A)
+</pre></div>
+
+<h2>REFERENCES</h2>
+
+<tt><a href="http://www.dabeaz.com/ply/">PLY(Python-Lex-Yacc)</a></tt>
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.mapcalc.html">r.mapcalc</a>
+<a href="t.vect.algebra.html">t.vect.algebra</a>
+<a href="t.rast3d.algebra.html">t.rast3d.algebra</a>
+<a href="t.select.html">t.select</a>
+<a href="t.rast3d.mapcalc.html">t.rast3d.mapcalc</a>
+<a href="t.rast.mapcalc.html">t.rast.mapcalc</a>
+</em>
+
+<h2>AUTHOR</h2>
+
+Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
+
+<p><i>Last changed: $Date: 2014-11-06 15:17:31 +0100 (Do, 06. Nov 2014) $</i>
+
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/t.rast.algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+############################################################################
+#
+# MODULE: t.rast.algebra
+# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
+#
+# PURPOSE: Provide temporal raster algebra to perform spatial an temporal operations
+# for space time datasets by topological relationships to other space time
+# datasets.
+# COPYRIGHT: (C) 2014 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
+#
+#############################################################################
+
+#%module
+#% description: Apply temporal and spatial operations on space time raster datasets using temporal raster algebra.
+#% keywords: temporal
+#% keywords: algebra
+#%end
+
+#%option
+#% key: expression
+#% type: string
+#% description: r.mapcalc expression for temporal and spatial analysis of space time raster datasets
+#% required : yes
+#%end
+
+#%option
+#% key: basename
+#% type: string
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% required: yes
+#%end
+
+#%option
+#% key: nprocs
+#% type: integer
+#% description: Number of r.mapcalc processes to run in parallel
+#% required: no
+#% multiple: no
+#% answer: 1
+#%end
+
+#%flag
+#% key: s
+#% description: Activate spatial topology
+#%end
+
+#%flag
+#% key: n
+#% description: Register Null maps
+#%end
+
+#%flag
+#% key: g
+#% description: Use granularity sampling instead of the temporal topology approach
+#%end
+
+
+import grass.script
+import grass.temporal as tgis
+import sys
+
+def main():
+ expression = options['expression']
+ basename = options['basename']
+ nprocs = options["nprocs"]
+ spatial = flags["s"]
+ register_null = flags["n"]
+ granularity = flags["g"]
+
+ # Check for PLY istallation
+ try:
+ import ply.lex as lex
+ import ply.yacc as yacc
+ except:
+ grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules. "
+ "You can use t.rast.mapcalc that provides a limited but useful alternative to "
+ "t.rast.algebra without PLY requirement."))
+
+ tgis.init(True)
+ p = tgis.TemporalRasterAlgebraParser(run = True, debug=False, spatial = spatial, nprocs = nprocs, register_null = register_null)
+
+ if granularity:
+ if not p.setup_common_granularity(expression=expression, lexer = tgis.TemporalRasterAlgebraLexer()):
+ grass.script.fatal(_("Unable to process the expression in granularity algebra mode"))
+
+ p.parse(expression, basename, grass.script.overwrite())
+
+if __name__ == "__main__":
+ options, flags = grass.script.parser()
+ sys.exit(main())
+
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,694 @@
+"""
+(C) 2013 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import datetime
+import os
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+
+class TestTRastAlgebra(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init(True) # Raise on error instead of exit(1)
+ cls.use_temp_region()
+ cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
+ w=0.0, t=1.0, b=0.0, res=10.0)
+
+ cls.runModule("r.mapcalc", quiet=True, expression="a1 = 1")
+ cls.runModule("r.mapcalc", quiet=True, expression="a2 = 2")
+ cls.runModule("r.mapcalc", quiet=True, expression="a3 = 3")
+ cls.runModule("r.mapcalc", quiet=True, expression="a4 = 4")
+ cls.runModule("r.mapcalc", quiet=True, expression="b1 = 5")
+ cls.runModule("r.mapcalc", quiet=True, expression="b2 = 6")
+ cls.runModule("r.mapcalc", quiet=True, expression="c1 = 7")
+ cls.runModule("r.mapcalc", quiet=True, expression="d1 = 8")
+ cls.runModule("r.mapcalc", quiet=True, expression="d2 = 9")
+ cls.runModule("r.mapcalc", quiet=True, expression="d3 = 10")
+ cls.runModule("r.mapcalc", quiet=True, expression="singletmap = 99")
+ cls.runModule("r.mapcalc", quiet=True, expression="singlemap = 100")
+
+ tgis.open_new_stds(name="A", type="strds", temporaltype="absolute",
+ title="A", descr="A", semantic="field")
+ tgis.open_new_stds(name="B", type="strds", temporaltype="absolute",
+ title="B", descr="B", semantic="field")
+ tgis.open_new_stds(name="C", type="strds", temporaltype="absolute",
+ title="B", descr="C", semantic="field")
+ tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
+ title="D", descr="D", semantic="field")
+
+ tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4",
+ start="2001-01-01", increment="1 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ start="2001-01-01", increment="2 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ start="2001-01-02", increment="2 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1,d2,d3",
+ start="2001-01-03", increment="1 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ start="2001-01-03", end="2001-01-04", interval=True)
+
+ def tearDown(self):
+ self.runModule("t.remove", flags="rf", inputs="R", quiet=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.runModule("t.remove", flags="rf", inputs="A,B,C,D", quiet=True)
+ cls.runModule("t.unregister", maps="singletmap", quiet=True)
+ cls.del_temp_region()
+
+ def test_temporal_conditional_time_dimension_bug(self):
+ """Testing the conditional time dimension bug, that uses the time
+ dimension of the conditional statement instead the time dimension
+ of the then/else statement."""
+ self.assertModule("t.rast.algebra", expression="R = if({contains}, B == 5, A - 1, A + 1)",
+ basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 0) # 1 - 1
+ self.assertEqual(D.metadata.get_max_max(), 5) # 4 + 1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_simple_arith_hash_1(self):
+ """Simple arithmetic test including the hash operator"""
+
+ self.assertModule("t.rast.algebra", expression='R = A + A {#, equal,l} A', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 5)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+
+ def test_simple_arith_td_1(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A + td(A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 5)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_simple_arith_td_2(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A / td(A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_simple_arith_td_3(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A {+,equal} td(A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 5)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_simple_arith_td_4(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A {/, equal} td(A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+
+ def test_simple_arith_if_1(self):
+ """Simple arithmetic test with if condition"""
+
+ self.assertModule("t.rast.algebra", expression='R = if({equal}, start_date(A) >= "2001-01-02", A + A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 3)
+ self.assertEqual(D.metadata.get_min_min(), 4)
+ self.assertEqual(D.metadata.get_max_max(), 8)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_simple_arith_if_2(self):
+ """Simple arithmetic test with if condition"""
+
+ self.assertModule("t.rast.algebra", expression='R = if({equal}, A#A == 1, A - A)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 0)
+ self.assertEqual(D.metadata.get_max_max(), 0)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_complex_arith_if_1(self):
+ """Complex arithmetic test with if condition"""
+
+ self.assertModule("t.rast.algebra", expression='R = if(start_date(A) < "2001-01-03" && A#A == 1, A{+, starts,l}C, A{+, finishes,l}C)', \
+ basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 9) # 2 + 7 a2 + c1
+ self.assertEqual(D.metadata.get_max_max(), 10) # 3 + 7 a3 + c1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_simple_arith_1(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {*, equal} A {+, equal} A", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 2) # 1*1 + 1
+ self.assertEqual(D.metadata.get_max_max(), 20) # 4*4 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_simple_arith_2(self):
+ """Simple arithmetic test that creates an empty strds"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {*, during} A {+, during} A", basename="r")
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 0)
+
+ def test_simple_arith_3(self):
+ """Simple arithmetic test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A / A + A*A/A", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 2) # 1/1 + 1*1/1
+ self.assertEqual(D.metadata.get_max_max(), 5) # 4/4 + 4*4/4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_intersection_1(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {+,equal,i} B", basename="r")
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 0)
+
+ def test_temporal_intersection_2(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {+,during,i} B", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
+ self.assertEqual(D.metadata.get_max_max(), 10) # 4 + 6
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_intersection_3(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {+,starts,i} B", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
+ self.assertEqual(D.metadata.get_max_max(), 9) # 3 + 6
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_temporal_intersection_4(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {+,finishes,intersect} B", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 7) # 2 + 5
+ self.assertEqual(D.metadata.get_max_max(), 10) # 4 + 6
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_intersection_5(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {+,starts|finishes,i} B", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 6) # 1 + 5
+ self.assertEqual(D.metadata.get_max_max(), 10) # 4 + 6
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_intersection_6(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {+,overlaps,u} C", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 12) # 5 + 7
+ self.assertEqual(D.metadata.get_max_max(), 12) # 5 + 7
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_temporal_intersection_7(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {+,overlapped,u} C", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 13) # 6 + 7
+ self.assertEqual(D.metadata.get_max_max(), 13) # 6 + 7
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_intersection_8(self):
+ """Simple temporal intersection test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A {+,during,l} buff_t(C, "1 day") ',
+ basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 8) # 1 + 7 a1 + c1
+ self.assertEqual(D.metadata.get_max_max(), 11) # 4 + 7 a4 + c1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+
+ def test_temporal_neighbors_1(self):
+ """Simple temporal neighborhood computation test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A[-1] + A[1]',
+ basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
+ self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_temporal_neighbors_2(self):
+ """Simple temporal neighborhood computation test"""
+
+ self.assertModule("t.rast.algebra", expression='R = A[0,0,-1] + A[0,0,1]',
+ basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
+ self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_tmap_function1(self):
+ """Testing the tmap function. """
+
+ self.assertModule("t.rast.algebra", expression='R = tmap(singletmap)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ maplist = D.get_registered_maps_as_objects()
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 99)
+ self.assertEqual(D.metadata.get_max_max(), 99)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_tmap_function2(self):
+ """Testing the tmap function. """
+
+ self.assertModule("t.rast.algebra", expression='R = tmap(singletmap) + 1', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ maplist = D.get_registered_maps_as_objects()
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 100)
+ self.assertEqual(D.metadata.get_max_max(), 100)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_map_function1(self):
+ """Testing the map function. """
+
+ self.assertModule("t.rast.algebra", expression='R = map(singlemap) + A', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ maplist = D.get_registered_maps_as_objects()
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 101)
+ self.assertEqual(D.metadata.get_max_max(), 104)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_map_function2(self):
+ """Testing the map function. """
+
+ self.assertModule("t.rast.algebra", expression='R = A * map(singlemap)', basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ maplist = D.get_registered_maps_as_objects()
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 100)
+ self.assertEqual(D.metadata.get_max_max(), 400)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select(self):
+ """Testing the temporal select operator. """
+
+ self.assertModule("t.rast.algebra", expression="R = A : A", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select(self):
+ """Testing the temporal select operator. """
+
+ self.assertModule("t.rast.algebra", expression="R = A : D", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 3)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select_operators1(self):
+ """Testing the temporal select operator. Including temporal relations. """
+
+ self.assertModule("t.rast.algebra", expression="R = A : D", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 3)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select_operators2(self):
+ """Testing the temporal select operator. Including temporal relations. """
+
+ self.assertModule("t.rast.algebra", expression="R = A {!:,during} C", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select_operators3(self):
+ """Testing the temporal select operator. Including temporal relations and
+ different temporal operators (lr|+&)"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {:,during,d} B", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), False)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_temporal_select_operators4(self):
+ """Testing the temporal select operator. Including temporal relations and
+ different temporal operators (lr|+&)"""
+
+ self.assertModule("t.rast.algebra", expression="R = A {:,equal|during,r} C", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ maplist = D.get_registered_maps_as_objects()
+ for map_i in maplist:
+ start_map, end_map = map_i.get_absolute_time()
+ self.assertEqual(start_map, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end_map, datetime.datetime(2001, 1, 4))
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 3)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), False)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_temporal_hash_operator1(self):
+ """Testing the temporal hash operator in the raster algebra. """
+
+ self.assertModule("t.rast.algebra", expression="R = if(A # D == 1, A)", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 3)
+ self.assertEqual(D.metadata.get_max_max(), 4)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_hash_operator2(self):
+ """Testing the temporal hash operator in the raster algebra. """
+
+ self.assertModule("t.rast.algebra", expression="R = A # D", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 1)
+ self.assertEqual(D.metadata.get_max_max(), 1)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_hash_operator3(self):
+ """Testing the temporal hash operator in the raster algebra. """
+
+ self.assertModule("t.rast.algebra", expression="R = C {#,contains} A", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 2)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_temporal_hash_operator4(self):
+ """Testing the temporal hash operator in the raster algebra. """
+
+ self.assertModule("t.rast.algebra", expression="R = if({contains},A # D == 1, C {#,contains} A)", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 1)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 2)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_raster_arithmetic_relation_1(self):
+ """Arithmetic test with temporal intersection"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {+,contains,l} A ", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 8)
+ self.assertEqual(D.metadata.get_max_max(), 13)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_raster_arithmetic_relation_2(self):
+ """Arithmetic test with temporal intersection"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {*,contains,l} A ", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 10)
+ self.assertEqual(D.metadata.get_max_max(), 72)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_raster_arithmetic_relation_3(self):
+ """Arithmetic test with temporal intersection"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {+,contains,l} A ", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 8)
+ self.assertEqual(D.metadata.get_max_max(), 13)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_raster_arithmetic_relation_4(self):
+ """Arithmetic test with temporal intersection"""
+
+ self.assertModule("t.rast.algebra", expression="R = B {+,contains,r} A ", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(),4)
+ self.assertEqual(D.metadata.get_min_min(), 8)
+ self.assertEqual(D.metadata.get_max_max(), 13)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_raster_arithmetic_relation_5(self):
+ """Complex arithmetic test with temporal intersection"""
+
+ self.assertModule("t.rast.algebra", expression="R = tmap(singletmap) {+,equal| precedes| follows,l} A + map(singlemap)", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(),1)
+ self.assertEqual(D.metadata.get_min_min(), 208)
+ self.assertEqual(D.metadata.get_max_max(), 208)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+if __name__ == '__main__':
+ gunittest.test()
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,42 @@
+"""
+(C) 2013 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import datetime
+import os
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+
+class TestTRastAlgebraFails(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def test_error_handling(self):
+ # Syntax error
+ self.assertModuleFail("t.rast.algebra", expression="R == A {+,equal| precedes| follows,l} B", basename="r")
+ # No STRDS
+ self.assertModuleFail("t.rast.algebra", expression="R = NoSTRDS + NoSTRDS", basename="r")
+ # No basename
+ self.assertModuleFail("t.rast.algebra", expression="R = A + B")
+
+
+if __name__ == '__main__':
+ gunittest.test()
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,227 @@
+"""
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert and Thomas Leppelt
+"""
+
+import datetime
+import os
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+
+class TestTRastAlgebraGranularity(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init(True) # Raise on error instead of exit(1)
+ cls.use_temp_region()
+ cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
+ w=0.0, t=1.0, b=0.0, res=10.0)
+
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a1 = 1")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a2 = 2")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a3 = 3")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a4 = 4")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a5 = 5")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a6 = 6")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="b1 = 7")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="b2 = 8")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="c1 = 9")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="d1 = 10")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="d2 = 11")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="d3 = 12")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="singletmap = 99")
+
+ tgis.open_new_stds(name="A", type="strds", temporaltype="absolute",
+ title="A", descr="A", semantic="field", overwrite=True)
+ tgis.open_new_stds(name="B", type="strds", temporaltype="absolute",
+ title="B", descr="B", semantic="field", overwrite=True)
+ tgis.open_new_stds(name="C", type="strds", temporaltype="absolute",
+ title="C", descr="C", semantic="field", overwrite=True)
+ tgis.open_new_stds(name="D", type="strds", temporaltype="absolute",
+ title="D", descr="D", semantic="field", overwrite=True)
+
+ tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1,a2,a3,a4,a5,a6",
+ start="2001-01-01", increment="1 month", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="B", maps="b1,b2",
+ start="2001-01-01", increment="3 months", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="C", maps="c1",
+ start="2001-01-01", increment="1 year", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d1",
+ start="2001-01-01", increment="5 days", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d2",
+ start="2001-03-01", increment="5 days", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="D", maps="d3",
+ start="2001-05-01", increment="5 days", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name=None, maps="singletmap",
+ start="2001-03-01", end="2001-04-01", interval=True)
+
+ def tearDown(self):
+ self.runModule("t.remove", flags="rf", inputs="R", quiet=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.runModule("t.remove", flags="rf", inputs="A,B,C,D", quiet=True)
+ cls.runModule("t.unregister", maps="singletmap", quiet=True)
+ cls.del_temp_region()
+
+ def test_1(self):
+ """Simple arithmetik test"""
+ expr = "R = if(C == 9, A - 1)"
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 6)
+ self.assertEqual(D.metadata.get_min_min(), 0) # 1 - 1
+ self.assertEqual(D.metadata.get_max_max(), 5) # 6 - 1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 month')
+
+ def test_2(self):
+ """Simple arithmetik test"""
+ expr = "R = if(D == 11, A - 1, A + 1)"
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 15)
+ self.assertEqual(D.metadata.get_min_min(), 2) # 1 - 1
+ self.assertEqual(D.metadata.get_max_max(), 6) # 5 + 1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 5, 6))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_simple_arith_hash_1(self):
+ """Simple arithmetic test including the hash operator"""
+ expr ='R = A + A # A'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 6)
+ self.assertEqual(D.metadata.get_min_min(), 2)
+ self.assertEqual(D.metadata.get_max_max(), 7)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+
+
+ def test_simple_arith_td_1(self):
+ """Simple arithmetic test"""
+ expr = 'R = A + td(A:D)'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 15)
+ self.assertEqual(D.metadata.get_min_min(), 2) # 1 - 1
+ self.assertEqual(D.metadata.get_max_max(), 6) # 5 + 1
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 5, 6))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_simple_arith_if_1(self):
+ """Simple arithmetic test with if condition"""
+ expr = 'R = if(start_date(A) >= "2001-02-01", A + A)'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 5)
+ self.assertEqual(D.metadata.get_min_min(), 4)
+ self.assertEqual(D.metadata.get_max_max(), 12)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 2, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+
+ def test_simple_arith_if_2(self):
+ """Simple arithmetic test with if condition"""
+ expr = 'R = if(A#A == 1, A - A)'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 6)
+ self.assertEqual(D.metadata.get_min_min(), 0)
+ self.assertEqual(D.metadata.get_max_max(), 0)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+
+ def test_complex_arith_if_1(self):
+ """Complex arithmetic test with if condition"""
+ expr = 'R = if(start_date(A) < "2001-03-01" && A#A == 1, A+C, A-C)'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 6)
+ self.assertEqual(D.metadata.get_min_min(), -6) # 3 - 9
+ self.assertEqual(D.metadata.get_max_max(), 11) # 2 + 2
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+
+ def test_temporal_neighbors(self):
+ """Simple temporal neighborhood computation test"""
+ expr ='R = (A[0,0,-1] : D) + (A[0,0,1] : D)'
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 14)
+ self.assertEqual(D.metadata.get_min_min(), 2) # 1 + 1
+ self.assertEqual(D.metadata.get_max_max(), 10) # 5 + 5
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 5, 6))
+
+ def test_map(self):
+ """Test STDS + single map without timestamp"""
+ expr = "R = A + map(singletmap)"
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 6)
+ self.assertEqual(D.metadata.get_min_min(), 100) # 1 + 99
+ self.assertEqual(D.metadata.get_max_max(), 105) # 6 + 99
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 7, 1))
+
+ def test_tmap_map(self):
+ """Test STDS + single map with and without timestamp"""
+ expr = "R = tmap(singletmap) + A + map(singletmap)"
+ self.assertModule("t.rast.algebra", expression=expr, flags="g", basename="r")
+
+ D = tgis.open_old_stds("R", type="strds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(),1)
+ self.assertEqual(D.metadata.get_min_min(), 201)
+ self.assertEqual(D.metadata.get_max_max(), 201)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 3, 1))
+ self.assertEqual(end, datetime.datetime(2001, 4, 1))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 month')
+
+if __name__ == '__main__':
+ gunittest.test()
Added: grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.algebra/testsuite/test_raster_algebra_granularity_fails.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,63 @@
+"""
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert and Thomas Leppelt
+"""
+
+import datetime
+import os
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+
+class TestTRastAlgebraGranularityFails(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init(True) # Raise on error instead of exit(1)
+ cls.use_temp_region()
+ cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
+ w=0.0, t=1.0, b=0.0, res=10.0)
+
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a1 = 7")
+ cls.runModule("r.mapcalc", overwrite=True, quiet=True, expression="a2 = 8")
+
+
+ tgis.open_new_stds(name="A", type="strds", temporaltype="absolute",
+ title="A", descr="A", semantic="field", overwrite=True)
+
+ tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a1",
+ start="2001-02-01", end="2001-04-01", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="rast", name="A", maps="a2",
+ start="2001-03-01", end="2001-05-01", interval=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.runModule("t.remove", flags="rf", inputs="A", quiet=True)
+ cls.runModule("t.unregister", maps="singletmap", quiet=True)
+ cls.del_temp_region()
+
+ def test_error_handling(self):
+ # Syntax error
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R = A {+,equal| precedes| follows,l A", basename="r")
+ # Syntax error
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R = A {+,equal| precedes| follows,l} A", basename="r")
+ # Syntax error
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R == A + A", basename="r")
+ # No STRDS
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R = NoSTRDS + NoSTRDS", basename="r")
+ # No basename
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R = A + A")
+ # Invalid temporal topology
+ self.assertModuleFail("t.rast.algebra", flags="g", expression="R = A + A", basename="r")
+
+if __name__ == '__main__':
+ gunittest.test()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -132,7 +132,7 @@
# Make sure the temporal database exists
tgis.init()
- sp = tgis.open_old_space_time_dataset(input, "strds")
+ sp = tgis.open_old_stds(input, "strds")
rows = sp.get_registered_maps("id", None, None, None)
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.extract/test.t.rast.extract.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.extract/test.t.rast.extract.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.extract/test.t.rast.extract.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Test the extraction of a subset of a space time raster input
-
-# 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
-
-# Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
-r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
-r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
-r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
-r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
-r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
-
-t.create --o 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-01-01" increment="3 months"
-
-# The @test
-t.rast.extract --o --v input=precip_abs1 output=precip_abs2 where="start_time > '2001-06-01'" \
- expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec nprocs=2
-t.info type=strds input=precip_abs2
-
-t.rast.extract --o --v -n input=precip_abs1 output=precip_abs3 where="start_time > '2001-06-01'" \
- expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec nprocs=4
-t.info type=strds input=precip_abs3
-
-# Let the test fail
-g.remove -f type=rast name=prec_1
-
-t.rast.extract --o --v input=precip_abs1 output=precip_abs4 \
- where="start_time > '2001-01-01'" expr="precip_abs1/1.0"\
- base=new_test
-t.info type=strds input=precip_abs4
-
-t.remove -rf type=strds input=precip_abs1,precip_abs2,precip_abs3
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py
===================================================================
--- grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py 2014-07-08 14:39:31 UTC (rev 61192)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,155 +0,0 @@
-"""Test t.rast.extract
-
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
- at author Soeren Gebbert
-"""
-
-import grass.script as grass
-import grass.pygrass.modules as pymod
-import subprocess
-from gunittest.case import TestCase
-
-class TestRasterExtraction(TestCase):
-
- @classmethod
- def setUpClass(cls):
- """!Initiate the temporal GIS and set the region
- """
- grass.use_temp_region()
- cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
- cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
-
- @classmethod
- def tearDownClass(cls):
- """!Remove the temporary region
- """
- grass.del_temp_region()
-
- def setUp(self):
- """Create input data for transient groundwater flow computation
- """
- # Use always the current mapset as temporal database
- self.runModule("r.mapcalc", expression="prec_1 = 100")
- self.runModule("r.mapcalc", expression="prec_2 = 200")
- self.runModule("r.mapcalc", expression="prec_3 = 300")
- self.runModule("r.mapcalc", expression="prec_4 = 400")
- self.runModule("r.mapcalc", expression="prec_5 = 500")
- self.runModule("r.mapcalc", expression="prec_6 = 600")
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="precip_abs1", title="A test", description="A test")
- self.runModule("t.register", flags="i", type="rast", input="precip_abs1",
- maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6",
- start="2001-01-01", increment="3 months")
-
- def tearDown(self):
- """Remove generated data"""
- self.runModule("t.remove", flags="rf", type="strds",
- inputs="precip_abs1,precip_abs2")
-
- def test_selection(self):
- """Perform a simple selection by datetime"""
- self.assertModule("t.rast.extract", input="precip_abs1", output="precip_abs2",
- where="start_time > '2001-06-01'")
-
- #self.assertModule("t.info", flags="g", input="precip_abs2")
-
- tinfo_string="""start_time=2001-07-01 00:00:00
- end_time=2002-07-01 00:00:00
- granularity=3 months
- map_time=interval
- north=80.0
- south=0.0
- east=120.0
- west=0.0
- top=0.0
- bottom=0.0
- aggregation_type=None
- number_of_maps=4
- nsres_min=10.0
- nsres_max=10.0
- ewres_min=10.0
- ewres_max=10.0
- min_min=300.0
- min_max=600.0
- max_min=300.0
- max_max=600.0"""
-
- self.assertCommandKeyValue(module="t.info",
- parameters=dict(flags="g", input="precip_abs2"),
- reference=tinfo_string, precision=2, sep="=")
-
- def test_selection_and_expression(self):
- """Perform a selection by datetime and a r.mapcalc expression"""
- self.assertModule("t.rast.extract", input="precip_abs1", output="precip_abs2",
- where="start_time > '2001-06-01'",
- expression=" if(precip_abs1 > 400, precip_abs1, null())",
- basename="new_prec", nprocs=2)
-
- #self.assertModule("t.info", flags="g", input="precip_abs2")
-
- tinfo_string="""start_time=2002-01-01 00:00:00
- end_time=2002-07-01 00:00:00
- granularity=3 months
- map_time=interval
- north=80.0
- south=0.0
- east=120.0
- west=0.0
- top=0.0
- bottom=0.0
- aggregation_type=None
- number_of_maps=2
- nsres_min=10.0
- nsres_max=10.0
- ewres_min=10.0
- ewres_max=10.0
- min_min=500.0
- min_max=600.0
- max_min=500.0
- max_max=600.0"""
-
- self.assertCommandKeyValue(module="t.info",
- parameters=dict(flags="g", input="precip_abs2"),
- reference=tinfo_string, precision=2, sep="=")
-
- def test_expression_with_empty_maps(self):
- """Perform r.mapcalc expression and register empty maps"""
- self.assertModule("t.rast.extract", flags="n", input="precip_abs1", output="precip_abs2",
- expression=" if(precip_abs1 > 400, precip_abs1, null())",
- basename="new_prec", nprocs=2)
-
- #self.assertModule("t.info", flags="g", input="precip_abs2")
-
- tinfo_string="""start_time=2001-01-01 00:00:00
- end_time=2002-07-01 00:00:00
- granularity=3 months
- map_time=interval
- north=80.0
- south=0.0
- east=120.0
- west=0.0
- top=0.0
- bottom=0.0
- aggregation_type=None
- number_of_maps=6
- nsres_min=10.0
- nsres_max=10.0
- ewres_min=10.0
- ewres_max=10.0
- min_min=500.0
- min_max=600.0
- max_min=500.0
- max_max=600.0"""
-
- self.assertCommandKeyValue(module="t.info",
- parameters=dict(flags="g", input="precip_abs2"),
- reference=tinfo_string, precision=2, sep="=")
-
-if __name__ == '__main__':
- from gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py (from rev 61192, grass/trunk/temporal/t.rast.extract/testsuite/test_extract.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.extract/testsuite/test_extract.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,178 @@
+"""Test t.rast.extract
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+ at author Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+import subprocess
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestRasterExtraction(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def setUp(self):
+ """Create input data for transient groundwater flow computation
+ """
+ # Use always the current mapset as temporal database
+ self.runModule("r.mapcalc", expression="prec_1 = 100", overwrite=True)
+ self.runModule("r.mapcalc", expression="prec_2 = 200", overwrite=True)
+ self.runModule("r.mapcalc", expression="prec_3 = 300", overwrite=True)
+ self.runModule("r.mapcalc", expression="prec_4 = 400", overwrite=True)
+ self.runModule("r.mapcalc", expression="prec_5 = 500", overwrite=True)
+ self.runModule("r.mapcalc", expression="prec_6 = 600", overwrite=True)
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="precip_abs1", title="A test", description="A test", overwrite=True)
+ self.runModule("t.register", flags="i", type="rast", input="precip_abs1",
+ maps="prec_1,prec_2,prec_3,prec_4,prec_5,prec_6",
+ start="2001-01-01", increment="3 months", overwrite=True)
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("t.remove", flags="rf", type="strds",
+ inputs="precip_abs1,precip_abs2")
+
+ def test_selection(self):
+ """Perform a simple selection by datetime"""
+ self.assertModule("t.rast.extract", input="precip_abs1", output="precip_abs2",
+ where="start_time > '2001-06-01'")
+
+ #self.assertModule("t.info", flags="g", input="precip_abs2")
+
+ tinfo_string="""start_time=2001-07-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ north=80.0
+ south=0.0
+ east=120.0
+ west=0.0
+ top=0.0
+ bottom=0.0
+ aggregation_type=None
+ number_of_maps=4
+ nsres_min=10.0
+ nsres_max=10.0
+ ewres_min=10.0
+ ewres_max=10.0
+ min_min=300.0
+ min_max=600.0
+ max_min=300.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="precip_abs2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_selection_and_expression(self):
+ """Perform a selection by datetime and a r.mapcalc expression"""
+ self.assertModule("t.rast.extract", input="precip_abs1", output="precip_abs2",
+ where="start_time > '2001-06-01'",
+ expression=" if(precip_abs1 > 400, precip_abs1, null())",
+ basename="new_prec", nprocs=2, overwrite=True)
+
+ #self.assertModule("t.info", flags="g", input="precip_abs2")
+
+ tinfo_string="""start_time=2002-01-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ north=80.0
+ south=0.0
+ east=120.0
+ west=0.0
+ top=0.0
+ bottom=0.0
+ aggregation_type=None
+ number_of_maps=2
+ nsres_min=10.0
+ nsres_max=10.0
+ ewres_min=10.0
+ ewres_max=10.0
+ min_min=500.0
+ min_max=600.0
+ max_min=500.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="precip_abs2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_expression_with_empty_maps(self):
+ """Perform r.mapcalc expression and register empty maps"""
+ self.assertModule("t.rast.extract", flags="n", input="precip_abs1", output="precip_abs2",
+ expression=" if(precip_abs1 > 400, precip_abs1, null())",
+ basename="new_prec", nprocs=2, overwrite=True)
+
+ #self.assertModule("t.info", flags="g", input="precip_abs2")
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ north=80.0
+ south=0.0
+ east=120.0
+ west=0.0
+ top=0.0
+ bottom=0.0
+ aggregation_type=None
+ number_of_maps=6
+ nsres_min=10.0
+ nsres_max=10.0
+ ewres_min=10.0
+ ewres_max=10.0
+ min_min=500.0
+ min_max=600.0
+ max_min=500.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", input="precip_abs2")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+class TestRasterExtractionFails(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def test_error_handling(self):
+ """Perform r.mapcalc expression and register empty maps"""
+ # No input
+ self.assertModuleFail("t.rast.extract", output="precip_abs2", basename="new_prec")
+ # No output
+ self.assertModuleFail("t.rast.extract", input="precip_abs1", basename="new_prec")
+ # No basename
+ self.assertModuleFail("t.rast.extract", input="precip_abs1", output="precip_abs2",
+ expression=" if(precip_abs1 > 400, precip_abs1, null())")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -74,7 +74,7 @@
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- sp = tgis.open_old_space_time_dataset(input, "strds")
+ sp = tgis.open_old_stds(input, "strds")
maps = sp.get_registered_maps_as_objects_with_gaps(where, dbif)
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.list/t.rast.list.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.list/t.rast.list.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.list/t.rast.list.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,43 +1,34 @@
<h2>DESCRIPTION</h2>
-List time stamped raster map layers that are registered in a space time
-raster dataset. This module provides several options to list map layers
-and their metadata. Listing of map layer can be ordered by metadata,
-metadata columns can be specified and SQL where conditions can be
-provided to select a map layer subset of the input space time raster
-dataset. Most of the raster map specific metadat is available for
-column selection, sorting and SQL where statements.
+List time stamped raster map layers that are registered in a space time raster dataset. This module provides
+several options to list map layers and their metadata. Listing of map layer can be ordered by metadata,
+metadata columns can be specified and SQL where conditions can be provided to select a map layer subset
+of the input space time raster dataset. Most of the raster map specific metadat is available for column selection,
+sorting and SQL where statements.
-Using the <b>method</b> option allows the specification of different
-methods to list map layers. Method <i>col</i> is the deafult option and
-sensitive to the <b>column</b>,<b>order</b> and <b>where</b> options.
-It will simply print user specified metadata columns of one map layer
-per line. The <i>comma</i> method will list the map layer as comma
-separated list that can be used as input for spatial modules.
-<p>
-To print interval length in days and distance from the begin use method
-<i>delta</i>. Method <i>deltagap</i> will additionally print temporal
-gaps between map layer. The <i>gran</i> method allows the listing of
-map layer sampled by a user defined <b>granule</b>. As default the
-granularity of the space time raster dataset is used for sampling.
+Using the <b>method</b> option allows the specification of different methods to list map layers.
+Method <i>col</i> is the deafult option and sensitive to the <b>column</b>,<b>order</b>
+and <b>where</b> options. It will simply print user specified metadata columns of one map layer per line.
+The <i>comma</i> method will list the map layer as comma separated list that can be used as input
+for spatial modules.
+To print interval length in days and distance from the begin use method <i>delta</i>. Method
+<i>deltagap</i> will additionally print temporal gaps between map layer. The <i>gran</i>
+method allows the listing of map layer sampled by a user defined <b>granule</b>. As default the granularity
+of the space time raster dataset is used for sampling.
-For user defined column separator can be specified with the <b>separator</b>
-option.
+For user defined column separator can be specified with the <b>separator</b> option.
<h2>EXAMPLE</h2>
-
This example shows several options that are available for map layers listing.
-
<div class="code"><pre>
g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-# Generate data
-r.mapcalc expr="map_1 = rand(0, 550)" -s
-r.mapcalc expr="map_2 = rand(0, 450)" -s
-r.mapcalc expr="map_3 = rand(0, 320)" -s
-r.mapcalc expr="map_4 = rand(0, 510)" -s
-r.mapcalc expr="map_5 = rand(0, 300)" -s
-r.mapcalc expr="map_6 = rand(0, 650)" -s
+r.mapcalc expr="map_1 = rand(0, 550)"
+r.mapcalc expr="map_2 = rand(0, 450)"
+r.mapcalc expr="map_3 = rand(0, 320)"
+r.mapcalc expr="map_4 = rand(0, 510)"
+r.mapcalc expr="map_5 = rand(0, 300)"
+r.mapcalc expr="map_6 = rand(0, 650)"
cat > map_list.txt << EOF
map_1|2001-01-01|2001-04-01
@@ -176,6 +167,7 @@
<em>
<a href="g.list.html">g.list</a>,
+<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -9,13 +9,12 @@
export GRASS_OVERWRITE=1
-# Generate data
-r.mapcalc expr="prec_1 = rand(0, 550)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
+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)"
n1=`g.tempfile pid=1 -d`
n2=`g.tempfile pid=2 -d`
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,58 +1,58 @@
#!/bin/sh
# Test for t.rast.mapcalc
-
+export GRASS_OVERWRITE=1
# We need to set a specific region in the
# @preprocess step of this test. We generate
# raster with r.mapcalc and create several space time raster datasets
# 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(0, 550)" -s
-r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
-r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
-r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
-r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
-r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
+r.mapcalc -s expr="prec_1 = rand(0, 550)"
+r.mapcalc -s expr="prec_2 = rand(0, 450)"
+r.mapcalc -s expr="prec_3 = rand(0, 320)"
+r.mapcalc -s expr="prec_4 = rand(0, 510)"
+r.mapcalc -s expr="prec_5 = rand(0, 300)"
+r.mapcalc -s expr="prec_6 = rand(0, 650)"
-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 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.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register --o type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.info precip_abs1
t.info precip_abs2
# The first @test
-t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
+t.rast.mapcalc --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
expression="if(start_time() >= 0 && end_time() >= 0, (precip_abs1*td() + precip_abs2) / td(), null()) " base=new_prec \
method=equal nprocs=5
t.info type=strds input=precip_abs3
-t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
+t.rast.mapcalc --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
expression="if(start_year()>=0&&start_month()>=0&&start_day()>=0&&start_hour()>=0&&start_minute()>=0&&start_second()>=0, (precip_abs1*td() + precip_abs2) / td(), null()) " base=new_prec \
method=equal nprocs=5
t.info type=strds input=precip_abs3
-t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
+t.rast.mapcalc --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
expression="if(end_year()>=0&&end_month()>=0&&end_day()>=0&&end_hour()>=0&&end_minute()>=0&&end_second()>=0, (precip_abs1*td() + precip_abs2) / td(), null()) " base=new_prec \
method=equal nprocs=5
t.info type=strds input=precip_abs3
# The first @test
-t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
+t.rast.mapcalc --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
expression="if(start_doy() >= 0 && start_dow() >= 0, (precip_abs1*td() + precip_abs2) / td(), null()) " base=new_prec \
method=equal nprocs=5
t.info type=strds input=precip_abs3
# The first @test
-t.rast.mapcalc --o --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
+t.rast.mapcalc --v -sn inputs=precip_abs1,precip_abs2 output=precip_abs3 \
expression="if(end_doy() >= 0 && end_dow() >= 0, (precip_abs1*td() + precip_abs2) / td(), null()) " base=new_prec \
method=equal nprocs=5
t.info type=strds input=precip_abs3
+t.rast.mapcalc --v -sn inputs=precip_abs1 output=precip_abs3 \
+ expression="if(precip_abs1 == prec_1, prec_1, null())" base=new_prec
+
# @postprocess
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.unregister type=rast maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
-t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3
+t.remove -fr type=strds input=precip_abs1,precip_abs2,precip_abs3
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -9,13 +9,12 @@
# 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)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
+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)"
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"
@@ -47,7 +46,7 @@
t.info type=strds input=precip_abs4
# Let the test fail
-g.remove -f type=rast name=prec_1
+g.remove rast=prec_1
t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
method=equal nprocs=5
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -101,7 +101,7 @@
overwrite = grass.overwrite()
- sp = tgis.open_old_space_time_dataset(input, "strds", dbif)
+ sp = tgis.open_old_stds(input, "strds", dbif)
maps = sp.get_registered_maps_as_objects(where=where, dbif=dbif)
if not maps:
@@ -109,7 +109,7 @@
grass.warning(_("Space time raster dataset <%s> is empty") % sp.get_id())
return
- new_sp = tgis.check_new_space_time_dataset(input, "strds", dbif=dbif,
+ new_sp = tgis.check_new_stds(input, "strds", dbif=dbif,
overwrite=overwrite)
# Configure the r.neighbor module
neighbor_module = pymod.Module("r.neighbors", input="dummy",
@@ -135,7 +135,7 @@
new_maps.append(new_map)
mod = copy.deepcopy(neighbor_module)
- mod(input=str(map.get_id()), output=str(new_map.get_id()))
+ mod(input=map.get_id(), output=new_map.get_id())
print(mod.get_bash())
process_queue.put(mod)
@@ -144,7 +144,7 @@
# Open the new space time raster dataset
ttype, stype, title, descr = sp.get_initial_values()
- new_sp = tgis.open_new_space_time_dataset(output, "strds", ttype, title,
+ new_sp = tgis.open_new_stds(output, "strds", ttype, title,
descr, stype, dbif, overwrite)
num_maps = len(new_maps)
# collect empty maps to remove them
@@ -185,7 +185,7 @@
else:
names += ",%s" % (map.get_name())
- grass.run_command("g.remove", type='rast', name=names, quiet=True, flags='f')
+ grass.run_command("g.remove", flags='f', type='rast', name=names, quiet=True)
dbif.close()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -92,7 +92,7 @@
os.chdir(expdir)
- sp = tgis.open_old_space_time_dataset(input, "strds")
+ sp = tgis.open_old_stds(input, "strds")
if use_granularity:
# Attention: A list of lists of maps will be returned
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.series/t.rast.series.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.series/t.rast.series.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.series/t.rast.series.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -82,7 +82,7 @@
# Make sure the temporal database exists
tgis.init()
- sp = tgis.open_old_space_time_dataset(input, "strds")
+ sp = tgis.open_old_stds(input, "strds")
rows = sp.get_registered_maps("id", where, order, None)
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -47,7 +47,7 @@
mapset = grass.gisenv()["MAPSET"]
- sp = tgis.open_old_space_time_dataset(input, "strds")
+ sp = tgis.open_old_stds(input, "strds")
grass.use_temp_region()
Deleted: grass/branches/releasebranch_7_0/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-07-30 13:46:53 UTC (rev 61457)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,350 +0,0 @@
-"""Test t.rast.to.rast3
-
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
- at author Soeren Gebbert
-"""
-
-import grass.pygrass.modules as pymod
-import subprocess
-from grass.gunittest.case import TestCase
-from grass.gunittest.gmodules import SimpleModule
-
-class TestSTRDSToRast3(TestCase):
-
- def setUp(self):
- """Create input data
- """
- self.use_temp_region()
- self.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
- self.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
-
- self.runModule("r.mapcalc", expression="prec_1i = 100")
- self.runModule("r.mapcalc", expression="prec_2i = 200")
- self.runModule("r.mapcalc", expression="prec_3i = 300")
- self.runModule("r.mapcalc", expression="prec_4i = 400")
- self.runModule("r.mapcalc", expression="prec_5i = 500")
- self.runModule("r.mapcalc", expression="prec_6i = 600")
-
- self.runModule("r.mapcalc", expression="prec_1d = 100.0")
- self.runModule("r.mapcalc", expression="prec_2d = 200.0")
- self.runModule("r.mapcalc", expression="prec_3d = 300.0")
- self.runModule("r.mapcalc", expression="prec_4d = 400.0")
- self.runModule("r.mapcalc", expression="prec_5d = 500.0")
- self.runModule("r.mapcalc", expression="prec_6d = 600.0")
-
- self.runModule("r.mapcalc", expression="prec_1f = float(100.0)")
- self.runModule("r.mapcalc", expression="prec_2f = float(200.0)")
- self.runModule("r.mapcalc", expression="prec_3f = float(300.0)")
- self.runModule("r.mapcalc", expression="prec_4f = float(400.0)")
- self.runModule("r.mapcalc", expression="prec_5f = float(500.0)")
- self.runModule("r.mapcalc", expression="prec_6f = float(600.0)")
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="precip_i", title="A test integer",
- description="A test integer values")
- self.runModule("t.register", flags="i", type="rast", input="precip_i",
- maps="prec_1i,prec_2i,prec_3i,prec_4i,prec_5i,prec_6i",
- start="2001-01-01", increment="3 months")
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="precip_f", title="A test float",
- description="A test float values")
- self.runModule("t.register", flags="i", type="rast", input="precip_f",
- maps="prec_1f,prec_2f,prec_3f,prec_4f,prec_5f,prec_6f",
- start="2001-01-01", increment="3 months")
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="precip_d", title="A test float",
- description="A test float values")
- 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="2001-01-01", increment="3 months")
-
- def tearDown(self):
- """Remove generated data"""
- self.runModule("t.remove", flags="rf", type="strds",
- inputs="precip_i,precip_f,precip_d")
- self.del_temp_region()
-
- def test_3m(self):
- """Convert STRDS into 3d raster map, granularity 3 months"""
-
- self.assertModule("t.rast.to.rast3", input="precip_i", output="precip_i")
- self.assertModule("t.rast.to.rast3", input="precip_f", output="precip_f")
- self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
-
- univar_string="""n=576
- null_cells=0
- cells=576
- min=100
- max=600
- range=500
- mean=350
- mean_of_abs=350
- stddev=170.782512765993
- variance=29166.6666666667
- coeff_var=48.7950036474267
- sum=201600"""
-
- 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)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_i", reference=tinfo_string, precision=2)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="FCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_f", reference=tinfo_string, precision=2)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
- def test_3m_gap(self):
- """Convert STRDS with gaps into 3d raster map, granularity 3 months"""
-
- self.runModule("t.unregister", maps="prec_3d,prec_3f,prec_3i")
-
- self.assertModule("t.rast.to.rast3", input="precip_i", output="precip_i")
- self.assertModule("t.rast.to.rast3", input="precip_f", output="precip_f")
- self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
-
- univar_string="""n=480
- null_cells=96
- cells=576
- min=100
- max=600
- range=500
- mean=360
- mean_of_abs=360
- stddev=185.472369909914
- variance=34400
- 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)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_i", reference=tinfo_string, precision=2)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="FCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_f", reference=tinfo_string, precision=2)
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1213
- top=1231
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
-class TestSTRDSToRast3MultiGran(TestCase):
-
- def setUp(self):
- """Create input data
- """
- self.use_temp_region()
- self.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
- self.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
-
- self.runModule("r.mapcalc", expression="prec_1d = 100.0")
- self.runModule("r.mapcalc", expression="prec_2d = 200.0")
- self.runModule("r.mapcalc", expression="prec_3d = 300.0")
- self.runModule("r.mapcalc", expression="prec_4d = 400.0")
- self.runModule("r.mapcalc", expression="prec_5d = 500.0")
- self.runModule("r.mapcalc", expression="prec_6d = 600.0")
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="precip_d", title="A test float",
- description="A test float values")
-
- def tearDown(self):
- """Remove generated data"""
- self.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
- self.del_temp_region()
-
- def test_years(self):
- """Convert STRDS into 3d raster map, granularity5 years"""
-
- 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="5 years")
-
- self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=100
- top=130
- nsres=10
- ewres=10
- tbres=3
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2000 00:00:00 / 1 Jan 2030 00:00:00"
- units="none"
- vertical_units="years" """
-
- self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
- def test_months(self):
- """Convert STRDS into 3d raster map, granularity 6 months"""
-
- 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="6 months")
-
- self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
-
- tinfo_string="""north=80
- south=0
- east=120
- west=0
- bottom=1201
- top=1237
- nsres=10
- ewres=10
- tbres=6
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2000 00:00:00 / 1 Jan 2003 00:00:00"
- units="none"
- vertical_units="months" """
-
- self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
-
- def test_months(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="7 days")
-
- 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=36566
- nsres=10
- ewres=10
- tbres=7
- rows=8
- cols=12
- depths=6
- datatype="DCELL"
- timestamp="1 Jan 2000 00:00:00 / 12 Feb 2000 00:00:00"
- units="none"
- vertical_units="days" """
-
- self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
-
-if __name__ == '__main__':
- from grass.gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py (from rev 61457, grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,408 @@
+"""Test t.rast.to.rast3
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+ at author Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+import subprocess
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestSTRDSToRast3(TestCase):
+
+ def setUp(self):
+ """Create input data
+ """
+ self.use_temp_region()
+ self.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ self.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ self.runModule("r.mapcalc", expression="prec_1i = 100")
+ self.runModule("r.mapcalc", expression="prec_2i = 200")
+ self.runModule("r.mapcalc", expression="prec_3i = 300")
+ self.runModule("r.mapcalc", expression="prec_4i = 400")
+ self.runModule("r.mapcalc", expression="prec_5i = 500")
+ self.runModule("r.mapcalc", expression="prec_6i = 600")
+
+ self.runModule("r.mapcalc", expression="prec_1d = 100.0")
+ self.runModule("r.mapcalc", expression="prec_2d = 200.0")
+ self.runModule("r.mapcalc", expression="prec_3d = 300.0")
+ self.runModule("r.mapcalc", expression="prec_4d = 400.0")
+ self.runModule("r.mapcalc", expression="prec_5d = 500.0")
+ self.runModule("r.mapcalc", expression="prec_6d = 600.0")
+
+ self.runModule("r.mapcalc", expression="prec_1f = float(100.0)")
+ self.runModule("r.mapcalc", expression="prec_2f = float(200.0)")
+ self.runModule("r.mapcalc", expression="prec_3f = float(300.0)")
+ self.runModule("r.mapcalc", expression="prec_4f = float(400.0)")
+ self.runModule("r.mapcalc", expression="prec_5f = float(500.0)")
+ self.runModule("r.mapcalc", expression="prec_6f = float(600.0)")
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="precip_i", title="A test integer",
+ description="A test integer values")
+ self.runModule("t.register", flags="i", type="rast", input="precip_i",
+ maps="prec_1i,prec_2i,prec_3i,prec_4i,prec_5i,prec_6i",
+ start="2001-01-01", increment="3 months")
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="precip_f", title="A test float",
+ description="A test float values")
+ self.runModule("t.register", flags="i", type="rast", input="precip_f",
+ maps="prec_1f,prec_2f,prec_3f,prec_4f,prec_5f,prec_6f",
+ start="2001-01-01", increment="3 months")
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="precip_d", title="A test float",
+ description="A test float values")
+ 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="2001-01-01", increment="3 months")
+
+ 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.del_temp_region()
+
+ 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")
+ self.assertModule("t.rast.to.rast3", input="precip_f", output="precip_f")
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+
+ univar_string="""n=576
+ null_cells=0
+ cells=576
+ min=100
+ max=600
+ range=500
+ mean=350
+ mean_of_abs=350
+ stddev=170.782512765993
+ variance=29166.6666666667
+ coeff_var=48.7950036474267
+ sum=201600"""
+
+ 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)
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_i", reference=tinfo_string, precision=2)
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="FCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_f", reference=tinfo_string, precision=2)
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
+ def test_3m_gap(self):
+ """Convert STRDS with gaps into 3d raster map, granularity 3 months"""
+
+ self.runModule("t.unregister", maps="prec_3d,prec_3f,prec_3i")
+
+ self.assertModule("t.rast.to.rast3", input="precip_i", output="precip_i")
+ self.assertModule("t.rast.to.rast3", input="precip_f", output="precip_f")
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+
+ univar_string="""n=480
+ null_cells=96
+ cells=576
+ min=100
+ max=600
+ range=500
+ mean=360
+ mean_of_abs=360
+ stddev=185.472369909914
+ variance=34400
+ coeff_var=51.5201027527539
+ sum=172800"""
+
+ 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
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_i", reference=tinfo_string, precision=2)
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="FCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_f", reference=tinfo_string, precision=2)
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1213
+ top=1231
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2001 00:00:00 / 1 Jul 2002 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
+class TestSTRDSToRast3MultiGran(TestCase):
+
+ def setUp(self):
+ """Create input data
+ """
+ self.use_temp_region()
+ self.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ self.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ self.runModule("r.mapcalc", expression="prec_1d = 100.0")
+ self.runModule("r.mapcalc", expression="prec_2d = 200.0")
+ self.runModule("r.mapcalc", expression="prec_3d = 300.0")
+ self.runModule("r.mapcalc", expression="prec_4d = 400.0")
+ self.runModule("r.mapcalc", expression="prec_5d = 500.0")
+ self.runModule("r.mapcalc", expression="prec_6d = 600.0")
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="precip_d", title="A test float",
+ description="A test float values")
+
+ 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.del_temp_region()
+
+ def otest_years(self):
+ """Convert STRDS into 3d raster map, granularity5 years"""
+
+ 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="5 years")
+
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=100
+ top=130
+ nsres=10
+ ewres=10
+ tbres=3
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2000 00:00:00 / 1 Jan 2030 00:00:00"
+ units="none"
+ vertical_units="years" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
+ def otest_months(self):
+ """Convert STRDS into 3d raster map, granularity 6 months"""
+
+ 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="6 months")
+
+ self.assertModule("t.rast.to.rast3", input="precip_d", output="precip_d")
+
+ tinfo_string="""north=80
+ south=0
+ east=120
+ west=0
+ bottom=1201
+ top=1237
+ nsres=10
+ ewres=10
+ tbres=6
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2000 00:00:00 / 1 Jan 2003 00:00:00"
+ units="none"
+ vertical_units="months" """
+
+ self.assertRaster3dFitsInfo(raster="precip_d", reference=tinfo_string, precision=2)
+
+ def otest_days(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="7 days")
+
+ 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=36566
+ nsres=10
+ ewres=10
+ tbres=7
+ rows=8
+ cols=12
+ depths=6
+ datatype="DCELL"
+ timestamp="1 Jan 2000 00:00:00 / 12 Feb 2000 00:00:00"
+ units="none"
+ vertical_units="days" """
+
+ 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()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.univar/test.t.rast.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.univar/test.t.rast.univar.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.univar/test.t.rast.univar.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -8,13 +8,13 @@
export GRASS_OVERWRITE=1
-# Generate data
-r.mapcalc expr="prec_1 = rand(0, 550)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
+# Data generation
+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)"
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
t.register type=rast --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"
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/Makefile 2014-11-06 14:17:31 UTC (rev 62637)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,7 +0,0 @@
-MODULE_TOPDIR = ../../
-
-PGM = t.rast3d.algebra
-
-include $(MODULE_TOPDIR)/include/Make/Script.make
-
-default: script
Copied: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile (from rev 62637, grass/trunk/temporal/t.rast3d.algebra/Makefile)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ../../
+
+PGM = t.rast3d.algebra
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+
+default: script
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html 2014-11-06 14:17:31 UTC (rev 62637)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,38 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>t.rast3d.algebra</em> performs temporal and spatial map algebra
-operations on space time 3D raster datasets (STR3DS) by using the
-temporal 3D raster algebra.
-
-<h3>NOTES</h3>
-
-The module expects an <b>expression</b> as input parameter in the following form: <br>
-<br>
-<b> "result = expression" </b>
-<br>
-<br>
-
-The statement structure is exact the same as of <em>t.rast.mapcalc2</em>,
-see <a href="t.rast.algebra.html">t.rast.algebra</a> but allows four dimensional indexing.
-
-<h2>REFERENCES</h2>
-
-<tt><a href="http://www.dabeaz.com/ply/">PLY(Python-Lex-Yacc)</a></tt>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="t.rast.algebra.html">t.rast.algebra</a>
-<a href="t.rast3d.mapcalc.html">t.rast3d.mapcalc</a>
-<a href="r.mapcalc.html">r.mapcalc</a>
-<a href="t.vect.algebra.html">t.vect.algebra</a>
-<a href="t.select.html">t.select</a>
-</em>
-
-
-<h2>AUTHOR</h2>
-
-Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
-
-<p><i>Last changed: $Date$</i>
-
Copied: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html (from rev 62637, grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,38 @@
+<h2>DESCRIPTION</h2>
+
+<em>t.rast3d.algebra</em> performs temporal and spatial map algebra
+operations on space time 3D raster datasets (STR3DS) by using the
+temporal 3D raster algebra.
+
+<h3>NOTES</h3>
+
+The module expects an <b>expression</b> as input parameter in the following form: <br>
+<br>
+<b> "result = expression" </b>
+<br>
+<br>
+
+The statement structure is exact the same as of <em>t.rast.mapcalc2</em>,
+see <a href="t.rast.algebra.html">t.rast.algebra</a> but allows four dimensional indexing.
+
+<h2>REFERENCES</h2>
+
+<tt><a href="http://www.dabeaz.com/ply/">PLY(Python-Lex-Yacc)</a></tt>
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="t.rast.algebra.html">t.rast.algebra</a>
+<a href="t.rast3d.mapcalc.html">t.rast3d.mapcalc</a>
+<a href="r.mapcalc.html">r.mapcalc</a>
+<a href="t.vect.algebra.html">t.vect.algebra</a>
+<a href="t.select.html">t.select</a>
+</em>
+
+
+<h2>AUTHOR</h2>
+
+Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
+
+<p><i>Last changed: $Date$</i>
+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-06 14:17:31 UTC (rev 62637)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-############################################################################
-#
-# MODULE: t.rast3d.algebra
-# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
-#
-# PURPOSE: Provide temporal 3D raster algebra to perform spatial an temporal operations
-# for space time datasets by topological relationships to other space time
-# datasets.
-# COPYRIGHT: (C) 2014 by the GRASS Development Team
-#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
-#
-#############################################################################
-
-#%module
-#% description: Apply temporal and spatial operations on space time 3D raster datasets using temporal raster algebra.
-#% keywords: temporal
-#% keywords: algebra
-#%end
-
-#%option
-#% key: expression
-#% type: string
-#% description: r3.mapcalc expression for temporal and spatial analysis of space time 3D raster datasets
-#% required : yes
-#%end
-
-#%option
-#% key: basename
-#% type: string
-#% label: Basename of the new generated output maps
-#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
-#% required: yes
-#%end
-
-#%option
-#% key: nprocs
-#% type: integer
-#% description: Number of r3.mapcalc processes to run in parallel
-#% required: no
-#% multiple: no
-#% answer: 1
-#%end
-
-#%flag
-#% key: s
-#% description: Activate spatial topology
-#%end
-
-#%flag
-#% key: n
-#% description: Register Null maps
-#%end
-
-
-import grass.script
-import grass.temporal as tgis
-import sys
-
-def main():
- expression = options['expression']
- basename = options['basename']
- nprocs = options["nprocs"]
- spatial = flags["s"]
- register_null = flags["n"]
-
- # Check for PLY istallation
- try:
- import ply.lex as lex
- import ply.yacc as yacc
- except:
- grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules. "
- "You can use t.rast3d.mapcalc that provides a limited but useful alternative to "
- "t.rast3d.mapcalc2 without PLY requirement."))
-
- tgis.init(True)
- p = tgis.TemporalRaster3DAlgebraParser(run = True, debug=False, spatial = spatial, nprocs = nprocs, register_null = register_null)
- p.parse(expression, basename, grass.script.overwrite())
-
-if __name__ == "__main__":
- options, flags = grass.script.parser()
- sys.exit(main())
-
Copied: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py (from rev 62637, grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/t.rast3d.algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+############################################################################
+#
+# MODULE: t.rast3d.algebra
+# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
+#
+# PURPOSE: Provide temporal 3D raster algebra to perform spatial an temporal operations
+# for space time datasets by topological relationships to other space time
+# datasets.
+# COPYRIGHT: (C) 2014 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
+#
+#############################################################################
+
+#%module
+#% description: Apply temporal and spatial operations on space time 3D raster datasets using temporal raster algebra.
+#% keywords: temporal
+#% keywords: algebra
+#%end
+
+#%option
+#% key: expression
+#% type: string
+#% description: r3.mapcalc expression for temporal and spatial analysis of space time 3D raster datasets
+#% required : yes
+#%end
+
+#%option
+#% key: basename
+#% type: string
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% required: yes
+#%end
+
+#%option
+#% key: nprocs
+#% type: integer
+#% description: Number of r3.mapcalc processes to run in parallel
+#% required: no
+#% multiple: no
+#% answer: 1
+#%end
+
+#%flag
+#% key: s
+#% description: Activate spatial topology
+#%end
+
+#%flag
+#% key: n
+#% description: Register Null maps
+#%end
+
+#%flag
+#% key: g
+#% description: Use granularity sampling instead of the temporal topology approach
+#%end
+
+
+import grass.script
+import grass.temporal as tgis
+import sys
+
+def main():
+ expression = options['expression']
+ basename = options['basename']
+ nprocs = options["nprocs"]
+ spatial = flags["s"]
+ register_null = flags["n"]
+ granularity = flags["g"]
+
+ # Check for PLY istallation
+ try:
+ import ply.lex as lex
+ import ply.yacc as yacc
+ except:
+ grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules. "
+ "You can use t.rast3d.mapcalc that provides a limited but useful alternative to "
+ "t.rast3d.mapcalc2 without PLY requirement."))
+
+ tgis.init(True)
+ p = tgis.TemporalRaster3DAlgebraParser(run = True, debug=False, spatial = spatial, nprocs = nprocs, register_null = register_null)
+
+ if granularity:
+ if not p.setup_common_granularity(expression=expression, stdstype = 'str3ds', lexer = tgis.TemporalRasterAlgebraLexer()):
+ grass.script.fatal(_("Unable to process the expression in granularity algebra mode"))
+
+ p.parse(expression, basename, grass.script.overwrite())
+
+if __name__ == "__main__":
+ options, flags = grass.script.parser()
+ sys.exit(main())
+
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py 2014-11-06 20:07:09 UTC (rev 62640)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,84 +0,0 @@
-"""
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
-:authors: Soeren Gebbert and Thomas Leppelt
-"""
-
-
-import grass.script
-import grass.temporal as tgis
-import grass.gunittest as gunittest
-import datetime
-import os
-
-class TestTRast3dAlgebra(gunittest.TestCase):
-
- @classmethod
- def setUpClass(cls):
- """Initiate the temporal GIS and set the region
- """
- os.putenv("GRASS_OVERWRITE", "1")
- tgis.init(True) # Raise on error instead of exit(1)
- cls.use_temp_region()
- ret = grass.script.run_command("g.region", n=80.0, s=0.0, e=120.0,
- w=0.0, t=100.0, b=0.0, res=10.0)
-
- cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a1 = 1")
- cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a2 = 2")
- cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a3 = 3")
- cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a4 = 4")
-
- tgis.open_new_stds(name="A", type="str3ds", temporaltype="absolute",
- title="A", descr="A", semantic="field", overwrite=True)
-
- tgis.register_maps_in_space_time_dataset(type="rast3d", name="A", maps="a1,a2,a3,a4",
- start="2001-01-01", increment="1 day", interval=True)
-
- def tearDown(self):
- self.runModule("t.remove", type="str3ds", flags="rf", inputs="D", quiet=True)
-
- @classmethod
- def tearDownClass(cls):
- """Remove the temporary region
- """
- cls.runModule("t.remove", type="str3ds", flags="rf", inputs="A", quiet=True)
- cls.del_temp_region()
-
- def test_temporal_neighbors_1(self):
- """Simple temporal neighborhood computation test"""
-
- self.assertModule("t.rast3d.algebra", expression='D = A[-1] + A[1]',
- basename="d")
-
- D = tgis.open_old_stds("D", type="str3ds")
-
- self.assertEqual(D.metadata.get_number_of_maps(), 2)
- self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
- self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
- start, end = D.get_absolute_time()
- self.assertEqual(start, datetime.datetime(2001, 1, 2))
- self.assertEqual(end, datetime.datetime(2001, 1, 4))
-
- def test_temporal_neighbors_2(self):
- """Simple temporal neighborhood computation test"""
-
- self.assertModule("t.rast3d.algebra", expression='D = A[0,0,0,-1] + A[0,0,0,1]',
- basename="d")
-
- D = tgis.open_old_stds("D", type="str3ds")
-
- self.assertEqual(D.metadata.get_number_of_maps(), 2)
- self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
- self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
- start, end = D.get_absolute_time()
- self.assertEqual(start, datetime.datetime(2001, 1, 2))
- self.assertEqual(end, datetime.datetime(2001, 1, 4))
-
-if __name__ == '__main__':
- grass.gunittest.test()
-
-
-
Copied: grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py (from rev 62640, grass/trunk/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.algebra/testsuite/test_raster3d_algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,127 @@
+"""
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert and Thomas Leppelt
+"""
+
+
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+import datetime
+import os
+
+class TestTRast3dAlgebra(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init(True) # Raise on error instead of exit(1)
+ cls.use_temp_region()
+ ret = grass.script.run_command("g.region", n=80.0, s=0.0, e=120.0,
+ w=0.0, t=100.0, b=0.0, res=10.0)
+
+ cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a1 = 1")
+ cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a2 = 2")
+ cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a3 = 3")
+ cls.runModule("r3.mapcalc", overwrite=True, quiet=True, expression="a4 = 4")
+
+ tgis.open_new_stds(name="A", type="str3ds", temporaltype="absolute",
+ title="A", descr="A", semantic="field", overwrite=True)
+
+ tgis.register_maps_in_space_time_dataset(type="rast3d", name="A", maps="a1,a2,a3,a4",
+ start="2001-01-01", increment="1 day", interval=True)
+
+ def tearDown(self):
+ self.runModule("t.remove", type="str3ds", flags="rf", inputs="D", quiet=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.runModule("t.remove", type="str3ds", flags="rf", inputs="A", quiet=True)
+ cls.del_temp_region()
+
+ def test_temporal_neighbors_1(self):
+ """Simple temporal neighborhood computation test"""
+
+ self.assertModule("t.rast3d.algebra", expression='D = A[-1] + A[1]',
+ basename="d")
+
+ D = tgis.open_old_stds("D", type="str3ds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
+ self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_temporal_neighbors_2(self):
+ """Simple temporal neighborhood computation test"""
+
+ self.assertModule("t.rast3d.algebra", expression='D = A[0,0,0,-1] + A[0,0,0,1]',
+ basename="d")
+
+ D = tgis.open_old_stds("D", type="str3ds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
+ self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+ def test_temporal_neighbors_granularity(self):
+ """Simple temporal neighborhood computation test with granularity algebra"""
+
+ self.assertModule("t.rast3d.algebra", flags="g", expression='D = A[0,0,0,-1] + A[0,0,0,1]',
+ basename="d")
+
+ D = tgis.open_old_stds("D", type="str3ds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_min_min(), 4) # 1 + 3
+ self.assertEqual(D.metadata.get_max_max(), 6) # 2 + 4
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+
+
+class TestTRast3dAlgebraFails(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def test_error_handling(self):
+ # Syntax error
+ self.assertModuleFail("t.rast3d.algebra", expression="R = A {+,equal| precedes| follows,l B", basename="r")
+ # Granularity syntax error
+ self.assertModuleFail("t.rast3d.algebra", flags="g", expression="R = A {+,equal| precedes| follows,l} B", basename="r")
+ # No STRDS
+ self.assertModuleFail("t.rast3d.algebra", expression="R = NoSTR3DS + NoSTR3DS", basename="r")
+ # No basename
+ self.assertModuleFail("t.rast3d.algebra", expression="R = A + B")
+
+
+if __name__ == '__main__':
+ grass.gunittest.test()
+
+
+
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -38,7 +38,7 @@
#%end
#%option
-#% key: base
+#% key: basename
#% type: string
#% description: Base name of the new created 3D raster maps
#% required: no
@@ -72,7 +72,7 @@
output = options["output"]
where = options["where"]
expression = options["expression"]
- base = options["base"]
+ base = options["basename"]
nprocs = int(options["nprocs"])
register_null = flags["n"]
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh (from rev 61807, grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Copied: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py (from rev 62703, grass/trunk/temporal/t.rast3d.extract/testsuite/test_extract.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test_extract.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,146 @@
+"""Test t.rast3d.extract
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+
+import grass.pygrass.modules as pymod
+import subprocess
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestRaster3dExtraction(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def setUp(self):
+ """Create input data for transient groundwater flow computation
+ """
+ # Use always the current mapset as temporal database
+ self.runModule("r3.mapcalc", expression="a1 = 100", overwrite=True)
+ self.runModule("r3.mapcalc", expression="a2 = 200", overwrite=True)
+ self.runModule("r3.mapcalc", expression="a3 = 300", overwrite=True)
+ self.runModule("r3.mapcalc", expression="a4 = 400", overwrite=True)
+ self.runModule("r3.mapcalc", expression="a5 = 500", overwrite=True)
+ self.runModule("r3.mapcalc", expression="a6 = 600", overwrite=True)
+
+ self.runModule("t.create", type="str3ds", temporaltype="absolute",
+ output="A", title="A test", description="A test", overwrite=True)
+ self.runModule("t.register", flags="i", type="rast3d", input="A",
+ maps="a1,a2,a3,a4,a5,a6",
+ start="2001-01-01", increment="3 months", overwrite=True)
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("t.remove", flags="rf", type="str3ds",
+ inputs="A,B")
+
+ def test_selection(self):
+ """Perform a simple selection by datetime"""
+ self.assertModule("t.rast3d.extract", input="A", output="B",
+ where="start_time > '2001-06-01'")
+
+ #self.assertModule("t.info", flags="g", input="B")
+
+ tinfo_string="""start_time=2001-07-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ aggregation_type=None
+ number_of_maps=4
+ min_min=300.0
+ min_max=600.0
+ max_min=300.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="B")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_selection_and_expression(self):
+ """Perform a selection by datetime and a r3.mapcalc expression"""
+ self.assertModule("t.rast3d.extract", input="A", output="B",
+ where="start_time > '2001-06-01'",
+ expression=" if(A > 400, A, null())",
+ basename="b", nprocs=2, overwrite=True)
+
+ #self.assertModule("t.info", flags="g", input="B")
+
+ tinfo_string="""start_time=2002-01-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ aggregation_type=None
+ number_of_maps=2
+ min_min=500.0
+ min_max=600.0
+ max_min=500.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="B")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+ def test_expression_with_empty_maps(self):
+ """Perform r3.mapcalc expression and register empty maps"""
+ self.assertModule("t.rast3d.extract", flags="n", input="A", output="B",
+ expression=" if(A > 400, A, null())",
+ basename="b", nprocs=2, overwrite=True)
+
+ #self.assertModule("t.info", flags="g", input="B")
+
+ tinfo_string="""start_time=2001-01-01 00:00:00
+ end_time=2002-07-01 00:00:00
+ granularity=3 months
+ map_time=interval
+ aggregation_type=None
+ number_of_maps=6
+ min_min=500.0
+ min_max=600.0
+ max_min=500.0
+ max_max=600.0"""
+
+ info = SimpleModule("t.info", flags="g", type="str3ds", input="B")
+ self.assertModuleKeyValue(module=info, reference=tinfo_string, precision=2, sep="=")
+
+class TestRaster3dExtractionFails(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ cls.use_temp_region()
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0, t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def test_error_handling(self):
+ """Perform r3.mapcalc expression and register empty maps"""
+ # No input
+ self.assertModuleFail("t.rast3d.extract", output="B", basename="b")
+ # No output
+ self.assertModuleFail("t.rast3d.extract", input="A", basename="b")
+ # No basename
+ self.assertModuleFail("t.rast3d.extract", input="A", output="B",
+ expression=" if(A > 400, A, null())")
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,22 +1,13 @@
<h2>DESCRIPTION</h2>
-This module provides the same functionality as
-<a href="t.rast.list.html">t.rast.list</a>, the only difference is the
-3D raster map layer metadata. Please refer to the manual page of
-<a href="t.rast.list.html">t.rast.list</a>.
+This module provides the same functionality as <a href="t.rast.list.html">t.rast.list</a>,
+the only difference is the 3d raster map layer metadata. Please refer to the manpage of <a href="t.rast.list.html">t.rast.list</a>.
-<h2>EXAMPLE</h2>
-
-The example is based on the XXX sample dataset:
-
-<div class="code"><pre>
-TBD
-</pre></div>
-
<h2>SEE ALSO</h2>
<em>
<a href="g.list.html">g.list</a>,
+<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/t.rast3d.list.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -2,15 +2,15 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.rast3d.list
-# AUTHOR(S): Soeren Gebbert
+# MODULE: t.rast3d.list
+# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: List registered maps of a space time raster3d dataset
-# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
+# PURPOSE: List registered maps of a space time raster3d dataset
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/test.t.rast3d.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh (from rev 61807, grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/t.rast3d.univar.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,9 +1,7 @@
<h2>DESCRIPTION</h2>
-This module provides the same functionality as
-<a href="t.rast.univar.html">t.rast.list</a>, the only difference is the
-vector map layer metadata. Please refer to the manpage of
-<a href="t.rast.univar.html">t.rast.list</a>.
+This module provides the same functionality as <a href="t.rast.univar.html">t.rast.list</a>,
+the only difference is the vector map layer metadata. Please refer to the manpage of <a href="t.rast.univar.html">t.rast.list</a>.
<h2>SEE ALSO</h2>
Deleted: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-09-05 19:48:09 UTC (rev 61807)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh (from rev 61807, grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -13,13 +13,12 @@
# 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)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
+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)"
# The first @test
# We create the space time raster inputs and register the raster maps with absolute time interval
Modified: grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -2,15 +2,15 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.remove
-# AUTHOR(S): Soeren Gebbert
+# MODULE: t.remove
+# AUTHOR(S): Soeren Gebbert
#
-# PURPOSE: Remove space time datasets from the temporal database
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# PURPOSE: Remove space time datasets from the temporal database
+# COPYRIGHT: (C) 2011 by the GRASS Development Team
#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
@@ -111,7 +111,7 @@
for name in dataset_list:
name = name.strip()
- sp = tgis.open_old_space_time_dataset(name, type, dbif)
+ sp = tgis.open_old_stds(name, type, dbif)
if recursive and force:
grass.message(_("Removing registered maps"))
@@ -125,14 +125,14 @@
# to avoid multiple deletation of the same map,
# but the database entries are still present and must be removed
if map.get_name() not in name_list:
- name_list.append(map.get_name())
+ name_list.append(str(map.get_name()))
map_statement += map.delete(dbif=dbif, execute=False)
count += 1
# Delete every 100 maps
if count%100 == 0:
dbif.execute_transaction(map_statement)
- remove(type='rast', name=name_list, run_=True)
+ remove(type="rast", name=name_list, run_=True)
map_statement = ""
name_list = []
@@ -140,11 +140,11 @@
dbif.execute_transaction(map_statement)
if name_list:
if type == "strds":
- remove(type='rast', name=name_list, run_=True)
+ remove(type="rast", name=",".join(name_list), run_=True)
if type == "stvds":
- remove(type='vect', name=name_list, run_=True)
+ remove(type="vect", name=",".join(name_list), run_=True)
if type == "str3ds":
- remove(type='rast3d', name=name_list, run_=True)
+ remove(type="rast3d", name=",".join(name_list), run_=True)
statement += sp.delete(dbif=dbif, execute=False)
Deleted: grass/branches/releasebranch_7_0/temporal/t.sample/test.t.sample.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/test.t.sample.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/test.t.sample.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,90 +0,0 @@
-#1/bin/sh
-# This is a test to sample a space time raster dataset with a space time vector 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
-r.mapcalc expr="prec_1 = rand(0, 550)" -s
-r.mapcalc expr="prec_2 = rand(0, 450)" -s
-r.mapcalc expr="prec_3 = rand(0, 320)" -s
-r.mapcalc expr="prec_4 = rand(0, 510)" -s
-r.mapcalc expr="prec_5 = rand(0, 300)" -s
-r.mapcalc expr="prec_6 = rand(0, 650)" -s
-
-v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height
-
-v.random -z output=pnts3 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts4 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts5 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts6 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts7 n=20 zmin=0 zmax=100 column=height
-v.random -z output=pnts8 n=20 zmin=0 zmax=100 column=height
-
-n1=`g.tempfile pid=1 -d`
-n2=`g.tempfile pid=2 -d`
-n3=`g.tempfile pid=3 -d`
-
-cat > "${n1}" << EOF
-prec_1
-prec_2
-prec_3
-prec_4
-prec_5
-prec_6
-EOF
-
-cat > "${n2}" << EOF
-pnts1|2001-01-01|2001-03-01
-pnts2|2001-05-01|2001-07-01
-EOF
-
-cat > "${n3}" << EOF
-pnts3|2001-01-01|2001-01-05
-pnts4|2001-01-05|2001-01-10
-pnts5|2001-01-10|2001-01-15
-pnts6|2001-01-15|2001-01-20
-pnts7|2001-01-20|2001-01-25
-pnts8|2001-01-25|2001-01-30
-EOF
-
-
-t.create type=strds temporaltype=absolute output=precip_abs0 \
- title="A test with raster input files" descr="A test with raster input files"
-t.create type=stvds temporaltype=absolute output=pnts_abs0 \
- title="A test with vector input files" descr="A test with vector input files"
-t.create type=stvds temporaltype=absolute output=pnts_abs1 \
- title="A test with vector input files" descr="A test with vector input files"
-
-t.register type=rast -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.list precip_abs0
-t.register type=vect input=pnts_abs0 file="${n2}"
-t.vect.list pnts_abs0
-t.register type=vect input=pnts_abs1 file="${n3}"
-t.vect.list pnts_abs1
-
-# The @test
-t.sample method=start input=precip_abs0,precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0
-t.sample method=equal input=precip_abs0,precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0
-t.sample method=contain input=precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0 -c
-t.sample method=overlap input=precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0 -cs
-t.sample method=during input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
-t.sample method=precedes input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
-t.sample method=follows input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
-t.sample method=precedes,follows input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
-t.sample input=precip_abs0 samtype=strds sample=precip_abs0 -cs
-
-
-# Test with temporal point data
-t.register type=rast input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.list precip_abs0
-t.sample input=precip_abs0 samtype=stvds sample=pnts_abs0 -cs
-t.sample input=precip_abs0 samtype=stvds sample=pnts_abs1 -cs
-
-t.remove -rf type=strds input=precip_abs0
-t.remove -rf type=stvds input=pnts_abs0,pnts_abs1
Added: grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,90 @@
+#1/bin/sh
+# This is a test to sample a space time raster dataset with a space time vector 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
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
+
+v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height
+
+v.random -z output=pnts3 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts4 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts5 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts6 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts7 n=20 zmin=0 zmax=100 column=height
+v.random -z output=pnts8 n=20 zmin=0 zmax=100 column=height
+
+n1=`g.tempfile pid=1 -d`
+n2=`g.tempfile pid=2 -d`
+n3=`g.tempfile pid=3 -d`
+
+cat > "${n1}" << EOF
+prec_1
+prec_2
+prec_3
+prec_4
+prec_5
+prec_6
+EOF
+
+cat > "${n2}" << EOF
+pnts1|2001-01-01|2001-03-01
+pnts2|2001-05-01|2001-07-01
+EOF
+
+cat > "${n3}" << EOF
+pnts3|2001-01-01|2001-01-05
+pnts4|2001-01-05|2001-01-10
+pnts5|2001-01-10|2001-01-15
+pnts6|2001-01-15|2001-01-20
+pnts7|2001-01-20|2001-01-25
+pnts8|2001-01-25|2001-01-30
+EOF
+
+
+t.create type=strds temporaltype=absolute output=precip_abs0 \
+ title="A test with raster input files" descr="A test with raster input files"
+t.create type=stvds temporaltype=absolute output=pnts_abs0 \
+ title="A test with vector input files" descr="A test with vector input files"
+t.create type=stvds temporaltype=absolute output=pnts_abs1 \
+ title="A test with vector input files" descr="A test with vector input files"
+
+t.register type=rast -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.rast.list precip_abs0
+t.register type=vect input=pnts_abs0 file="${n2}"
+t.vect.list pnts_abs0
+t.register type=vect input=pnts_abs1 file="${n3}"
+t.vect.list pnts_abs1
+
+# The @test
+t.sample method=start input=precip_abs0,precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0
+t.sample method=equal input=precip_abs0,precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0
+t.sample method=contain input=precip_abs0,precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0 -c
+t.sample method=overlap input=precip_abs0,precip_abs0 samtype=stvds sample=pnts_abs0 -cs
+t.sample method=during input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
+t.sample method=precedes input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
+t.sample method=follows input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
+t.sample method=precedes,follows input=precip_abs0 samtype=stvds sample=pnts_abs0 -c
+t.sample input=precip_abs0 samtype=strds sample=precip_abs0 -cs
+
+
+# Test with temporal point data
+t.register type=rast input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.rast.list precip_abs0
+t.sample input=precip_abs0 samtype=stvds sample=pnts_abs0 -cs
+t.sample input=precip_abs0 samtype=stvds sample=pnts_abs1 -cs
+
+t.remove -rf type=strds input=precip_abs0
+t.remove -rf type=stvds input=pnts_abs0,pnts_abs1
Property changes on: grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: grass/branches/releasebranch_7_0/temporal/t.select/t.select.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/t.select.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.select/t.select.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -94,6 +94,21 @@
<br>
Topological relations must be specified in {} parentheses. <br>
+<h3>TEMPORAL OPERATORS</h3>
+
+The temporal algebra defines temporal operators that can be combined with other
+operators to perform spatio-temporal operations.
+The temporal operators process the time instances and intervals of two temporal
+related maps and calculate the result temporal extent by five differnt possibilities.
+<div class="code"><pre>
+LEFT REFERENCE l Use the time stamp of the left space time dataset
+INTERSECTION i Intersection
+DISJOINT UNION d Disjoint union
+UNION u Union
+RIGHT REFERENCE r Use the time stamp of the right space time dataset
+</pre></div>
+
+
<h3>TEMPORAL SELECTION</h3>
The temporal selection simply selects parts of a space time dataset without
@@ -118,36 +133,48 @@
<br>
To select parts of a STDS by different topological relations to other STDS,
the temporal topology selection operator can be used. The operator consists of
-topological relations, that must be separated by the logical OR operator
-<b>||</b> and the temporal selection operator. Both parts are separated by
-comma and surrounded by curly braces:
-{"topological relations", "temporal selection operator"} <br>
+the temporal selection operator, the topological relations, that must be separated
+by the logical OR operator <b>|</b> and the temporal extent operator.
+All three parts are separated by comma and surrounded by curly braces:
+{"temporal selection operator", "topological relations", "temporal operator"} <br>
<br>
+
Examples:
<div class="code"><pre>
-C = A {equals,:} B
-C = A {equals,!:} B
+C = A {:, equals} B
+C = A {!:, equals} B
</pre></div>
We can now define arbitrary topological relations using the OR operator "|"
to connect them:
<div class="code"><pre>
-C = A {equals|during|overlaps,:} B
+C = A {:,equals|during|overlaps} B
</pre></div>
Select all parts of A that are equal to B, during B or overlaps B. <br>
+
+In addition we can define the temporal extent of the result STDS by adding the
+temporal operator.
+<div class="code"><pre>
+C = A {:, during,r} B
+</pre></div>
+Select all parts of A that are during B and use the temporal extents from B for
+C. <br>
+
<br>
The selection operator is implicitly contained in the temporal topology
selection operator, so that the following statements are exactly the same:
<div class="code"><pre>
C = A : B
C = A {:} B
-C = A {equal,:} B
+C = A {:,equal} B
+C = A {:,equal,l} B
</pre></div>
Same for the complementary selection:
<div class="code"><pre>
C = A !: B
C = A {!:} B
-C = A {equal,!:} B
+C = A {!:,equal} B
+C = A {!:,equal,l} B
</pre></div>
<h3>CONDITIONAL STATEMENTS</h3>
@@ -155,7 +182,10 @@
Selection operations can be evaluated within conditional statements.
<br>
<div class="code"><pre>
-Note A and B can either be space time datasets or expressions.
+Note A and B can either be space time datasets or expressions. The temporal
+relationship between the conditions and the conclusions can be defined at the
+beginning of the if statement. The relationship between then and else conclusion
+must be always equal.
if statement decision option temporal relations
if(if, then, else)
@@ -166,10 +196,10 @@
</pre></div>
The conditions are comparison expressions that are used to evaluate
space time datasets. Specific values of temporal variables are
-compared by logical operators and evaluated for each map of the STDS.
-<br>
-<br>
-The supported logical operators:
+compared by logical operators and evaluated for each map of the STDS.<br>
+<b>Important:</b> The conditions are evaluated from left to right.
+
+<h4>Logical operators</h4>
<div class="code"><pre>
Symbol description
@@ -183,52 +213,90 @@
|| or
</pre></div>
-Temporal functions: <br>
+<h4>Temporal functions</h4>
+The following temporal function are evaluated only for the STDS that must be given in parenthesis.
<div class="code"><pre>
-td(A) Returns a list of time intervals of STDS A
+td(A) Returns a list of time intervals of STDS A
-start_time() Start time as HH::MM:SS
-start_date() Start date as yyyy-mm-DD
-start_datetime() Start datetime as yyyy-mm-DD HH:MM:SS
-end_time() End time as HH:MM:SS
-end_date() End date as yyyy-mm-DD
-end_datetime() End datetime as yyyy-mm-DD HH:MM
+start_time(A) Start time as HH::MM:SS
+start_date(A) Start date as yyyy-mm-DD
+start_datetime(A) Start datetime as yyyy-mm-DD HH:MM:SS
+end_time(A) End time as HH:MM:SS
+end_date(A) End date as yyyy-mm-DD
+end_datetime(A) End datetime as yyyy-mm-DD HH:MM
-start_doy() Day of year (doy) from the start time [1 - 366]
-start_dow() Day of week (dow) from the start time [1 - 7], the start of the week is Monday == 1
-start_year() The year of the start time [0 - 9999]
-start_month() The month of the start time [1 - 12]
-start_week() Week of year of the start time [1 - 54]
-start_day() Day of month from the start time [1 - 31]
-start_hour() The hour of the start time [0 - 23]
-start_minute() The minute of the start time [0 - 59]
-start_second() The second of the start time [0 - 59]
-end_doy() Day of year (doy) from the end time [1 - 366]
-end_dow() Day of week (dow) from the end time [1 - 7], the start of the week is Monday == 1
-end_year() The year of the end time [0 - 9999]
-end_month() The month of the end time [1 - 12]
-end_week() Week of year of the end time [1 - 54]
-end_day() Day of month from the start time [1 - 31]
-end_hour() The hour of the end time [0 - 23]
-end_minute() The minute of the end time [0 - 59]
-end_second() The second of the end time [0 - 59]
+start_doy(A) Day of year (doy) from the start time [1 - 366]
+start_dow(A) Day of week (dow) from the start time [1 - 7], the start of the week is Monday == 1
+start_year(A) The year of the start time [0 - 9999]
+start_month(A) The month of the start time [1 - 12]
+start_week(A) Week of year of the start time [1 - 54]
+start_day(A) Day of month from the start time [1 - 31]
+start_hour(A) The hour of the start time [0 - 23]
+start_minute(A) The minute of the start time [0 - 59]
+start_second(A) The second of the start time [0 - 59]
+end_doy(A) Day of year (doy) from the end time [1 - 366]
+end_dow(A) Day of week (dow) from the end time [1 - 7], the start of the week is Monday == 1
+end_year(A) The year of the end time [0 - 9999]
+end_month(A) The month of the end time [1 - 12]
+end_week(A) Week of year of the end time [1 - 54]
+end_day(A) Day of month from the start time [1 - 31]
+end_hour(A) The hour of the end time [0 - 23]
+end_minute(A) The minute of the end time [0 - 59]
+end_second(A) The second of the end time [0 - 59]
</pre></div>
-Additionally the number of maps in intervals can be computed and
-used in conditional statements. <br>
-The operator to count the number of maps
-is the hash <b>#</b>.
+<h4>Comparison operator</h4>
+The conditions are comparison expressions that are used to evaluate
+space time datasets. Specific values of temporal variables are
+compared by logical operators and evaluated for each map of the STDS and
+the related maps.
+For complex relations the comparison operator can be used to combine conditions:
+<br>
+The structure is similar to the select operator with the extention of an aggregation operator:
+{"comparison operator", "topological relations", aggregation operator, "temporal operator"}
+<br>
+This aggregation operator (| or &) define the behaviour if a map is related the more
+than one map, e.g for the topological relations 'contains'.
+Should all (&) conditions for the related maps be true or is it sufficient to
+have any (|) condition that is true. The resulting boolean value is then compared
+to the first condition by the comparison operator (|| or &&).
+As default the aggregation operator is related to the comparison operator: <br>
+Comparison operator -> aggregation operator:
<div class="code"><pre>
-A{contains,#}B
+|| -> | and && -> &
</pre></div>
+Examples:
+<div class="code"><pre>
+Condition 1 {||, equal, r} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2
+Condition 1 {&&, equal|contains, |, l} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2 && Condition 3
+Condition 1 {&&, equal|during, l} Condition 2 {&&,contains, |, r} Condition 3
+</pre></div>
+
+<h4>Hash operator</h4>
+Additionally the number of maps in intervals can be computed and used in
+conditional statements with the hash (#) operator. <br>
+<div class="code"><pre>
+A{#, contains}B
+</pre></div>
This expression computes the number of maps from space
time dataset B which are during the time intervals of maps from
space time dataset A.<br>
A list of integers (scalars) corresponding to the maps of A
that contain maps from B will be returned. <br>
<br>
-
+<div class="code"><pre>
+C = if({equal}, A {#, contains} B > 2, A {:, contains} B)
+</pre></div>
+This expression selects all maps from A that temporally contains at least 2
+maps from B and stores them in space time dataset C. The leading equal statement
+in the if condition specifies the temporal relation between the if and then part
+of the if expression. This is very important, so we do not need to specify a
+global time reference (a space time dataset) for temporal processing.
+<br>
+<br>
Furthermore the temporal algebra allows temporal buffering, shifting
and snapping with the functions buff_t(), tshift() and tsnap()
respectively.
@@ -237,28 +305,40 @@
tshift(A, size) Shift STDS A with granule ("1 month" or 5)
tsnap(A) Snap time instances and intervals of STDS A
</pre></div>
+<br>
+<h4>Single map with temporal extent</h4>
+The temporal algebra can also handle single maps with time stamps in the tmap function.
+<div class="code"><pre>
+tmap()
+</pre></div>
+For example:
+<div class="code"><pre>
+ C = A {:,during} tmap(event)
+</pre></div>
+This statement select all maps from space time data set A that are during the temporal extent of single map 'event'
+<br>
<h3>Examples: </h3>
Select all maps from space time dataset A which have equal time stamps
with space time dataset B and C and are ealier that Jan. 1. 2005 and
store them in space time dataset D.
<div class="code"><pre>
-D = if(start_date() < "2005-01-01", A : B : C)
+D = if(start_date(A) < "2005-01-01", A : B : C)
</pre></div>
Select all maps from space time dataset A which contains more than three
maps of space time dataset B, else select maps from C with time
stamps that are not equal to A and store them in space time dataset D.
<div class="code"><pre>
-D = if(A {contain, #} B > 3, A {contain, :} B, C)
+D = if(A {#, contains} B > 3, A {:, contains} B, C)
</pre></div>
Select all maps from space time dataset B which are during the temporal
buffered space time dataset A with a map interval of three days, else
select maps from C and store them in space time dataset D.
<div class="code"><pre>
-D = if(contain, td(buff_t(A, "1 days")) == 3, B, C)
+D = if(contains, td(buff_t(A, "1 days")) == 3, B, C)
</pre></div>
<h2>REFERENCES</h2>
Modified: grass/branches/releasebranch_7_0/temporal/t.select/t.select.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/t.select.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.select/t.select.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -13,7 +13,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/branches/releasebranch_7_0/temporal/t.shift/t.shift.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -62,7 +62,7 @@
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- stds = tgis.open_old_space_time_dataset(name, type, dbif)
+ stds = tgis.open_old_stds(name, type, dbif)
check = stds.shift(gran=gran, dbif=dbif)
if check == False:
Modified: grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -52,7 +52,7 @@
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- stds = tgis.open_old_space_time_dataset(name, type, dbif)
+ stds = tgis.open_old_stds(name, type, dbif)
stds.snap(dbif=dbif)
stds.update_command_string(dbif=dbif)
Modified: grass/branches/releasebranch_7_0/temporal/t.support/t.support.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.support/t.support.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.support/t.support.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -87,7 +87,7 @@
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- stds = tgis.open_old_space_time_dataset(name, type, dbif)
+ stds = tgis.open_old_stds(name, type, dbif)
update = False
if title:
Modified: grass/branches/releasebranch_7_0/temporal/t.topology/t.topology.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.topology/t.topology.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.topology/t.topology.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -59,7 +59,7 @@
# Make sure the temporal database exists
tgis.init()
- sp = tgis.open_old_space_time_dataset(name, type)
+ sp = tgis.open_old_stds(name, type)
# Get ordered map list
maps = sp.get_registered_maps_as_objects(
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -70,4 +70,3 @@
Sören Gebbert
<p><i>Last changed: $Date$</i>
-
Modified: grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -72,7 +72,7 @@
# In case a space time dataset is specified
if input:
- sp = tgis.open_old_space_time_dataset(input, type, dbif)
+ sp = tgis.open_old_stds(input, type, dbif)
maplist = []
@@ -151,15 +151,19 @@
grass.percent(num_maps, num_maps, 1)
# Update space time datasets
- grass.message(_("Unregister maps from space time dataset(s)"))
if input:
+ grass.message(_("Unregister maps from space time dataset <%s>"%(input)))
+ else:
+ grass.message(_("Unregister maps from the temporal database"))
+
+ if input:
sp.update_from_registered_maps(dbif)
sp.update_command_string(dbif=dbif)
elif len(update_dict) > 0:
count = 0
for key in update_dict.keys():
id = update_dict[key]
- sp = tgis.open_old_space_time_dataset(id, type, dbif)
+ sp = tgis.open_old_stds(id, type, dbif)
sp.update_from_registered_maps(dbif)
grass.percent(count, len(update_dict), 1)
count += 1
Deleted: grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py
===================================================================
--- grass/trunk/temporal/t.unregister/testsuite/test_unregister.py 2014-11-05 13:32:06 UTC (rev 62613)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,139 +0,0 @@
-"""Test t.unregister
-
-(C) 2014 by the GRASS Development Team
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
-
-:authors: Soeren Gebbert
-"""
-import os
-import grass.pygrass.modules as pymod
-import grass.temporal as tgis
-from grass.gunittest.case import TestCase
-from grass.gunittest.gmodules import SimpleModule
-
-class TestUnregister(TestCase):
-
- @classmethod
- def setUpClass(cls):
- """!Initiate the temporal GIS and set the region
- """
- tgis.init()
- cls.use_temp_region()
- cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
- cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0,
- t=50, res=10, res3=10)
-
- @classmethod
- def tearDownClass(cls):
- """!Remove the temporary region
- """
- cls.del_temp_region()
-
- def setUp(self):
- """Create input data for transient groundwater flow computation
- """
- self.runModule("r.mapcalc", expression="a1 = 100", overwrite=True)
- self.runModule("r.mapcalc", expression="a2 = 200", overwrite=True)
- self.runModule("r.mapcalc", expression="a3 = 300", overwrite=True)
- self.runModule("r.mapcalc", expression="a4 = 400", overwrite=True)
- self.runModule("r.mapcalc", expression="a5 = 500", overwrite=True)
- self.runModule("r.mapcalc", expression="a6 = 600", overwrite=True)
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="A", title="A test",
- description="A test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast", input="A",
- maps="a1,a2,a3,a4,a5,a6",
- start="2001-01-01", increment="3 months",
- overwrite=True)
-
- self.runModule("t.create", type="strds", temporaltype="absolute",
- output="B", title="B test",
- description="B test", overwrite=True)
- self.runModule("t.register", flags="i", type="rast", input="B",
- maps="a1,a2,a3,a4,a5,a6",
- start="2001-01-01", increment="3 months",
- overwrite=True)
-
- def tearDown(self):
- """Remove generated data"""
- self.runModule("g.remove", type="rast",
- name="a1,a2,a3,a4,a5,a6")
-
- def test_selection(self):
- """Perform a simple selection by datetime"""
-
- # Prepare some strings for the tests
- new_line = os.linesep
- a = ["a1","a2","a3","a4","a5","a6"]
- al = new_line.join(a)
- al += new_line
-
- a123 = new_line.join(a[:3])
- a123 += new_line
-
- a456 = new_line.join(a[3:])
- a456 += new_line
-
-
- # Unregister maps a1, a2 and a3 from STRDS A
- self.assertModule("t.unregister", input="A", maps="a1,a2,a3")
-
- lister = SimpleModule("t.rast.list", input="A", columns="name",
- flags="s")
- self.runModule(lister)
- self.assertEqual(a456, lister.outputs.stdout)
-
-
- # Check if all maps are present in STRDS B
- lister = SimpleModule("t.rast.list", input="B", columns="name",
- flags="s")
- self.runModule(lister)
- self.assertEqual(al, lister.outputs.stdout)
-
-
- # Check if maps a1, a2 and a3 are still present in the temporal database
- lister = SimpleModule("t.list", type="rast", columns="name",
- where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
- self.runModule(lister)
- self.assertEqual(a123, lister.outputs.stdout)
-
-
- # Unregister maps a1, a2 and a3 from the temporal database
- self.assertModule("t.unregister", maps="a1,a2,a3")
-
- lister = SimpleModule("t.list", type="rast", columns="name",
- where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
- self.runModule(lister)
- self.assertEqual("", lister.outputs.stdout)
-
-
- # Check that masp a1, a2 and a3 are not present in STRDS B
- lister = SimpleModule("t.rast.list", input="B", columns="name",
- flags="s")
- self.runModule(lister)
- self.assertEqual(a456, lister.outputs.stdout)
-
-
- # Remove STRDS A and B and chceck if maps a4, a5 and a6 are still in the temporal database
- self.assertModule("t.remove", type="strds", inputs="A,B")
-
- lister = SimpleModule("t.list", type="rast", columns="name",
- where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
- self.runModule(lister)
- self.assertEqual(a456, lister.outputs.stdout)
-
-
- # Unregister maps a4, a5 and a6 from the temporal database
- self.assertModule("t.unregister", maps="a4,a5,a6")
-
- lister = SimpleModule("t.list", type="rast", columns="name",
- where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
- self.runModule(lister)
- self.assertEqual("", lister.outputs.stdout)
-
-if __name__ == '__main__':
- from grass.gunittest.main import test
- test()
Copied: grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py (from rev 62613, grass/trunk/temporal/t.unregister/testsuite/test_unregister.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/testsuite/test_unregister.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,139 @@
+"""Test t.unregister
+
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert
+"""
+import os
+import grass.pygrass.modules as pymod
+import grass.temporal as tgis
+from grass.gunittest.case import TestCase
+from grass.gunittest.gmodules import SimpleModule
+
+class TestUnregister(TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ tgis.init()
+ cls.use_temp_region()
+ cls.runModule("g.gisenv", set="TGIS_USE_CURRENT_MAPSET=1")
+ cls.runModule("g.region", s=0, n=80, w=0, e=120, b=0,
+ t=50, res=10, res3=10)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.del_temp_region()
+
+ def setUp(self):
+ """Create input data
+ """
+ self.runModule("r.mapcalc", expression="a1 = 100", overwrite=True)
+ self.runModule("r.mapcalc", expression="a2 = 200", overwrite=True)
+ self.runModule("r.mapcalc", expression="a3 = 300", overwrite=True)
+ self.runModule("r.mapcalc", expression="a4 = 400", overwrite=True)
+ self.runModule("r.mapcalc", expression="a5 = 500", overwrite=True)
+ self.runModule("r.mapcalc", expression="a6 = 600", overwrite=True)
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="A", title="A test",
+ description="A test", overwrite=True)
+ self.runModule("t.register", flags="i", type="rast", input="A",
+ maps="a1,a2,a3,a4,a5,a6",
+ start="2001-01-01", increment="3 months",
+ overwrite=True)
+
+ self.runModule("t.create", type="strds", temporaltype="absolute",
+ output="B", title="B test",
+ description="B test", overwrite=True)
+ self.runModule("t.register", flags="i", type="rast", input="B",
+ maps="a1,a2,a3,a4,a5,a6",
+ start="2001-01-01", increment="3 months",
+ overwrite=True)
+
+ def tearDown(self):
+ """Remove generated data"""
+ self.runModule("g.remove", type="rast",
+ name="a1,a2,a3,a4,a5,a6")
+
+ def test_1(self):
+ """Perform several unregistration operations"""
+
+ # Prepare some strings for the tests
+ new_line = os.linesep
+ a = ["a1","a2","a3","a4","a5","a6"]
+ al = new_line.join(a)
+ al += new_line
+
+ a123 = new_line.join(a[:3])
+ a123 += new_line
+
+ a456 = new_line.join(a[3:])
+ a456 += new_line
+
+
+ # Unregister maps a1, a2 and a3 from STRDS A
+ self.assertModule("t.unregister", input="A", maps="a1,a2,a3")
+
+ lister = SimpleModule("t.rast.list", input="A", columns="name",
+ flags="s")
+ self.runModule(lister)
+ self.assertEqual(a456, lister.outputs.stdout)
+
+
+ # Check if all maps are present in STRDS B
+ lister = SimpleModule("t.rast.list", input="B", columns="name",
+ flags="s")
+ self.runModule(lister)
+ self.assertEqual(al, lister.outputs.stdout)
+
+
+ # Check if maps a1, a2 and a3 are still present in the temporal database
+ lister = SimpleModule("t.list", type="rast", columns="name",
+ where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
+ self.runModule(lister)
+ self.assertEqual(a123, lister.outputs.stdout)
+
+
+ # Unregister maps a1, a2 and a3 from the temporal database
+ self.assertModule("t.unregister", maps="a1,a2,a3")
+
+ lister = SimpleModule("t.list", type="rast", columns="name",
+ where='mapset = "%s" AND (name = "a1" OR name = "a2" OR name = "a3")'%(tgis.get_current_mapset()))
+ self.runModule(lister)
+ self.assertEqual("", lister.outputs.stdout)
+
+
+ # Check that masp a1, a2 and a3 are not present in STRDS B
+ lister = SimpleModule("t.rast.list", input="B", columns="name",
+ flags="s")
+ self.runModule(lister)
+ self.assertEqual(a456, lister.outputs.stdout)
+
+
+ # Remove STRDS A and B and chceck if maps a4, a5 and a6 are still in the temporal database
+ self.assertModule("t.remove", type="strds", inputs="A,B")
+
+ lister = SimpleModule("t.list", type="rast", columns="name",
+ where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
+ self.runModule(lister)
+ self.assertEqual(a456, lister.outputs.stdout)
+
+
+ # Unregister maps a4, a5 and a6 from the temporal database
+ self.assertModule("t.unregister", maps="a4,a5,a6")
+
+ lister = SimpleModule("t.list", type="rast", columns="name",
+ where='mapset = "%s" AND (name = "a4" OR name = "a5" OR name = "a6")'%(tgis.get_current_mapset()))
+ self.runModule(lister)
+ self.assertEqual("", lister.outputs.stdout)
+
+if __name__ == '__main__':
+ from grass.gunittest.main import test
+ test()
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile
===================================================================
--- grass/trunk/temporal/t.vect.algebra/Makefile 2014-11-06 14:05:21 UTC (rev 62636)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,7 +0,0 @@
-MODULE_TOPDIR = ../../
-
-PGM = t.vect.algebra
-
-include $(MODULE_TOPDIR)/include/Make/Script.make
-
-default: script
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile (from rev 62636, grass/trunk/temporal/t.vect.algebra/Makefile)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/Makefile 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ../../
+
+PGM = t.vect.algebra
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+
+default: script
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html
===================================================================
--- grass/trunk/temporal/t.vect.algebra/t.vect.algebra.html 2014-11-06 14:05:21 UTC (rev 62636)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,407 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-t.vect.mapcalc performs temporal and spatial overlay and buffer functions on space time vector datasets (STVDS)
-by using the temporal vector algebra. New STVDS can be created, which are expressions of existing STVDS.
-
-<h3>PROGRAM USE</h3>
-The module expects an <b>expression</b> as input parameter in the following form: <br>
-<br>
-<b> "result = expression" </b>
-<br>
-<br>
-
-The statement structure is similar to r.mapcalc, see <a href="r.mapcalc.html">r.mapcalc</a>.
-Where <b>result</b> represents the name of a space time dataset (STVDS) that will
-contain the result of the calculation that is given as <b>expression</b>
-on the right side of the equality sign.
-These expression can be any valid or nested combination of temporal
-operations and functions that are provided by the temporal vector algebra. <br>
-The algebra provides methods for map selection from STDS based on their temporal relations.
-It is also possible to temporally shift maps, to create temporal buffer and to snap time
-instances to create a valid temporal topology. Furthermore expressions can be nested and
-evaluated in conditional statements (if, else statements). Within if-statements the algebra
-provides temporal variables like start time, end time, day of year, time differences or
-number of maps per time interval to build up conditions. These operations can be assigned
-to space time datasets or to the results of operations between space time datasets.
-<br>
-<br>
-The type of the input space time datasets must be defined with the input
-parameter <b>type</b>. Possible options are STRDS, STVDS or STR3DS.
-The default is set to space time raster datasets (STRDS).
-<br>
-<br>
-As default, topological relationships between space time datasets will be
-evaluated only temporal. Use the <b>s</b> flag to activate the
-additionally spatial topology evaluation.
-<br>
-<br>
-The expression option must be passed as <b>quoted</b>
-expression, for example: <br>
-<div class="code"><pre>t.select expression="C = A : B"</pre></div>
-Where <b>C</b> is the new space time raster dataset that will contain maps
-from <b>A</b> that are selected by equal temporal relationships
-to the existing dataset <b>B</b> in this case. <br>
-<br>
-<h2>TEMPORAL VECTOR ALGEBRA</h2>
-
-The temporal algebra provides a wide range of temporal operators and
-functions that will be presented in the following section. <br>
-<br>
-
-<h3>TEMPORAL RELATIONS</h3>
-
-Several temporal topology relations between registered maps of space
-time datasets are supported: <br>
-<div class="code"><pre>
-equals A ------
- B ------
-
-during A ----
- B ------
-
-contains A ------
- B ----
-
-starts A ----
- B ------
-
-started A ------
- B ----
-
-finishs A ----
- B ------
-
-finished A ------
- B ----
-
-precedes A ----
- B ----
-
-follows A ----
- B ----
-
-overlapped A ------
- B ------
-
-overlaps A ------
- B ------
-
-over booth overlaps and overlapped
-
-</pre></div>
-The relations must be read as: A is related to B, like - A equals B - A is
-during B - A contains B <br>
-<br>
-Topological relations must be specified in {} parentheses. <br>
-
-<h3>TEMPORAL OPERATORS</h3>
-
-The temporal algebra defines temporal operators that can be combined with other
-operators to perform spatio-temporal operations.
-The temporal operators process the time instances and intervals of two temporal
-related maps and calculate the result temporal extent by five differnt possibilities.
-<div class="code"><pre>
-LEFT REFERENCE l Use the time stamp of the left space time dataset
-INTERSECTION i Intersection
-DISJOINT UNION d Disjoint union
-UNION u Union
-RIGHT REFERENCE r Use the time stamp of the right space time dataset
-</pre></div>
-
-
-<h3>TEMPORAL SELECTION</h3>
-
-The temporal selection simply selects parts of a space time dataset without
-processing raster or vector data.
-
-The algebra provides a selection operator <b>:</b> that selects parts
-of a space time dataset that are temporally equal to parts of a second one
-by default. The following expression
-<div class="code"><pre>
-C = A : B
-</pre></div>
-means: Select all parts of space time dataset A that are equal to B and store
-it in space time dataset C. The parts are time stamped maps. <br>
-<br>
-In addition the inverse selection operator <b>!:</b> is defined as the complement of
-the selection operator, hence the following expression
-<div class="code"><pre>
-C = A !: B
-</pre></div>
-means: select all parts of space time time dataset A that are not equal to B
-and store it in space time dataset (STDS) C. <br>
-<br>
-To select parts of a STDS by different topological relations to other STDS,
-the temporal topology selection operator can be used. The operator consists of
-the temporal selection operator, the topological relations, that must be separated
-by the logical OR operator <b>|</b> and the temporal extent operator.
-All three parts are separated by comma and surrounded by curly braces:
-{"temporal selection operator", "topological relations", "temporal operator"} <br>
-<br>
-
-Examples:
-<div class="code"><pre>
-C = A {:, equals} B
-C = A {!:, equals} B
-</pre></div>
-We can now define arbitrary topological relations using the OR operator "|"
-to connect them:
-<div class="code"><pre>
-C = A {:,equals|during|overlaps} B
-</pre></div>
-Select all parts of A that are equal to B, during B or overlaps B. <br>
-
-In addition we can define the temporal extent of the result STDS by adding the
-temporal operator.
-<div class="code"><pre>
-C = A {:, during,r} B
-</pre></div>
-Select all parts of A that are during B and use the temporal extents from B for
-C. <br>
-
-<br>
-The selection operator is implicitly contained in the temporal topology
-selection operator, so that the following statements are exactly the same:
-<div class="code"><pre>
-C = A : B
-C = A {:} B
-C = A {:,equal} B
-C = A {:,equal,l} B
-</pre></div>
-
-Same for the complementary selection:
-<div class="code"><pre>
-C = A !: B
-C = A {!:} B
-C = A {!:,equal} B
-C = A {!:,equal,l} B
-</pre></div>
-
-<h3>CONDITIONAL STATEMENTS</h3>
-
-Selection operations can be evaluated within conditional statements.
-<br>
-<div class="code"><pre>
-Note A and B can either be space time datasets or expressions. The temporal
-relationship between the conditions and the conclusions can be defined at the
-beginning of the if statement. The relationship between then and else conclusion
-must be always equal.
-
-if statement decision option temporal relations
- if(if, then, else)
- if(conditions, A) A if conditions are True; temporal topological relation between if and then is equal.
- if(conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is equal.
- if(topologies, conditions, A) A if conditions are True; temporal topological relation between if and then is explicit specified by topologies.
- if(topologies, conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is explicit specified by topologies.
-</pre></div>
-
-<h4>Logical operators</h4>
-<div class="code"><pre>
-Symbol description
-
- == equal
- != not equal
- > greater than
- >= greater than or equal
- < less than
- <= less than or equal
- && and
- || or
-</pre></div>
-
-<h4>Temporal functions</h4>
-The following temporal function are evaluated only for the STDS that must be given in parenthesis.
-<div class="code"><pre>
-
-td(A) Returns a list of time intervals of STDS A
-
-start_time(A) Start time as HH::MM:SS
-start_date(A) Start date as yyyy-mm-DD
-start_datetime(A) Start datetime as yyyy-mm-DD HH:MM:SS
-end_time(A) End time as HH:MM:SS
-end_date(A) End date as yyyy-mm-DD
-end_datetime(A) End datetime as yyyy-mm-DD HH:MM
-
-start_doy(A) Day of year (doy) from the start time [1 - 366]
-start_dow(A) Day of week (dow) from the start time [1 - 7], the start of the week is Monday == 1
-start_year(A) The year of the start time [0 - 9999]
-start_month(A) The month of the start time [1 - 12]
-start_week(A) Week of year of the start time [1 - 54]
-start_day(A) Day of month from the start time [1 - 31]
-start_hour(A) The hour of the start time [0 - 23]
-start_minute(A) The minute of the start time [0 - 59]
-start_second(A) The second of the start time [0 - 59]
-end_doy(A) Day of year (doy) from the end time [1 - 366]
-end_dow(A) Day of week (dow) from the end time [1 - 7], the start of the week is Monday == 1
-end_year(A) The year of the end time [0 - 9999]
-end_month(A) The month of the end time [1 - 12]
-end_week(A) Week of year of the end time [1 - 54]
-end_day(A) Day of month from the start time [1 - 31]
-end_hour(A) The hour of the end time [0 - 23]
-end_minute(A) The minute of the end time [0 - 59]
-end_second(A) The second of the end time [0 - 59]
-</pre></div>
-
-<h4>Comparison operator</h4>
-The conditions are comparison expressions that are used to evaluate
-space time datasets. Specific values of temporal variables are
-compared by logical operators and evaluated for each map of the STDS and
-the related maps.
-For complex relations the comparison operator can be used to combine conditions:
-<br>
-The structure is similar to the select operator with the extention of an aggregation operator:
-{"comparison operator", "topological relations", aggregation operator, "temporal operator"}
-<br>
-This aggregation operator (| or &) define the behaviour if a map is related the more
-than one map, e.g for the topological relations 'contains'.
-Should all (&) conditions for the related maps be true or is it sufficient to
-have any (|) condition that is true. The resulting boolean value is then compared
-to the first condition by the comparison operator (|| or &&).
-As default the aggregation operator is related to the comparison operator: <br>
-Comparison operator -> aggregation operator:
-<div class="code"><pre>
-|| -> | and && -> &
-</pre></div>
-Examples:
-<div class="code"><pre>
-Condition 1 {||, equal, r} Condition 2
-Condition 1 {&&, equal|during, l} Condition 2
-Condition 1 {&&, equal|contains, |, l} Condition 2
-Condition 1 {&&, equal|during, l} Condition 2 && Condition 3
-Condition 1 {&&, equal|during, l} Condition 2 {&&,contains, |, r} Condition 3
-</pre></div>
-
-<h4>Hash operator</h4>
-Additionally the number of maps in intervals can be computed and used in
-conditional statements with the hash (#) operator. <br>
-<div class="code"><pre>
-A{#, contains}B
-</pre></div>
-This expression computes the number of maps from space
-time dataset B which are during the time intervals of maps from
-space time dataset A.<br>
-A list of integers (scalars) corresponding to the maps of A
-that contain maps from B will be returned. <br>
-<br>
-<div class="code"><pre>
-C = if({equal}, A {#, contains} B > 2, A {:, contains} B)
-</pre></div>
-This expression selects all maps from A that temporally contains at least 2
-maps from B and stores them in space time dataset C. The leading equal statement
-in the if condition specifies the temporal relation between the if and then part
-of the if expression. This is very important, so we do not need to specify a
-global time reference (a space time dataset) for temporal processing.
-<br>
-<br>
-Furthermore the temporal algebra allows temporal buffering, shifting
-and snapping with the functions buff_t(), tshift() and tsnap()
-respectively.
-<div class="code"><pre>
-buff_t(A, size) Buffer STDS A with granule ("1 month" or 5)
-tshift(A, size) Shift STDS A with granule ("1 month" or 5)
-tsnap(A) Snap time instances and intervals of STDS A
-</pre></div>
-<br>
-<h4>Single map with temporal extent</h4>
-The temporal algebra can also handle single maps with time stamps in the tmap function.
-<div class="code"><pre>
-tmap()
-</pre></div>
-For example:
-<div class="code"><pre>
- C = A {:,during} tmap(event)
-</pre></div>
-This statement select all maps from space time data set A that are during the temporal extent of single map 'event'
-
-<br>
-
-<h3>Spatial vector operators</h3>
-
-The module supports the following boolean vector operations: <br>
-<div class="code"><pre>
- Boolean Name Operator Meaning Precedence Correspondent function
-----------------------------------------------------------------------------------
- AND & Intersection 1 (v.overlay operator=and)
- OR | Union 1 (v.overlay operator=or)
- DISJOINT OR + Disjoint union 1 (v.patch)
- XOR ^ Symmetric difference 1 (v.overlay operator=xor)
- NOT ~ Complement 1 (v.overlay operator=not)
-
-</pre></div>
-
-And vector functions:
-<div class="code"><pre>
- buff_p(A, size) Buffer the points of vector map layer A with size
- buff_l(A, size) Buffer the lines of vector map layer A with size
- buff_a(A, size) Buffer the areas of vector map layer A with size
-</pre></div>
-<br>
-
-<p>
-<h3>Combinations of temporal, vector and select operators</h3>
-
-We combine the temporal topology relations, the temporal operators and the spatial/select operators to create spatio-temporal vector operators:
-
-<pre class="code">
-{"spatial or select operator" , "list of temporal relations", "temporal operator" }
-</pre><p>
-
-For multiple topological relations or several related maps the spatio-temporal
-operators feature implicit aggregation.
-
-The algebra evaluates the stated STDS by their temporal topologies and apply
-the given spatio temporal operators in a aggregated form.
-
-If we have two STDS A and B, B has three maps: b1, b2, b3 that are all during
-the temporal extent of the single map a1 of A, then the following overlay
-calculations would implicitly aggregate all maps of B into one result map for
-a1 of A:
-<pre class="code">
-C = A {&, contains} B --> c1 = a1 & b1 & b2 & b3
-</pre><p>
-Keep attention that the aggregation behaviour is not symmetric:
-<pre class="code">
-C = B {&, during} A --> c1 = b1 & a1
- c2 = b2 & a1
- c3 = b3 & a1
-</pre><p>
-<h3>Examples: </h3>
-
-Spatio-temporal intersect all maps from space time dataset A with all maps from space time dataset
-B which have equal time stamps and are temporary before Jan. 1. 2005 and
-store them in space time dataset D.
-<div class="code"><pre>
-D = if(start_date(A) < "2005-01-01", A & B)
-</pre></div>
-
-Buffer all vector points from space time vector dataset A and B with a distance of one and
-intersect the results with overlapping, containing, during and equal temporal relations
-to store the result in space time vector dataset D with intersected time stamps.
-<div class="code"><pre>
-D = buff_p(A, 1) {&,overlaps|overlapped|equal|during|contains,i} buff_p(B, 1)
-</pre></div>
-
-Select all maps from space time dataset B which are during the temporal
-buffered space time dataset A with a map interval of three days, else
-select maps from C and store them in space time dataset D.
-<div class="code"><pre>
-D = if(contains, td(buff_t(A, "1 days")) == 3, B, C)
-</pre></div>
-
-<h2>REFERENCES</h2>
-
-<tt><a href="http://www.dabeaz.com/ply/">PLY(Python-Lex-Yacc)</a></tt>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="t.select.html">t.select</a>
-</em>
-
-
-<h2>AUTHOR</h2>
-
-Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
-
-<p><i>Last changed: $Date$</i>
-
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html (from rev 62636, grass/trunk/temporal/t.vect.algebra/t.vect.algebra.html)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,407 @@
+<h2>DESCRIPTION</h2>
+
+t.vect.algebra performs temporal and spatial overlay and buffer functions on space time vector datasets (STVDS)
+by using the temporal vector algebra. New STVDS can be created, which are expressions of existing STVDS.
+
+<h3>PROGRAM USE</h3>
+The module expects an <b>expression</b> as input parameter in the following form: <br>
+<br>
+<b> "result = expression" </b>
+<br>
+<br>
+
+The statement structure is similar to r.mapcalc, see <a href="r.mapcalc.html">r.mapcalc</a>.
+Where <b>result</b> represents the name of a space time dataset (STVDS) that will
+contain the result of the calculation that is given as <b>expression</b>
+on the right side of the equality sign.
+These expression can be any valid or nested combination of temporal
+operations and functions that are provided by the temporal vector algebra. <br>
+The algebra provides methods for map selection from STDS based on their temporal relations.
+It is also possible to temporally shift maps, to create temporal buffer and to snap time
+instances to create a valid temporal topology. Furthermore expressions can be nested and
+evaluated in conditional statements (if, else statements). Within if-statements the algebra
+provides temporal variables like start time, end time, day of year, time differences or
+number of maps per time interval to build up conditions. These operations can be assigned
+to space time datasets or to the results of operations between space time datasets.
+<br>
+<br>
+The type of the input space time datasets must be defined with the input
+parameter <b>type</b>. Possible options are STRDS, STVDS or STR3DS.
+The default is set to space time raster datasets (STRDS).
+<br>
+<br>
+As default, topological relationships between space time datasets will be
+evaluated only temporal. Use the <b>s</b> flag to activate the
+additionally spatial topology evaluation.
+<br>
+<br>
+The expression option must be passed as <b>quoted</b>
+expression, for example: <br>
+<div class="code"><pre>t.select expression="C = A : B"</pre></div>
+Where <b>C</b> is the new space time raster dataset that will contain maps
+from <b>A</b> that are selected by equal temporal relationships
+to the existing dataset <b>B</b> in this case. <br>
+<br>
+<h2>TEMPORAL VECTOR ALGEBRA</h2>
+
+The temporal algebra provides a wide range of temporal operators and
+functions that will be presented in the following section. <br>
+<br>
+
+<h3>TEMPORAL RELATIONS</h3>
+
+Several temporal topology relations between registered maps of space
+time datasets are supported: <br>
+<div class="code"><pre>
+equals A ------
+ B ------
+
+during A ----
+ B ------
+
+contains A ------
+ B ----
+
+starts A ----
+ B ------
+
+started A ------
+ B ----
+
+finishs A ----
+ B ------
+
+finished A ------
+ B ----
+
+precedes A ----
+ B ----
+
+follows A ----
+ B ----
+
+overlapped A ------
+ B ------
+
+overlaps A ------
+ B ------
+
+over booth overlaps and overlapped
+
+</pre></div>
+The relations must be read as: A is related to B, like - A equals B - A is
+during B - A contains B <br>
+<br>
+Topological relations must be specified in {} parentheses. <br>
+
+<h3>TEMPORAL OPERATORS</h3>
+
+The temporal algebra defines temporal operators that can be combined with other
+operators to perform spatio-temporal operations.
+The temporal operators process the time instances and intervals of two temporal
+related maps and calculate the result temporal extent by five differnt possibilities.
+<div class="code"><pre>
+LEFT REFERENCE l Use the time stamp of the left space time dataset
+INTERSECTION i Intersection
+DISJOINT UNION d Disjoint union
+UNION u Union
+RIGHT REFERENCE r Use the time stamp of the right space time dataset
+</pre></div>
+
+
+<h3>TEMPORAL SELECTION</h3>
+
+The temporal selection simply selects parts of a space time dataset without
+processing raster or vector data.
+
+The algebra provides a selection operator <b>:</b> that selects parts
+of a space time dataset that are temporally equal to parts of a second one
+by default. The following expression
+<div class="code"><pre>
+C = A : B
+</pre></div>
+means: Select all parts of space time dataset A that are equal to B and store
+it in space time dataset C. The parts are time stamped maps. <br>
+<br>
+In addition the inverse selection operator <b>!:</b> is defined as the complement of
+the selection operator, hence the following expression
+<div class="code"><pre>
+C = A !: B
+</pre></div>
+means: select all parts of space time time dataset A that are not equal to B
+and store it in space time dataset (STDS) C. <br>
+<br>
+To select parts of a STDS by different topological relations to other STDS,
+the temporal topology selection operator can be used. The operator consists of
+the temporal selection operator, the topological relations, that must be separated
+by the logical OR operator <b>|</b> and the temporal extent operator.
+All three parts are separated by comma and surrounded by curly braces:
+{"temporal selection operator", "topological relations", "temporal operator"} <br>
+<br>
+
+Examples:
+<div class="code"><pre>
+C = A {:, equals} B
+C = A {!:, equals} B
+</pre></div>
+We can now define arbitrary topological relations using the OR operator "|"
+to connect them:
+<div class="code"><pre>
+C = A {:,equals|during|overlaps} B
+</pre></div>
+Select all parts of A that are equal to B, during B or overlaps B. <br>
+
+In addition we can define the temporal extent of the result STDS by adding the
+temporal operator.
+<div class="code"><pre>
+C = A {:, during,r} B
+</pre></div>
+Select all parts of A that are during B and use the temporal extents from B for
+C. <br>
+
+<br>
+The selection operator is implicitly contained in the temporal topology
+selection operator, so that the following statements are exactly the same:
+<div class="code"><pre>
+C = A : B
+C = A {:} B
+C = A {:,equal} B
+C = A {:,equal,l} B
+</pre></div>
+
+Same for the complementary selection:
+<div class="code"><pre>
+C = A !: B
+C = A {!:} B
+C = A {!:,equal} B
+C = A {!:,equal,l} B
+</pre></div>
+
+<h3>CONDITIONAL STATEMENTS</h3>
+
+Selection operations can be evaluated within conditional statements.
+<br>
+<div class="code"><pre>
+Note A and B can either be space time datasets or expressions. The temporal
+relationship between the conditions and the conclusions can be defined at the
+beginning of the if statement. The relationship between then and else conclusion
+must be always equal.
+
+if statement decision option temporal relations
+ if(if, then, else)
+ if(conditions, A) A if conditions are True; temporal topological relation between if and then is equal.
+ if(conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is equal.
+ if(topologies, conditions, A) A if conditions are True; temporal topological relation between if and then is explicit specified by topologies.
+ if(topologies, conditions, A, B) A if conditions are True, B otherwise; temporal topological relation between if, then and else is explicit specified by topologies.
+</pre></div>
+
+<h4>Logical operators</h4>
+<div class="code"><pre>
+Symbol description
+
+ == equal
+ != not equal
+ > greater than
+ >= greater than or equal
+ < less than
+ <= less than or equal
+ && and
+ || or
+</pre></div>
+
+<h4>Temporal functions</h4>
+The following temporal function are evaluated only for the STDS that must be given in parenthesis.
+<div class="code"><pre>
+
+td(A) Returns a list of time intervals of STDS A
+
+start_time(A) Start time as HH::MM:SS
+start_date(A) Start date as yyyy-mm-DD
+start_datetime(A) Start datetime as yyyy-mm-DD HH:MM:SS
+end_time(A) End time as HH:MM:SS
+end_date(A) End date as yyyy-mm-DD
+end_datetime(A) End datetime as yyyy-mm-DD HH:MM
+
+start_doy(A) Day of year (doy) from the start time [1 - 366]
+start_dow(A) Day of week (dow) from the start time [1 - 7], the start of the week is Monday == 1
+start_year(A) The year of the start time [0 - 9999]
+start_month(A) The month of the start time [1 - 12]
+start_week(A) Week of year of the start time [1 - 54]
+start_day(A) Day of month from the start time [1 - 31]
+start_hour(A) The hour of the start time [0 - 23]
+start_minute(A) The minute of the start time [0 - 59]
+start_second(A) The second of the start time [0 - 59]
+end_doy(A) Day of year (doy) from the end time [1 - 366]
+end_dow(A) Day of week (dow) from the end time [1 - 7], the start of the week is Monday == 1
+end_year(A) The year of the end time [0 - 9999]
+end_month(A) The month of the end time [1 - 12]
+end_week(A) Week of year of the end time [1 - 54]
+end_day(A) Day of month from the start time [1 - 31]
+end_hour(A) The hour of the end time [0 - 23]
+end_minute(A) The minute of the end time [0 - 59]
+end_second(A) The second of the end time [0 - 59]
+</pre></div>
+
+<h4>Comparison operator</h4>
+The conditions are comparison expressions that are used to evaluate
+space time datasets. Specific values of temporal variables are
+compared by logical operators and evaluated for each map of the STDS and
+the related maps.
+For complex relations the comparison operator can be used to combine conditions:
+<br>
+The structure is similar to the select operator with the extention of an aggregation operator:
+{"comparison operator", "topological relations", aggregation operator, "temporal operator"}
+<br>
+This aggregation operator (| or &) define the behaviour if a map is related the more
+than one map, e.g for the topological relations 'contains'.
+Should all (&) conditions for the related maps be true or is it sufficient to
+have any (|) condition that is true. The resulting boolean value is then compared
+to the first condition by the comparison operator (|| or &&).
+As default the aggregation operator is related to the comparison operator: <br>
+Comparison operator -> aggregation operator:
+<div class="code"><pre>
+|| -> | and && -> &
+</pre></div>
+Examples:
+<div class="code"><pre>
+Condition 1 {||, equal, r} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2
+Condition 1 {&&, equal|contains, |, l} Condition 2
+Condition 1 {&&, equal|during, l} Condition 2 && Condition 3
+Condition 1 {&&, equal|during, l} Condition 2 {&&,contains, |, r} Condition 3
+</pre></div>
+
+<h4>Hash operator</h4>
+Additionally the number of maps in intervals can be computed and used in
+conditional statements with the hash (#) operator. <br>
+<div class="code"><pre>
+A{#, contains}B
+</pre></div>
+This expression computes the number of maps from space
+time dataset B which are during the time intervals of maps from
+space time dataset A.<br>
+A list of integers (scalars) corresponding to the maps of A
+that contain maps from B will be returned. <br>
+<br>
+<div class="code"><pre>
+C = if({equal}, A {#, contains} B > 2, A {:, contains} B)
+</pre></div>
+This expression selects all maps from A that temporally contains at least 2
+maps from B and stores them in space time dataset C. The leading equal statement
+in the if condition specifies the temporal relation between the if and then part
+of the if expression. This is very important, so we do not need to specify a
+global time reference (a space time dataset) for temporal processing.
+<br>
+<br>
+Furthermore the temporal algebra allows temporal buffering, shifting
+and snapping with the functions buff_t(), tshift() and tsnap()
+respectively.
+<div class="code"><pre>
+buff_t(A, size) Buffer STDS A with granule ("1 month" or 5)
+tshift(A, size) Shift STDS A with granule ("1 month" or 5)
+tsnap(A) Snap time instances and intervals of STDS A
+</pre></div>
+<br>
+<h4>Single map with temporal extent</h4>
+The temporal algebra can also handle single maps with time stamps in the tmap function.
+<div class="code"><pre>
+tmap()
+</pre></div>
+For example:
+<div class="code"><pre>
+ C = A {:,during} tmap(event)
+</pre></div>
+This statement select all maps from space time data set A that are during the temporal extent of single map 'event'
+
+<br>
+
+<h3>Spatial vector operators</h3>
+
+The module supports the following boolean vector operations: <br>
+<div class="code"><pre>
+ Boolean Name Operator Meaning Precedence Correspondent function
+----------------------------------------------------------------------------------
+ AND & Intersection 1 (v.overlay operator=and)
+ OR | Union 1 (v.overlay operator=or)
+ DISJOINT OR + Disjoint union 1 (v.patch)
+ XOR ^ Symmetric difference 1 (v.overlay operator=xor)
+ NOT ~ Complement 1 (v.overlay operator=not)
+
+</pre></div>
+
+And vector functions:
+<div class="code"><pre>
+ buff_p(A, size) Buffer the points of vector map layer A with size
+ buff_l(A, size) Buffer the lines of vector map layer A with size
+ buff_a(A, size) Buffer the areas of vector map layer A with size
+</pre></div>
+<br>
+
+<p>
+<h3>Combinations of temporal, vector and select operators</h3>
+
+We combine the temporal topology relations, the temporal operators and the spatial/select operators to create spatio-temporal vector operators:
+
+<pre class="code">
+{"spatial or select operator" , "list of temporal relations", "temporal operator" }
+</pre><p>
+
+For multiple topological relations or several related maps the spatio-temporal
+operators feature implicit aggregation.
+
+The algebra evaluates the stated STDS by their temporal topologies and apply
+the given spatio temporal operators in a aggregated form.
+
+If we have two STDS A and B, B has three maps: b1, b2, b3 that are all during
+the temporal extent of the single map a1 of A, then the following overlay
+calculations would implicitly aggregate all maps of B into one result map for
+a1 of A:
+<pre class="code">
+C = A {&, contains} B --> c1 = a1 & b1 & b2 & b3
+</pre><p>
+Keep attention that the aggregation behaviour is not symmetric:
+<pre class="code">
+C = B {&, during} A --> c1 = b1 & a1
+ c2 = b2 & a1
+ c3 = b3 & a1
+</pre><p>
+<h3>Examples: </h3>
+
+Spatio-temporal intersect all maps from space time dataset A with all maps from space time dataset
+B which have equal time stamps and are temporary before Jan. 1. 2005 and
+store them in space time dataset D.
+<div class="code"><pre>
+D = if(start_date(A) < "2005-01-01", A & B)
+</pre></div>
+
+Buffer all vector points from space time vector dataset A and B with a distance of one and
+intersect the results with overlapping, containing, during and equal temporal relations
+to store the result in space time vector dataset D with intersected time stamps.
+<div class="code"><pre>
+D = buff_p(A, 1) {&,overlaps|overlapped|equal|during|contains,i} buff_p(B, 1)
+</pre></div>
+
+Select all maps from space time dataset B which are during the temporal
+buffered space time dataset A with a map interval of three days, else
+select maps from C and store them in space time dataset D.
+<div class="code"><pre>
+D = if(contains, td(buff_t(A, "1 days")) == 3, B, C)
+</pre></div>
+
+<h2>REFERENCES</h2>
+
+<tt><a href="http://www.dabeaz.com/ply/">PLY(Python-Lex-Yacc)</a></tt>
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="t.select.html">t.select</a>
+</em>
+
+
+<h2>AUTHOR</h2>
+
+Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
+
+<p><i>Last changed: $Date$</i>
+
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py
===================================================================
--- grass/trunk/temporal/t.vect.algebra/t.vect.algebra.py 2014-11-06 14:05:21 UTC (rev 62636)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-############################################################################
-#
-# MODULE: t.vect.mapcalc
-# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
-#
-# PURPOSE: Provide temporal vector algebra to perform spatial an temporal operations
-# for space time datasets by topological relationships to other space time
-# datasets.
-# COPYRIGHT: (C) 2014 by the GRASS Development Team
-#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
-#
-#############################################################################
-
-#%module
-#% description: Apply temporal and spatial oeprations on space time vector datasets using temporal vector algebra.
-#% keywords: temporal
-#% keywords: algebra
-#%end
-
-#%option
-#% key: expression
-#% type: string
-#% description: Spatio-temporal mapcalc expression
-#% key_desc: expression
-#% required : yes
-#%end
-
-#%option
-#% key: basename
-#% type: string
-#% label: Basename of the new generated output maps
-#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
-#% key_desc: basename
-#% required : yes
-#%end
-
-#%flag
-#% key: s
-#% description: Activate spatial topology
-#%end
-
-import grass.script
-import grass.temporal as tgis
-import sys
-
-def main():
- expression = options['expression']
- basename = options['basename']
- spatial = flags["s"]
- stdstype = "stvds"
-
- # Check for PLY istallation
- try:
- import ply.lex as lex
- import ply.yacc as yacc
- except:
- grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules."))
-
- tgis.init(True)
- p = tgis.TemporalVectorAlgebraParser(run = True, debug=False, spatial = spatial)
- p.parse(expression, basename, grass.script.overwrite())
-
-if __name__ == "__main__":
- options, flags = grass.script.parser()
- sys.exit(main())
-
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py (from rev 62636, grass/trunk/temporal/t.vect.algebra/t.vect.algebra.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/t.vect.algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+############################################################################
+#
+# MODULE: t.vect.algebra
+# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
+#
+# PURPOSE: Provide temporal vector algebra to perform spatial an temporal operations
+# for space time datasets by topological relationships to other space time
+# datasets.
+# COPYRIGHT: (C) 2014 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
+#
+#############################################################################
+
+#%module
+#% description: Apply temporal and spatial oeprations on space time vector datasets using temporal vector algebra.
+#% keywords: temporal
+#% keywords: algebra
+#%end
+
+#%option
+#% key: expression
+#% type: string
+#% description: Spatio-temporal mapcalc expression
+#% key_desc: expression
+#% required : yes
+#%end
+
+#%option
+#% key: basename
+#% type: string
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% key_desc: basename
+#% required : yes
+#%end
+
+#%flag
+#% key: s
+#% description: Activate spatial topology
+#%end
+
+import grass.script
+import grass.temporal as tgis
+import sys
+
+def main():
+ expression = options['expression']
+ basename = options['basename']
+ spatial = flags["s"]
+ stdstype = "stvds"
+
+ # Check for PLY istallation
+ try:
+ import ply.lex as lex
+ import ply.yacc as yacc
+ except:
+ grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules."))
+
+ tgis.init(True)
+ p = tgis.TemporalVectorAlgebraParser(run = True, debug=False, spatial = spatial)
+ p.parse(expression, basename, grass.script.overwrite())
+
+if __name__ == "__main__":
+ options, flags = grass.script.parser()
+ sys.exit(main())
+
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py (from rev 62640, grass/trunk/temporal/t.vect.algebra/testsuite/test_vector_algebra.py)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test_vector_algebra.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,194 @@
+"""
+(C) 2014 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+:authors: Soeren Gebbert and Thomas Leppelt
+"""
+
+import datetime
+import os
+import grass.script
+import grass.temporal as tgis
+import grass.gunittest as gunittest
+
+class TestTemporalVectorAlgebra(gunittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ """Initiate the temporal GIS and set the region
+ """
+ os.putenv("GRASS_OVERWRITE", "1")
+ tgis.init(True) # Raise on error instead of exit(1)
+ cls.use_temp_region()
+ cls.runModule("g.region", n=80.0, s=0.0, e=120.0,
+ w=0.0, t=1.0, b=0.0, res=10.0)
+
+ cls.runModule("v.random", quiet=True, n=20, seed=1, output='a1')
+ cls.runModule("v.random", quiet=True, n=20, seed=1, output='a2')
+ cls.runModule("v.random", quiet=True, n=20, seed=1, output='a3')
+ cls.runModule("v.random", quiet=True, n=20, seed=1, output='a4')
+ cls.runModule("v.random", quiet=True, n=20, seed=2, output='b1')
+ cls.runModule("v.random", quiet=True, n=20, seed=2, output='b2')
+ cls.runModule("v.random", quiet=True, n=20, seed=3, output='c1')
+ cls.runModule("v.random", quiet=True, n=20, seed=4, output='d1')
+ cls.runModule("v.random", quiet=True, n=20, seed=4, output='d2')
+ cls.runModule("v.random", quiet=True, n=20, seed=4, output='d3')
+ cls.runModule("v.random", quiet=True, n=20, seed=5, output='singletmap')
+ cls.runModule("v.random", quiet=True, n=20, seed=6, output='singlemap')
+
+ tgis.open_new_stds(name="A", type="stvds", temporaltype="absolute",
+ title="A", descr="A", semantic="field")
+ tgis.open_new_stds(name="B", type="stvds", temporaltype="absolute",
+ title="B", descr="B", semantic="field")
+ tgis.open_new_stds(name="C", type="stvds", temporaltype="absolute",
+ title="B", descr="C", semantic="field")
+ tgis.open_new_stds(name="D", type="stvds", temporaltype="absolute",
+ title="D", descr="D", semantic="field")
+
+ tgis.register_maps_in_space_time_dataset(type="vect", name="A", maps="a1,a2,a3,a4",
+ start="2001-01-01", increment="1 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="vect", name="B", maps="b1,b2",
+ start="2001-01-01", increment="2 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="vect", name="C", maps="c1",
+ start="2001-01-02", increment="2 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="vect", name="D", maps="d1,d2,d3",
+ start="2001-01-03", increment="1 day", interval=True)
+ tgis.register_maps_in_space_time_dataset(type="vect", name=None, maps="singletmap",
+ start="2001-01-03", end="2001-01-04", interval=True)
+
+ def tearDown(self):
+ self.runModule("t.remove", type="stvds", inputs="R", quiet=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ """Remove the temporary region
+ """
+ cls.runModule("t.remove", flags="rf", inputs="A,B,C,D", type='stvds', quiet=True)
+ cls.del_temp_region()
+
+ def test_temporal_select(self):
+ """Testing the temporal select operator. """
+
+ self.assertModule("t.vect.algebra", expression="R = A : A", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_number_of_points(), 80)
+ self.assertEqual(D.metadata.get_number_of_areas(), 0)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 0)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_select_operators(self):
+ """Testing the temporal select operator. Including temporal relations. """
+
+ self.assertModule("t.vect.algebra", expression="R = A {:,during} C", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_number_of_points(), 40)
+ self.assertEqual(D.metadata.get_number_of_areas(), 0)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 0)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_buff_operators_1(self):
+ """Testing the bufferoperator."""
+
+ self.assertModule("t.vect.algebra", expression="R = buff_p(A,0.5)", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_number_of_points(), 0)
+ self.assertEqual(D.metadata.get_number_of_areas(), 80)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 80)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_buff_operators_2(self):
+ """Testing the bufferoperator."""
+
+ self.assertModule("t.vect.algebra", expression="R = buff_a(buff_p(A,1),10)", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_number_of_points(), 0)
+ self.assertEqual(D.metadata.get_number_of_areas(), 20)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 20)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_overlay_operators_1(self):
+ """Testing the spatial overlay operator."""
+
+ self.assertModule("t.vect.algebra", expression="R = buff_p(A,2) & buff_p(D,2)", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_number_of_points(), 0)
+ self.assertEqual(D.metadata.get_number_of_areas(), 6)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 6)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 3))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+ def test_temporal_overlay_operators_2(self):
+ """Testing the spatial overlay operator."""
+
+ self.assertModule("t.vect.algebra", expression="R = buff_p(A,1.5) {&,during,r} buff_p(B,1.5)", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 4)
+ self.assertEqual(D.metadata.get_number_of_points(), 0)
+ self.assertEqual(D.metadata.get_number_of_areas(), 8)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 8)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 1))
+ self.assertEqual(end, datetime.datetime(2001, 1, 5))
+ self.assertEqual( D.check_temporal_topology(), False)
+ self.assertEqual(D.get_granularity(), u'2 days')
+
+ def test_temporal_overlay_operators_3(self):
+ """Testing the spatial overlay operator."""
+
+ self.assertModule("t.vect.algebra", expression="R = buff_p(A,2.5) {&,during,l} buff_p(C,2.5)", basename="r")
+
+ D = tgis.open_old_stds("R", type="stvds")
+
+ self.assertEqual(D.metadata.get_number_of_maps(), 2)
+ self.assertEqual(D.metadata.get_number_of_points(), 0)
+ self.assertEqual(D.metadata.get_number_of_areas(), 8)
+ self.assertEqual(D.metadata.get_number_of_centroids(), 8)
+ start, end = D.get_absolute_time()
+ self.assertEqual(start, datetime.datetime(2001, 1, 2))
+ self.assertEqual(end, datetime.datetime(2001, 1, 4))
+ self.assertEqual( D.check_temporal_topology(), True)
+ self.assertEqual(D.get_granularity(), u'1 day')
+
+if __name__ == '__main__':
+ gunittest.test()
+
+
+
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.db.select/t.vect.db.select.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.db.select/t.vect.db.select.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.db.select/t.vect.db.select.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -68,7 +68,7 @@
# Make sure the temporal database exists
tgis.init()
- sp = tgis.open_old_space_time_dataset(input, "stvds")
+ sp = tgis.open_old_stds(input, "stvds")
rows = sp.get_registered_maps("name,layer,mapset,start_time,end_time",
tempwhere, "start_time", None)
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -42,6 +42,6 @@
t.remove type=stvds input=prec_observer,test_extract_1,test_extract_2,test_extract_3
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 -f type=vect name=prec_observer
-g.remove -f vect=test_*
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove vect=prec_observer
+g.mremove -f type=vect pattern=test_*
+g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.import/test.t.vect.import.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/test.t.vect.import.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/test.t.vect.import.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,71 +0,0 @@
-#!/bin/sh
-# Test the import 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
-
-mkdir test
-
-v.random --o -z output=soil_1 n=100 zmin=0 zmax=100 column=height seed=1
-v.random --o -z output=soil_2 n=100 zmin=0 zmax=100 column=height seed=2
-v.random --o -z output=soil_3 n=100 zmin=0 zmax=100 column=height seed=3
-
-n1=`g.tempfile pid=1 -d`
-
-cat > "${n1}" << EOF
-soil_1
-soil_2
-soil_3
-EOF
-
-t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register -i type=vect input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
-
-# The first @test
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
-
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
-
-# Checking different flags
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
- -oe title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
- -o title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
- title="A test" description="Description of a test"
-
-# Import using different compression and formats
-t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 extrdir=test\
- title="A test" description="Description of a test"
-v.info soil_1
-t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 extrdir=test\
- title="A test" description="Description of a test"
-v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 extrdir=test\
- title="A test" description="Description of a test"
-v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 extrdir=test\
- title="A test" description="Description of a test"
-v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 extrdir=test\
- title="A test" description="Description of a test"
-v.info soil_1
-
-# Cleaning up
-rm -rf test
-g.remove -f type=vect name=soil_1,soil_2,soil_3
-t.unregister type=vect file="${n1}"
-t.remove type=stvds input=soil_abs1,soil_abs2
-rm stvds_export_gml.tar.bz2
-rm stvds_export_gml.tar.gz
-rm stvds_export_gml.tar
-rm stvds_export_pack.tar.bz2
-rm stvds_export_pack.tar.gz
-rm stvds_export_pack.tar
-
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh (from rev 62857, grass/branches/releasebranch_7_0/temporal/t.vect.import/test.t.vect.import.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,71 @@
+#!/bin/sh
+# Test the import 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
+
+mkdir test
+
+v.random --o -z output=soil_1 n=100 zmin=0 zmax=100 column=height seed=1
+v.random --o -z output=soil_2 n=100 zmin=0 zmax=100 column=height seed=2
+v.random --o -z output=soil_3 n=100 zmin=0 zmax=100 column=height seed=3
+
+n1=`g.tempfile pid=1 -d`
+
+cat > "${n1}" << EOF
+soil_1
+soil_2
+soil_3
+EOF
+
+t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
+t.register -i type=vect input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
+
+# The first @test
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
+
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
+
+# Checking different flags
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+ -oe title="A test" description="Description of a test"
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+ -o title="A test" description="Description of a test"
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+ title="A test" description="Description of a test"
+
+# Import using different compression and formats
+t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 extrdir=test\
+ title="A test" description="Description of a test"
+v.info soil_1
+t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 extrdir=test\
+ title="A test" description="Description of a test"
+v.info soil_1
+t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 extrdir=test\
+ title="A test" description="Description of a test"
+v.info soil_1
+t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 extrdir=test\
+ title="A test" description="Description of a test"
+v.info soil_1
+t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 extrdir=test\
+ title="A test" description="Description of a test"
+v.info soil_1
+
+# Cleaning up
+rm -rf test
+g.remove -f type=vect name=soil_1,soil_2,soil_3
+t.unregister type=vect file="${n1}"
+t.remove type=stvds input=soil_abs1,soil_abs2
+rm stvds_export_gml.tar.bz2
+rm stvds_export_gml.tar.gz
+rm stvds_export_gml.tar
+rm stvds_export_pack.tar.bz2
+rm stvds_export_pack.tar.gz
+rm stvds_export_pack.tar
+
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.html 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.html 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,22 +1,13 @@
<h2>DESCRIPTION</h2>
-This module provides the same functionality as
-<a href="t.rast.list.html">t.rast.list</a>, the only difference is the
-vector map layer metadata. Please refer to the manual page of
-<a href="t.rast.list.html">t.rast.list</a>.
+This module provides the same functionality as <a href="t.rast.list.html">t.rast.list</a>,
+the only difference is the vector map layer metadata. Please refer to the manpage of <a href="t.rast.list.html">t.rast.list</a>.
-<h2>EXAMPLE</h2>
-
-The example is based on the XXX sample dataset:
-
-<div class="code"><pre>
-TBD
-</pre></div>
-
<h2>SEE ALSO</h2>
<em>
<a href="g.list.html">g.list</a>,
+<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/t.vect.list.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -44,7 +44,7 @@
#% required: no
#% multiple: yes
#% options: id,name,layer,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,points,lines,boundaries,centroids,faces,kernels,primitives,nodes,areas,islands,holes,volumes
-#% answer: id,name,layer,mapset,start_time,end_time
+#% answer: name,layer,mapset,start_time,end_time
#%end
#%option G_OPT_T_WHERE
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.layer.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.layer.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,124 +0,0 @@
-#!/bin/sh
-# This is a test to list vecter maps of a space time vecter 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
-
-v.random -z seed=1 output=soil_orig n=20 zmin=0 zmax=100 column=sand
-# Adding new layer with categories
-v.category input=soil_orig out=soils option=transfer layer=1,1
-v.category input=soils out=soil_orig option=transfer layer=1,2
-v.category input=soil_orig out=soils option=transfer layer=1,3
-v.category input=soils out=soil_orig option=transfer layer=1,4
-v.category input=soil_orig out=soils option=transfer layer=1,5
-v.category input=soils out=soil_orig option=transfer layer=1,6
-g.copy vect=soil_orig,soils
-# Creating new tables for each layer
-db.copy from_table=soil_orig to_table=soils_2
-db.copy from_table=soil_orig to_table=soils_3
-db.copy from_table=soil_orig to_table=soils_4
-db.copy from_table=soil_orig to_table=soils_5
-db.copy from_table=soil_orig to_table=soils_6
-v.db.addtable map=soils table=soils_2 layer=2
-v.db.addtable map=soils table=soils_3 layer=3
-v.db.addtable map=soils table=soils_4 layer=4
-v.db.addtable map=soils table=soils_5 layer=5
-v.db.addtable map=soils table=soils_6 layer=6
-
-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
-soils:1
-soils:2
-soils:3
-soils:4
-soils:5
-soils:6
-EOF
-
-cat > "${n2}" << EOF
-soils:1|2001-01-01
-soils:2|2001-02-01
-soils:3|2001-03-01
-soils:4|2001-04-01
-soils:5|2001-05-01
-soils:6|2001-06-01
-EOF
-
-cat > "${n3}" << EOF
-soils:1|2001-01-01|2001-04-01
-soils:2|2001-05-01|2001-07-01
-soils:3|2001-08-01|2001-10-01
-soils:4|2001-11-01|2002-01-01
-soils:5|2002-02-01|2002-04-01
-soils:6|2002-05-01|2002-07-01
-EOF
-
-cat > "${n4}" << EOF
-soils:1|2001-01-01|2001-07-01
-soils:2|2001-02-01|2001-04-01
-soils:3|2001-03-01|2001-04-01
-soils:4|2001-04-01|2001-06-01
-soils:5|2001-05-01|2001-06-01
-soils:6|2001-06-01|2001-07-01
-EOF
-
-cat > "${n5}" << EOF
-soils:1|2001-01-01|2001-03-11
-soils:2|2001-02-01|2001-04-01
-soils:3|2001-03-01|2001-06-02
-soils:4|2001-04-01|2001-04-01
-soils:5|2001-05-01|2001-05-01
-soils:6|2001-06-01|2001-07-01
-EOF
-
-t.create type=stvds temporaltype=absolute output=soils_abs1 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=soils_abs2 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=soils_abs3 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=soils_abs4 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=soils_abs5 title="A test with input files" descr="A test with input files"
-
-# The first @test
-t.register type=vect input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.vect.list separator=" | " method=comma input=soils_abs1
-t.vect.list input=soils_abs1
-t.vect.list separator=" | " method=cols input=soils_abs1
-t.vect.list separator=" | " method=delta input=soils_abs1
-t.vect.list separator=" | " method=deltagaps input=soils_abs1
-
-t.register type=vect -i input=soils_abs2 file="${n2}"
-t.vect.list separator=" | " method=comma input=soils_abs2
-t.vect.list input=soils_abs2
-t.vect.list separator=" | " method=cols input=soils_abs2
-t.vect.list separator=" | " method=delta input=soils_abs2
-t.vect.list separator=" | " method=deltagaps input=soils_abs2
-
-t.register type=vect -i input=soils_abs3 file="${n3}"
-t.vect.list separator=" | " method=comma input=soils_abs3
-t.vect.list separator=" | " method=delta input=soils_abs3
-t.vect.list separator=" | " method=deltagaps input=soils_abs3
-
-t.register type=vect -i input=soils_abs4 file="${n4}"
-t.vect.list separator=" | " method=comma input=soils_abs4
-t.vect.list separator=" | " method=delta input=soils_abs4
-t.vect.list separator=" | " method=deltagaps input=soils_abs4
-
-t.register type=vect -i input=soils_abs5 file="${n5}"
-t.vect.list separator=" | " method=comma input=soils_abs5
-t.vect.list input=soils_abs5
-t.vect.list separator=" | " method=cols input=soils_abs5
-t.vect.list separator=" | " method=delta input=soils_abs5
-t.vect.list separator=" | " method=deltagaps input=soils_abs5
-
-t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
-t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
-
-g.remove -f type=vect name=soil_orig,soils
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -1,109 +0,0 @@
-#!/bin/sh
-# This is a test to list vecter maps of a space time vecter 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
-
-v.random -z output=lidar_1 n=20 zmin=0 zmax=100 column=height
-v.random -z output=lidar_2 n=20 zmin=0 zmax=100 column=height
-v.random -z output=lidar_3 n=20 zmin=0 zmax=100 column=height
-v.random -z output=lidar_4 n=20 zmin=0 zmax=100 column=height
-v.random -z output=lidar_5 n=20 zmin=0 zmax=100 column=height
-v.random -z output=lidar_6 n=20 zmin=0 zmax=100 column=height
-
-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
-lidar_1
-lidar_2
-lidar_3
-lidar_4
-lidar_5
-lidar_6
-EOF
-
-cat > "${n2}" << EOF
-lidar_1|2001-01-01
-lidar_2|2001-02-01
-lidar_3|2001-03-01
-lidar_4|2001-04-01
-lidar_5|2001-05-01
-lidar_6|2001-06-01
-EOF
-
-cat > "${n3}" << EOF
-lidar_1|2001-01-01|2001-04-01
-lidar_2|2001-05-01|2001-07-01
-lidar_3|2001-08-01|2001-10-01
-lidar_4|2001-11-01|2002-01-01
-lidar_5|2002-02-01|2002-04-01
-lidar_6|2002-05-01|2002-07-01
-EOF
-
-cat > "${n4}" << EOF
-lidar_1|2001-01-01|2001-07-01
-lidar_2|2001-02-01|2001-04-01
-lidar_3|2001-03-01|2001-04-01
-lidar_4|2001-04-01|2001-06-01
-lidar_5|2001-05-01|2001-06-01
-lidar_6|2001-06-01|2001-07-01
-EOF
-
-cat > "${n5}" << EOF
-lidar_1|2001-01-01|2001-03-11
-lidar_2|2001-02-01|2001-04-01
-lidar_3|2001-03-01|2001-06-02
-lidar_4|2001-04-01|2001-04-01
-lidar_5|2001-05-01|2001-05-01
-lidar_6|2001-06-01|2001-07-01
-EOF
-
-t.create type=stvds temporaltype=absolute output=lidar_abs1 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=lidar_abs2 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=lidar_abs3 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=lidar_abs4 title="A test with input files" descr="A test with input files"
-t.create type=stvds temporaltype=absolute output=lidar_abs5 title="A test with input files" descr="A test with input files"
-
-# The first @test
-t.register type=vect input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.vect.list separator=" | " method=comma input=lidar_abs1
-t.vect.list input=lidar_abs1
-t.vect.list separator=" | " method=cols input=lidar_abs1
-t.vect.list separator=" | " method=delta input=lidar_abs1
-t.vect.list separator=" | " method=deltagaps input=lidar_abs1
-
-t.register type=vect -i input=lidar_abs2 file="${n2}"
-t.vect.list separator=" | " method=comma input=lidar_abs2
-t.vect.list input=lidar_abs2
-t.vect.list separator=" | " method=cols input=lidar_abs2
-t.vect.list separator=" | " method=delta input=lidar_abs2
-t.vect.list separator=" | " method=deltagaps input=lidar_abs2
-
-t.register type=vect -i input=lidar_abs3 file="${n3}"
-t.vect.list separator=" | " method=comma input=lidar_abs3
-t.vect.list separator=" | " method=delta input=lidar_abs3
-t.vect.list separator=" | " method=deltagaps input=lidar_abs3
-
-t.register type=vect -i input=lidar_abs4 file="${n4}"
-t.vect.list separator=" | " method=comma input=lidar_abs4
-t.vect.list separator=" | " method=delta input=lidar_abs4
-t.vect.list separator=" | " method=deltagaps input=lidar_abs4
-
-t.register type=vect -i input=lidar_abs5 file="${n5}"
-t.vect.list separator=" | " method=comma input=lidar_abs5
-t.vect.list input=lidar_abs5
-t.vect.list separator=" | " method=cols input=lidar_abs5
-t.vect.list separator=" | " method=delta input=lidar_abs5
-t.vect.list separator=" | " method=deltagaps input=lidar_abs5
-
-#t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
-#t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
-#g.remove -f type=vect name=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh (from rev 62857, grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.layer.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,124 @@
+#!/bin/sh
+# This is a test to list vecter maps of a space time vecter 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
+
+v.random -z seed=1 output=soil_orig n=20 zmin=0 zmax=100 column=sand
+# Adding new layer with categories
+v.category input=soil_orig out=soils option=transfer layer=1,1
+v.category input=soils out=soil_orig option=transfer layer=1,2
+v.category input=soil_orig out=soils option=transfer layer=1,3
+v.category input=soils out=soil_orig option=transfer layer=1,4
+v.category input=soil_orig out=soils option=transfer layer=1,5
+v.category input=soils out=soil_orig option=transfer layer=1,6
+g.copy vect=soil_orig,soils
+# Creating new tables for each layer
+db.copy from_table=soil_orig to_table=soils_2
+db.copy from_table=soil_orig to_table=soils_3
+db.copy from_table=soil_orig to_table=soils_4
+db.copy from_table=soil_orig to_table=soils_5
+db.copy from_table=soil_orig to_table=soils_6
+v.db.addtable map=soils table=soils_2 layer=2
+v.db.addtable map=soils table=soils_3 layer=3
+v.db.addtable map=soils table=soils_4 layer=4
+v.db.addtable map=soils table=soils_5 layer=5
+v.db.addtable map=soils table=soils_6 layer=6
+
+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
+soils:1
+soils:2
+soils:3
+soils:4
+soils:5
+soils:6
+EOF
+
+cat > "${n2}" << EOF
+soils:1|2001-01-01
+soils:2|2001-02-01
+soils:3|2001-03-01
+soils:4|2001-04-01
+soils:5|2001-05-01
+soils:6|2001-06-01
+EOF
+
+cat > "${n3}" << EOF
+soils:1|2001-01-01|2001-04-01
+soils:2|2001-05-01|2001-07-01
+soils:3|2001-08-01|2001-10-01
+soils:4|2001-11-01|2002-01-01
+soils:5|2002-02-01|2002-04-01
+soils:6|2002-05-01|2002-07-01
+EOF
+
+cat > "${n4}" << EOF
+soils:1|2001-01-01|2001-07-01
+soils:2|2001-02-01|2001-04-01
+soils:3|2001-03-01|2001-04-01
+soils:4|2001-04-01|2001-06-01
+soils:5|2001-05-01|2001-06-01
+soils:6|2001-06-01|2001-07-01
+EOF
+
+cat > "${n5}" << EOF
+soils:1|2001-01-01|2001-03-11
+soils:2|2001-02-01|2001-04-01
+soils:3|2001-03-01|2001-06-02
+soils:4|2001-04-01|2001-04-01
+soils:5|2001-05-01|2001-05-01
+soils:6|2001-06-01|2001-07-01
+EOF
+
+t.create type=stvds temporaltype=absolute output=soils_abs1 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=soils_abs2 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=soils_abs3 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=soils_abs4 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=soils_abs5 title="A test with input files" descr="A test with input files"
+
+# The first @test
+t.register type=vect input=soils_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.vect.list separator=" | " method=comma input=soils_abs1
+t.vect.list input=soils_abs1
+t.vect.list separator=" | " method=cols input=soils_abs1
+t.vect.list separator=" | " method=delta input=soils_abs1
+t.vect.list separator=" | " method=deltagaps input=soils_abs1
+
+t.register type=vect -i input=soils_abs2 file="${n2}"
+t.vect.list separator=" | " method=comma input=soils_abs2
+t.vect.list input=soils_abs2
+t.vect.list separator=" | " method=cols input=soils_abs2
+t.vect.list separator=" | " method=delta input=soils_abs2
+t.vect.list separator=" | " method=deltagaps input=soils_abs2
+
+t.register type=vect -i input=soils_abs3 file="${n3}"
+t.vect.list separator=" | " method=comma input=soils_abs3
+t.vect.list separator=" | " method=delta input=soils_abs3
+t.vect.list separator=" | " method=deltagaps input=soils_abs3
+
+t.register type=vect -i input=soils_abs4 file="${n4}"
+t.vect.list separator=" | " method=comma input=soils_abs4
+t.vect.list separator=" | " method=delta input=soils_abs4
+t.vect.list separator=" | " method=deltagaps input=soils_abs4
+
+t.register type=vect -i input=soils_abs5 file="${n5}"
+t.vect.list separator=" | " method=comma input=soils_abs5
+t.vect.list input=soils_abs5
+t.vect.list separator=" | " method=cols input=soils_abs5
+t.vect.list separator=" | " method=delta input=soils_abs5
+t.vect.list separator=" | " method=deltagaps input=soils_abs5
+
+t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
+t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
+
+g.remove -f type=vect name=soil_orig,soils
Copied: grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh (from rev 62857, grass/branches/releasebranch_7_0/temporal/t.vect.list/test.t.vect.list.sh)
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -0,0 +1,109 @@
+#!/bin/sh
+# This is a test to list vecter maps of a space time vecter 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
+
+v.random -z output=lidar_1 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_2 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_3 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_4 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_5 n=20 zmin=0 zmax=100 column=height
+v.random -z output=lidar_6 n=20 zmin=0 zmax=100 column=height
+
+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
+lidar_1
+lidar_2
+lidar_3
+lidar_4
+lidar_5
+lidar_6
+EOF
+
+cat > "${n2}" << EOF
+lidar_1|2001-01-01
+lidar_2|2001-02-01
+lidar_3|2001-03-01
+lidar_4|2001-04-01
+lidar_5|2001-05-01
+lidar_6|2001-06-01
+EOF
+
+cat > "${n3}" << EOF
+lidar_1|2001-01-01|2001-04-01
+lidar_2|2001-05-01|2001-07-01
+lidar_3|2001-08-01|2001-10-01
+lidar_4|2001-11-01|2002-01-01
+lidar_5|2002-02-01|2002-04-01
+lidar_6|2002-05-01|2002-07-01
+EOF
+
+cat > "${n4}" << EOF
+lidar_1|2001-01-01|2001-07-01
+lidar_2|2001-02-01|2001-04-01
+lidar_3|2001-03-01|2001-04-01
+lidar_4|2001-04-01|2001-06-01
+lidar_5|2001-05-01|2001-06-01
+lidar_6|2001-06-01|2001-07-01
+EOF
+
+cat > "${n5}" << EOF
+lidar_1|2001-01-01|2001-03-11
+lidar_2|2001-02-01|2001-04-01
+lidar_3|2001-03-01|2001-06-02
+lidar_4|2001-04-01|2001-04-01
+lidar_5|2001-05-01|2001-05-01
+lidar_6|2001-06-01|2001-07-01
+EOF
+
+t.create type=stvds temporaltype=absolute output=lidar_abs1 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=lidar_abs2 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=lidar_abs3 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=lidar_abs4 title="A test with input files" descr="A test with input files"
+t.create type=stvds temporaltype=absolute output=lidar_abs5 title="A test with input files" descr="A test with input files"
+
+# The first @test
+t.register type=vect input=lidar_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.vect.list separator=" | " method=comma input=lidar_abs1
+t.vect.list input=lidar_abs1
+t.vect.list separator=" | " method=cols input=lidar_abs1
+t.vect.list separator=" | " method=delta input=lidar_abs1
+t.vect.list separator=" | " method=deltagaps input=lidar_abs1
+
+t.register type=vect -i input=lidar_abs2 file="${n2}"
+t.vect.list separator=" | " method=comma input=lidar_abs2
+t.vect.list input=lidar_abs2
+t.vect.list separator=" | " method=cols input=lidar_abs2
+t.vect.list separator=" | " method=delta input=lidar_abs2
+t.vect.list separator=" | " method=deltagaps input=lidar_abs2
+
+t.register type=vect -i input=lidar_abs3 file="${n3}"
+t.vect.list separator=" | " method=comma input=lidar_abs3
+t.vect.list separator=" | " method=delta input=lidar_abs3
+t.vect.list separator=" | " method=deltagaps input=lidar_abs3
+
+t.register type=vect -i input=lidar_abs4 file="${n4}"
+t.vect.list separator=" | " method=comma input=lidar_abs4
+t.vect.list separator=" | " method=delta input=lidar_abs4
+t.vect.list separator=" | " method=deltagaps input=lidar_abs4
+
+t.register type=vect -i input=lidar_abs5 file="${n5}"
+t.vect.list separator=" | " method=comma input=lidar_abs5
+t.vect.list input=lidar_abs5
+t.vect.list separator=" | " method=cols input=lidar_abs5
+t.vect.list separator=" | " method=delta input=lidar_abs5
+t.vect.list separator=" | " method=deltagaps input=lidar_abs5
+
+#t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
+#t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
+#g.remove -f type=vect name=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/t.vect.observe.strds.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/t.vect.observe.strds.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/t.vect.observe.strds.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -102,11 +102,11 @@
mapset = grass.gisenv()["MAPSET"]
- out_sp = tgis.check_new_space_time_dataset(output, "stvds", dbif, overwrite)
+ out_sp = tgis.check_new_stds(output, "stvds", dbif, overwrite)
samples = []
- first_strds = tgis.open_old_space_time_dataset(strds_names[0], "strds", dbif)
+ first_strds = tgis.open_old_stds(strds_names[0], "strds", dbif)
# Single space time raster dataset
if len(strds_names) == 1:
@@ -128,7 +128,7 @@
else:
# Multiple space time raster datasets
for name in strds_names[1:]:
- dataset = tgis.open_old_space_time_dataset(name, "strds", dbif)
+ dataset = tgis.open_old_stds(name, "strds", dbif)
if dataset.get_temporal_type() != first_strds.get_temporal_type():
grass.fatal(_("Temporal type of space time raster datasets must be equal\n"
"<%(a)s> of type %(type_a)s do not match <%(b)s> of type %(type_b)s"%\
@@ -205,7 +205,7 @@
" with vector map <%s>") % (strds, input)
# Create the output space time vector dataset
- out_sp = tgis.open_new_space_time_dataset(output, "stvds",
+ out_sp = tgis.open_new_stds(output, "stvds",
first_strds.get_temporal_type(),
title, description,
first_strds.get_semantic_type(),
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.layer_bug.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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 -f type=vect name=prec_observer
-g.remove -f type=rast pattern=test_prec_*
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.relative.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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 -f type=vect name=prec_observer,test_extract
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Deleted: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/test.t.vect.observe.strds.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Added: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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 -f type=vect name=prec_observer
+g.remove -f type=rast pattern=test_prec_*
Property changes on: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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 -f type=vect name=prec_observer,test_extract
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Property changes on: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh (rev 0)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh 2014-11-22 23:47:45 UTC (rev 62867)
@@ -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
Property changes on: grass/branches/releasebranch_7_0/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-11-22 23:20:45 UTC (rev 62866)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-11-22 23:47:45 UTC (rev 62867)
@@ -85,8 +85,8 @@
dbif = tgis.SQLDatabaseInterfaceConnection()
dbif.connect()
- sp = tgis.open_old_space_time_dataset(input, "stvds", dbif)
- strds_sp = tgis.open_old_space_time_dataset(strds, "strds", dbif)
+ sp = tgis.open_old_stds(input, "stvds", dbif)
+ strds_sp = tgis.open_old_stds(strds, "strds", dbif)
if strds_sp.get_temporal_type() != sp.get_temporal_type():
dbif.close()
More information about the grass-commit
mailing list