[GRASS-SVN] r49153 - in grass/trunk/temporal: . tr.to.rast3 tr.univar

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Nov 9 09:12:50 EST 2011


Author: huhabla
Date: 2011-11-09 06:12:50 -0800 (Wed, 09 Nov 2011)
New Revision: 49153

Added:
   grass/trunk/temporal/tr.univar/
   grass/trunk/temporal/tr.univar/Makefile
   grass/trunk/temporal/tr.univar/test.tr.univar.sh
   grass/trunk/temporal/tr.univar/tr.univar.html
   grass/trunk/temporal/tr.univar/tr.univar.py
Modified:
   grass/trunk/temporal/Makefile
   grass/trunk/temporal/tr.to.rast3/tr.to.rast3.py
Log:
New simple module to compute univariate statistics of a space time
arster dataest.


Modified: grass/trunk/temporal/Makefile
===================================================================
--- grass/trunk/temporal/Makefile	2011-11-09 10:43:51 UTC (rev 49152)
+++ grass/trunk/temporal/Makefile	2011-11-09 14:12:50 UTC (rev 49153)
@@ -14,6 +14,7 @@
 	tr.aggregate.ds \
 	tr.register \
 	tr.to.rast3 \
+	tr.univar \
 	tr.list \
 	tv.list \
 	tr3.list \

Modified: grass/trunk/temporal/tr.to.rast3/tr.to.rast3.py
===================================================================
--- grass/trunk/temporal/tr.to.rast3/tr.to.rast3.py	2011-11-09 10:43:51 UTC (rev 49152)
+++ grass/trunk/temporal/tr.to.rast3/tr.to.rast3.py	2011-11-09 14:12:50 UTC (rev 49153)
@@ -62,16 +62,16 @@
 
     sp.select()
 
-    # Compute relative granularity and set bottom, top and resolution
+    maps = sp.get_registered_maps_as_objects_by_granularity()
+
+    # Compute relative granularity and set bottom, top and top-bottom resolution
     granularity = sp.get_granularity()
 
+    # We do not convert months or years into days, we simply use
+    # The digit of the string as topo-bottom resolution
     if sp.is_time_absolute():
-        start, end = sp.get_valid_time()
-        end = tgis.increment_datetime_by_string(start, granularity)
-        granularity = tgis.time_delta_to_relative_time(end - start)
+        granularity = int(granularity.split(" ")[0])
 
-    maps = sp.get_registered_maps_as_objects_by_granularity()
-
     num_maps = len(maps)
     bottom = 0
     top = granularity * num_maps

Added: grass/trunk/temporal/tr.univar/Makefile
===================================================================
--- grass/trunk/temporal/tr.univar/Makefile	                        (rev 0)
+++ grass/trunk/temporal/tr.univar/Makefile	2011-11-09 14:12:50 UTC (rev 49153)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ../../
+
+PGM = tr.univar
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+
+default: script $(TEST_DST)

Added: grass/trunk/temporal/tr.univar/test.tr.univar.sh
===================================================================
--- grass/trunk/temporal/tr.univar/test.tr.univar.sh	                        (rev 0)
+++ grass/trunk/temporal/tr.univar/test.tr.univar.sh	2011-11-09 14:12:50 UTC (rev 49153)
@@ -0,0 +1,24 @@
+# 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 and create two space time raster inputs
+# with relative and absolute time
+# 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 = rand(0, 550)"
+r.mapcalc --o expr="prec_2 = rand(0, 450)"
+r.mapcalc --o expr="prec_3 = rand(0, 320)"
+r.mapcalc --o expr="prec_4 = rand(0, 510)"
+r.mapcalc --o expr="prec_5 = rand(0, 300)"
+r.mapcalc --o expr="prec_6 = rand(0, 650)"
+
+t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
+tr.register --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"
+
+# The first @test
+tr.univar -he input=precip_abs1 
+
+t.remove type=rast input=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.remove type=strds input=precip_abs1,precip_abs2

