Commit 14737964 authored by thomas.forbriger's avatar thomas.forbriger
Browse files

[FIX][FEATURE] (anyextract): properly name values

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.

Time values given in GAP messages are now labeled appropriately.
parent 9099adcf
......@@ -70,6 +70,7 @@
* - 08/01/2013 V1.24 bug fix: handle earliest and latest times properly
* in situations where a completeness analysis is done
* on data on staggered sampling rasters
* - 07/11/2014 V1.25 properly report meaning of gap messages
*
* TODO:
* * properly handle cases in which the output format can take only single
......@@ -82,7 +83,7 @@
*/
#define ANYEXTRACT_VERSION \
"ANYEXTRACT V1.24 extract data files, using index file"
"ANYEXTRACT V1.25 extract data files, using index file"
#define ANYEXTRACT_CVSID \
"$Id$"
......@@ -1223,18 +1224,20 @@ int main(int iargc, char* argv[])
<< entry.wid2.auxid << "): ";
if (nextdate < entry.wid2.date)
{
cout << nextdate.timestring() << " < "
<< entry.wid2.date.timestring() << endl;
cout << nextdate.timestring() << " (expected)" << " < "
<< entry.wid2.date.timestring() << " (actual)" << endl;
}
else if ((entry.wid2.date <= nextdate) &&
(sff::wid2isamplerest(entry.wid2,nextdate)
> tolerancewindow))
{
cout << entry.wid2.date.timestring() << " <= "
<< nextdate.timestring() << endl
cout << nextdate.timestring() << " (expected)" << " >= "
<< entry.wid2.date.timestring() << " (actual)" << endl
<< " && " << " "
<< sff::wid2isamplerest(entry.wid2,nextdate).timestring()
<< " > " << tolerancewindow.timestring() << endl;
<< " (residual to sampling raster)"
<< " > " << tolerancewindow.timestring()
<< " (tolerance)" << endl;
/*
libtime::TRelativeTime diff=entry.wid2.date-nextdate;
cout << "NOTICE: diff=" << diff.timestring()<< endl;
......@@ -1249,8 +1252,8 @@ int main(int iargc, char* argv[])
else if (gc_sample_overlap && gc_no_duplicates_allowed)
{
cout << "duplicates: ";
cout << nextdate.timestring() << " > "
<< entry.wid2.date.timestring() << endl;
cout << nextdate.timestring() << " (expected)" << " > "
<< entry.wid2.date.timestring() << " (actual)" << endl;
}
else
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment