temporal modules: Renaming of the temporal algebra modules from t.*.mapcalc2 to t.*.algebra

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62637 15284696-431f-4ddb-bdfa-cd5b030d7da7

temporal/t.rast.mapcalc2/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../
 
-PGM = t.rast.mapcalc2
+PGM = t.rast.algebra
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

temporal/t.rast.mapcalc2/t.rast.mapcalc2.html

@@ -1,6 +1,6 @@
 <h2>DESCRIPTION</h2>
 
-t.rast.mapcalc2 performs temporal and spatial map algebra operations on space time raster datasets (STRDS)
+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>
@@ -461,11 +461,12 @@ C = if({equal}, B {#,contain} A > 1, (B {+,contain,l} A {-,equal,l} B) {equal,=/
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="t.rast.mapcalc.html">t.rast.mapcalc2</a>
 <a href="r.mapcalc.html">r.mapcalc</a>
-<a href="t.vect.mapcalc.html">t.vect.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>

temporal/t.rast.mapcalc2/t.rast.mapcalc2.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:       t.rast.mapcalc2
+# MODULE:       t.rast.algebra
 # AUTHOR(S):    Thomas Leppelt, Soeren Gebbert
 #
 # PURPOSE:      Provide temporal raster algebra to perform spatial an temporal operations

temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-# Test for t.rast.mapcalc2
-
-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 expr="a1 = rand(0, 550)" -s
-r.mapcalc expr="a2 = if(col() == 2, null(), rand(0, 450))" -s
-r.mapcalc expr="a3 = rand(0, 320)" -s
-r.mapcalc expr="a4 = rand(0, 510)" -s
-r.mapcalc expr="a5 = rand(0, 300)" -s
-r.mapcalc expr="a6 = rand(0, 650)" -s
-
-t.create type=strds temporaltype=absolute output=A1 title="A test" descr="A test"
-t.create type=strds temporaltype=absolute output=A2 title="A test" descr="A test"
-t.register -i type=rast input=A1 maps=a1,a2,a3,a4,a5,a6 start="2001-01-01" increment="3 months"
-t.register type=rast input=A2 maps=a1,a2,a3,a4,a5,a6
-
-t.info A1
-t.info A2
-
-# The first @test
-t.rast.mapcalc2 --v expression="B = A1 + A2" base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = if(start_year()>=0&&start_month()>=0&&start_day()>=0&&start_hour()>=0&&start_minute()>=0&&start_second()>=0, A1 + A2) " base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = if(end_year()>=0&&end_month()>=0&&end_day()>=0&&end_hour()>=0&&end_minute()>=0&&end_second()>=0, A1 + A2) " base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = if(start_doy() >= 0 && start_dow() >= 0, A1 + A2) " base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = if(end_doy() >= 0 && end_dow() >= 0, A1 + A2) " base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = A1[-1] + A2[1] " base=b nprocs=5
-t.info type=strds input=B
-
-t.rast.mapcalc2 --v expression="B = if(isnull(A1), (A1[-1] + A1[1])/2.0, A1)" base=b nprocs=5
-t.info type=strds input=B
-
-# @postprocess
-t.remove -rf type=strds input=A1,A2,B

temporal/t.rast3d.mapcalc2/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../
 
-PGM = t.rast3d.mapcalc2
+PGM = t.rast3d.algebra
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.html

@@ -1,8 +1,8 @@
 <h2>DESCRIPTION</h2>
 
-<em>t.rast3d.mapcalc2</em> performs temporal and spatial map algebra 
+<em>t.rast3d.algebra</em> performs temporal and spatial map algebra 
 operations on space time 3D raster datasets (STR3DS) by using the 
-temporal raster algebra.
+temporal 3D raster algebra.
 
 <h3>NOTES</h3>
 
@@ -13,7 +13,7 @@ The module expects an <b>expression</b> as input parameter in the following form
 <br>
 
 The statement structure is exact the same as of <em>t.rast.mapcalc2</em>,
-see <a href="t.rast.mapcalc2.html">t.rast.mapcalc2</a>.
+see <a href="t.rast.algebra.html">t.rast.algebra</a> but allows four dimensional indexing.
 
 <h2>REFERENCES</h2>
 
@@ -22,10 +22,10 @@ see <a href="t.rast.mapcalc2.html">t.rast.mapcalc2</a>.
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="t.rast.mapcalc2.html">t.rast.mapcalc2</a>
+<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.mapcalc.html">t.vect.mapcalc</a>
+<a href="t.vect.algebra.html">t.vect.algebra</a>
 <a href="t.select.html">t.select</a>
 </em>
 

temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:       t.rast3d.mapcalc2
+# MODULE:       t.rast3d.algebra
 # AUTHOR(S):    Thomas Leppelt, Soeren Gebbert
 #
 # PURPOSE:      Provide temporal 3D raster algebra to perform spatial an temporal operations

temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh

@@ -1,48 +0,0 @@
-#!/bin/sh
-# Test for t.rast3d.mapcalc2
-
-export GRASS_OVERWRITE=1
-
-# We need to set a specific region in the
-# @preprocess step of this test. We generate
-# raster with r3.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
-r3.mapcalc expr="a1 = rand(0, 550)" -s
-r3.mapcalc expr="a2 = rand(0, 450)" -s
-r3.mapcalc expr="a3 = rand(0, 320)" -s
-r3.mapcalc expr="a4 = rand(0, 510)" -s
-r3.mapcalc expr="a5 = rand(0, 300)" -s
-r3.mapcalc expr="a6 = rand(0, 650)" -s
-
-t.create type=str3ds temporaltype=absolute output=A1 title="A test" descr="A test"
-t.create type=str3ds temporaltype=absolute output=A2 title="A test" descr="A test"
-t.register -i type=rast3d input=A1 maps=a1,a2,a3,a4,a5,a6 start="2001-01-01" increment="3 months"
-t.register type=rast3d input=A2 maps=a1,a2,a3,a4,a5,a6
-
-t.info type=str3ds input=A1
-t.info type=str3ds input=A2
-
-# The first @test
-t.rast3d.mapcalc2 --v expression="B = A1 + A2" base=b nprocs=5
-t.info type=str3ds input=B
-
-t.rast3d.mapcalc2 --v expression="B = if(start_year()>=0&&start_month()>=0&&start_day()>=0&&start_hour()>=0&&start_minute()>=0&&start_second()>=0, A1 + A2) " base=b nprocs=5
-t.info type=str3ds input=B
-
-t.rast3d.mapcalc2 --v expression="B = if(end_year()>=0&&end_month()>=0&&end_day()>=0&&end_hour()>=0&&end_minute()>=0&&end_second()>=0, A1 + A2) " base=b nprocs=5
-t.info type=str3ds input=B
-
-t.rast3d.mapcalc2 --v expression="B = if(start_doy() >= 0 && start_dow() >= 0, A1 + A2) " base=b nprocs=5
-t.info type=str3ds input=B
-
-t.rast3d.mapcalc2 --v expression="B = if(end_doy() >= 0 && end_dow() >= 0, A1 + A2) " base=b nprocs=5
-t.info type=str3ds input=B
-
-t.rast3d.mapcalc2 --v expression="B = A1[-1] + A2[1] " base=b nprocs=5
-t.info type=str3ds input=B
-
-# @postprocess
-t.remove -rf type=str3ds input=A1,A2,B

temporal/t.vect.algebra/t.vect.algebra.html

@@ -1,6 +1,6 @@
 <h2>DESCRIPTION</h2> 
 
-t.vect.mapcalc performs temporal and spatial overlay and buffer functions on space time vector datasets (STVDS)
+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>

temporal/t.vect.algebra/t.vect.algebra.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ############################################################################
 #
-# MODULE:       t.vect.mapcalc
+# MODULE:       t.vect.algebra
 # AUTHOR(S):    Thomas Leppelt, Soeren Gebbert
 #
 # PURPOSE:      Provide temporal vector algebra to perform spatial an temporal operations