Added: grass/trunk/temporal/tr.univar/tr.univar.html
===================================================================
Added: grass/trunk/temporal/tr.univar/tr.univar.py
===================================================================
--- grass/trunk/temporal/tr.univar/tr.univar.py	                        (rev 0)
+++ grass/trunk/temporal/tr.univar/tr.univar.py	2011-11-09 14:12:50 UTC (rev 49153)
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+############################################################################
+#
+# MODULE:	tr.univar
+# AUTHOR(S):	Soeren Gebbert
+#
+# PURPOSE:	Calculates univariate statistics from the non-null cells of a space time raster 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.
+#
+#############################################################################
+
+#%module
+#% description: Calculates univariate statistics from the non-null cells for each registred raster map of a space time raster dataset
+#% keywords: spacetime raster dataset
+#% keywords: raster
+#% keywords: statistics
+#%end
+
+#%option
+#% key: input
+#% type: string
+#% description: Name of a space time raster dataset
+#% required: yes
+#% multiple: no
+#%end
+
+#%option G_OPT_DB_WHERE
+#%end
+
+#%option
+#% key: fs
+#% type: string
+#% description: The field separator character between the columns
+#% required: no
+#% answer: |
+#%end
+
+#%flag
+#% key: e
+#% description: Calculate extended statistics
+#%end
+
+#%flag
+#% key: h
+#% description: Print column names 
+#%end
+
+import grass.script as grass
+import grass.temporal as tgis
+
+############################################################################
+
+def main():
+
+    # Get the options
+    input = options["input"]
+    where = options["where"]
+    extended = flags["e"]
+    header = flags["h"]
+    fs = options["fs"]
+
+    # Make sure the temporal database exists
+    tgis.create_temporal_database()
+    # We need a database interface
+    dbif = tgis.sql_database_interface()
+    dbif.connect()
+   
+    mapset =  grass.gisenv()["MAPSET"]
+
+    if input.find("@") >= 0:
+        id = input
+    else:
+        id = input + "@" + mapset
+
+    sp = tgis.space_time_raster_dataset(id)
+    
+    if sp.is_in_db() == False:
+        dbif.close()
+        grass.fatal(_("Dataset <%s> not found in temporal database") % (id))
+
+    sp.select(dbif)
+
+    rows = sp.get_registered_maps("id,start_time,end_time", where, "start_time", dbif)
+
+    if not rows:
+            dbif.close()
+            grass.fatal(_("Space time raster dataset <%s> is empty") % out_id)
+
+    if header == True:
+        print "id" + fs + "start" + fs + "end" + fs + "mean" + fs + "min" + fs + "max" + fs,
+        print "mean_of_abs" + fs + "stddev" + fs + "variance" + fs,
+        if extended == True:
+            print "coeff_var" + fs + "sum" + fs + "null_cells" + fs + "cells" + fs,
+            print "first_quartile" + fs + "median" + fs + "third_quartile" + fs + "percentile_90" 
+        else:
+            print "coeff_var" + fs + "sum" + fs + "null_cells" + fs + "cells" 
+
+    for row in rows:
+        id = row["id"]
+        start = row["start_time"]
+        end = row["end_time"]
+
+        flag="g"
+
+        if extended == True:
+            flag += "e"
+
+        stats = grass.parse_command("r.univar", map=id, flags=flag)
+
+        print str(id) + fs + str(start) + fs + str(end),
+        print fs + str(stats["mean"]) + fs + str(stats["min"]) + fs + str(stats["max"]) + fs + str(stats["mean_of_abs"]),
+        print fs + str(stats["stddev"]) + fs + str(stats["variance"]) + fs + str(stats["coeff_var"]) + fs + str(stats["sum"]),
+
+        if extended == True:
+            print fs + str(stats["null_cells"]) + fs + str(stats["cells"]) + fs,
+            print str(stats["first_quartile"]) + fs + str(stats["median"]) + fs + str(stats["third_quartile"]) + fs + str(stats["percentile_90"]) 
+        else:
+            print fs + str(stats["null_cells"]) + fs + str(stats["cells"])
+        
+    dbif.close()
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()
+


Property changes on: grass/trunk/temporal/tr.univar/tr.univar.py
___________________________________________________________________
Added: svn:executable
   + *



More information about the grass-commit mailing list