[GRASS-SVN] r61283 - in grass/trunk/raster/r.series.interp/testsuite: . data
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Jul 19 17:18:37 PDT 2014
Author: huhabla
Date: 2014-07-19 17:18:36 -0700 (Sat, 19 Jul 2014)
New Revision: 61283
Added:
grass/trunk/raster/r.series.interp/testsuite/data/
grass/trunk/raster/r.series.interp/testsuite/data/infile_2.txt
grass/trunk/raster/r.series.interp/testsuite/data/outfile_1.txt
grass/trunk/raster/r.series.interp/testsuite/data/outfile_2.txt
grass/trunk/raster/r.series.interp/testsuite/data/outfile_corrupt.txt
Removed:
grass/trunk/raster/r.series.interp/testsuite/infile_2.txt
grass/trunk/raster/r.series.interp/testsuite/outfile_1.txt
grass/trunk/raster/r.series.interp/testsuite/outfile_2.txt
grass/trunk/raster/r.series.interp/testsuite/outfile_corrupt.txt
Modified:
grass/trunk/raster/r.series.interp/testsuite/interp_test.py
Log:
r.series.interp: Use data directory to store test input data
Copied: grass/trunk/raster/r.series.interp/testsuite/data/infile_2.txt (from rev 61244, grass/trunk/raster/r.series.interp/testsuite/infile_2.txt)
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/data/infile_2.txt (rev 0)
+++ grass/trunk/raster/r.series.interp/testsuite/data/infile_2.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -0,0 +1,4 @@
+map_10|10
+map_20|20
+map_30|30
+map_40|40
Copied: grass/trunk/raster/r.series.interp/testsuite/data/outfile_1.txt (from rev 61244, grass/trunk/raster/r.series.interp/testsuite/outfile_1.txt)
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/data/outfile_1.txt (rev 0)
+++ grass/trunk/raster/r.series.interp/testsuite/data/outfile_1.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -0,0 +1,9 @@
+
+prec_2|0.25
+
+
+prec_3|0.5
+
+prec_4|0.75
+
+
Copied: grass/trunk/raster/r.series.interp/testsuite/data/outfile_2.txt (from rev 61244, grass/trunk/raster/r.series.interp/testsuite/outfile_2.txt)
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/data/outfile_2.txt (rev 0)
+++ grass/trunk/raster/r.series.interp/testsuite/data/outfile_2.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -0,0 +1,6 @@
+map_12|12
+map_14|14
+map_16|16
+map_18|18
+map_25|25
+map_35|35
Copied: grass/trunk/raster/r.series.interp/testsuite/data/outfile_corrupt.txt (from rev 61244, grass/trunk/raster/r.series.interp/testsuite/outfile_corrupt.txt)
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/data/outfile_corrupt.txt (rev 0)
+++ grass/trunk/raster/r.series.interp/testsuite/data/outfile_corrupt.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -0,0 +1,3 @@
+prec_2|0.25
+prec_3|0.5
+prec_4
Deleted: grass/trunk/raster/r.series.interp/testsuite/infile_2.txt
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/infile_2.txt 2014-07-20 00:02:05 UTC (rev 61282)
+++ grass/trunk/raster/r.series.interp/testsuite/infile_2.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -1,4 +0,0 @@
-map_10|10
-map_20|20
-map_30|30
-map_40|40
Modified: grass/trunk/raster/r.series.interp/testsuite/interp_test.py
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/interp_test.py 2014-07-20 00:02:05 UTC (rev 61282)
+++ grass/trunk/raster/r.series.interp/testsuite/interp_test.py 2014-07-20 00:18:36 UTC (rev 61283)
@@ -1,10 +1,4 @@
-"""Test to verify r.gwflow calculation, this calculation is based on
-the example at page 133 of the following book:
-author = "Kinzelbach, W. and Rausch, R.",
-title = "Grundwassermodellierung",
-publisher = "Gebr{\"u}der Borntraeger (Berlin, Stuttgart)",
-year = "1995"
-
+"""Test of r.series.interp
@author Soeren Gebbert
"""
from grass.gunittest.case import TestCase
@@ -44,15 +38,15 @@
def test_infile(self):
self.assertModule("r.series.interp", input="prec_1,prec_5", datapos=(0.0,1.0),
- outfile="outfile_1.txt", method="linear")
+ outfile="data/outfile_1.txt", method="linear")
self.assertRasterMinMax(map="prec_2", refmin=200, refmax=200)
self.assertRasterMinMax(map="prec_3", refmin=300, refmax=300)
self.assertRasterMinMax(map="prec_4", refmin=400, refmax=400)
def test_inoutfiles(self):
- self.assertModule("r.series.interp", infile="infile_2.txt",
- outfile="outfile_2.txt", method="linear")
+ self.assertModule("r.series.interp", infile="data/infile_2.txt",
+ outfile="data/outfile_2.txt", method="linear")
self.assertRasterMinMax(map="map_12", refmin=12, refmax=12)
self.assertRasterMinMax(map="map_14", refmin=14, refmax=14)
Deleted: grass/trunk/raster/r.series.interp/testsuite/outfile_1.txt
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/outfile_1.txt 2014-07-20 00:02:05 UTC (rev 61282)
+++ grass/trunk/raster/r.series.interp/testsuite/outfile_1.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -1,9 +0,0 @@
-
-prec_2|0.25
-
-
-prec_3|0.5
-
-prec_4|0.75
-
-
Deleted: grass/trunk/raster/r.series.interp/testsuite/outfile_2.txt
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/outfile_2.txt 2014-07-20 00:02:05 UTC (rev 61282)
+++ grass/trunk/raster/r.series.interp/testsuite/outfile_2.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -1,6 +0,0 @@
-map_12|12
-map_14|14
-map_16|16
-map_18|18
-map_25|25
-map_35|35
Deleted: grass/trunk/raster/r.series.interp/testsuite/outfile_corrupt.txt
===================================================================
--- grass/trunk/raster/r.series.interp/testsuite/outfile_corrupt.txt 2014-07-20 00:02:05 UTC (rev 61282)
+++ grass/trunk/raster/r.series.interp/testsuite/outfile_corrupt.txt 2014-07-20 00:18:36 UTC (rev 61283)
@@ -1,3 +0,0 @@
-prec_2|0.25
-prec_3|0.5
-prec_4
More information about the grass-commit
mailing list