Small bugfix, added error handling tests and

moved tests in the dedicated directory test


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

raster/r.series.interpol/main.c

@@ -47,12 +47,12 @@ int main(int argc, char *argv[])
     struct GModule *module;
     struct
     {
-	struct Option *input, *file, *output, *sampoint, *method;
+	struct Option *input, *file, *output, *sampoints, *method;
     } parm;
     int i;
     int num_outputs;
     int num_inputs;
-    int num_sampoint;
+    int num_sampoints;
     struct map_store *inputs = NULL;
     struct map_store *outputs = NULL;
     int interpol_method = LINEAR_INTERPOLATION;
@@ -73,13 +73,13 @@ int main(int argc, char *argv[])
     parm.output->multiple = YES;
     parm.output->required = NO;
 
-    parm.sampoint = G_define_option();
-    parm.sampoint->key = "sampoint";
-    parm.sampoint->type = TYPE_DOUBLE;
-    parm.sampoint->required = NO;
-    parm.sampoint->description = _("Sampling point for each input map,"
+    parm.sampoints = G_define_option();
+    parm.sampoints->key = "sampoints";
+    parm.sampoints->type = TYPE_DOUBLE;
+    parm.sampoints->required = NO;
+    parm.sampoints->description = _("Sampling point for each input map,"
                                    " the point must in between the interval (0;1)");
-    parm.sampoint->multiple = YES;
+    parm.sampoints->multiple = YES;
 
     parm.file = G_define_standard_option(G_OPT_F_INPUT);
     parm.file->key = "file";
@@ -100,13 +100,17 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
 
     if (parm.output->answer && parm.file->answer)
-        G_fatal_error(_("input= and file= are mutually exclusive"));
+        G_fatal_error(_("output= and file= are mutually exclusive"));
  
-    if (!parm.input->answer && !parm.file->answer)
-        G_fatal_error(_("Please specify input= or file="));
+    if (parm.sampoints->answer && parm.file->answer)
+        G_fatal_error(_("sampoints= and file= are mutually exclusive"));
  
-    if (parm.output->answer && !parm.sampoint->answer)
-        G_fatal_error(_("Please specify input= and sampoint="));
+
+    if (!parm.output->answer && !parm.file->answer)
+        G_fatal_error(_("Please specify output= or file="));
+ 
+    if (parm.output->answer && !parm.sampoints->answer)
+        G_fatal_error(_("Please specify output= and sampoints="));
 
     if(G_strncasecmp(parm.method->answer, "linear", 6))
         interpol_method = LINEAR_INTERPOLATION;
@@ -192,7 +196,7 @@ int main(int argc, char *argv[])
                 if(pos < left || pos > right)
 	            G_fatal_error(_("Wrong sampling point for output map <%s> in file <%s> "
                                     "near line %i, sampling point must be in between (%g:%g) not: %g"), 
-                                     name, parm.file->answer, num_outputs, left, right, pos);
+                                     name, parm.file->answer, num_outputs + 1, left, right, pos);
             } else {
 	        name = G_chop(buf);
             }
@@ -232,12 +236,12 @@ int main(int argc, char *argv[])
     	if (num_outputs < 1)
 	    G_fatal_error(_("No output raster map not found"));
 
-        for (i = 0; parm.sampoint->answers[i]; i++)
+        for (i = 0; parm.sampoints->answers[i]; i++)
 	    ;
-        num_sampoint = i;
+        num_sampoints = i;
     
-        if (num_sampoint != num_outputs)
-                G_fatal_error(_("input= and sampoint= must have the same number of values"));
+        if (num_sampoints != num_outputs)
+                G_fatal_error(_("input= and sampoints= must have the same number of values"));
         
     	outputs = G_malloc(num_outputs * sizeof(struct map_store));
 
@@ -245,7 +249,7 @@ int main(int argc, char *argv[])
 	    struct map_store *p = &outputs[i];
 
 	    p->name = parm.output->answers[i];
-            p->pos = (DCELL)atof(parm.sampoint->answers[i]);
+            p->pos = (DCELL)atof(parm.sampoints->answers[i]);
             p->fd = -1;
             p->buf = NULL;
         }

raster/r.series.interpol/r.series.interpol.html

@@ -1,7 +1,7 @@
 <h2>DESCRIPTION</h2>
 
 <em>r.series.interpol</em> 
-interpolates raster maps which are located temporal or spatial in between existing input raster maps. 
+interpolates new raster maps located temporal or spatial in between existing raster maps. 
 The interpolation is performed at specific sampling positions. The sampling position for each output map must be specified.
 Sampling positions are always located in the normalized intervall (0;1).
 The following interpolation methods are supported.
@@ -10,7 +10,7 @@ The following interpolation methods are supported.
  </ul> 
 
 <h2>EXAMPLES</h2>
-<p>Interpolate linear three new maps at 3 sampling positions in between the interval (0;1) 
+<p>Interpolate linear three new maps at 3 sampling positions 
 
 First prepare the input maps:
 <br>
@@ -27,11 +27,12 @@ r.mapcalc --o expr="prec_5 = 500"
 r.series.interpol --o --v input=prec_1,prec_5 output=prec_2,prec_3,prec_4 sampoint=0.25,0.5,0.75 method=linear
 </pre></div>
 
