[geos-commits] r3954 - in trunk: capi tests/unit tests/unit/capi
svn_geos at osgeo.org
svn_geos at osgeo.org
Fri Sep 13 01:20:23 PDT 2013
Author: strk
Date: 2013-09-13 01:20:23 -0700 (Fri, 13 Sep 2013)
New Revision: 3954
Added:
trunk/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
Removed:
trunk/tests/unit/capi/GEOSVoronoiDiagramBuilderTest.cpp
Modified:
trunk/capi/geos_c.cpp
trunk/capi/geos_c.h.in
trunk/capi/geos_ts_c.cpp
trunk/tests/unit/Makefile.am
Log:
Rename CAPI method GEOSVoronoiDiagramBuilder to GEOSVoronoiDiagram
See #627
Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp 2013-09-13 07:56:44 UTC (rev 3953)
+++ trunk/capi/geos_c.cpp 2013-09-13 08:20:23 UTC (rev 3954)
@@ -1271,9 +1271,9 @@
}
Geometry*
-GEOSVoronoiDiagramBuilder(const Geometry *g, double tolerance)
+GEOSVoronoiDiagram(const Geometry *g, double tolerance)
{
- return GEOSVoronoiDiagramBuilder_r(handle, g, tolerance);
+ return GEOSVoronoiDiagram_r(handle, g, tolerance);
}
} /* extern "C" */
Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in 2013-09-13 07:56:44 UTC (rev 3953)
+++ trunk/capi/geos_c.h.in 2013-09-13 08:20:23 UTC (rev 3954)
@@ -752,11 +752,11 @@
*
* @return a newly allocated geometry, or NULL on exception.
*/
-extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagramBuilder(
+extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagram(
const GEOSGeometry *g,
double tolerance);
-extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagramBuilder_r(
+extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagram_r(
GEOSContextHandle_t extHandle,
const GEOSGeometry *g1,
double tolerance);
Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp 2013-09-13 07:56:44 UTC (rev 3953)
+++ trunk/capi/geos_ts_c.cpp 2013-09-13 08:20:23 UTC (rev 3954)
@@ -6219,7 +6219,7 @@
return NULL;
}
Geometry*
-GEOSVoronoiDiagramBuilder_r(GEOSContextHandle_t extHandle, const Geometry *g1,double tolerance)
+GEOSVoronoiDiagram_r(GEOSContextHandle_t extHandle, const Geometry *g1,double tolerance)
{
if ( 0 == extHandle ) return NULL;
Modified: trunk/tests/unit/Makefile.am
===================================================================
--- trunk/tests/unit/Makefile.am 2013-09-13 07:56:44 UTC (rev 3953)
+++ trunk/tests/unit/Makefile.am 2013-09-13 08:20:23 UTC (rev 3954)
@@ -111,7 +111,7 @@
util/UniqueCoordinateArrayFilterTest.cpp \
capi/GEOSCoordSeqTest.cpp \
capi/GEOSDelaunayTriangulationTest.cpp \
- capi/GEOSVoronoiDiagramBuilderTest.cpp \
+ capi/GEOSVoronoiDiagramTest.cpp \
capi/GEOSGeomFromWKBTest.cpp \
capi/GEOSGeomToWKTTest.cpp \
capi/GEOSGetCentroidTest.cpp \
Deleted: trunk/tests/unit/capi/GEOSVoronoiDiagramBuilderTest.cpp
===================================================================
--- trunk/tests/unit/capi/GEOSVoronoiDiagramBuilderTest.cpp 2013-09-13 07:56:44 UTC (rev 3953)
+++ trunk/tests/unit/capi/GEOSVoronoiDiagramBuilderTest.cpp 2013-09-13 08:20:23 UTC (rev 3954)
@@ -1,138 +0,0 @@
-//
-// Test Suite for C-API GEOSVoronoiDiagramBuilder
-
-#include <tut.hpp>
-// geos
-#include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-
-namespace tut
-{
- //
- // Test Group
- //
-
- // Common data used in test cases.
- struct test_capigeosvoronoidiagrambuilder_data
- {
- GEOSGeometry* geom1_;
- GEOSGeometry* geom2_;
- GEOSWKTWriter* w_;
-
- static void notice(const char *fmt, ...)
- {
- std::fprintf( stdout, "NOTICE: ");
-
- va_list ap;
- va_start(ap, fmt);
- std::vfprintf(stdout, fmt, ap);
- va_end(ap);
-
- std::fprintf(stdout, "\n");
- }
-
- test_capigeosvoronoidiagrambuilder_data()
- : geom1_(0), geom2_(0)
- {
- initGEOS(notice, notice);
- w_ = GEOSWKTWriter_create();
- GEOSWKTWriter_setTrim(w_, 1);
- }
-
- void ensure_equals_wkt(GEOSGeometry* g, const char* exp)
- {
- GEOSNormalize(g);
- char* wkt_c = GEOSWKTWriter_write(w_, g);
- std::string out(wkt_c);
- free(wkt_c);
-
- GEOSGeometry* exp_g = GEOSGeomFromWKT(exp);
- GEOSNormalize(exp_g);
- char* wkt_c2 = GEOSWKTWriter_write(w_, exp_g);
- std::string out_exp(wkt_c2);
- free(wkt_c2);
-
-// cout << "OUTPUT STRING::" << out << endl << endl;
-// cout << "Expected STRING::" << out_exp << endl << endl;
- ensure_equals(out, out_exp);
- GEOSGeom_destroy(exp_g);
- }
-
- ~test_capigeosvoronoidiagrambuilder_data()
- {
- GEOSGeom_destroy(geom1_);
- GEOSGeom_destroy(geom2_);
- GEOSWKTWriter_destroy(w_);
- geom1_ = 0;
- geom2_ = 0;
- finishGEOS();
- }
-
- };
-
- typedef test_group<test_capigeosvoronoidiagrambuilder_data> group;
- typedef group::object object;
-
- group test_capigeosvoronoidiagrambuilder_group("capi::GEOSVoronoiDiagram");
-
- //
- // Test Cases
- //
-
- // Single point
- template<>
- template<>
- void object::test<1>()
- {
- geom1_ = GEOSGeomFromWKT("POINT(10 20)");
-
- geom2_ = GEOSVoronoiDiagramBuilder(geom1_,0);
- ensure_equals ( GEOSisEmpty(geom2_), 1 );
- ensure_equals ( GEOSGeomTypeId(geom2_), GEOS_GEOMETRYCOLLECTION );
- }
-
- //More points:
- template<>
- template<>
- void object::test<2>()
- {
- geom1_ = GEOSGeomFromWKT("MULTIPOINT ((280 300), (420 330), (380 230), (320 160))");
-
- geom2_ = GEOSVoronoiDiagramBuilder(geom1_,0);
- ensure_equals_wkt(geom2_ ,"GEOMETRYCOLLECTION (POLYGON ((110 175.71428571428572, 110 500, 310.35714285714283 500, 353.515625 298.59375, 306.875 231.96428571428572, 110 175.71428571428572)), POLYGON ((590 204, 590 -10, 589.1666666666666 -10, 306.875 231.96428571428572, 353.515625 298.59375, 590 204)), POLYGON ((110 -10, 110 175.71428571428572, 306.875 231.96428571428572, 589.1666666666666 -10, 110 -10)), POLYGON ((310.35714285714283 500, 590 500, 590 204, 353.515625 298.59375, 310.35714285714283 500)))" );
- }
- //Larger number of points:
- template<>
- template<>
- void object::test<3>()
- {
- geom1_ = GEOSGeomFromWKT("MULTIPOINT ((170 270), (270 270), (230 310), (180 330), (250 340), (315 318), (330 260), (240 170), (220 220), (270 220))");
-
- geom2_ = GEOSVoronoiDiagramBuilder(geom1_,0);
- ensure_equals_wkt(geom2_,"GEOMETRYCOLLECTION (POLYGON ((0 329.1666666666667, 0 510, 190 510, 213.94736842105263 342.36842105263156, 195.625 296.5625, 0 329.1666666666667)), POLYGON ((0 76.50000000000001, 0 329.1666666666667, 195.625 296.5625, 216 266, 88.33333333333333 138.33333333333334, 0 76.50000000000001)), POLYGON ((216 266, 195.625 296.5625, 213.94736842105263 342.36842105263156, 267 307, 225 265, 216 266)), POLYGON ((245 245, 225 265, 267 307, 275.9160583941606 309.54744525547443, 303.1666666666667 284, 296.6666666666667 245, 245 245)), POLYGON ((225 265, 245 245, 245 201, 88.33333333333333 138.33333333333334, 216 266, 225 265)), POLYGON ((0 0, 0 76.50000000000001, 88.33333333333333 138.33333333333334, 245 201, 380 120, 500 0, 0 0)), POLYGON ((190 510, 343.76153846153846 510, 275.9160583941606 309.54744525547443, 267 307, 213.94736842105263 342.36842105263156, 190 510)), POLYGON ((245 201, 245 245, 296.6666666666667 245, 380 120, 245 201)), POLYGON ((343.76153846
153846 510, 500 510, 500 334.9051724137931, 303.1666666666667 284, 275.9160583941606 309.54744525547443, 343.76153846153846 510)), POLYGON ((500 334.9051724137931, 500 0, 380 120, 296.6666666666667 245, 303.1666666666667 284, 500 334.9051724137931)))");
- }
- //Test with non-zero Tolerance value
- template<>
- template<>
- void object::test<4>()
- {
- geom1_ = GEOSGeomFromWKT("MULTIPOINT ((150 210), (210 270), (150 220), (220 210), (215 269))");
-
- geom2_ = GEOSVoronoiDiagramBuilder(geom1_,10);
- ensure_equals_wkt(geom2_,"GEOMETRYCOLLECTION (POLYGON ((290 252.5, 290 140, 185 140, 185 215, 187.9268292682927 235.4878048780488, 290 252.5)), POLYGON ((80 215, 80 340, 100.83333333333336 340, 187.9268292682927 235.4878048780488, 185 215, 80 215)), POLYGON ((80 140, 80 215, 185 215, 185 140, 80 140)), POLYGON ((100.83333333333336 340, 290 340, 290 252.5, 187.9268292682927 235.4878048780488, 100.83333333333336 340)))");
- }
- template<>
- template<>
- void object::test<5>()
- {
- geom1_ = GEOSGeomFromWKT("MULTIPOINT ((40 420), (50 420), (210 290), (300 360), (350 150), (170 70), (134 135) ,(305 359), (351 145), (175 71))");
-
- geom2_ = GEOSVoronoiDiagramBuilder(geom1_,10);
- ensure_equals_wkt(geom2_, "GEOMETRYCOLLECTION (POLYGON ((-310 146.559649122807, -310 770, 45 770, 45 263.64736842105265, -310 146.559649122807)), POLYGON ((-310 -153.37692307692305, -310 146.559649122807, 45 263.64736842105265, 59.16911764705881 267.8235294117647, 239.43506493506493 179.43506493506493, 241.34156378600824 151.98148148148147, -310 -153.37692307692305)), POLYGON ((45 770, 266.20000000000005 770, 181.94323144104806 418.9301310043668, 59.16911764705881 267.8235294117647, 45 263.64736842105265, 45 770)), POLYGON ((59.16911764705881 267.8235294117647, 181.94323144104806 418.9301310043668, 311.875 251.875, 239.43506493506493 179.43506493506493, 59.16911764705881 267.8235294117647)), POLYGON ((-310 -280, -310 -153.37692307692305, 241.34156378600824 151.98148148148147, 433.3333333333333 -280, -310 -280)), POLYGON ((266.20000000000005 770, 701 770, 701 344.5238095238096, 311.875 251.875, 181.94323144104806 418.9301310043668, 266.20000000000005 770)), POLYGON ((701
344.5238095238096, 701 -280, 433.3333333333333 -280, 241.34156378600824 151.98148148148147, 239.43506493506493 179.43506493506493, 311.875 251.875, 701 344.5238095238096)))");
- }
-} // namespace tut
-
Copied: trunk/tests/unit/capi/GEOSVoronoiDiagramTest.cpp (from rev 3953, trunk/tests/unit/capi/GEOSVoronoiDiagramBuilderTest.cpp)
===================================================================
--- trunk/tests/unit/capi/GEOSVoronoiDiagramTest.cpp (rev 0)
+++ trunk/tests/unit/capi/GEOSVoronoiDiagramTest.cpp 2013-09-13 08:20:23 UTC (rev 3954)
@@ -0,0 +1,138 @@
+//
+// Test Suite for C-API GEOSVoronoiDiagram
+
+#include <tut.hpp>
+// geos
+#include <geos_c.h>
+// std
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <memory>
+
+namespace tut
+{
+ //
+ // Test Group
+ //
+
+ // Common data used in test cases.
+ struct test_capigeosvoronoidiagram_data
+ {
+ GEOSGeometry* geom1_;
+ GEOSGeometry* geom2_;
+ GEOSWKTWriter* w_;
+
+ static void notice(const char *fmt, ...)
+ {
+ std::fprintf( stdout, "NOTICE: ");
+
+ va_list ap;
+ va_start(ap, fmt);
+ std::vfprintf(stdout, fmt, ap);
+ va_end(ap);
+
+ std::fprintf(stdout, "\n");
+ }
+
+ test_capigeosvoronoidiagram_data()
+ : geom1_(0), geom2_(0)
+ {
+ initGEOS(notice, notice);
+ w_ = GEOSWKTWriter_create();
+ GEOSWKTWriter_setTrim(w_, 1);
+ }
+
+ void ensure_equals_wkt(GEOSGeometry* g, const char* exp)
+ {
+ GEOSNormalize(g);
+ char* wkt_c = GEOSWKTWriter_write(w_, g);
+ std::string out(wkt_c);
+ free(wkt_c);
+
+ GEOSGeometry* exp_g = GEOSGeomFromWKT(exp);
+ GEOSNormalize(exp_g);
+ char* wkt_c2 = GEOSWKTWriter_write(w_, exp_g);
+ std::string out_exp(wkt_c2);
+ free(wkt_c2);
+
+// cout << "OUTPUT STRING::" << out << endl << endl;
+// cout << "Expected STRING::" << out_exp << endl << endl;
+ ensure_equals(out, out_exp);
+ GEOSGeom_destroy(exp_g);
+ }
+
+ ~test_capigeosvoronoidiagram_data()
+ {
+ GEOSGeom_destroy(geom1_);
+ GEOSGeom_destroy(geom2_);
+ GEOSWKTWriter_destroy(w_);
+ geom1_ = 0;
+ geom2_ = 0;
+ finishGEOS();
+ }
+
+ };
+
+ typedef test_group<test_capigeosvoronoidiagram_data> group;
+ typedef group::object object;
+
+ group test_capigeosvoronoidiagram_group("capi::GEOSVoronoiDiagram");
+
+ //
+ // Test Cases
+ //
+
+ // Single point
+ template<>
+ template<>
+ void object::test<1>()
+ {
+ geom1_ = GEOSGeomFromWKT("POINT(10 20)");
+
+ geom2_ = GEOSVoronoiDiagram(geom1_,0);
+ ensure_equals ( GEOSisEmpty(geom2_), 1 );
+ ensure_equals ( GEOSGeomTypeId(geom2_), GEOS_GEOMETRYCOLLECTION );
+ }
+
+ //More points:
+ template<>
+ template<>
+ void object::test<2>()
+ {
+ geom1_ = GEOSGeomFromWKT("MULTIPOINT ((280 300), (420 330), (380 230), (320 160))");
+
+ geom2_ = GEOSVoronoiDiagram(geom1_,0);
+ ensure_equals_wkt(geom2_ ,"GEOMETRYCOLLECTION (POLYGON ((110 175.71428571428572, 110 500, 310.35714285714283 500, 353.515625 298.59375, 306.875 231.96428571428572, 110 175.71428571428572)), POLYGON ((590 204, 590 -10, 589.1666666666666 -10, 306.875 231.96428571428572, 353.515625 298.59375, 590 204)), POLYGON ((110 -10, 110 175.71428571428572, 306.875 231.96428571428572, 589.1666666666666 -10, 110 -10)), POLYGON ((310.35714285714283 500, 590 500, 590 204, 353.515625 298.59375, 310.35714285714283 500)))" );
+ }
+ //Larger number of points:
+ template<>
+ template<>
+ void object::test<3>()
+ {
+ geom1_ = GEOSGeomFromWKT("MULTIPOINT ((170 270), (270 270), (230 310), (180 330), (250 340), (315 318), (330 260), (240 170), (220 220), (270 220))");
+
+ geom2_ = GEOSVoronoiDiagram(geom1_,0);
+ ensure_equals_wkt(geom2_,"GEOMETRYCOLLECTION (POLYGON ((0 329.1666666666667, 0 510, 190 510, 213.94736842105263 342.36842105263156, 195.625 296.5625, 0 329.1666666666667)), POLYGON ((0 76.50000000000001, 0 329.1666666666667, 195.625 296.5625, 216 266, 88.33333333333333 138.33333333333334, 0 76.50000000000001)), POLYGON ((216 266, 195.625 296.5625, 213.94736842105263 342.36842105263156, 267 307, 225 265, 216 266)), POLYGON ((245 245, 225 265, 267 307, 275.9160583941606 309.54744525547443, 303.1666666666667 284, 296.6666666666667 245, 245 245)), POLYGON ((225 265, 245 245, 245 201, 88.33333333333333 138.33333333333334, 216 266, 225 265)), POLYGON ((0 0, 0 76.50000000000001, 88.33333333333333 138.33333333333334, 245 201, 380 120, 500 0, 0 0)), POLYGON ((190 510, 343.76153846153846 510, 275.9160583941606 309.54744525547443, 267 307, 213.94736842105263 342.36842105263156, 190 510)), POLYGON ((245 201, 245 245, 296.6666666666667 245, 380 120, 245 201)), POLYGON ((343.76153846
153846 510, 500 510, 500 334.9051724137931, 303.1666666666667 284, 275.9160583941606 309.54744525547443, 343.76153846153846 510)), POLYGON ((500 334.9051724137931, 500 0, 380 120, 296.6666666666667 245, 303.1666666666667 284, 500 334.9051724137931)))");
+ }
+ //Test with non-zero Tolerance value
+ template<>
+ template<>
+ void object::test<4>()
+ {
+ geom1_ = GEOSGeomFromWKT("MULTIPOINT ((150 210), (210 270), (150 220), (220 210), (215 269))");
+
+ geom2_ = GEOSVoronoiDiagram(geom1_,10);
+ ensure_equals_wkt(geom2_,"GEOMETRYCOLLECTION (POLYGON ((290 252.5, 290 140, 185 140, 185 215, 187.9268292682927 235.4878048780488, 290 252.5)), POLYGON ((80 215, 80 340, 100.83333333333336 340, 187.9268292682927 235.4878048780488, 185 215, 80 215)), POLYGON ((80 140, 80 215, 185 215, 185 140, 80 140)), POLYGON ((100.83333333333336 340, 290 340, 290 252.5, 187.9268292682927 235.4878048780488, 100.83333333333336 340)))");
+ }
+ template<>
+ template<>
+ void object::test<5>()
+ {
+ geom1_ = GEOSGeomFromWKT("MULTIPOINT ((40 420), (50 420), (210 290), (300 360), (350 150), (170 70), (134 135) ,(305 359), (351 145), (175 71))");
+
+ geom2_ = GEOSVoronoiDiagram(geom1_,10);
+ ensure_equals_wkt(geom2_, "GEOMETRYCOLLECTION (POLYGON ((-310 146.559649122807, -310 770, 45 770, 45 263.64736842105265, -310 146.559649122807)), POLYGON ((-310 -153.37692307692305, -310 146.559649122807, 45 263.64736842105265, 59.16911764705881 267.8235294117647, 239.43506493506493 179.43506493506493, 241.34156378600824 151.98148148148147, -310 -153.37692307692305)), POLYGON ((45 770, 266.20000000000005 770, 181.94323144104806 418.9301310043668, 59.16911764705881 267.8235294117647, 45 263.64736842105265, 45 770)), POLYGON ((59.16911764705881 267.8235294117647, 181.94323144104806 418.9301310043668, 311.875 251.875, 239.43506493506493 179.43506493506493, 59.16911764705881 267.8235294117647)), POLYGON ((-310 -280, -310 -153.37692307692305, 241.34156378600824 151.98148148148147, 433.3333333333333 -280, -310 -280)), POLYGON ((266.20000000000005 770, 701 770, 701 344.5238095238096, 311.875 251.875, 181.94323144104806 418.9301310043668, 266.20000000000005 770)), POLYGON ((701
344.5238095238096, 701 -280, 433.3333333333333 -280, 241.34156378600824 151.98148148148147, 239.43506493506493 179.43506493506493, 311.875 251.875, 701 344.5238095238096)))");
+ }
+} // namespace tut
+
More information about the geos-commits
mailing list