From 252b3dd94bce1ad7e0d4df0d9680249ca7f358ac Mon Sep 17 00:00:00 2001
From: Barend Gehrels <barend@xs4all.nl>
Date: Sat, 5 Mar 2011 22:28:20 +0000
Subject: [PATCH] Small addition/update in examples Updated various
 intersection tests

[SVN r69585]
---
 doc/other/status.xls                          | Bin 18432 -> 18944 bytes
 doc/src/examples/algorithms/Jamfile.v2        |   2 +
 doc/src/examples/algorithms/clear.cpp         |  62 ++++++++++++++++++
 doc/src/examples/algorithms/difference.cpp    |   2 +-
 test/algorithms/intersection.cpp              |   4 +-
 .../overlay/robustness/intersection_pies.cpp  |   4 +-
 .../overlay/robustness/recursive_polygons.cpp |  23 ++++++-
 .../overlay/robustness/test_overlay_p_q.hpp   |   6 +-
 8 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 doc/src/examples/algorithms/clear.cpp

diff --git a/doc/other/status.xls b/doc/other/status.xls
index 1a6ed5c1ad6de0e20abf009e5e2000b1da831d2b..2fe9fc18baba2d64088ca375b48a21421277bbf9 100644
GIT binary patch
delta 2148
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
JsAgbb000RjhX4Qo