-<p>Interpolate using the file option: 
+<p>Interpolate using the file option. 
 First prepare the input file:
 <br>
 <div class="code"><pre>
 TMP_FILE=`g.tempfile pid=1`
+
 cat > "${TMP_FILE}" << EOF
 prec_2|0.25
 prec_3|0.5
@@ -39,13 +40,13 @@ prec_4|0.75
 EOF
 </pre></div>
 
-<p>Interpolate
+<p>Interpolate:
 
 <div class="code"><pre>
 r.series.interpol --o --v input=prec_1,prec_5 file="${TMP_FILE}" method=linear
 </pre></div>
 
-The created maps will have the values 200, 300 and 400.
+The resulting maps will have the values 200, 300 and 400.
 
 
 <h2>SEE ALSO</h2>

raster/r.series.interpol/test.r.series.interpol.sh

@@ -1,39 +0,0 @@
-# Test r.series.interpol 
-# We need to set a specific region in the
-# @preprocess step of this test. We generate
-# raster maps with r.mapcalc 
-# 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 = 100"
-r.mapcalc --o expr="prec_5 = 500"
-
-TMP_FILE=`g.tempfile pid=1`
-# We create an input files containing empty lines. However, r.series.interpol should process the 
-# valid raster maps listed in the files.
-
-cat > "${TMP_FILE}" << EOF
-
-prec_2|0.25
-
-
-prec_3|0.5
-
-prec_4|0.75
-
-
-EOF
-
-# The first @test with map input and @precision=3
-r.series.interpol --o --v input=prec_1,prec_5 output=prec_2,prec_3,prec_4 sampoint=0.25,0.5,0.75 method=linear
-
-#r.out.ascii --o input=prec_2 output=test_1_prec_2.ref dp=3
-#r.out.ascii --o input=prec_3 output=test_1_prec_3.ref dp=3
-#r.out.ascii --o input=prec_4 output=test_1_prec_4.ref dp=3
-
-# The second @test with file input and @precision=3
-r.series.interpol --o --v input=prec_1,prec_5 file="${TMP_FILE}" method=linear
-
-#r.out.ascii --o input=prec_2 output=test_2_prec_2.ref dp=3
-#r.out.ascii --o input=prec_3 output=test_2_prec_3.ref dp=3
-#r.out.ascii --o input=prec_4 output=test_2_prec_4.ref dp=3

raster/r.series.interpol/test/test.r.series.interpol.sh

@@ -0,0 +1,63 @@
+# Test r.series.interpol 
+# We need to set a specific region in the
+# @preprocess step of this test. We generate
+# raster maps with r.mapcalc 
+# 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 = 100"
+r.mapcalc --o expr="prec_5 = 500"
+
+TMP_FILE=`g.tempfile pid=1`
+TMP_FILE_CORRUPT=`g.tempfile pid=2`
+# We create an input files containing empty lines. 
+# However, r.series.interpol should process the 
+# valid raster maps and positions listed in the files.
+
+cat > "${TMP_FILE}" << EOF
+
+prec_2|0.25
+
+
+prec_3|0.5
+
+prec_4|0.75
+
+
+EOF
+
+cat > "${TMP_FILE_CORRUPT}" << EOF
+prec_2|0.25
+prec_3|0.5
+prec_4
+EOF
+
+
+# The first @test with map input and @precision=3
+r.series.interpol --o --v input=prec_1,prec_5 output=prec_2,prec_3,prec_4 sampoints=0.25,0.5,0.75 method=linear
+
+#r.out.ascii --o input=prec_2 output=test_1_prec_2.ref dp=3
+#r.out.ascii --o input=prec_3 output=test_1_prec_3.ref dp=3
+#r.out.ascii --o input=prec_4 output=test_1_prec_4.ref dp=3
+
+# The second @test with file input and @precision=3
+r.series.interpol --o --v input=prec_1,prec_5 file="${TMP_FILE}" method=linear
+
+#r.out.ascii --o input=prec_2 output=test_2_prec_2.ref dp=3
+#r.out.ascii --o input=prec_3 output=test_2_prec_3.ref dp=3
+#r.out.ascii --o input=prec_4 output=test_2_prec_4.ref dp=3
+
+# We need @tests to check the @failure handling, as outputs, file and sampling points
+# are not handled by the grass parser
+# No outputs
+r.series.interpol --o --v input=prec_1,prec_5 sampoints=0.25,0.5,0.75
+# No sampling points
+r.series.interpol --o --v input=prec_1,prec_5 output=prec_2,prec_3,prec_4 
+# Output and file at once
+r.series.interpol --o --v  input=prec_1,prec_5 file="${TMP_FILE}" output=prec_2,prec_3,prec_4 sampoints=0.25,0.5,0.75 method=linear
+# Sampling points and file at once 
+r.series.interpol --o --v  input=prec_1,prec_5 file="${TMP_FILE}" sampoints=0.25,0.5,0.75 method=linear
+# Wrong input file
+r.series.interpol --o --v input=prec_1,prec_5 file=no_file_there method=linear
+# Corrupt input file
+r.series.interpol --o --v  input=prec_1,prec_5 file="${TMP_FILE_CORRUPT}" method=linear