[GRASS-SVN] r62637 - in grass/trunk/temporal: . t.rast.algebra t.rast3d.algebra t.vect.algebra

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Nov 6 06:17:31 PST 2014


Author: huhabla
Date: 2014-11-06 06:17:31 -0800 (Thu, 06 Nov 2014)
New Revision: 62637

Added:
   grass/trunk/temporal/t.rast.algebra/
   grass/trunk/temporal/t.rast.algebra/t.rast.algebra.html
   grass/trunk/temporal/t.rast.algebra/t.rast.algebra.py
   grass/trunk/temporal/t.rast3d.algebra/
   grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html
   grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py
Removed:
   grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.html
   grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.py
   grass/trunk/temporal/t.rast.algebra/test.t.rast.mapcalc2.sh
   grass/trunk/temporal/t.rast.mapcalc2/
   grass/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.html
   grass/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.py
   grass/trunk/temporal/t.rast3d.algebra/test.t.rast3d.mapcalc2.sh
   grass/trunk/temporal/t.rast3d.mapcalc2/
Modified:
   grass/trunk/temporal/t.rast.algebra/Makefile
   grass/trunk/temporal/t.rast3d.algebra/Makefile
   grass/trunk/temporal/t.vect.algebra/t.vect.algebra.html
   grass/trunk/temporal/t.vect.algebra/t.vect.algebra.py
Log:
temporal modules: Renaming of the temporal algebra modules from t.*.mapcalc2 to t.*.algebra


Modified: grass/trunk/temporal/t.rast.algebra/Makefile
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/Makefile	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast.algebra/Makefile	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../
 
-PGM = t.rast.mapcalc2
+PGM = t.rast.algebra
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

Copied: grass/trunk/temporal/t.rast.algebra/t.rast.algebra.html (from rev 62629, grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.html)
===================================================================
--- grass/trunk/temporal/t.rast.algebra/t.rast.algebra.html	                        (rev 0)
+++ grass/trunk/temporal/t.rast.algebra/t.rast.algebra.html	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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$</i>
+

Copied: grass/trunk/temporal/t.rast.algebra/t.rast.algebra.py (from rev 62629, grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py)
===================================================================
--- grass/trunk/temporal/t.rast.algebra/t.rast.algebra.py	                        (rev 0)
+++ grass/trunk/temporal/t.rast.algebra/t.rast.algebra.py	2014-11-06 14:17:31 UTC (rev 62637)
@@ -0,0 +1,87 @@
+#!/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
+
+
+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.rast.mapcalc that provides a limited but useful alternative to "
+                             "t.rast.mapcalc2 without PLY requirement."))
+
+    tgis.init(True)
+    p = tgis.TemporalRasterAlgebraParser(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())
+

Deleted: grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.html
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.html	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.html	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,476 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-t.rast.mapcalc2 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="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.select.html">t.select</a>
-<a href="t.rast3d.mapcalc.html">t.rast3d.mapcalc</a>
-</em>
-
-<h2>AUTHOR</h2>
-
-Thomas Leppelt, Soeren Gebbert, Thuenen Institut, Germany <br>
-
-<p><i>Last changed: $Date$</i>
-

Deleted: grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.py
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast.algebra/t.rast.mapcalc2.py	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-############################################################################
-#
-# MODULE:       t.rast.mapcalc2
-# 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
-
-
-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.rast.mapcalc that provides a limited but useful alternative to "
-                             "t.rast.mapcalc2 without PLY requirement."))
-
-    tgis.init(True)
-    p = tgis.TemporalRasterAlgebraParser(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())
-

Deleted: grass/trunk/temporal/t.rast.algebra/test.t.rast.mapcalc2.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast.algebra/test.t.rast.mapcalc2.sh	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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

Modified: grass/trunk/temporal/t.rast3d.algebra/Makefile
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/Makefile	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast3d.algebra/Makefile	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../
 
-PGM = t.rast3d.mapcalc2
+PGM = t.rast3d.algebra
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

Copied: grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html (from rev 62629, grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.html)
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html	                        (rev 0)
+++ grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.html	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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>
+

Copied: grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py (from rev 62629, grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py)
===================================================================
--- grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py	                        (rev 0)
+++ grass/trunk/temporal/t.rast3d.algebra/t.rast3d.algebra.py	2014-11-06 14:17:31 UTC (rev 62637)
@@ -0,0 +1,87 @@
+#!/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())
+

Deleted: grass/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.html
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.html	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.html	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,38 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>t.rast3d.mapcalc2</em> performs temporal and spatial map algebra 
-operations on space time 3D raster datasets (STR3DS) by using the 
-temporal 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.mapcalc2.html">t.rast.mapcalc2</a>.
-
-<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.mapcalc2.html">t.rast.mapcalc2</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.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/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.py
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast3d.algebra/t.rast3d.mapcalc2.py	2014-11-06 14:17:31 UTC (rev 62637)
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-############################################################################
-#
-# MODULE:       t.rast3d.mapcalc2
-# 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())
-

Deleted: grass/trunk/temporal/t.rast3d.algebra/test.t.rast3d.mapcalc2.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh	2014-11-05 21:51:48 UTC (rev 62629)
+++ grass/trunk/temporal/t.rast3d.algebra/test.t.rast3d.mapcalc2.sh	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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

Modified: grass/trunk/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/trunk/temporal/t.vect.algebra/t.vect.algebra.html	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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>

Modified: grass/trunk/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/trunk/temporal/t.vect.algebra/t.vect.algebra.py	2014-11-06 14:17:31 UTC (rev 62637)
@@ -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



More information about the grass-commit mailing list