[GRASS-SVN] r61702 - in grass/trunk/temporal: t.create t.info t.list t.merge t.rast.accumulate/test_suite t.rast.aggregate/testsuite t.rast.export t.rast.import t.rast.list t.rast.mapcalc t.rast.mapcalc2 t.rast.neighbors t.rast.out.vtk t.rast.univar t.rast.univar/testsuite t.rast3d.extract t.rast3d.list t.rast3d.mapcalc t.rast3d.mapcalc2 t.rast3d.univar t.register t.remove t.rename t.sample/testsuite t.shift t.snap t.support t.topology
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 19 13:39:39 PDT 2014
Author: neteler
Date: 2014-08-19 13:39:38 -0700 (Tue, 19 Aug 2014)
New Revision: 61702
Modified:
grass/trunk/temporal/t.create/t.create.html
grass/trunk/temporal/t.info/t.info.html
grass/trunk/temporal/t.info/test.t.info.sh
grass/trunk/temporal/t.list/t.list.html
grass/trunk/temporal/t.merge/t.merge.html
grass/trunk/temporal/t.merge/test.t.merge.sh
grass/trunk/temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh
grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh
grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh
grass/trunk/temporal/t.rast.export/test.t.rast.export.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/trunk/temporal/t.rast.list/t.rast.list.html
grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/trunk/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh
grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
grass/trunk/temporal/t.rast.univar/t.rast.univar.html
grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh
grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
grass/trunk/temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh
grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.timezone.sh
grass/trunk/temporal/t.register/test.t.register.raster.sh
grass/trunk/temporal/t.register/test.t.register.raster.timestamp.sh
grass/trunk/temporal/t.register/test.t.register.raster3d.sh
grass/trunk/temporal/t.remove/test.t.remove.sh
grass/trunk/temporal/t.rename/test.t.rename.sh
grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh
grass/trunk/temporal/t.shift/t.shift.html
grass/trunk/temporal/t.shift/test.t.shift.absolue.sh
grass/trunk/temporal/t.shift/test.t.shift.relative.sh
grass/trunk/temporal/t.snap/t.snap.html
grass/trunk/temporal/t.snap/test.t.snap.absolute.sh
grass/trunk/temporal/t.snap/test.t.snap.relative.sh
grass/trunk/temporal/t.support/test.t.support.sh
grass/trunk/temporal/t.topology/test.t.topology.abstime.sh
grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
Log:
temporal: add seeding in r.mapcalc calls (completes r61353)
Modified: grass/trunk/temporal/t.create/t.create.html
===================================================================
--- grass/trunk/temporal/t.create/t.create.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.create/t.create.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -32,7 +32,7 @@
MAPS="map_1 map_2 map_3 map_4 map_5 map_6 map_7"
for map in ${MAPS} ; do
- r.mapcalc --o expr="${map} = rand(0, 10)"
+ r.mapcalc --o expr="${map} = rand(0, 10)" -s
echo ${map} >> map_list.txt
done
Modified: grass/trunk/temporal/t.info/t.info.html
===================================================================
--- grass/trunk/temporal/t.info/t.info.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.info/t.info.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -33,7 +33,7 @@
| SQL template path:.......... /home/soeren/src/grass7.0/grass_trunk/dist.x86_64-unknown-linux-gnu/etc/sql
+----------------------------------------------------------------------------+
-r.mapcalc expr="map1 = rand(0, 10)"
+r.mapcalc expr="map1 = rand(0, 10)" -s
t.create type=strds temporaltype=absolute \
output=precipitation_daily \
Modified: grass/trunk/temporal/t.info/test.t.info.sh
===================================================================
--- grass/trunk/temporal/t.info/test.t.info.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.info/test.t.info.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -5,11 +5,11 @@
# @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)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
+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)"
-r3.mapcalc --o expr="prec_2 = rand(0, 320)"
+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
Modified: grass/trunk/temporal/t.list/t.list.html
===================================================================
--- grass/trunk/temporal/t.list/t.list.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.list/t.list.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -17,9 +17,10 @@
We use t.list to show what maps are already in the
<div class="code"><pre>
-r.mapcalc expr="map1 = rand(0, 10)"
-r.mapcalc expr="map2 = rand(10, 20)"
-r.mapcalc expr="map3 = rand(20, 30)"
+# Generate data
+r.mapcalc expr="map1 = rand(0, 10)" -s
+r.mapcalc expr="map2 = rand(10, 20)" -s
+r.mapcalc expr="map3 = rand(20, 30)" -s
t.register type=rast maps=map1 start=2012-08-20 end=2012-08-21
t.register type=rast maps=map2 start=2012-08-21 end=2012-08-22
Modified: grass/trunk/temporal/t.merge/t.merge.html
===================================================================
--- grass/trunk/temporal/t.merge/t.merge.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.merge/t.merge.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -17,8 +17,8 @@
datasets together.
<div class="code"><pre>
-r.mapcalc expr="map1 = rand(0, 10)"
-r.mapcalc expr="map2 = rand(10, 20)"
+r.mapcalc expr="map1 = rand(0, 10)" -s
+r.mapcalc expr="map2 = rand(10, 20)" -s
t.create type=strds temporaltype=absolute \
output=precipitation_daily_1 \
@@ -80,8 +80,8 @@
|
+----------------------------------------------------------------------------+
-r.mapcalc expr="map3 = rand(20, 30)"
-r.mapcalc expr="map4 = rand(30, 40)"
+r.mapcalc expr="map3 = rand(20, 30)" -s
+r.mapcalc expr="map4 = rand(30, 40)" -s
t.create type=strds temporaltype=absolute \
output=precipitation_daily_2 \
Modified: grass/trunk/temporal/t.merge/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/test.t.merge.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.merge/test.t.merge.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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(10, 150)"
-r.mapcalc --o expr="prec_2 = rand(20, 250)"
-r.mapcalc --o expr="prec_3 = rand(30, 350)"
-r.mapcalc --o expr="prec_4 = rand(40, 450)"
-r.mapcalc --o expr="prec_5 = rand(50, 550)"
-r.mapcalc --o expr="prec_6 = rand(60, 650)"
+# 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 \
Modified: grass/trunk/temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -8,12 +8,12 @@
export GRASS_OVERWRITE=1
# Generate data
-r.mapcalc expr="prec_1 = rand(0, 25)"
-r.mapcalc expr="prec_2 = rand(0, 24)"
-r.mapcalc expr="prec_3 = rand(0, 23)"
-r.mapcalc expr="prec_4 = rand(0, 25)"
-r.mapcalc expr="prec_5 = rand(0, 23)"
-r.mapcalc expr="prec_6 = rand(0, 26)"
+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 \
Modified: grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.relative_time.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -5,13 +5,14 @@
# @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
+
# Data generation
-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_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 = null()"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+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
Modified: grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.aggregate/testsuite/test.t.rast.aggregate.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -7,13 +7,14 @@
# 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)"
-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)"
+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_7 = null()"
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
Modified: grass/trunk/temporal/t.rast.export/test.t.rast.export.sh
===================================================================
--- grass/trunk/temporal/t.rast.export/test.t.rast.export.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.export/test.t.rast.export.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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.0)"
-r.mapcalc --o expr="prec_2 = rand(0, 80000)"
-r.mapcalc --o expr="prec_3 = rand(-120, 120)"
-r.mapcalc --o expr="prec_4 = rand(0, 255)"
-r.mapcalc --o expr="prec_5 = rand(-1, 60000)"
-r.mapcalc --o expr="prec_6 = rand(0, 256)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550.0)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 80000)" -s
+r.mapcalc --o expr="prec_3 = rand(-120, 120)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 255)" -s
+r.mapcalc --o expr="prec_5 = rand(-1, 60000)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 256)" -s
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,12 +11,13 @@
mkdir test
-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)"
+# 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
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,12 +11,13 @@
mkdir test
-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)"
+# 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
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,13 @@
mkdir test
-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)"
+# 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
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.rast.list/t.rast.list.html
===================================================================
--- grass/trunk/temporal/t.rast.list/t.rast.list.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.list/t.rast.list.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -23,12 +23,13 @@
<div class="code"><pre>
g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-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)"
+# 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
cat > map_list.txt << EOF
map_1|2001-01-01|2001-04-01
Modified: grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
===================================================================
--- grass/trunk/temporal/t.rast.list/test.t.rast.list.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.list/test.t.rast.list.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,13 @@
export GRASS_OVERWRITE=1
-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)"
+# 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
n1=`g.tempfile pid=1 -d`
n2=`g.tempfile pid=2 -d`
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -7,12 +7,13 @@
# 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)"
+# 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.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,13 @@
# 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 = 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)"
+# 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.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
Modified: grass/trunk/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,13 @@
# 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="a1 = rand(0, 550)"
-r.mapcalc expr="a2 = if(col() == 2, null(), rand(0, 450))"
-r.mapcalc expr="a3 = rand(0, 320)"
-r.mapcalc expr="a4 = rand(0, 510)"
-r.mapcalc expr="a5 = rand(0, 300)"
-r.mapcalc expr="a6 = rand(0, 650)"
+# 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"
Modified: grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
===================================================================
--- grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -4,13 +4,14 @@
# @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
+
# Generate data
-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_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 = null()"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+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 --o 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"
Modified: grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
===================================================================
--- grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -7,12 +7,13 @@
# The region setting should work for UTM and LL test locations
g.region s=0 n=80 w=0 e=120 res=0.5 -p
-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)"
+# 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 --o expr="elevation = sin(row() + col()) * 10"
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.rast.univar/t.rast.univar.html
===================================================================
--- grass/trunk/temporal/t.rast.univar/t.rast.univar.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.univar/t.rast.univar.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -16,7 +16,7 @@
maxn=10
for map in ${MAPS} ; do
- r.mapcalc --o expr="${map} = rand(0,$maxn)"
+ r.mapcalc --o expr="${map} = rand(0,$maxn)" -s
echo ${map} >> map_list.txt
maxn=`expr $maxn + 10`
done
Modified: grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,12 @@
export GRASS_OVERWRITE=1
# 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)"
+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 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"
Modified: grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast3d.extract/test.t.rast3d.extract.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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
-r3.mapcalc --o expr="prec_1 = rand(0, 550)"
-r3.mapcalc --o expr="prec_2 = rand(0, 450)"
-r3.mapcalc --o expr="prec_3 = rand(0, 320)"
-r3.mapcalc --o expr="prec_4 = rand(0, 510)"
-r3.mapcalc --o expr="prec_5 = rand(0, 300)"
-r3.mapcalc --o expr="prec_6 = rand(0, 650)"
+# 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"
Modified: grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast3d.list/test.t.rast3d.list.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -8,12 +8,13 @@
export GRASS_OVERWRITE=1
-r3.mapcalc expr="vol_1 = rand(0, 550)"
-r3.mapcalc expr="vol_2 = rand(0, 450)"
-r3.mapcalc expr="vol_3 = rand(0, 320)"
-r3.mapcalc expr="vol_4 = rand(0, 510)"
-r3.mapcalc expr="vol_5 = rand(0, 300)"
-r3.mapcalc expr="vol_6 = rand(0, 650)"
+# 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`
Modified: grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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
-r3.mapcalc --o expr="prec_1 = rand(0, 550)"
-r3.mapcalc --o expr="prec_2 = rand(0, 450)"
-r3.mapcalc --o expr="prec_3 = rand(0, 320)"
-r3.mapcalc --o expr="prec_4 = rand(0, 510)"
-r3.mapcalc --o expr="prec_5 = rand(0, 300)"
-r3.mapcalc --o expr="prec_6 = rand(0, 650)"
+# 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.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
Modified: grass/trunk/temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -9,12 +9,13 @@
# 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
-r3.mapcalc expr="a1 = rand(0, 550)"
-r3.mapcalc expr="a2 = rand(0, 450)"
-r3.mapcalc expr="a3 = rand(0, 320)"
-r3.mapcalc expr="a4 = rand(0, 510)"
-r3.mapcalc expr="a5 = rand(0, 300)"
-r3.mapcalc expr="a6 = rand(0, 650)"
+# 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"
Modified: grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rast3d.univar/test.t.rast3d.univar.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -8,13 +8,13 @@
export GRASS_OVERWRITE=1
-# Data generation
-r3.mapcalc expr="prec_1 = rand(0, 550)"
-r3.mapcalc expr="prec_2 = rand(0, 450)"
-r3.mapcalc expr="prec_3 = rand(0, 320)"
-r3.mapcalc expr="prec_4 = rand(0, 510)"
-r3.mapcalc expr="prec_5 = rand(0, 300)"
-r3.mapcalc expr="prec_6 = rand(0, 650)"
+# 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"
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,12 +11,13 @@
# 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)"
+# 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
n1=`g.tempfile pid=1 -d` # Only map names
n2=`g.tempfile pid=2 -d` # Map names and start time
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,12 +11,13 @@
# 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)"
+# 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
n1=`g.tempfile pid=1 -d` # Only map names
n2=`g.tempfile pid=2 -d` # Map names and start time
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.timezone.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.timezone.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.timezone.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -12,12 +12,13 @@
# 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)"
+# 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
n2=`g.tempfile pid=2 -d` # Map names and start time
n3=`g.tempfile pid=3 -d` # Map names start time and increment
Modified: grass/trunk/temporal/t.register/test.t.register.raster.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -13,12 +13,13 @@
# 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 = 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)"
+# 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
# The first @test
# We create the space time raster inputs and register the raster maps with absolute time interval
Modified: grass/trunk/temporal/t.register/test.t.register.raster.timestamp.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.timestamp.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster.timestamp.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,10 +11,11 @@
# 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)"
+# 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.timestamp map=prec_1 date="1 jan 1995 / 23 sep 1995"
r.timestamp map=prec_2 date="14 jul 1996 / 15 jul 1996"
Modified: grass/trunk/temporal/t.register/test.t.register.raster3d.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -11,12 +11,13 @@
# 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
-r3.mapcalc --o expr="volume_1 = rand(0, 550)"
-r3.mapcalc --o expr="volume_2 = rand(0, 450)"
-r3.mapcalc --o expr="volume_3 = rand(0, 320)"
-r3.mapcalc --o expr="volume_4 = rand(0, 510)"
-r3.mapcalc --o expr="volume_5 = rand(0, 300)"
-r3.mapcalc --o expr="volume_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc --o expr="volume_1 = rand(0, 550)" -s
+r3.mapcalc --o expr="volume_2 = rand(0, 450)" -s
+r3.mapcalc --o expr="volume_3 = rand(0, 320)" -s
+r3.mapcalc --o expr="volume_4 = rand(0, 510)" -s
+r3.mapcalc --o expr="volume_5 = rand(0, 300)" -s
+r3.mapcalc --o expr="volume_6 = rand(0, 650)" -s
# The first @test
# We create the space time raster3d dataset and register the raster3d maps with absolute time interval
Modified: grass/trunk/temporal/t.remove/test.t.remove.sh
===================================================================
--- grass/trunk/temporal/t.remove/test.t.remove.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.remove/test.t.remove.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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)"
+# 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
# The first @test
t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
Modified: grass/trunk/temporal/t.rename/test.t.rename.sh
===================================================================
--- grass/trunk/temporal/t.rename/test.t.rename.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.rename/test.t.rename.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,8 +6,9 @@
# 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)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
# We need to create three space time dataset
t.create --v --o type=strds temporaltype=absolute output=precip_abs1 \
Modified: grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh
===================================================================
--- grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -8,12 +8,13 @@
export GRASS_OVERWRITE=1
-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)"
+# 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
Modified: grass/trunk/temporal/t.shift/t.shift.html
===================================================================
--- grass/trunk/temporal/t.shift/t.shift.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.shift/t.shift.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -26,14 +26,13 @@
Then we shift the time intervals with a granularity of 12 hours.
<div class="code"><pre>
+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=precipitation_daily \
title="Daily precipitation" \
Modified: grass/trunk/temporal/t.shift/test.t.shift.absolue.sh
===================================================================
--- grass/trunk/temporal/t.shift/test.t.shift.absolue.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.shift/test.t.shift.absolue.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -4,13 +4,14 @@
# @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)"
-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)"
+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_abs title="A test" descr="A test"
t.register -i --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
Modified: grass/trunk/temporal/t.shift/test.t.shift.relative.sh
===================================================================
--- grass/trunk/temporal/t.shift/test.t.shift.relative.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.shift/test.t.shift.relative.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -4,13 +4,14 @@
# @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)"
-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)"
+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_rel title="A test" descr="A test"
t.register -i --o type=rast unit=days input=precip_rel maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
Modified: grass/trunk/temporal/t.snap/t.snap.html
===================================================================
--- grass/trunk/temporal/t.snap/t.snap.html 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.snap/t.snap.html 2014-08-19 20:39:38 UTC (rev 61702)
@@ -17,14 +17,14 @@
Then we snap the created time instances resulting in time intervals.
<div class="code"><pre>
+# 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=precipitation_daily \
title="Daily precipitation" \
Modified: grass/trunk/temporal/t.snap/test.t.snap.absolute.sh
===================================================================
--- grass/trunk/temporal/t.snap/test.t.snap.absolute.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.snap/test.t.snap.absolute.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -4,13 +4,14 @@
# @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)"
-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)"
+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
n1=`g.tempfile pid=1 -d`
Modified: grass/trunk/temporal/t.snap/test.t.snap.relative.sh
===================================================================
--- grass/trunk/temporal/t.snap/test.t.snap.relative.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.snap/test.t.snap.relative.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -4,13 +4,14 @@
# @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)"
-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)"
+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_rel title="A test" descr="A test"
t.register --o type=rast input=precip_rel unit="days" \
Modified: grass/trunk/temporal/t.support/test.t.support.sh
===================================================================
--- grass/trunk/temporal/t.support/test.t.support.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.support/test.t.support.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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)"
+# 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
# We create several space time raster datasets
# @test Register the maps in two space time datasets
@@ -37,13 +38,15 @@
# @test the map update function
g.region s=0 n=80 w=0 e=120 b=0 t=50 res=20 res3=20
-r.mapcalc --o expr="prec_1 = rand(0, 55)"
-r.mapcalc --o expr="prec_2 = rand(0, 45)"
-r.mapcalc --o expr="prec_3 = rand(0, 32)"
-r.mapcalc --o expr="prec_4 = rand(0, 51)"
-r.mapcalc --o expr="prec_5 = rand(0, 30)"
-r.mapcalc --o expr="prec_6 = rand(0, 65)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 55)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 45)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 32)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 51)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 30)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 65)" -s
+
# The map dependent metadata should have been updated
t.support --v -m type=strds input=precip_abs1
t.info type=strds input=precip_abs1
Modified: grass/trunk/temporal/t.topology/test.t.topology.abstime.sh
===================================================================
--- grass/trunk/temporal/t.topology/test.t.topology.abstime.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.topology/test.t.topology.abstime.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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)"
+# 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
# Different spatial extents
r.mapcalc --o expr="A = 1"
Modified: grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
===================================================================
--- grass/trunk/temporal/t.topology/test.t.topology.reltime.sh 2014-08-19 20:32:16 UTC (rev 61701)
+++ grass/trunk/temporal/t.topology/test.t.topology.reltime.sh 2014-08-19 20:39:38 UTC (rev 61702)
@@ -6,12 +6,13 @@
# 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)"
+# 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
n1=`g.tempfile pid=1 -d`
n2=`g.tempfile pid=2 -d`
More information about the grass-commit
mailing list