delta 1558
zcmZpe!q_l@ae@J((nLdP7DWaIhK+&i87Kc|<Yhd#nV0D`<7Nw%6|786e3Kt>YH<Ex
zXkuEyz`$Uzxsa=tss2BM77GW%HFgFD9)<!Yc@74KP=>z@l^hHV>lscQeaykYAjv3l
z!J3nSp^)*m@N`ZFhO>;>%nS?+d<+aA+UBSP!w&%=gLWnch8au{@dW3YOg=6%nLuh7
zK;UJtfdIn<MivGJ1`rlzVPIfnU|_h%mQ>I1>zD*c2^?pe<QVj3F&lsc61+nUKpH>>
zg7}3SnG94J7#KkIFx-$}U;_y<Ffe>rKi6P2GXukNCI$u=4V7Y;23E|#AjrVL;K0DZ
zpb6!J<j?-7cP=-&R9HFzNf0FQ=cok3hNKV!1`ZGpf;~?b8C+va0{h_8F$pjY@&(9&
zAU;g4;=csLhPaZ_D%mxU|NZ~}zv5D1=^CLkWgt6XW`gvAOige+Cc*H4Es3G!S+K!^
zV-gG{AW^Unj~g&B95vXG6=Lv;k%6J&m;}S#1A+!Gj6E1$$K@IDF&sCz$iTqx=-A`~
zd{S<Yj!7{51#=}Bo}7?ic=v$G03-%78e}3!3}$rFBmr>XJ~$@9z|O$H@c;k+|6df7
z7!*!UR^V5w=U^yc2RW~$TgU)JD=;uJa5DU7U|<L_;9*DtM_kDXNSuMZ4pQ^x++47c
zDGVwM1t%oHYB~iN48)>B3@*io7}(|r7@U<-V+dhTVMrBVFaXgYJ}A^Tb|d5%85rsr
zrbwxQoXo(%pu+HnQ3cEf5x1e@AT|iwg9ru&hA+n@7<fAc3_ytiq*s%H0qid}CKU#y
zlM)OHCndmUf&2<e0DfK}V8?<S@*y(B;0=o!gAW4(1IWQ|SnAanK!P9vkivf_Bp6su
zLVOFgk3lwDz<?9vb*KQyi4HF%7(k&@ZCeZuC6E*-WI!Rc%eL4+VEbGHkernag8?Xn
zK-xj-Wt5T__PESsg0ai%XYzv$;NeIDyBcKBof9A*FffQSFfjZ%A;Dmwl*FKMQi4H#
zzn}rccMRZ!3S#e@%WnWu2MXGMY+_6{FCmWqc0>Xk(+mP)ASnh=5U??DF)%Q2atJUm
zun92i<~_rHkU@a~oU6E*Alg9IgQ8=FFav|2JOjg0h0R%lGg%qcCbNjAgF>8<iD7b~
zc$pRh0|%1;12@P#aAIKqXK|1i51QCyK?x;0=W+(dLRXM9Kbka1OaPwd5XK0?#gZ5%
z7fPrx6_!q(DWMezF+~h6>jAe|94=-K7XzhDNNSc~U|=i(yFe1IuCSDW@yuiqNoA(S
z(#@8VlQ>wfGq^D9oBT#`^5n@%e;lqe@G$r=GBDUMgfO@<xG~r<2{CK~g#x%_0fiL^
z%QEmYFl&J`0V9JJgBAlL<5O^v#kF~&ur%W)H3tP-P{AO?z`!8Pz`!8Fz`!8Nz`!8J
z0EuEy$b;mi7#J9&85kI37#J9285kJk7#JAj85kH8HaEJ}GfqrkndI?<>4n1NUmjJA
Sf|E-<>v<$W)(e0L1_l6}wjQYf

diff --git a/doc/src/examples/algorithms/Jamfile.v2 b/doc/src/examples/algorithms/Jamfile.v2
index 72677def0..76e8f03e0 100644
--- a/doc/src/examples/algorithms/Jamfile.v2
+++ b/doc/src/examples/algorithms/Jamfile.v2
@@ -22,6 +22,8 @@ exe assign_box_corners : assign_box_corners.cpp ;
 exe assign_point_from_index : assign_point_from_index.cpp ;
 exe assign_point_to_index : assign_point_to_index.cpp ;
 
+exe clear : clear.cpp ;
+
 exe for_each_point : for_each_point.cpp ;
 exe for_each_point_const : for_each_point_const.cpp ;
 exe for_each_segment_const : for_each_segment_const.cpp ;
diff --git a/doc/src/examples/algorithms/clear.cpp b/doc/src/examples/algorithms/clear.cpp
new file mode 100644
index 000000000..50b10b4e8
--- /dev/null
+++ b/doc/src/examples/algorithms/clear.cpp
@@ -0,0 +1,62 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+//
+// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// Quickbook Example
+
+//[clear
+//` Shows how to clear a ring or polygon
+
+#include <iostream>
+
+#include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+
+#include <boost/assign.hpp>
+
+int main()
+{
+    using boost::assign::tuple_list_of;
+
+    typedef boost::tuple<float, float> point;
+    typedef boost::geometry::model::polygon<point> polygon;
+    typedef boost::geometry::model::ring<point> ring;
+
+    polygon poly;
+
+    // Fill the polygon (using its own methods + Boost.Assign)
+    poly.outer() = tuple_list_of(0, 0)(0, 10)(11, 11)(0, 0);
+    poly.inners().push_back(tuple_list_of(0, 0)(0, 10)(11, 11)(0, 0));
+
+    std::cout << boost::geometry::dsv(poly) << std::endl;
+    boost::geometry::clear(poly);
+    std::cout << boost::geometry::dsv(poly) << std::endl;
+
+    // Create a ring using Boost.Assign
+    ring r = tuple_list_of(0, 0)(0, 9)(8, 8)(0, 0);
+
+    std::cout << boost::geometry::dsv(r) << std::endl;
+    boost::geometry::clear(r);
+    std::cout << boost::geometry::dsv(r) << std::endl;
+
+    return 0;
+}
+
+//]
+
+
+//[clear_output
+/*`
+Output:
+[pre
+(((0, 0), (0, 10), (11, 11), (0, 0)), ((0, 0), (0, 10), (11, 11), (0, 0)))
+(())
+((0, 0), (0, 9), (8, 8), (0, 0))
+()
+]
+*/
+//]
diff --git a/doc/src/examples/algorithms/difference.cpp b/doc/src/examples/algorithms/difference.cpp
index 0d1112fdd..65d968805 100644
--- a/doc/src/examples/algorithms/difference.cpp
+++ b/doc/src/examples/algorithms/difference.cpp
@@ -54,7 +54,7 @@ int main()
         std::cout << i++ << ": " << boost::geometry::area(p) << std::endl;
     }
 
-    /*<-*/ create_svg("difference_a.svg", green, blue, output); /*->*/
+    /*<-*/ create_svg("difference_b.svg", green, blue, output); /*->*/
     return 0;
 }
 
diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp
index b6eb2560f..cb822fc8f 100644
--- a/test/algorithms/intersection.cpp
+++ b/test/algorithms/intersection.cpp
@@ -32,9 +32,9 @@ static std::string pie_2_3_23_0[2] =
 template <typename Polygon>
 void test_areal()
 {
-    /*test_one<Polygon, Polygon, Polygon>("pie_2_3_23_0",
+    test_one<Polygon, Polygon, Polygon>("pie_2_3_23_0",
         pie_2_3_23_0[0], pie_2_3_23_0[1],
-        1, 4, 163292.677335535, 0.01);*/
+        1, 4, 163292.679042133, 0.1);
 
     test_one<Polygon, Polygon, Polygon>("simplex_with_empty_1",
         simplex_normal[0], polygon_empty,
diff --git a/test/algorithms/overlay/robustness/intersection_pies.cpp b/test/algorithms/overlay/robustness/intersection_pies.cpp
index 8d6724ccc..3a3ca4d37 100644
--- a/test/algorithms/overlay/robustness/intersection_pies.cpp
+++ b/test/algorithms/overlay/robustness/intersection_pies.cpp
@@ -255,10 +255,10 @@ int main(int argc, char** argv)
 
         description.add_options()
             ("help", "Help message")
-            ("svg", po::value<bool>(&svg)->default_value(false), "Create an SVG filename for all tests")
             ("multi", po::value<bool>(&multi)->default_value(false), "Multiple tangencies at one point")
             ("ccw", po::value<bool>(&ccw)->default_value(false), "Counter clockwise polygons")
-            ("open", po::value<bool>(&open)->default_value(false), "Open polytons")
+            ("open", po::value<bool>(&open)->default_value(false), "Open polygons")
+            ("svg", po::value<bool>(&svg)->default_value(false), "Create an SVG filename for all tests")
         ;
 
         po::variables_map varmap;
diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp
index 35ae2d65e..a9d00aef7 100644
--- a/test/algorithms/overlay/robustness/recursive_polygons.cpp
+++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp
@@ -160,6 +160,8 @@ int main(int argc, char** argv)
         int seed = static_cast<unsigned int>(std::time(0));
         int level = 3;
         int field_size = 10;
+        bool ccw = false;
+        bool open = false;
         bool svg = false;
         std::string form = "box";
 
@@ -170,6 +172,8 @@ int main(int argc, char** argv)
             ("level", po::value<int>(&level)->default_value(3), "Level to reach (higher->slower)")
             ("size", po::value<int>(&field_size)->default_value(10), "Size of the field")
             ("form", po::value<std::string>(&form)->default_value("box"), "Form of the polygons (box, triangle)")
+            ("ccw", po::value<bool>(&ccw)->default_value(false), "Counter clockwise polygons")
+            ("open", po::value<bool>(&open)->default_value(false), "Open polygons")
             ("svg", po::value<bool>(&svg)->default_value(false), "Create an SVG filename for all tests")
         ;
 
@@ -183,8 +187,25 @@ int main(int argc, char** argv)
             return 1;
         }
 
+        bool triangular = form != "box";
 
-        test_all<double, true, true>(seed, count, field_size, svg, level, form != "box");
+
+        if (ccw && open)
+        {
+            test_all<double, false, false>(seed, count, field_size, svg, level, triangular);
+        }
+        else if (ccw)
+        {
+            test_all<double, false, true>(seed, count, field_size, svg, level, triangular);
+        }
+        else if (open)
+        {
+            test_all<double, true, false>(seed, count, field_size, svg, level, triangular);
+        }
+        else
+        {
+            test_all<double, true, true>(seed, count, field_size, svg, level, triangular);
+        }
 
 #if defined(HAVE_TTMATH)
         // test_all<ttmath_big, true, true>(seed, count, max, svg, level);
diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
index d3d06d20a..66f5f6dd7 100644
--- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
+++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
@@ -48,7 +48,7 @@ static bool test_overlay_p_q(std::string const& caseid,
     CalculationType area_q = bg::area(q);
 
     bg::intersection(p, q, out_i);
-    CalculationType area_i = abs(bg::area(out_i)); // TEMP abs call, TODO solve this
+    CalculationType area_i = bg::area(out_i);
 
     bg::union_(p, q, out_u);
     CalculationType area_u = bg::area(out_u);
@@ -77,6 +77,8 @@ static bool test_overlay_p_q(std::string const& caseid,
             result = false;
             svg = true;
         }
+        bg::unique(out_i);
+        bg::unique(out_u);
 
         std::cout
             << "type: " << string_from_type<CalculationType>::name()
@@ -94,6 +96,8 @@ static bool test_overlay_p_q(std::string const& caseid,
             << std::setprecision(20)
             << " p: " << bg::wkt(p) << std::endl
             << " q: " << bg::wkt(q) << std::endl
+            << " i: " << bg::wkt(out_i) << std::endl
+            << " u: " << bg::wkt(out_u) << std::endl
             ;
 
     }