[geos-commits] [SCM] GEOS branch master updated. ee833c55b1c1466ea44fe2adbde451b486b57392
git at osgeo.org
git at osgeo.org
Fri Nov 30 10:42:33 PST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via ee833c55b1c1466ea44fe2adbde451b486b57392 (commit)
from b5eb5cd30df17480a55d81e8c087049d03c13ef3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee833c55b1c1466ea44fe2adbde451b486b57392
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Nov 30 10:42:21 2018 -0800
Reformatting pass
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index 624de71..6be7a4d 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -99,27 +99,27 @@ std::unique_ptr<const PreparedGeometry> prepare( const geom::Geometry *g ) {
// Copy from geos/util/math.cpp
double java_math_round(double val)
{
- double n;
- double f = std::fabs(std::modf(val, &n));
-
- if (val >= 0)
- {
- if (f < 0.5) {
- return std::floor(val);
- } else if (f > 0.5) {
- return std::ceil(val);
- } else {
- return (n + 1.0);
- }
- } else {
- if (f < 0.5) {
- return std::ceil(val);
- } else if (f > 0.5) {
- return std::floor(val);
- } else {
- return n;
- }
- }
+ double n;
+ double f = std::fabs(std::modf(val, &n));
+
+ if (val >= 0)
+ {
+ if (f < 0.5) {
+ return std::floor(val);
+ } else if (f > 0.5) {
+ return std::ceil(val);
+ } else {
+ return (n + 1.0);
+ }
+ } else {
+ if (f < 0.5) {
+ return std::ceil(val);
+ } else if (f > 0.5) {
+ return std::floor(val);
+ } else {
+ return n;
+ }
+ }
} // java_math_round
@@ -196,10 +196,10 @@ checkBufferSuccess(geom::Geometry const& gRes, geom::Geometry const& gRealRes, d
if ( gRes.getGeometryTypeId() != gRealRes.getGeometryTypeId() )
{
std::cerr << "Expected result is of type "
- << gRes.getGeometryType()
- << "; obtained result is of type "
- << gRealRes.getGeometryType()
- << std::endl;
+ << gRes.getGeometryType()
+ << "; obtained result is of type "
+ << gRealRes.getGeometryType()
+ << std::endl;
success=0;
break;
}
@@ -208,19 +208,19 @@ checkBufferSuccess(geom::Geometry const& gRes, geom::Geometry const& gRealRes, d
if ( gRes.getDimension() != 2 )
{
std::cerr << "Don't know how to validate "
- << "result of buffer operation "
- << "when expected result is not an "
- << "areal type."
- << std::endl;
+ << "result of buffer operation "
+ << "when expected result is not an "
+ << "areal type."
+ << std::endl;
}
geos::xmltester::BufferResultMatcher matcher;
if ( ! matcher.isBufferResultMatch(gRealRes,
- gRes,
- dist) )
+ gRes,
+ dist) )
{
-std::cerr << "BufferResultMatcher FAILED" << std::endl;
+ std::cerr << "BufferResultMatcher FAILED" << std::endl;
success=0;
break;
}
@@ -233,7 +233,7 @@ std::cerr << "BufferResultMatcher FAILED" << std::endl;
static int
checkSingleSidedBufferSuccess(geom::Geometry& gRes,
- geom::Geometry& gRealRes, double dist)
+ geom::Geometry& gRealRes, double dist)
{
int success = 1;
do
@@ -242,20 +242,20 @@ checkSingleSidedBufferSuccess(geom::Geometry& gRes,
if ( gRes.getGeometryTypeId() != gRealRes.getGeometryTypeId() )
{
std::cerr << "Expected result is of type "
- << gRes.getGeometryType()
- << "; obtained result is of type "
- << gRealRes.getGeometryType()
- << std::endl;
+ << gRes.getGeometryType()
+ << "; obtained result is of type "
+ << gRealRes.getGeometryType()
+ << std::endl;
success=0;
break;
}
geos::xmltester::SingleSidedBufferResultMatcher matcher;
if ( ! matcher.isBufferResultMatch(gRealRes,
- gRes,
- dist) )
+ gRes,
+ dist) )
{
-std::cerr << "SingleSidedBufferResultMatcher FAILED" << std::endl;
+ std::cerr << "SingleSidedBufferResultMatcher FAILED" << std::endl;
success=0;
break;
}
@@ -342,7 +342,7 @@ XMLTester::printTest(bool success, const std::string& expected_result, const std
std::cout << *curr_file <<":";
std::cout << " case" << caseCount << ":";
std::cout << " test" << testCount << ": "
- << opSignature;
+ << opSignature;
std::cout << ": " << (success?"ok.":"failed.");
std::cout << " (" << std::setprecision(15) << java_math_round(prof.getTot()/1000) << " ms)" << std::endl;
@@ -376,17 +376,17 @@ XMLTester::run(const std::string &source)
{
std::cout << "CREATE TABLE \"" << normalize_filename(*curr_file) << "\""
<< "( caseno integer, testno integer, "
- << " operation varchar, description varchar, "
- << " a geometry, b geometry, expected geometry, "
- << " obtained geometry, result bool )"
+ << " operation varchar, description varchar, "
+ << " a geometry, b geometry, expected geometry, "
+ << " obtained geometry, result bool )"
- // NOTE: qgis 0.7.4 require oids for proper operations.
- // The 'WITH OIDS' parameter is supported back to
- // PostgreSQL 7.2, so if you run an older version
- // rebuild with the next line commented out.
- << " WITH OIDS"
+ // NOTE: qgis 0.7.4 require oids for proper operations.
+ // The 'WITH OIDS' parameter is supported back to
+ // PostgreSQL 7.2, so if you run an older version
+ // rebuild with the next line commented out.
+ << " WITH OIDS"
- << ";" << std::endl;
+ << ";" << std::endl;
}
++testFileCount;
@@ -407,7 +407,7 @@ XMLTester::run(const std::string &source)
const tinyxml2::XMLNode* node = xml.FirstChildElement("run");
if ( ! node )
- throw(runtime_error("Document has no childs"));
+ throw(runtime_error("Document has no childs"));
parseRun(node);
@@ -475,8 +475,8 @@ XMLTester::parseRun(const tinyxml2::XMLNode* node)
const tinyxml2::XMLNode* casenode;
for ( casenode = node->FirstChildElement("case");
- casenode;
- casenode = casenode->NextSiblingElement("case") )
+ casenode;
+ casenode = casenode->NextSiblingElement("case") )
{
try {
parseCase(casenode);
@@ -538,11 +538,11 @@ XMLTester::testValid(const geom::Geometry* g, const std::string& label)
{
operation::valid::TopologyValidationError *err = ivo.getValidationError();
std::cerr << *curr_file << ":"
- << " case" << caseCount << ":"
- << " test" << testCount << ": "
- << opSignature << ": "
- << " invalid geometry (" << label
- << "): " << err->toString() << std::endl;
+ << " case" << caseCount << ":"
+ << " test" << testCount << ": "
+ << opSignature << ": "
+ << " invalid geometry (" << label
+ << "): " << err->toString() << std::endl;
}
return valid;
}
@@ -567,27 +567,27 @@ XMLTester::parseGeometry(const std::string &in, const char* label)
switch (first_char)
{
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- case 'A':
- case 'B':
- case 'C':
- case 'D':
- case 'E':
- case 'F':
- ret = wkbreader->readHEX(is);
- break;
- default:
- ret = wktreader->read(in);
- break;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ ret = wkbreader->readHEX(is);
+ break;
+ default:
+ ret = wktreader->read(in);
+ break;
}
if ( testValidInput ) testValid(ret, std::string(label));
@@ -670,8 +670,8 @@ XMLTester::parseCase(const tinyxml2::XMLNode* node)
const tinyxml2::XMLNode* testnode;
for ( testnode = node->FirstChildElement("test");
- testnode;
- testnode = testnode->NextSiblingElement("test") )
+ testnode;
+ testnode = testnode->NextSiblingElement("test") )
{
parseTest(testnode);
}
@@ -750,8 +750,8 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
{
std::stringstream p_tmp;
p_tmp << "op of test " << testCount
- << " of case " << caseCount
- << " has no expected result child";
+ << " of case " << caseCount
+ << " has no expected result child";
throw(runtime_error(p_tmp.str()));
}
opRes = resnode->Value();
@@ -1186,7 +1186,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
BufferParameters params;
if ( opArg3 != "" ) {
- params.setQuadrantSegments(std::atoi(opArg3.c_str()));
+ params.setQuadrantSegments(std::atoi(opArg3.c_str()));
}
@@ -1224,7 +1224,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
BufferParameters params ;
params.setJoinStyle( BufferParameters::JOIN_ROUND ) ;
if ( opArg3 != "" ) {
- params.setQuadrantSegments( std::atoi(opArg3.c_str()));
+ params.setQuadrantSegments( std::atoi(opArg3.c_str()));
}
bool leftSide = true ;
@@ -1235,14 +1235,14 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
BufferBuilder bufBuilder( params ) ;
gRealRes.reset( bufBuilder.bufferLineSingleSided(
- p_gT, dist, leftSide ) ) ;
+ p_gT, dist, leftSide ) ) ;
profile.stop();
gRealRes->normalize();
// Validate the single sided buffer operation
success = checkSingleSidedBufferSuccess(*gRes,
- *gRealRes, dist);
+ *gRealRes, dist);
actual_result=printGeom(gRealRes.get());
expected_result=printGeom(gRes.get());
@@ -1270,7 +1270,7 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
params.setJoinStyle(BufferParameters::JOIN_MITRE);
if ( opArg3 != "" ) {
- params.setQuadrantSegments(std::atoi(opArg3.c_str()));
+ params.setQuadrantSegments(std::atoi(opArg3.c_str()));
}
BufferOp op(p_gT, params);
@@ -1393,13 +1393,13 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if ( verbose > 1 )
{
- std::cerr << "Running intersection for areatest" << std::endl;
+ std::cerr << "Running intersection for areatest" << std::endl;
}
#ifndef USE_BINARYOP
GeomPtr gI(gA->intersection(gB));
#else
GeomPtr gI = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opINTERSECTION));
+ overlayOp(OverlayOp::opINTERSECTION));
#endif
if ( testValidOutput )
@@ -1409,14 +1409,14 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if ( verbose > 1 )
{
- std::cerr << "Running difference(A,B) for areatest" << std::endl;
+ std::cerr << "Running difference(A,B) for areatest" << std::endl;
}
#ifndef USE_BINARYOP
GeomPtr gDab(gA->difference(gB));
#else
GeomPtr gDab = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opDIFFERENCE));
+ overlayOp(OverlayOp::opDIFFERENCE));
#endif
if ( testValidOutput )
@@ -1426,14 +1426,14 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if ( verbose > 1 )
{
- std::cerr << "Running difference(B,A) for areatest" << std::endl;
+ std::cerr << "Running difference(B,A) for areatest" << std::endl;
}
#ifndef USE_BINARYOP
GeomPtr gDba(gB->difference(gA));
#else
GeomPtr gDba = BinaryOp(gB, gA,
- overlayOp(OverlayOp::opDIFFERENCE));
+ overlayOp(OverlayOp::opDIFFERENCE));
#endif
if ( testValidOutput )
@@ -1443,14 +1443,14 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if ( verbose > 1 )
{
- std::cerr << "Running symdifference for areatest" << std::endl;
+ std::cerr << "Running symdifference for areatest" << std::endl;
}
#ifndef USE_BINARYOP
GeomPtr gSD(gA->symDifference(gB));
#else
GeomPtr gSD = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opSYMDIFFERENCE));
+ overlayOp(OverlayOp::opSYMDIFFERENCE));
#endif
if ( testValidOutput )
@@ -1460,14 +1460,14 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
if ( verbose > 1 )
{
- std::cerr << "Running union for areatest" << std::endl;
+ std::cerr << "Running union for areatest" << std::endl;
}
#ifndef USE_BINARYOP
GeomPtr gU(gA->Union(gB));
#else
GeomPtr gU = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opUNION));
+ overlayOp(OverlayOp::opUNION));
#endif
double areaA = gA->getArea();
@@ -1537,7 +1537,8 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
geom::Geometry *g1 = opArg1 == "B" ? gB : gA;
geom::Geometry *g2 = opArg2 == "B" ? gB : gA;
double distO = g1->distance(g2);
- std::stringstream ss; ss << distO;
+ std::stringstream ss;
+ ss << distO;
actual_result = ss.str();
// TODO: Use a tolerance ?
@@ -1558,8 +1559,8 @@ XMLTester::parseTest(const tinyxml2::XMLNode* node)
catch (const std::exception &e)
{
std::cerr<<"EXCEPTION on case "<<caseCount
- <<" test "<<testCount<<": "<<e.what()
- <<std::endl;
+ <<" test "<<testCount<<": "<<e.what()
+ <<std::endl;
actual_result = e.what();
}
catch (...)
@@ -1628,7 +1629,7 @@ usage(char *me, int exitcode, std::ostream &os)
void
request_interrupt(int)
{
- geos::util::Interrupt::request();
+ geos::util::Interrupt::request();
}
int
@@ -1642,60 +1643,60 @@ main(int argC, char* argV[])
{
#endif
- if ( argC < 2 ) usage(argV[0], 1, std::cerr);
+ if ( argC < 2 ) usage(argV[0], 1, std::cerr);
- signal(15, request_interrupt);
+ signal(15, request_interrupt);
- XMLTester tester;
- tester.setVerbosityLevel(verbose);
+ XMLTester tester;
+ tester.setVerbosityLevel(verbose);
- for (int i=1; i<argC; ++i)
- {
- // increment verbosity level
- if ( ! std::strcmp(argV[i], "-v" ) )
+ for (int i=1; i<argC; ++i)
{
- ++verbose;
- tester.setVerbosityLevel(verbose);
- continue;
- }
- if ( ! std::strcmp(argV[i], "--test-valid-output" ) )
- {
- tester.testOutputValidity(true);
- continue;
- }
- if ( ! std::strcmp(argV[i], "--sql-output" ) )
- {
- sql_output = true;
- tester.setSQLOutput(sql_output);
- continue;
- }
- if ( ! std::strcmp(argV[i], "--wkb-output" ) )
- {
- sql_output = true;
- tester.setHEXWKBOutput(sql_output);
- continue;
- }
- if ( ! std::strcmp(argV[i], "--test-valid-input" ) )
- {
- tester.testInputValidity(true);
- continue;
- }
+ // increment verbosity level
+ if ( ! std::strcmp(argV[i], "-v" ) )
+ {
+ ++verbose;
+ tester.setVerbosityLevel(verbose);
+ continue;
+ }
+ if ( ! std::strcmp(argV[i], "--test-valid-output" ) )
+ {
+ tester.testOutputValidity(true);
+ continue;
+ }
+ if ( ! std::strcmp(argV[i], "--sql-output" ) )
+ {
+ sql_output = true;
+ tester.setSQLOutput(sql_output);
+ continue;
+ }
+ if ( ! std::strcmp(argV[i], "--wkb-output" ) )
+ {
+ sql_output = true;
+ tester.setHEXWKBOutput(sql_output);
+ continue;
+ }
+ if ( ! std::strcmp(argV[i], "--test-valid-input" ) )
+ {
+ tester.testInputValidity(true);
+ continue;
+ }
- std::string source = argV[i];
+ std::string source = argV[i];
- try {
- tester.run(source);
- } catch (const std::exception& exc) {
- std::cerr<<exc.what()<<std::endl;
+ try {
+ tester.run(source);
+ } catch (const std::exception& exc) {
+ std::cerr<<exc.what()<<std::endl;
+ }
}
- }
- if ( ! sql_output ) tester.resultSummary(std::cout);
- else tester.resultSummary(std::cerr);
+ if ( ! sql_output ) tester.resultSummary(std::cout);
+ else tester.resultSummary(std::cerr);
- io::Unload::Release();
+ io::Unload::Release();
- return tester.getFailuresCount();
+ return tester.getFailuresCount();
#if defined(_MSC_VER) && defined(GEOS_TEST_USE_STACKWALKER)
}
-----------------------------------------------------------------------
Summary of changes:
tests/xmltester/XMLTester.cpp | 293 +++++++++++++++++++++---------------------
1 file changed, 147 insertions(+), 146 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list