|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r71339 - in branches/release/libs/geometry: doc doc/concept doc/doxy doc/doxy/doxygen_output/html doc/generated doc/html doc/html/img/algorithms doc/reference doc/reference/algorithms doc/reference/core doc/src doc/src/docutils/tools/implementation_status doc/src/examples/algorithms doc/src/examples/core doc/src/examples/geometries/register example example/with_external_libs test test/algorithms test/algorithms/detail test/arithmetic test/geometries test/strategies test/util
From: barend.gehrels_at_[hidden]
Date: 2011-04-16 19:24:44
Author: barendgehrels
Date: 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
New Revision: 71339
URL: http://svn.boost.org/trac/boost/changeset/71339
Log:
Merged Boost.Geometry from revision 71123 to 71336
Added:
branches/release/libs/geometry/doc/generated/equals_status.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/generated/equals_status.qbk
branches/release/libs/geometry/doc/html/img/algorithms/convex_hull.png
- copied unchanged from r71336, /trunk/libs/geometry/doc/html/img/algorithms/convex_hull.png
branches/release/libs/geometry/doc/html/img/algorithms/return_envelope.png
- copied unchanged from r71191, /trunk/libs/geometry/doc/html/img/algorithms/return_envelope.png
branches/release/libs/geometry/doc/reference/algorithms/comparable_distance.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/reference/algorithms/comparable_distance.qbk
branches/release/libs/geometry/doc/reference/algorithms/convert.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/algorithms/convert.qbk
branches/release/libs/geometry/doc/reference/algorithms/convex_hull.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/algorithms/convex_hull.qbk
branches/release/libs/geometry/doc/reference/algorithms/correct.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/reference/algorithms/correct.qbk
branches/release/libs/geometry/doc/reference/algorithms/distance.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/reference/algorithms/distance.qbk
branches/release/libs/geometry/doc/reference/algorithms/equals.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/algorithms/equals.qbk
branches/release/libs/geometry/doc/reference/algorithms/transform.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/reference/algorithms/transform.qbk
branches/release/libs/geometry/doc/reference/algorithms/transform_with_strategy.qbk
- copied unchanged from r71191, /trunk/libs/geometry/doc/reference/algorithms/transform_with_strategy.qbk
branches/release/libs/geometry/doc/reference/core/closure.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/closure.qbk
branches/release/libs/geometry/doc/reference/core/coordinate_dimension.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/coordinate_dimension.qbk
branches/release/libs/geometry/doc/reference/core/coordinate_system.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/coordinate_system.qbk
branches/release/libs/geometry/doc/reference/core/coordinate_type.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/coordinate_type.qbk
branches/release/libs/geometry/doc/reference/core/degree_radian.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/degree_radian.qbk
branches/release/libs/geometry/doc/reference/core/max_corner.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/max_corner.qbk
branches/release/libs/geometry/doc/reference/core/min_corner.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/min_corner.qbk
branches/release/libs/geometry/doc/reference/core/min_max_corner.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/min_max_corner.qbk
branches/release/libs/geometry/doc/reference/core/point_order.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/point_order.qbk
branches/release/libs/geometry/doc/reference/core/point_type.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/point_type.qbk
branches/release/libs/geometry/doc/reference/core/tag.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/tag.qbk
branches/release/libs/geometry/doc/reference/core/tag_cast.qbk
- copied unchanged from r71336, /trunk/libs/geometry/doc/reference/core/tag_cast.qbk
branches/release/libs/geometry/doc/src/examples/algorithms/assign.cpp
- copied, changed from r71226, /trunk/libs/geometry/doc/src/examples/algorithms/assign.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/assign_points.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/algorithms/assign_points.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/comparable_distance.cpp
- copied unchanged from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/comparable_distance.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/convert.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/algorithms/convert.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/convex_hull.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/algorithms/convex_hull.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/correct.cpp
- copied unchanged from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/correct.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/equals.cpp
- copied, changed from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/equals.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/expand.cpp
- copied unchanged from r71131, /trunk/libs/geometry/doc/src/examples/algorithms/expand.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/transform.cpp
- copied unchanged from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/transform.cpp
branches/release/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp
- copied unchanged from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp
branches/release/libs/geometry/doc/src/examples/core/closure.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/closure.cpp
branches/release/libs/geometry/doc/src/examples/core/coordinate_dimension.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/coordinate_dimension.cpp
branches/release/libs/geometry/doc/src/examples/core/coordinate_system.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/coordinate_system.cpp
branches/release/libs/geometry/doc/src/examples/core/coordinate_type.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/coordinate_type.cpp
branches/release/libs/geometry/doc/src/examples/core/degree_radian.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/degree_radian.cpp
branches/release/libs/geometry/doc/src/examples/core/point_order.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/point_order.cpp
branches/release/libs/geometry/doc/src/examples/core/point_type.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/point_type.cpp
branches/release/libs/geometry/doc/src/examples/core/tag.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/tag.cpp
branches/release/libs/geometry/doc/src/examples/core/tag_cast.cpp
- copied unchanged from r71336, /trunk/libs/geometry/doc/src/examples/core/tag_cast.cpp
branches/release/libs/geometry/test/algorithms/convert.cpp
- copied unchanged from r71336, /trunk/libs/geometry/test/algorithms/convert.cpp
branches/release/libs/geometry/test/algorithms/convert.vcproj
- copied unchanged from r71336, /trunk/libs/geometry/test/algorithms/convert.vcproj
Removed:
branches/release/libs/geometry/doc/html/img/algorithms/make_envelope.png
branches/release/libs/geometry/doc/src/examples/algorithms/assign_with_range.cpp
branches/release/libs/geometry/test/algorithms/detail/convert.cpp
branches/release/libs/geometry/test/algorithms/detail/convert.vcproj
branches/release/libs/geometry/test/compile_test.cpp
branches/release/libs/geometry/test/compile_test.sln
branches/release/libs/geometry/test/compile_test.vcproj
branches/release/libs/geometry/test/custom_tests.sln
branches/release/libs/geometry/test/ggl_headers.sln
branches/release/libs/geometry/test/ggl_headers.vcproj
Properties modified:
branches/release/libs/geometry/doc/concept/ (props changed)
branches/release/libs/geometry/doc/doxy/ (props changed)
branches/release/libs/geometry/doc/generated/ (props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/reference/ (props changed)
branches/release/libs/geometry/doc/src/ (props changed)
branches/release/libs/geometry/example/ (props changed)
branches/release/libs/geometry/test/ (props changed)
Binary files modified:
branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.png
Text files modified:
branches/release/libs/geometry/doc/doxy/Doxyfile | 3
branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css | 380 ++++-----------------------------------
branches/release/libs/geometry/doc/doxy/doxygen_output/html/tabs.css | 132 +++++++++----
branches/release/libs/geometry/doc/geometry.qbk | 4
branches/release/libs/geometry/doc/imports.qbk | 4
branches/release/libs/geometry/doc/quickref.xml | 4
branches/release/libs/geometry/doc/reference.qbk | 4
branches/release/libs/geometry/doc/reference/algorithms/append.qbk | 2
branches/release/libs/geometry/doc/reference/algorithms/difference.qbk | 6
branches/release/libs/geometry/doc/reference/algorithms/intersection.qbk | 6
branches/release/libs/geometry/doc/reference/algorithms/sym_difference.qbk | 6
branches/release/libs/geometry/doc/reference/algorithms/union.qbk | 6
branches/release/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.cpp | 9
branches/release/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 | 36 +++
branches/release/libs/geometry/doc/src/examples/algorithms/assign.cpp | 16
branches/release/libs/geometry/doc/src/examples/algorithms/assign_2d_point.cpp | 6
branches/release/libs/geometry/doc/src/examples/algorithms/assign_3d_point.cpp | 2
branches/release/libs/geometry/doc/src/examples/algorithms/assign_box_corners.cpp | 2
branches/release/libs/geometry/doc/src/examples/algorithms/assign_point_from_index.cpp | 2
branches/release/libs/geometry/doc/src/examples/algorithms/clear.cpp | 4
branches/release/libs/geometry/doc/src/examples/algorithms/distance.cpp | 13
branches/release/libs/geometry/doc/src/examples/algorithms/equals.cpp | 2
branches/release/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp | 2
branches/release/libs/geometry/doc/src/examples/core/Jamfile.v2 | 11 +
branches/release/libs/geometry/doc/src/examples/geometries/register/point.cpp | 4
branches/release/libs/geometry/example/01_point_example.cpp | 24 +-
branches/release/libs/geometry/example/02_linestring_example.cpp | 4
branches/release/libs/geometry/example/03_polygon_example.cpp | 4
branches/release/libs/geometry/example/05_a_overlay_polygon_example.cpp | 4
branches/release/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 4
branches/release/libs/geometry/example/06_a_transformation_example.cpp | 2
branches/release/libs/geometry/example/c01_custom_point_example.cpp | 12
branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp | 2
branches/release/libs/geometry/test/algorithms/Jamfile.v2 | 1
branches/release/libs/geometry/test/algorithms/algorithms_tests.sln | 6
branches/release/libs/geometry/test/algorithms/assign.cpp | 94 ++++++++-
branches/release/libs/geometry/test/algorithms/detail/Jamfile.v2 | 1
branches/release/libs/geometry/test/algorithms/detail/detail.sln | 6
branches/release/libs/geometry/test/algorithms/detail/partition.cpp | 255 ++++++++++++++++++++++++++
branches/release/libs/geometry/test/algorithms/intersection.cpp | 2
branches/release/libs/geometry/test/algorithms/make.cpp | 4
branches/release/libs/geometry/test/algorithms/transform.cpp | 4
branches/release/libs/geometry/test/arithmetic/arithmetic.cpp | 34 ++
branches/release/libs/geometry/test/arithmetic/dot_product.cpp | 4
branches/release/libs/geometry/test/geometries/boost_polygon.cpp | 4
branches/release/libs/geometry/test/geometries/box.cpp | 4
branches/release/libs/geometry/test/strategies/cross_track.cpp | 6
branches/release/libs/geometry/test/strategies/haversine.cpp | 12
branches/release/libs/geometry/test/strategies/projected_point.cpp | 6
branches/release/libs/geometry/test/strategies/pythagoras.cpp | 28 +-
branches/release/libs/geometry/test/strategies/segment_intersection.cpp | 8
branches/release/libs/geometry/test/strategies/segment_intersection_collinear.cpp | 8
branches/release/libs/geometry/test/strategies/side_by_cross_track.cpp | 6
branches/release/libs/geometry/test/strategies/transformer.cpp | 2
branches/release/libs/geometry/test/util/for_each_coordinate.cpp | 2
55 files changed, 674 insertions(+), 545 deletions(-)
Modified: branches/release/libs/geometry/doc/doxy/Doxyfile
==============================================================================
--- branches/release/libs/geometry/doc/doxy/Doxyfile (original)
+++ branches/release/libs/geometry/doc/doxy/Doxyfile 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -50,6 +50,7 @@
brief_macro{1}="Macro to register a \1" \
brief_macro_const=" (const version)" \
brief_macro_getset=" (having separate get/set methods)" \
+ brief_meta{3}="Metafunction defining [*\1] as the specified \2 of the \3" \
tparam_allocator="container-allocator-type" \
tparam_box="Any type fulfilling a Box Concept" \
tparam_box_or_segment="Any type fulfilling a Box Concept or a Segment Concept" \
@@ -107,6 +108,8 @@
return_check{1}="Returns true if the geometry \1" \
return_check2{1}="Returns true if two geometries \1" \
return_out="The output iterator" \
+ meta_geometry_type="specified geometry type" \
+ meta_point_type="point type making up the specified geometry type" \
brf_for_each{1}="Applies function [*f] to each \1" \
det_envelope="envelope (also known as axis aligned bounding box, aabb, or minimum bounding rectangle, mbr)" \
det_buffer="buffer (a polygon being the spatial point set collection within a specified maximum distance from a geometry)" \
Modified: branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css (original)
+++ branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -8,15 +8,10 @@
/* @group Heading Levels */
h1 {
+ text-align: center;
font-size: 150%;
}
-.title {
- font-size: 150%;
- font-weight: bold;
- margin: 10px 2px;
-}
-
h2 {
font-size: 120%;
}
@@ -69,8 +64,8 @@
}
div.qindex, div.navtab{
- background-color: #EBEFF6;
- border: 1px solid #A3B4D7;
+ background-color: #e8eef2;
+ border: 1px solid #84b0c7;
text-align: center;
margin: 2px;
padding: 2px;
@@ -88,13 +83,13 @@
/* @group Link Styling */
a {
- color: #3D578C;
+ color: #153788;
font-weight: normal;
text-decoration: none;
}
.contents a:visited {
- color: #4665A2;
+ color: #1b77c5;
}
a:hover {
@@ -107,9 +102,9 @@
a.qindexHL {
font-weight: bold;
- background-color: #9CAFD4;
+ background-color: #6666cc;
color: #ffffff;
- border: 1px double #869DCA;
+ border: 1px double #9295C2;
}
.contents a.qindexHL:visited {
@@ -124,11 +119,11 @@
}
a.code {
- color: #4665A2;
+ color: #3030f0;
}
a.codeRef {
- color: #4665A2;
+ color: #3030f0;
}
/* @end */
@@ -143,8 +138,8 @@
}
pre.fragment {
- border: 1px solid #C4CFE5;
- background-color: #FBFCFD;
+ border: 1px solid #CCCCCC;
+ background-color: #f5f5f5;
padding: 4px 6px;
margin: 4px 8px 4px 2px;
overflow: auto;
@@ -158,22 +153,13 @@
font-weight: bold;
color: #ffffff;
margin-bottom: 3px;
- margin-top: 3px;
- padding: 0.2em;
- border: solid thin #333;
- border-radius: 0.5em;
- -webkit-border-radius: .5em;
- -moz-border-radius: .5em;
- box-shadow: 2px 2px 3px #999;
- -webkit-box-shadow: 2px 2px 3px #999;
- -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
- background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
+ margin-top: 3px
}
div.groupHeader {
margin-left: 16px;
margin-top: 12px;
+ margin-bottom: 6px;
font-weight: bold;
}
@@ -185,32 +171,27 @@
body {
background: white;
color: black;
- margin: 0;
-}
-
-div.contents {
- margin-top: 10px;
- margin-left: 10px;
- margin-right: 5px;
+ margin-right: 20px;
+ margin-left: 20px;
}
td.indexkey {
- background-color: #EBEFF6;
+ background-color: #e8eef2;
font-weight: bold;
- border: 1px solid #C4CFE5;
+ border: 1px solid #CCCCCC;
margin: 2px 0px 2px 0;
padding: 2px 10px;
}
td.indexvalue {
- background-color: #EBEFF6;
- border: 1px solid #C4CFE5;
+ background-color: #e8eef2;
+ border: 1px solid #CCCCCC;
padding: 2px 10px;
margin: 2px 0px;
}
tr.memlist {
- background-color: #EEF1F7;
+ background-color: #f0f0f0;
}
p.formulaDsp {
@@ -236,11 +217,6 @@
border: 0px;
}
-address.footer {
- text-align: right;
- padding-right: 12px;
-}
-
img.footer {
border: 0px;
vertical-align: middle;
@@ -294,7 +270,6 @@
/* @end */
-/*
.search {
color: #003399;
font-weight: bold;
@@ -311,7 +286,6 @@
font-weight: normal;
background-color: #e8eef2;
}
-*/
td.tiny {
font-size: 75%;
@@ -320,18 +294,18 @@
.dirtab {
padding: 4px;
border-collapse: collapse;
- border: 1px solid #A3B4D7;
+ border: 1px solid #84b0c7;
}
th.dirtab {
- background: #EBEFF6;
+ background: #e8eef2;
font-weight: bold;
}
hr {
height: 0px;
border: none;
- border-top: 1px solid #4A6AAA;
+ border-top: 1px solid #666;
}
hr.footer {
@@ -340,15 +314,10 @@
/* @group Member Descriptions */
-table.memberdecls {
- border-spacing: 0px;
- padding: 0px;
-}
-
.mdescLeft, .mdescRight,
.memItemLeft, .memItemRight,
.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
- background-color: #F9FAFC;
+ background-color: #FAFAFA;
border: none;
margin: 4px;
padding: 1px 0 0 8px;
@@ -360,19 +329,15 @@
}
.memItemLeft, .memItemRight, .memTemplParams {
- border-top: 1px solid #C4CFE5;
+ border-top: 1px solid #ccc;
}
.memItemLeft, .memTemplItemLeft {
white-space: nowrap;
}
-.memItemRight {
- width: 100%;
-}
-
.memTemplParams {
- color: #4665A2;
+ color: #606060;
white-space: nowrap;
}
@@ -384,28 +349,23 @@
.memtemplate {
font-size: 80%;
- color: #4665A2;
+ color: #606060;
font-weight: normal;
- margin-left: 9px;
+ margin-left: 3px;
}
.memnav {
- background-color: #EBEFF6;
- border: 1px solid #A3B4D7;
+ background-color: #e8eef2;
+ border: 1px solid #84b0c7;
text-align: center;
margin: 2px;
margin-right: 15px;
padding: 2px;
}
-.mempage {
- width: 100%;
-}
-
.memitem {
padding: 0;
margin-bottom: 10px;
- margin-right: 5px;
}
.memname {
@@ -415,52 +375,40 @@
}
.memproto {
- border-top: 1px solid #A8B8D9;
- border-left: 1px solid #A8B8D9;
- border-right: 1px solid #A8B8D9;
- padding: 6px 0px 6px 0px;
- color: #253555;
+ border-top: 1px solid #84b0c7;
+ border-left: 1px solid #84b0c7;
+ border-right: 1px solid #84b0c7;
+ padding: 0;
+ background-color: #d5e1e8;
font-weight: bold;
- text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
- /* opera specific markup */
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- border-top-right-radius: 8px;
- border-top-left-radius: 8px;
/* firefox specific markup */
+ background-image: -moz-linear-gradient(rgba(228, 233, 245, 1.0) 0%, rgba(193, 205, 232, 1.0) 100%);
-moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-moz-border-radius-topright: 8px;
-moz-border-radius-topleft: 8px;
/* webkit specific markup */
+ background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(228, 233, 245, 1.0)), to(rgba(193, 205, 232, 1.0)));
-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-webkit-border-top-right-radius: 8px;
-webkit-border-top-left-radius: 8px;
- background-image:url('nav_f.png');
- background-repeat:repeat-x;
- background-color: #E2E8F2;
}
.memdoc {
- border-bottom: 1px solid #A8B8D9;
- border-left: 1px solid #A8B8D9;
- border-right: 1px solid #A8B8D9;
+ border-bottom: 1px solid #84b0c7;
+ border-left: 1px solid #84b0c7;
+ border-right: 1px solid #84b0c7;
padding: 2px 5px;
- background-color: #FBFCFD;
+ background-color: #eef3f5;
border-top-width: 0;
- /* opera specific markup */
- border-bottom-left-radius: 8px;
- border-bottom-right-radius: 8px;
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
/* firefox specific markup */
-moz-border-radius-bottomleft: 8px;
-moz-border-radius-bottomright: 8px;
-moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
- background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
/* webkit specific markup */
-webkit-border-bottom-left-radius: 8px;
-webkit-border-bottom-right-radius: 8px;
-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
- background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
}
.paramkey {
@@ -479,28 +427,6 @@
font-style: normal;
}
-.params, .retval, .exception, .tparams {
- border-spacing: 6px 2px;
-}
-
-.params .paramname, .retval .paramname {
- font-weight: bold;
- vertical-align: top;
-}
-
-.params .paramtype {
- font-style: italic;
- vertical-align: top;
-}
-
-.params .paramdir {
- font-family: "courier new",courier,monospace;
- vertical-align: top;
-}
-
-
-
-
/* @end */
/* @group Directory (tree) */
@@ -509,7 +435,7 @@
.ftvtree {
font-family: sans-serif;
- margin: 0px;
+ margin: 0.5em;
}
/* these are for tree view when used as main index */
@@ -517,7 +443,6 @@
.directory {
font-size: 9pt;
font-weight: bold;
- margin: 5px;
}
.directory h3 {
@@ -595,13 +520,9 @@
/* @end */
-div.dynheader {
- margin-top: 8px;
-}
-
address {
font-style: normal;
- color: #2A3D61;
+ color: #333;
}
table.doxtable {
@@ -609,12 +530,12 @@
}
table.doxtable td, table.doxtable th {
- border: 1px solid #2D4068;
+ border: 1px solid #153788;
padding: 3px 7px 2px;
}
table.doxtable th {
- background-color: #374F7F;
+ background-color: #254798;
color: #FFFFFF;
font-size: 110%;
padding-bottom: 4px;
@@ -622,214 +543,3 @@
text-align:left;
}
-.tabsearch {
- top: 0px;
- left: 10px;
- height: 36px;
- background-image: url('tab_b.png');
- z-index: 101;
- overflow: hidden;
- font-size: 13px;
-}
-
-.navpath ul
-{
- font-size: 11px;
- background-image:url('tab_b.png');
- background-repeat:repeat-x;
- height:30px;
- line-height:30px;
- color:#8AA0CC;
- border:solid 1px #C2CDE4;
- overflow:hidden;
- margin:0px;
- padding:0px;
-}
-
-.navpath li
-{
- list-style-type:none;
- float:left;
- padding-left:10px;
- padding-right:15px;
- background-image:url('bc_s.png');
- background-repeat:no-repeat;
- background-position:right;
- color:#364D7C;
-}
-
-.navpath li.navelem a
-{
- height:32px;
- display:block;
- text-decoration: none;
- outline: none;
-}
-
-.navpath li.navelem a:hover
-{
- color:#6884BD;
-}
-
-.navpath li.footer
-{
- list-style-type:none;
- float:right;
- padding-left:10px;
- padding-right:15px;
- background-image:none;
- background-repeat:no-repeat;
- background-position:right;
- color:#364D7C;
- font-size: 8pt;
-}
-
-
-div.summary
-{
- float: right;
- font-size: 8pt;
- padding-right: 5px;
- width: 50%;
- text-align: right;
-}
-
-div.summary a
-{
- white-space: nowrap;
-}
-
-div.ingroups
-{
- font-size: 8pt;
- padding-left: 5px;
- width: 50%;
- text-align: left;
-}
-
-div.ingroups a
-{
- white-space: nowrap;
-}
-
-div.header
-{
- background-image:url('nav_h.png');
- background-repeat:repeat-x;
- background-color: #F9FAFC;
- margin: 0px;
- border-bottom: 1px solid #C4CFE5;
-}
-
-div.headertitle
-{
- padding: 5px 5px 5px 10px;
-}
-
-dl
-{
- padding: 0 0 0 10px;
-}
-
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
-{
- border-left:4px solid;
- padding: 0 0 0 6px;
-}
-
-dl.note
-{
- border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
- border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
- border-color: #00D000;
-}
-
-dl.deprecated
-{
- border-color: #505050;
-}
-
-dl.todo
-{
- border-color: #00C0E0;
-}
-
-dl.test
-{
- border-color: #3030E0;
-}
-
-dl.bug
-{
- border-color: #C08050;
-}
-
-#projectlogo
-{
- text-align: center;
- vertical-align: bottom;
- border-collapse: separate;
-}
-
-#projectlogo img
-{
- border: 0px none;
-}
-
-#projectname
-{
- font: 300% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 2px 0px;
-}
-
-#projectbrief
-{
- font: 120% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 0px;
-}
-
-#projectnumber
-{
- font: 50% Tahoma, Arial,sans-serif;
- margin: 0px;
- padding: 0px;
-}
-
-#titlearea
-{
- padding: 0px;
- margin: 0px;
- width: 100%;
- border-bottom: 1px solid #5373B4;
-}
-
-.image
-{
- text-align: center;
-}
-
-.dotgraph
-{
- text-align: center;
-}
-
-.mscgraph
-{
- text-align: center;
-}
-
-.caption
-{
- font-weight: bold;
-}
-
Modified: branches/release/libs/geometry/doc/doxy/doxygen_output/html/doxygen.png
==============================================================================
Binary files. No diff available.
Modified: branches/release/libs/geometry/doc/doxy/doxygen_output/html/tabs.css
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_output/html/tabs.css (original)
+++ branches/release/libs/geometry/doc/doxy/doxygen_output/html/tabs.css 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -1,59 +1,105 @@
-.tabs, .tabs2, .tabs3 {
- background-image: url('tab_b.png');
- width: 100%;
- z-index: 101;
- font-size: 13px;
+/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
+DIV.tabs
+{
+ float : left;
+ width : 100%;
+ background : url("tab_b.gif") repeat-x bottom;
+ margin-bottom : 4px;
+}
+
+DIV.tabs UL
+{
+ margin : 0px;
+ padding-left : 10px;
+ list-style : none;
+}
+
+DIV.tabs LI, DIV.tabs FORM
+{
+ display : inline;
+ margin : 0px;
+ padding : 0px;
+}
+
+DIV.tabs FORM
+{
+ float : right;
}
-.tabs2 {
- font-size: 10px;
+DIV.tabs A
+{
+ float : left;
+ background : url("tab_r.gif") no-repeat right top;
+ border-bottom : 1px solid #84B0C7;
+ font-size : 80%;
+ font-weight : bold;
+ text-decoration : none;
}
-.tabs3 {
- font-size: 9px;
+
+DIV.tabs A:hover
+{
+ background-position: 100% -150px;
}
-.tablist {
- margin: 0;
- padding: 0;
- display: table;
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+ color: #1A419D;
}
-.tablist li {
- float: left;
- display: table-cell;
- background-image: url('tab_b.png');
- line-height: 36px;
- list-style: none;
+DIV.tabs SPAN
+{
+ float : left;
+ display : block;
+ background : url("tab_l.gif") no-repeat left top;
+ padding : 5px 9px;
+ white-space : nowrap;
}
-.tablist a {
- display: block;
- padding: 0 20px;
- font-weight: bold;
- background-image:url('tab_s.png');
- background-repeat:no-repeat;
- background-position:right;
- color: #283A5D;
- text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
- text-decoration: none;
- outline: none;
+DIV.tabs #MSearchBox
+{
+ float : right;
+ display : inline;
+ font-size : 1em;
+}
+
+DIV.tabs TD
+{
+ font-size : 80%;
+ font-weight : bold;
+ text-decoration : none;
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+DIV.tabs SPAN {float : none;}
+/* End IE5-Mac hack */
+
+DIV.tabs A:hover SPAN
+{
+ background-position: 0% -150px;
}
-.tabs3 .tablist a {
- padding: 0 10px;
+DIV.tabs LI.current A
+{
+ background-position: 100% -150px;
+ border-width : 0px;
}
-.tablist a:hover {
- background-image: url('tab_h.png');
- background-repeat:repeat-x;
- color: #fff;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
- text-decoration: none;
+DIV.tabs LI.current SPAN
+{
+ background-position: 0% -150px;
+ padding-bottom : 6px;
}
-.tablist li.current a {
- background-image: url('tab_a.png');
- background-repeat:repeat-x;
- color: #fff;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+DIV.navpath
+{
+ background : none;
+ border : none;
+ border-bottom : 1px solid #84B0C7;
+ text-align : center;
+ margin : 2px;
+ padding : 2px;
}
Modified: branches/release/libs/geometry/doc/geometry.qbk
==============================================================================
--- branches/release/libs/geometry/doc/geometry.qbk (original)
+++ branches/release/libs/geometry/doc/geometry.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -42,7 +42,8 @@
[def __linestring__ Linestring]
[def __polygon__ Polygon]
[def __ring__ Ring]
-[def __multi_point__ Multi point]
+[def __multi_point__ Multi Point]
+[def __multi_linestring__ Multi Linestring]
[def __multi_polygon__ Multi Polygon]
[def __range__ Rangelike (linestring, ring)]
[def __other__ Other geometries]
@@ -51,6 +52,7 @@
[/Parts]
[def __ret_zero__ Returns zero]
[def __ret_one__ Returns 1]
+[def __does_nothing__ Nothing happens, geometry is unchanged]
[def __cs_units__ in the same units as the input coordinates]
[def __sph1__ on a unit sphere (or another sphere, if specified as such in the constructor of the strategy)]
[template qbk_ret[what] Returns [what]]
Deleted: branches/release/libs/geometry/doc/html/img/algorithms/make_envelope.png
==============================================================================
Binary file. No diff available.
Modified: branches/release/libs/geometry/doc/imports.qbk
==============================================================================
--- branches/release/libs/geometry/doc/imports.qbk (original)
+++ branches/release/libs/geometry/doc/imports.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -21,10 +21,12 @@
[import src/examples/algorithms/assign_with_range.cpp]
[import src/examples/algorithms/assign_point_to_index.cpp]
[import src/examples/algorithms/assign_point_from_index.cpp]
+[import src/examples/algorithms/clear.cpp]
[import src/examples/algorithms/centroid.cpp]
[import src/examples/algorithms/distance.cpp]
[import src/examples/algorithms/difference.cpp]
[import src/examples/algorithms/envelope.cpp]
+[import src/examples/algorithms/expand.cpp]
[import src/examples/algorithms/for_each_point.cpp]
[import src/examples/algorithms/for_each_point_const.cpp]
[import src/examples/algorithms/for_each_segment_const.cpp]
@@ -41,10 +43,12 @@
[import src/examples/algorithms/num_geometries.cpp]
[import src/examples/algorithms/num_interior_rings.cpp]
[import src/examples/algorithms/num_points.cpp]
+[import src/examples/algorithms/reverse.cpp]
[import src/examples/algorithms/return_envelope.cpp]
[import src/examples/algorithms/simplify.cpp]
[import src/examples/algorithms/sym_difference.cpp]
[import src/examples/algorithms/union.cpp]
+[import src/examples/algorithms/unique.cpp]
[import src/examples/algorithms/within.cpp]
[import src/examples/core/get_point.cpp]
[import src/examples/core/get_box.cpp]
Modified: branches/release/libs/geometry/doc/quickref.xml
==============================================================================
--- branches/release/libs/geometry/doc/quickref.xml (original)
+++ branches/release/libs/geometry/doc/quickref.xml 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -315,10 +315,6 @@
<simplelist type="vert" columns="1">
<member><link linkend="geometry.reference.algorithms.clear">clear</link></member>
</simplelist>
- <bridgehead renderas="sect3">Convert</bridgehead>
- <simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.algorithms.convert">convert</link></member>
- </simplelist>
<bridgehead renderas="sect3">Convex Hull</bridgehead>
<simplelist type="vert" columns="1">
<member><link linkend="geometry.reference.algorithms.convex_hull">convex_hull</link></member>
Modified: branches/release/libs/geometry/doc/reference.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference.qbk (original)
+++ branches/release/libs/geometry/doc/reference.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -69,10 +69,6 @@
[include generated/clear.qbk]
[endsect]
-[section:convert convert]
-[include generated/convert.qbk]
-[endsect]
-
[section:convex_hull convex_hull]
[include generated/convex_hull.qbk]
[endsect]
Modified: branches/release/libs/geometry/doc/reference/algorithms/append.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference/algorithms/append.qbk (original)
+++ branches/release/libs/geometry/doc/reference/algorithms/append.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -30,4 +30,4 @@
[append_output]
[heading See also]
-* [link geometry.reference.algorithms.assign.assign_2_with_a_range assign]
+* [link geometry.reference.algorithms.assign.assign_points assign]
Modified: branches/release/libs/geometry/doc/reference/algorithms/difference.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference/algorithms/difference.qbk (original)
+++ branches/release/libs/geometry/doc/reference/algorithms/difference.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -14,7 +14,7 @@
[difference] [difference_output]
[heading See also]
-* [link geometry.reference.algorithms.sym_difference.sym_difference sym_difference (symmetric difference)]
-* [link geometry.reference.algorithms.intersection.intersection intersection]
-* [link geometry.reference.algorithms.union.union_ union]
+* [link geometry.reference.algorithms.sym_difference sym_difference (symmetric difference)]
+* [link geometry.reference.algorithms.intersection intersection]
+* [link geometry.reference.algorithms.union_ union]
Modified: branches/release/libs/geometry/doc/reference/algorithms/intersection.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference/algorithms/intersection.qbk (original)
+++ branches/release/libs/geometry/doc/reference/algorithms/intersection.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -23,6 +23,6 @@
[intersection_output]
[heading See also]
-* [link geometry.reference.algorithms.union.union_ union]
-* [link geometry.reference.algorithms.difference.difference difference]
-* [link geometry.reference.algorithms.sym_difference.sym_difference sym_difference (symmetric difference)]
+* [link geometry.reference.algorithms.union_ union]
+* [link geometry.reference.algorithms.difference difference]
+* [link geometry.reference.algorithms.sym_difference sym_difference (symmetric difference)]
Modified: branches/release/libs/geometry/doc/reference/algorithms/sym_difference.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference/algorithms/sym_difference.qbk (original)
+++ branches/release/libs/geometry/doc/reference/algorithms/sym_difference.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -23,7 +23,7 @@
[sym_difference_output]
[heading See also]
-* [link geometry.reference.algorithms.difference.difference difference]
-* [link geometry.reference.algorithms.intersection.intersection intersection]
-* [link geometry.reference.algorithms.union.union_ union]
+* [link geometry.reference.algorithms.difference difference]
+* [link geometry.reference.algorithms.intersection intersection]
+* [link geometry.reference.algorithms.union_ union]
Modified: branches/release/libs/geometry/doc/reference/algorithms/union.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference/algorithms/union.qbk (original)
+++ branches/release/libs/geometry/doc/reference/algorithms/union.qbk 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -20,6 +20,6 @@
[union_output]
[heading See also]
-* [link geometry.reference.algorithms.intersection.intersection intersection]
-* [link geometry.reference.algorithms.difference.difference difference]
-* [link geometry.reference.algorithms.sym_difference.sym_difference sym_difference (symmetric difference)]
+* [link geometry.reference.algorithms.intersection intersection]
+* [link geometry.reference.algorithms.difference difference]
+* [link geometry.reference.algorithms.sym_difference sym_difference (symmetric difference)]
Modified: branches/release/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.cpp (original)
+++ branches/release/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -71,8 +71,9 @@
command << "u";
}
- command << "implementation_status.hpp tmp/t.cpp > tmp/t.out";
- // For debugging: << type1 << "_" << type2 << ".out";
+ command << "implementation_status.hpp tmp/t.cpp > tmp/t" //.out";
+ // For debugging:
+ << type1 << "_" << type2 << ".out";
int failed = system(command.str().c_str());
return failed == 0;
@@ -300,7 +301,9 @@
algorithms.push_back(algorithm("correct"));
algorithms.push_back(algorithm("distance", 2));
algorithms.push_back(algorithm("centroid", 2));
- //algorithms.push_back(algorithm("within", 2));
+ algorithms.push_back(algorithm("intersects", 2));
+ algorithms.push_back(algorithm("within", 2));
+ algorithms.push_back(algorithm("equals", 2));
typedef std::vector<cs> cs_type;
cs_type css;
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -13,22 +13,34 @@
: # requirements
;
+exe append : append.cpp ;
+
exe area : area.cpp ;
exe area_with_strategy : area_with_strategy.cpp ;
+exe assign : assign.cpp ;
exe assign_2d_point : assign_2d_point.cpp ;
exe assign_3d_point : assign_3d_point.cpp ;
exe assign_inverse : assign_inverse.cpp ;
-exe assign_with_range : assign_with_range.cpp ;
-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 assign_points : assign_points.cpp ;
+# 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 centroid : centroid.cpp ;
exe clear : clear.cpp ;
+exe comparable_distance : comparable_distance.cpp ;
+exe convert : convert.cpp ;
+exe convex_hull : convex_hull.cpp ;
+exe correct : correct.cpp ;
+exe difference : difference.cpp ;
exe distance : distance.cpp ;
+exe envelope : envelope.cpp ;
+exe equals : equals.cpp ;
+exe expand : expand.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 ;
@@ -38,19 +50,29 @@
exe intersects_linestring : intersects_linestring.cpp ;
+exe length : length.cpp ;
+exe length_with_strategy : length_with_strategy.cpp ;
+
exe make_2d_point : make_2d_point.cpp ;
exe make_3d_point : make_3d_point.cpp ;
exe make_inverse : make_inverse.cpp ;
-exe make_with_range : make_with_range.cpp ;
+# exe make_with_range : make_with_range.cpp ;
exe num_geometries : num_geometries.cpp ;
exe num_interior_rings : num_interior_rings.cpp ;
exe num_points : num_points.cpp ;
+exe return_envelope : return_envelope.cpp ;
-exe length : length.cpp ;
-exe length_with_strategy : length_with_strategy.cpp ;
+exe reverse : reverse.cpp ;
exe simplify : length.cpp ;
+exe sym_difference : sym_difference.cpp ;
+
+exe transform : transform.cpp ;
+exe transform_with_strategy : transform_with_strategy.cpp ;
+
+exe union : union.cpp ;
+exe unique : unique.cpp ;
exe within : within.cpp ;
Copied: branches/release/libs/geometry/doc/src/examples/algorithms/assign.cpp (from r71226, /trunk/libs/geometry/doc/src/examples/algorithms/assign.cpp)
==============================================================================
--- /trunk/libs/geometry/doc/src/examples/algorithms/assign.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/assign.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -8,7 +8,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//[assign
-//` Shows how to assign a geometry to another
+//` Shows how to assign a geometry from another geometry
#include <iostream>
@@ -26,20 +26,19 @@
boost::geometry::assign_values(p1, 1, 1);
boost::geometry::assign_values(b, 1, 1, 2, 2);
- // Assign a box to a polygon (conversion box->poly)
+ // Assign a box to a polygon (target = source)
polygon p;
- boost::geometry::assign(b, p);
+ boost::geometry::assign(p, b);
// Assign a point to another point type (conversion of point-type)
boost::tuple<double, double> p2;
- boost::geometry::assign(p1, p2);
+ boost::geometry::assign(p2, p1);
-
using boost::geometry::dsv;
std::cout
<< "box: " << dsv(b) << std::endl
<< "polygon: " << dsv(p) << std::endl
- << "point: " << dsv(p) << std::endl
+ << "point: " << dsv(p1) << std::endl
<< "point tuples: " << dsv(p2) << std::endl
;
@@ -54,8 +53,9 @@
Output:
[pre
box: ((1, 1), (2, 2))
-first: (1, 1)
-second: (2, 2)
+polygon: (((1, 1), (1, 2), (2, 2), (2, 1), (1, 1)))
+point: (1, 1)
+point tuples: (1, 1)
]
*/
//]
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/assign_2d_point.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/assign_2d_point.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/assign_2d_point.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -23,15 +23,15 @@
int main()
{
- using boost::geometry::assign;
+ using boost::geometry::assign_values;
boost::geometry::model::d2::point_xy<double> p1;
- assign(p1, 1.2345, 2.3456);
+ assign_values(p1, 1.2345, 2.3456);
#if defined(HAVE_TTMATH)
boost::geometry::model::d2::point_xy<ttmath::Big<1,4> > p2;
- assign(p2, "1.2345", "2.3456"); /*< It is possible to assign coordinates with other types than the coordinate type.
+ assign_values(p2, "1.2345", "2.3456"); /*< It is possible to assign coordinates with other types than the coordinate type.
For ttmath, you can e.g. conveniently use strings. The advantage is that it then has higher precision, because
if doubles are used for assignments the double-precision is used.
>*/
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/assign_3d_point.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/assign_3d_point.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/assign_3d_point.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -19,7 +19,7 @@
int main()
{
boost::geometry::model::point<double, 3, boost::geometry::cs::cartesian> p;
- boost::geometry::assign(p, 1.2345, 2.3456, 3.4567);
+ boost::geometry::assign_values(p, 1.2345, 2.3456, 3.4567);
std::cout << boost::geometry::dsv(p) << std::endl;
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/assign_box_corners.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/assign_box_corners.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/assign_box_corners.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -23,7 +23,7 @@
typedef model::box<point> box;
box b;
- assign(b, 2, 2, 5, 5);
+ assign_values(b, 2, 2, 5, 5);
point ll, lr, ul, ur;
assign_box_corners(b, ll, lr, ul, ur);
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/assign_point_from_index.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/assign_point_from_index.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/assign_point_from_index.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -23,7 +23,7 @@
typedef model::segment<point> segment;
segment s;
- assign(s, 1, 1, 2, 2);
+ assign_values(s, 1, 1, 2, 2);
point first, second;
assign_point_from_index<0>(s, first);
Deleted: branches/release/libs/geometry/doc/src/examples/algorithms/assign_with_range.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/assign_with_range.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,71 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// QuickBook Example
-
-// Copyright (c) 2011 Barend Gehrels, 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)
-
-//[assign_with_range
-//` Shows usage of Boost.Geometry's assign, Boost.Assign, and Boost.Range to assign ranges of a linestring
-
-#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>
-#include <boost/geometry/geometries/adapted/boost_range/filtered.hpp>
-
-template <typename T>
-struct x_between
-{
- x_between(T a, T b)
- : fa(a), fb(b)
- {}
-
- template <typename P>
- bool operator()(P const& p) const
- {
- return boost::geometry::get<0>(p) >= fa
- && boost::geometry::get<0>(p) <= fb;
- }
-private :
- T fa, fb;
-};
-
-
-int main()
-{
- using namespace boost::assign;
-
- typedef boost::geometry::model::linestring<boost::tuple<int, int> > ls;
-
- ls line1, line2, line3;
-
- line1 = tuple_list_of(0, 0)(2, 3)(4, 0)(6, 3)(8, 0)(10, 3)(12, 0); /*< tuple_list_of is part of Boost.Assign and can be used for Boost.Geometry if points are tuples >*/
- boost::geometry::assign(line2, tuple_list_of(0, 0)(2, 2)(4, 0)(6, 2)(8, 0)); /*< tuple_list_of delivers a range and can therefore be used in boost::geometry::assign >*/
- boost::geometry::assign(line3, line1 | boost::adaptors::filtered(x_between<int>(4, 8))); /*< Boost.Range adaptors can also be used in boost::geometry::assign >*/
-
- std::cout << "line 1: " << boost::geometry::dsv(line1) << std::endl;
- std::cout << "line 2: " << boost::geometry::dsv(line2) << std::endl;
- std::cout << "line 3: " << boost::geometry::dsv(line3) << std::endl;
-
- return 0;
-}
-
-//]
-
-
-//[assign_with_range_output
-/*`
-Output:
-[pre
-line 1: ((0, 0), (2, 3), (4, 0), (6, 3), (8, 0), (10, 3), (12, 0))
-line 2: ((0, 0), (2, 2), (4, 0), (6, 2), (8, 0))
-line 3: ((4, 0), (6, 3), (8, 0))
-]
-*/
-//]
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/clear.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/clear.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/clear.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -29,8 +29,8 @@
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));
+ poly.outer() = tuple_list_of(0, 0)(0, 9)(10, 10)(0, 0);
+ poly.inners().push_back(tuple_list_of(1, 2)(4, 6)(2, 8)(1, 2));
std::cout << boost::geometry::dsv(poly) << std::endl;
boost::geometry::clear(poly);
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/distance.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/distance.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/distance.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -41,9 +41,10 @@
mp.push_back(point_type(0,0));
mp.push_back(point_type(3,3));
- std::cout << "distance: " << boost::geometry::distance(p, poly) << std::endl;
- std::cout << "distance: " << boost::geometry::distance(p, line) << std::endl;
- std::cout << "distance: " << boost::geometry::distance(p, mp) << std::endl;
+ std::cout
+ << "Point-Poly: " << boost::geometry::distance(p, poly) << std::endl
+ << "Point-Line: " << boost::geometry::distance(p, line) << std::endl
+ << "Point-MultiPoint: " << boost::geometry::distance(p, mp) << std::endl;
return 0;
}
@@ -55,9 +56,9 @@
/*`
Output:
[pre
-distance: 1.22066
-distance: 1
-distance: 2.23607
+Point-Poly: 1.22066
+Point-Line: 1
+Point-MultiPoint: 2.23607
]
*/
//]
Copied: branches/release/libs/geometry/doc/src/examples/algorithms/equals.cpp (from r71191, /trunk/libs/geometry/doc/src/examples/algorithms/equals.cpp)
==============================================================================
--- /trunk/libs/geometry/doc/src/examples/algorithms/equals.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/equals.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -34,7 +34,7 @@
<< std::endl;
boost::geometry::model::box<point> box;
- boost::geometry::assign(box, 0, 0, 5, 5);
+ boost::geometry::assign_values(box, 0, 0, 5, 5);
std::cout
<< "polygon and box are spatially "
Modified: branches/release/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -8,7 +8,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//[num_interior_rings
-//` Get the number of interior rings in a polygon or multi-polygon
+//` Get the number of interior rings in a multi-polygon
#include <iostream>
Modified: branches/release/libs/geometry/doc/src/examples/core/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/core/Jamfile.v2 (original)
+++ branches/release/libs/geometry/doc/src/examples/core/Jamfile.v2 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -17,3 +17,14 @@
exe get_box : get_box.cpp ;
exe set_point : set_point.cpp ;
exe set_box : set_box.cpp ;
+exe degree_radian : degree_radian.cpp ;
+
+exe coordinate_type : coordinate_type.cpp ;
+exe coordinate_system : coordinate_system.cpp ;
+exe coordinate_dimension : coordinate_dimension.cpp ;
+exe point_order : point_order.cpp ;
+exe closure : closure.cpp ;
+
+exe point_type : point_type.cpp ;
+exe tag : tag.cpp ;
+exe tag_cast : tag_cast.cpp ;
Modified: branches/release/libs/geometry/doc/src/examples/geometries/register/point.cpp
==============================================================================
--- branches/release/libs/geometry/doc/src/examples/geometries/register/point.cpp (original)
+++ branches/release/libs/geometry/doc/src/examples/geometries/register/point.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -29,8 +29,8 @@
namespace bg = boost::geometry;
/*< Any Boost.Geometry function can be used for legacy point now. Here: assign and distance >*/
- bg::assign(p1, 1, 1);
- bg::assign(p2, 2, 2);
+ bg::assign_values(p1, 1, 1);
+ bg::assign_values(p2, 2, 2);
double d = bg::distance(p1, p2);
Modified: branches/release/libs/geometry/example/01_point_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/01_point_example.cpp (original)
+++ branches/release/libs/geometry/example/01_point_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -53,13 +53,13 @@
// All these types are handled the same way. We show here
// assigning them and calculating distances.
- assign(pt1, 1, 1);
- assign(pt2, 2, 2);
- assign(pt3, 3, 3);
- assign(pt4, 4, 4);
- assign(pt5, 5, 5);
- assign(pt6, 6, 6);
- assign(pt7, 7, 7);
+ assign_values(pt1, 1, 1);
+ assign_values(pt2, 2, 2);
+ assign_values(pt3, 3, 3);
+ assign_values(pt4, 4, 4);
+ assign_values(pt5, 5, 5);
+ assign_values(pt6, 6, 6);
+ assign_values(pt7, 7, 7);
double d1 = distance(pt1, pt2);
@@ -76,13 +76,13 @@
// 1: default, empty constructor, causing no initialization at all
model::d2::point_xy<double> p1;
- // 2: as shown above, assign
+ // 2: as shown above, assign_values
model::d2::point_xy<double> p2;
- assign(p2, 1, 1);
+ assign_values(p2, 1, 1);
// 3: using "set" function
// set uses the concepts behind, such that it can be applied for
- // every point-type (like assign)
+ // every point-type (like assign_values)
model::d2::point_xy<double> p3;
set<0>(p3, 1);
set<1>(p3, 1);
@@ -118,8 +118,8 @@
// There are 3-dimensional points too
model::point<double, 3, cs::cartesian> d3a, d3b;
- assign(d3a, 1, 2, 3);
- assign(d3b, 4, 5, 6);
+ assign_values(d3a, 1, 2, 3);
+ assign_values(d3b, 4, 5, 6);
d3 = distance(d3a, d3b);
Modified: branches/release/libs/geometry/example/02_linestring_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/02_linestring_example.cpp (original)
+++ branches/release/libs/geometry/example/02_linestring_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -79,9 +79,9 @@
// points can be created using "make" and added to a linestring using the std:: "push_back"
ls.push_back(make<point_2d>(1.1, 1.1));
- // points can also be assigned using "assign" and added to a linestring using "append"
+ // points can also be assigned using "assign_values" and added to a linestring using "append"
point_2d lp;
- assign(lp, 2.5, 2.1);
+ assign_values(lp, 2.5, 2.1);
append(ls, lp);
// Lines can be streamed using DSV (delimiter separated values)
Modified: branches/release/libs/geometry/example/03_polygon_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/03_polygon_example.cpp (original)
+++ branches/release/libs/geometry/example/03_polygon_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -41,7 +41,7 @@
{3.4, 2.0}, {4.1, 3.0}, {5.3, 2.6}, {5.4, 1.2}, {4.9, 0.8}, {2.9, 0.7},
{2.0, 1.3} // closing point is opening point
};
- assign(poly, coor);
+ assign_points(poly, coor);
}
// Polygons should be closed, and directed clockwise. If you're not sure if that is the case,
@@ -77,7 +77,7 @@
model::ring<point_2d>& inner = poly.inners().back();
const double coor[][2] = { {4.0, 2.0}, {4.2, 1.4}, {4.8, 1.9}, {4.4, 2.2}, {4.0, 2.0} };
- assign(inner, coor);
+ assign_points(inner, coor);
}
correct(poly);
Modified: branches/release/libs/geometry/example/05_a_overlay_polygon_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/05_a_overlay_polygon_example.cpp (original)
+++ branches/release/libs/geometry/example/05_a_overlay_polygon_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -45,7 +45,7 @@
const double c[][2] = {
{160, 330}, {60, 260}, {20, 150}, {60, 40}, {190, 20}, {270, 130}, {260, 250}, {160, 330}
};
- bg::assign(a, c);
+ bg::assign_points(a, c);
}
bg::correct(a);
std::cout << "A: " << bg::dsv(a) << std::endl;
@@ -55,7 +55,7 @@
const double c[][2] = {
{300, 330}, {190, 270}, {150, 170}, {150, 110}, {250, 30}, {380, 50}, {380, 250}, {300, 330}
};
- bg::assign(b, c);
+ bg::assign_points(b, c);
}
bg::correct(b);
std::cout << "B: " << bg::dsv(b) << std::endl;
Modified: branches/release/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp (original)
+++ branches/release/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -35,13 +35,13 @@
bg::model::linestring<point_2d> ls;
{
const double c[][2] = { {0, 1}, {2, 5}, {5, 3} };
- bg::assign(ls, c);
+ bg::assign_points(ls, c);
}
bg::model::polygon<point_2d> p;
{
const double c[][2] = { {3, 0}, {0, 3}, {4, 5}, {3, 0} };
- bg::assign(p, c);
+ bg::assign_points(p, c);
}
bg::correct(p);
Modified: branches/release/libs/geometry/example/06_a_transformation_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/06_a_transformation_example.cpp (original)
+++ branches/release/libs/geometry/example/06_a_transformation_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -35,7 +35,7 @@
const double coor[][2] = { {0, 0}, {0, 7}, {2, 2}, {2, 0}, {0, 0} };
// note that for this syntax you have to include the two
// include files above (c_array_cartesian.hpp, std_as_linestring.hpp)
- assign(poly, coor);
+ assign_points(poly, coor);
//read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", poly);
transform(poly, poly2, translate);
Modified: branches/release/libs/geometry/example/c01_custom_point_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/c01_custom_point_example.cpp (original)
+++ branches/release/libs/geometry/example/c01_custom_point_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -108,8 +108,8 @@
my_array_point a1 = {{0}};
my_array_point a2 = {{0}};
- boost::geometry::assign(a1, 1, 2, 3);
- boost::geometry::assign(a2, 3, 2, 1);
+ boost::geometry::assign_values(a1, 1, 2, 3);
+ boost::geometry::assign_values(a2, 3, 2, 1);
std::cout << "color distance "
<< boost::geometry::dsv(a1) << " to "
@@ -132,8 +132,8 @@
my_class_rw crw1;
my_class_rw crw2;
- boost::geometry::assign(crw1, 1, 2);
- boost::geometry::assign(crw2, 3, 4);
+ boost::geometry::assign_values(crw1, 1, 2);
+ boost::geometry::assign_values(crw2, 3, 4);
std::cout << "class r/w distance "
<< boost::geometry::dsv(crw1) << " to "
<< boost::geometry::dsv(crw2) << " is "
@@ -141,8 +141,8 @@
my_class_gs cgs1;
my_class_gs cgs2;
- boost::geometry::assign(cgs1, 1, 2);
- boost::geometry::assign(cgs2, 3, 4);
+ boost::geometry::assign_values(cgs1, 1, 2);
+ boost::geometry::assign_values(cgs2, 3, 4);
std::cout << "class g/s distance "
<< boost::geometry::dsv(crw1) << " to "
<< boost::geometry::dsv(crw2) << " is "
Modified: branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp
==============================================================================
--- branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp (original)
+++ branches/release/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -73,7 +73,7 @@
for (int v = 0; v < psShape->nVertices; v++)
{
typename point_type<T>::type point;
- assign(point, x[v], y[v]);
+ assign_values(point, x[v], y[v]);
append(polygon, point);
}
}
Modified: branches/release/libs/geometry/test/algorithms/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/test/algorithms/Jamfile.v2 (original)
+++ branches/release/libs/geometry/test/algorithms/Jamfile.v2 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -18,6 +18,7 @@
[ run comparable_distance.cpp ]
[ run convex_hull.cpp ]
[ run correct.cpp ]
+ [ run convert.cpp ]
[ run difference.cpp ]
[ run disjoint.cpp ]
[ run distance.cpp ]
Modified: branches/release/libs/geometry/test/algorithms/algorithms_tests.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/algorithms_tests.sln (original)
+++ branches/release/libs/geometry/test/algorithms/algorithms_tests.sln 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -54,6 +54,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comparable_distance", "comparable_distance.vcproj", "{F11970B5-BE16-4FF5-9780-4C15082B76A0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert", "convert.vcproj", "{FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -168,6 +170,10 @@
{F11970B5-BE16-4FF5-9780-4C15082B76A0}.Debug|Win32.Build.0 = Debug|Win32
{F11970B5-BE16-4FF5-9780-4C15082B76A0}.Release|Win32.ActiveCfg = Release|Win32
{F11970B5-BE16-4FF5-9780-4C15082B76A0}.Release|Win32.Build.0 = Release|Win32
+ {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.Build.0 = Debug|Win32
+ {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.ActiveCfg = Release|Win32
+ {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/release/libs/geometry/test/algorithms/assign.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/assign.cpp (original)
+++ branches/release/libs/geometry/test/algorithms/assign.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -14,6 +14,7 @@
#include <geometry_test_common.hpp>
+#include <boost/geometry/arithmetic/arithmetic.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
@@ -48,25 +49,25 @@
{
bg::model::linestring<Point> line;
- // Test assignment of plain array (note that this is only possible if adapted c-array is included!
+ // Test assignment of plain array (note that this is only possible if adapted c-array is included!)
const double coors[3][2] = { {1, 2}, {3, 4}, {5, 6} };
- bg::assign(line, coors);
+ bg::assign_points(line, coors);
check_linestring_2d(line);
// Test assignment of point array
Point points[3];
- bg::assign(points[0], 1, 2);
- bg::assign(points[1], 3, 4);
- bg::assign(points[2], 5, 6);
- bg::assign(line, points);
+ bg::assign_values(points[0], 1, 2);
+ bg::assign_values(points[1], 3, 4);
+ bg::assign_values(points[2], 5, 6);
+ bg::assign_points(line, points);
check_linestring_2d(line);
- // Test assignment of array with different point-type
+ // Test assignment of array with different point-type (tuple adaption should be included)
boost::tuple<float, float> tuples[3];
tuples[0] = boost::make_tuple(1, 2);
tuples[1] = boost::make_tuple(3, 4);
tuples[2] = boost::make_tuple(5, 6);
- bg::assign(line, tuples);
+ bg::assign_points(line, tuples);
check_linestring_2d(line);
}
@@ -76,7 +77,7 @@
void test_assign_box_or_segment_2d()
{
BoxOrSegment geometry;
- bg::assign(geometry, 1, 2, 3, 4);
+ bg::assign_values(geometry, 1, 2, 3, 4);
BOOST_CHECK((bg::get<bg::min_corner, 0>(geometry) == 1));
BOOST_CHECK((bg::get<bg::min_corner, 1>(geometry) == 2));
BOOST_CHECK((bg::get<bg::max_corner, 0>(geometry) == 3));
@@ -114,12 +115,12 @@
void test_assign_point_3d()
{
Point p;
- bg::assign(p, 1, 2, 3);
+ bg::assign_values(p, 1, 2, 3);
BOOST_CHECK(bg::get<0>(p) == 1);
BOOST_CHECK(bg::get<1>(p) == 2);
BOOST_CHECK(bg::get<2>(p) == 3);
- bg::detail::assign::assign_value(p, 123);
+ bg::assign_value(p, 123);
BOOST_CHECK(bg::get<0>(p) == 123);
BOOST_CHECK(bg::get<1>(p) == 123);
BOOST_CHECK(bg::get<2>(p) == 123);
@@ -131,15 +132,75 @@
}
+template <typename P>
+void test_assign_conversion()
+{
+ typedef bg::model::box<P> box_type;
+ typedef bg::model::ring<P> ring_type;
+ typedef bg::model::polygon<P> polygon_type;
+
+ P p;
+ bg::assign_values(p, 1, 2);
+
+ box_type b;
+ bg::assign(b, p);
+
+ BOOST_CHECK_CLOSE((bg::get<0, 0>(b)), 1.0, 0.001);
+ BOOST_CHECK_CLOSE((bg::get<0, 1>(b)), 2.0, 0.001);
+ BOOST_CHECK_CLOSE((bg::get<1, 0>(b)), 1.0, 0.001);
+ BOOST_CHECK_CLOSE((bg::get<1, 1>(b)), 2.0, 0.001);
+
+
+ bg::set<bg::min_corner, 0>(b, 1);
+ bg::set<bg::min_corner, 1>(b, 2);
+ bg::set<bg::max_corner, 0>(b, 3);
+ bg::set<bg::max_corner, 1>(b, 4);
+
+ ring_type ring;
+ bg::assign(ring, b);
+
+ //std::cout << bg::wkt(b) << std::endl;
+ //std::cout << bg::wkt(ring) << std::endl;
+
+ typename boost::range_const_iterator<ring_type>::type it = ring.begin();
+ BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+ BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+ it++;
+ BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+ BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
+ it++;
+ BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
+ BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
+ it++;
+ BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
+ BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+ it++;
+ BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+ BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+
+ BOOST_CHECK_EQUAL(ring.size(), 5u);
+
+
+ polygon_type polygon;
+
+ bg::assign(polygon, ring);
+ BOOST_CHECK_EQUAL(bg::num_points(polygon), 5u);
+
+ ring_type ring2;
+ bg::assign(ring2, polygon);
+ BOOST_CHECK_EQUAL(bg::num_points(ring2), 5u);
+}
+
+
template <typename Point>
void test_assign_point_2d()
{
Point p;
- bg::assign(p, 1, 2);
+ bg::assign_values(p, 1, 2);
BOOST_CHECK(bg::get<0>(p) == 1);
BOOST_CHECK(bg::get<1>(p) == 2);
- bg::detail::assign::assign_value(p, 123);
+ bg::assign_value(p, 123);
BOOST_CHECK(bg::get<0>(p) == 123);
BOOST_CHECK(bg::get<1>(p) == 123);
@@ -148,6 +209,10 @@
BOOST_CHECK(bg::get<1>(p) == 0);
}
+
+
+
+
int test_main(int, char* [])
{
test_assign_point_3d<int[3]>();
@@ -165,6 +230,9 @@
test_assign_point_2d<bg::model::point<float, 2, bg::cs::cartesian> >();
test_assign_point_2d<bg::model::point<double, 2, bg::cs::cartesian> >();
+ test_assign_conversion<bg::model::point<double, 2, bg::cs::cartesian> >();
+
+
// Segment (currently) cannot handle array's because derived from std::pair
test_assign_box_2d<int[2]>();
test_assign_box_2d<float[2]>();
Modified: branches/release/libs/geometry/test/algorithms/detail/Jamfile.v2
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/Jamfile.v2 (original)
+++ branches/release/libs/geometry/test/algorithms/detail/Jamfile.v2 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -10,7 +10,6 @@
test-suite boost-geometry-algorithms-detail
:
- [ run convert.cpp ]
[ run partition.cpp ]
;
Deleted: branches/release/libs/geometry/test/algorithms/detail/convert.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/convert.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,105 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// Unit Test
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 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)
-
-#include <geometry_test_common.hpp>
-
-
-#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/detail/convert.hpp>
-#include <boost/geometry/algorithms/make.hpp>
-#include <boost/geometry/algorithms/num_points.hpp>
-
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
-#include <test_common/test_point.hpp>
-
-
-template <typename P>
-void test_all()
-{
- typedef bg::model::box<P> box_type;
-
- P p;
- bg::assign(p, 1, 2);
-
- box_type b;
- bg::detail::convert(p, b);
-
- BOOST_CHECK_CLOSE((bg::get<0, 0>(b)), 1.0, 0.001);
- BOOST_CHECK_CLOSE((bg::get<0, 1>(b)), 2.0, 0.001);
- BOOST_CHECK_CLOSE((bg::get<1, 0>(b)), 1.0, 0.001);
- BOOST_CHECK_CLOSE((bg::get<1, 1>(b)), 2.0, 0.001);
-}
-
-template <typename P>
-void test_std()
-{
- test_all<P>();
-
- typedef bg::model::box<P> box_type;
- typedef bg::model::ring<P> ring_type;
- typedef bg::model::polygon<P> polygon_type;
-
- box_type b;
- bg::set<bg::min_corner, 0>(b, 1);
- bg::set<bg::min_corner, 1>(b, 2);
- bg::set<bg::max_corner, 0>(b, 3);
- bg::set<bg::max_corner, 1>(b, 4);
-
- ring_type ring;
- bg::detail::convert(b, ring);
-
- //std::cout << bg::wkt(b) << std::endl;
- //std::cout << bg::wkt(ring) << std::endl;
-
- typename boost::range_const_iterator<ring_type>::type it = ring.begin();
- BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
- BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
- it++;
- BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
- BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
- it++;
- BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
- BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
- it++;
- BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
- BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
- it++;
- BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
- BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
-
- BOOST_CHECK_EQUAL(ring.size(), 5u);
-
-
- polygon_type polygon;
-
- bg::detail::convert(ring, polygon);
- BOOST_CHECK_EQUAL(bg::num_points(polygon), 5u);
-
- bg::detail::convert(polygon, ring);
- BOOST_CHECK_EQUAL(bg::num_points(ring), 5u);
-}
-
-int test_main(int, char* [])
-{
- test_std<bg::model::point<int, 2, bg::cs::cartesian> >();
- test_std<bg::model::point<float, 2, bg::cs::cartesian> >();
- test_std<bg::model::point<double, 2, bg::cs::cartesian> >();
-
-#ifdef HAVE_TTMATH
- test_std<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
-#endif
- return 0;
-}
Deleted: branches/release/libs/geometry/test/algorithms/detail/convert.vcproj
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/convert.vcproj 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="convert"
- ProjectGUID="{FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}"
- RootNamespace="convert"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convert"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../..;../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\convert"
- ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../..;../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\convert.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: branches/release/libs/geometry/test/algorithms/detail/detail.sln
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/detail.sln (original)
+++ branches/release/libs/geometry/test/algorithms/detail/detail.sln 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -2,8 +2,6 @@
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "partition", "partition.vcproj", "{5EF21715-DB87-41AB-9D0A-59ED04F316A1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert", "convert.vcproj", "{FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -14,10 +12,6 @@
{5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Debug|Win32.Build.0 = Debug|Win32
{5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Release|Win32.ActiveCfg = Release|Win32
{5EF21715-DB87-41AB-9D0A-59ED04F316A1}.Release|Win32.Build.0 = Release|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.ActiveCfg = Debug|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Debug|Win32.Build.0 = Debug|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.ActiveCfg = Release|Win32
- {FABF1AA7-F695-49F8-92F6-AB6C4B0C088A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/release/libs/geometry/test/algorithms/detail/partition.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/detail/partition.cpp (original)
+++ branches/release/libs/geometry/test/algorithms/detail/partition.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -9,18 +9,24 @@
#include <algorithms/test_overlay.hpp>
-#include <boost/range/algorithm/copy.hpp>
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/geometries/register/point.hpp>
-#include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
-#include <boost/geometry/algorithms/detail/overlay/assign_parents.hpp>
#include <boost/geometry/algorithms/detail/partition.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#if defined(TEST_WITH_SVG)
+# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#endif
+
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+
template <typename Box>
struct box_item
@@ -214,6 +220,234 @@
}
+//------------------- higher volumes
+
+template <typename SvgMapper>
+struct svg_visitor
+{
+ SvgMapper& m_mapper;
+
+ svg_visitor(SvgMapper& mapper)
+ : m_mapper(mapper)
+ {}
+
+ template <typename Box>
+ inline void apply(Box const& box, int level)
+ {
+ /*
+ std::string color("rgb(64,64,64)");
+ switch(level)
+ {
+ case 0 : color = "rgb(255,0,0)"; break;
+ case 1 : color = "rgb(0,255,0)"; break;
+ case 2 : color = "rgb(0,0,255)"; break;
+ case 3 : color = "rgb(255,255,0)"; break;
+ case 4 : color = "rgb(255,0,255)"; break;
+ case 5 : color = "rgb(0,255,255)"; break;
+ case 6 : color = "rgb(255,128,0)"; break;
+ case 7 : color = "rgb(0,128,255)"; break;
+ }
+ std::ostringstream style;
+ style << "fill:none;stroke-width:" << (5.0 - level / 2.0) << ";stroke:" << color << ";";
+ m_mapper.map(box, style.str());
+ */
+ m_mapper.map(box, "fill:none;stroke-width:2;stroke:rgb(0,0,0);");
+
+ }
+};
+
+
+
+
+template <typename Collection>
+void fill_points(Collection& collection, int seed, int size, int count)
+{
+ typedef boost::minstd_rand base_generator_type;
+
+ base_generator_type generator(seed);
+
+ boost::uniform_int<> random_coordinate(0, size - 1);
+ boost::variate_generator<base_generator_type&, boost::uniform_int<> >
+ coordinate_generator(generator, random_coordinate);
+
+ std::set<std::pair<int, int> > included;
+
+ int n = 0;
+ for (int i = 0; n < count && i < count*count; i++)
+ {
+ int x = coordinate_generator();
+ int y = coordinate_generator();
+ std::pair<int, int> pair = std::make_pair(x, y);
+ if (included.find(pair) == included.end())
+ {
+ included.insert(pair);
+ typename boost::range_value<Collection>::type item;
+ item.x = x;
+ item.y = y;
+ collection.push_back(item);
+ n++;
+ }
+ }
+}
+
+void test_many_points(int seed, int size, int count)
+{
+ bg::model::multi_point<point_item> mp1, mp2;
+
+ fill_points(mp1, seed, size, count);
+ fill_points(mp2, seed * 2, size, count);
+
+ // Test equality in quadratic loop
+ int expected_count = 0;
+ BOOST_FOREACH(point_item const& item1, mp1)
+ {
+ BOOST_FOREACH(point_item const& item2, mp2)
+ {
+ if (bg::equals(item1, item2))
+ {
+ expected_count++;
+ }
+ }
+ }
+
+#if defined(TEST_WITH_SVG)
+ std::ostringstream filename;
+ filename << "partition" << seed << ".svg";
+ std::ofstream svg(filename.str().c_str());
+
+ bg::svg_mapper<point_item> mapper(svg, 800, 800);
+
+ {
+ point_item p;
+ p.x = -1; p.y = -1; mapper.add(p);
+ p.x = size + 1; p.y = size + 1; mapper.add(p);
+ }
+
+ typedef svg_visitor<bg::svg_mapper<point_item> > box_visitor_type;
+ box_visitor_type box_visitor(mapper);
+#else
+ typedef bg::visit_no_policy box_visitor_type;
+ box_visitor_type box_visitor;
+#endif
+
+ point_visitor visitor;
+ bg::partition
+ <
+ bg::model::box<point_item>, get_point, ovelaps_point,
+ box_visitor_type
+ >::apply(mp1, mp2, visitor, 2, box_visitor);
+
+ BOOST_CHECK_EQUAL(visitor.count, expected_count);
+
+#if defined(TEST_WITH_SVG)
+ BOOST_FOREACH(point_item const& item, mp1)
+ {
+ mapper.map(item, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1", 8);
+ }
+ BOOST_FOREACH(point_item const& item, mp2)
+ {
+ mapper.map(item, "fill:rgb(0,128,255);stroke:rgb(0,0,100);stroke-width:1", 4);
+ }
+#endif
+}
+
+template <typename Collection>
+void fill_boxes(Collection& collection, int seed, int size, int count)
+{
+ typedef boost::minstd_rand base_generator_type;
+
+ base_generator_type generator(seed);
+
+ boost::uniform_int<> random_coordinate(0, size * 10 - 1);
+ boost::variate_generator<base_generator_type&, boost::uniform_int<> >
+ coordinate_generator(generator, random_coordinate);
+
+ int n = 0;
+ for (int i = 0; n < count && i < count*count; i++)
+ {
+ int w = coordinate_generator() % 30;
+ int h = coordinate_generator() % 30;
+ if (w > 0 && h > 0)
+ {
+ int x = coordinate_generator();
+ int y = coordinate_generator();
+ if (x + w < size * 10 && y + h < size * 10)
+ {
+ typename boost::range_value<Collection>::type item(n+1);
+ bg::assign_values(item.box, x / 10.0, y / 10.0, (x + w) / 10.0, (y + h) / 10.0);
+ collection.push_back(item);
+ n++;
+ }
+ }
+ }
+}
+
+
+
+void test_many_boxes(int seed, int size, int count)
+{
+ typedef bg::model::box<point_item> box_type;
+ std::vector<box_item<box_type> > boxes;
+
+ fill_boxes(boxes, seed, size, count);
+
+ // Test equality in quadratic loop
+ int expected_count = 0;
+ double expected_area = 0.0;
+ BOOST_FOREACH(box_item<box_type> const& item1, boxes)
+ {
+ BOOST_FOREACH(box_item<box_type> const& item2, boxes)
+ {
+ if (item1.id < item2.id)
+ {
+ if (bg::intersects(item1.box, item2.box))
+ {
+ box_type b;
+ bg::intersection(item1.box, item2.box, b);
+ expected_area += bg::area(b);
+ expected_count++;
+ }
+ }
+ }
+ }
+
+
+#if defined(TEST_WITH_SVG)
+ std::ostringstream filename;
+ filename << "partition_box_" << seed << ".svg";
+ std::ofstream svg(filename.str().c_str());
+
+ bg::svg_mapper<point_item> mapper(svg, 800, 800);
+
+ {
+ point_item p;
+ p.x = -1; p.y = -1; mapper.add(p);
+ p.x = size + 1; p.y = size + 1; mapper.add(p);
+ }
+
+ BOOST_FOREACH(box_item<box_type> const& item, boxes)
+ {
+ mapper.map(item.box, "opacity:0.6;fill:rgb(50,50,210);stroke:rgb(0,0,0);stroke-width:1");
+ }
+
+ typedef svg_visitor<bg::svg_mapper<point_item> > partition_visitor_type;
+ partition_visitor_type partition_visitor(mapper);
+
+
+ box_visitor<box_type> visitor;
+ bg::partition
+ <
+ box_type, get_box, ovelaps_box,
+ partition_visitor_type
+ >::apply(boxes, visitor, 2, partition_visitor);
+
+ BOOST_CHECK_EQUAL(visitor.count, expected_count);
+ BOOST_CHECK_CLOSE(visitor.area, expected_area, 0.001);
+
+#endif
+}
+
+
@@ -221,5 +455,20 @@
{
test_all<bg::model::d2::point_xy<double> >();
+ test_many_points(12345, 20, 40);
+ test_many_points(54321, 20, 60);
+ test_many_points(67890, 20, 80);
+ test_many_points(98765, 20, 100);
+ for (int i = 1; i < 10; i++)
+ {
+ test_many_points(i, 30, i * 20);
+ }
+
+ test_many_boxes(12345, 20, 40);
+ for (int i = 1; i < 10; i++)
+ {
+ test_many_boxes(i, 20, i * 10);
+ }
+
return 0;
}
Modified: branches/release/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/intersection.cpp (original)
+++ branches/release/libs/geometry/test/algorithms/intersection.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -324,7 +324,7 @@
p = new test::test_point_xy; p->x = 10; p->y = 10; ln.push_back(p);
bg::model::box<bg::model::d2::point_xy<double> > box;
- bg::assign(box, 2, 2, 8, 8);
+ bg::assign_values(box, 2, 2, 8, 8);
typedef bg::model::linestring<bg::model::d2::point_xy<double> > output_type;
std::vector<output_type> clip;
Modified: branches/release/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/make.cpp (original)
+++ branches/release/libs/geometry/test/algorithms/make.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -62,7 +62,7 @@
T coors[][2] = {{1,2}, {3,4}};
- L line = bg::make<L>(coors);
+ L line = bg::detail::make::make_points<L>(coors);
BOOST_CHECK_EQUAL(line.size(), 2u);
}
@@ -74,7 +74,7 @@
T coors[][3] = {{1,2,3}, {4,5,6}};
- L line = bg::make<L>(coors);
+ L line = bg::detail::make::make_points<L>(coors);
BOOST_CHECK_EQUAL(line.size(), 2u);
//std::cout << dsv(line) << std::endl;
Modified: branches/release/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- branches/release/libs/geometry/test/algorithms/transform.cpp (original)
+++ branches/release/libs/geometry/test/algorithms/transform.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -80,7 +80,7 @@
{
typedef bg::model::point<T, 3, bg::cs::spherical<DegreeOrRadian> > spherical_type;
spherical_type sph1;
- assign(sph1, phi, theta, r);
+ assign_values(sph1, phi, theta, r);
BOOST_CHECK(transform(sph1, p));
spherical_type sph2;
@@ -97,7 +97,7 @@
{
typedef bg::model::point<T, 2, bg::cs::spherical<DegreeOrRadian> > spherical_type;
spherical_type sph1, sph2;
- assign(sph1, phi, theta);
+ assign_values(sph1, phi, theta);
BOOST_CHECK(transform(sph1, p));
BOOST_CHECK(transform(p, sph2));
Modified: branches/release/libs/geometry/test/arithmetic/arithmetic.cpp
==============================================================================
--- branches/release/libs/geometry/test/arithmetic/arithmetic.cpp (original)
+++ branches/release/libs/geometry/test/arithmetic/arithmetic.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -30,14 +30,14 @@
void test_addition()
{
P p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
bg::add_value(p1, 10);
BOOST_CHECK(bg::get<0>(p1) == 11);
BOOST_CHECK(bg::get<1>(p1) == 12);
BOOST_CHECK(bg::get<2>(p1) == 13);
P p2;
- bg::assign(p2, 4, 5, 6);
+ bg::assign_values(p2, 4, 5, 6);
bg::add_point(p1, p2);
BOOST_CHECK(bg::get<0>(p1) == 15);
BOOST_CHECK(bg::get<1>(p1) == 17);
@@ -48,14 +48,14 @@
void test_subtraction()
{
P p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
bg::subtract_value(p1, 10);
BOOST_CHECK(bg::get<0>(p1) == -9);
BOOST_CHECK(bg::get<1>(p1) == -8);
BOOST_CHECK(bg::get<2>(p1) == -7);
P p2;
- bg::assign(p2, 4, 6, 8);
+ bg::assign_values(p2, 4, 6, 8);
bg::subtract_point(p1, p2);
BOOST_CHECK(bg::get<0>(p1) == -13);
BOOST_CHECK(bg::get<1>(p1) == -14);
@@ -66,14 +66,14 @@
void test_multiplication()
{
P p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
bg::multiply_value(p1, 5);
BOOST_CHECK(bg::get<0>(p1) == 5);
BOOST_CHECK(bg::get<1>(p1) == 10);
BOOST_CHECK(bg::get<2>(p1) == 15);
P p2;
- bg::assign(p2, 4, 5, 6);
+ bg::assign_values(p2, 4, 5, 6);
bg::multiply_point(p1, p2);
BOOST_CHECK(bg::get<0>(p1) == 20);
BOOST_CHECK(bg::get<1>(p1) == 50);
@@ -84,20 +84,37 @@
void test_division()
{
P p1;
- bg::assign(p1, 50, 100, 150);
+ bg::assign_values(p1, 50, 100, 150);
bg::divide_value(p1, 5);
BOOST_CHECK(bg::get<0>(p1) == 10);
BOOST_CHECK(bg::get<1>(p1) == 20);
BOOST_CHECK(bg::get<2>(p1) == 30);
P p2;
- bg::assign(p2, 2, 4, 6);
+ bg::assign_values(p2, 2, 4, 6);
bg::divide_point(p1, p2);
BOOST_CHECK(bg::get<0>(p1) == 5);
BOOST_CHECK(bg::get<1>(p1) == 5);
BOOST_CHECK(bg::get<2>(p1) == 5);
}
+template <typename P>
+void test_assign()
+{
+ P p1;
+ P p2;
+ bg::assign_values(p1, 12, 34, 56);
+ bg::assign_point(p2, p1);
+ BOOST_CHECK(bg::get<0>(p2) == 12);
+ BOOST_CHECK(bg::get<1>(p2) == 34);
+ BOOST_CHECK(bg::get<2>(p2) == 56);
+
+ bg::assign_value(p2, 78);
+ BOOST_CHECK(bg::get<0>(p2) == 78);
+ BOOST_CHECK(bg::get<1>(p2) == 78);
+ BOOST_CHECK(bg::get<2>(p2) == 78);
+}
+
template <typename P>
void test_all()
@@ -106,6 +123,7 @@
test_subtraction<P>();
test_multiplication<P>();
test_division<P>();
+ test_assign<P>();
}
Modified: branches/release/libs/geometry/test/arithmetic/dot_product.cpp
==============================================================================
--- branches/release/libs/geometry/test/arithmetic/dot_product.cpp (original)
+++ branches/release/libs/geometry/test/arithmetic/dot_product.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -30,9 +30,9 @@
void test_all()
{
P p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
P p2;
- bg::assign(p2, 4, 5, 6);
+ bg::assign_values(p2, 4, 5, 6);
BOOST_CHECK(bg::dot_product(p1, p2) == 1*4 + 2*5 + 3*6);
}
Deleted: branches/release/libs/geometry/test/compile_test.cpp
==============================================================================
--- branches/release/libs/geometry/test/compile_test.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,220 +0,0 @@
-// TODO: OLD!
-
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright (c) 2007-2011 Barend Gehrels, 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)
-
-#include <deque>
-#include <iostream>
-#include <limits>
-#include <list>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
-
-#include <boost/geometry/geometries/geometries.hpp>
-
-template<typename P>
-struct modifying_functor
-{
- double sum;
- modifying_functor() : sum(0)
- {}
- inline void operator()(P& p)
- {
- p.x(1);
- }
-
- inline void operator()(bg::segment<P>& s)
- {
- s.first.x(1);
- }
-};
-
-template<typename P>
-struct const_functor
-{
- double sum;
- const_functor() : sum(0)
- {}
- inline void operator()(P const& p)
- {
- sum += p.x();
- }
-
- inline void operator()(bg::segment<P> const& s)
- {
- sum += s.first.x() - s.second.x();
- }
-};
-
-template <typename T, template<typename, typename> class V>
-void check_linestring()
-{
- typedef bg::model::d2::point_xy<T> P;
- typedef bg::model::linestring<P, V, std::allocator> line_type;
- line_type line;
- line.push_back(P(0,0));
- line.push_back(P(1,1));
-
- typedef bg::multi_linestring<line_type, V, std::allocator> multi_line_type;
- multi_line_type multi;
- multi.push_back(line);
-
- double len = bg::length(line);
- len = bg::length(multi);
- double d = bg::distance(P(0,1), line);
- //d = bg::distance(P(0,1), multi); not defined yet!
-
- line_type simp;
- bg::simplify(line, simp, 3);
- multi_line_type simpm;
- bg::simplify(multi, simpm, 3);
-
- typedef bg::model::box<P> box_type;
- box_type box1;
- bg::envelope(line, box1);
- box_type box2;
- bg::envelope(multi, box2);
-
- // FIXME: Where is output stream op for line/multi --mloskot
- //std::stringstream out;
- // out << line << std::endl;
- //out << multi << std::endl;
-
- // For each, const
- /* TODO: Fix for_each/functor
- const_functor<P> cf;
- std::for_each(line.begin(), line.end(), cf);
-
- const line_type& cl = line;
- const multi_line_type& cm = multi;
-
- bg::for_each_point(cl, cf);
- bg::for_each_point(cm, cf);
- bg::for_each_segment(cl, cf);
- bg::for_each_segment(cm, cf);
-
- // For each, modifying
- modifying_functor<P> mf;
- line_type& ml = line;
- multi_line_type& mm = multi;
- std::for_each(line.begin(), line.end(), mf);
- bg::for_each_point(ml, mf);
- bg::for_each_point(mm, mf);
- bg::for_each_segment(ml, mf);
- bg::for_each_segment(mm, mf);
- */
-
-}
-
-template
-<
- typename T,
- template<typename, typename> class VP,
- template<typename, typename> class VR
->
-void check_polygon()
-{
- typedef bg::model::d2::point_xy<T> P;
- typedef bg::model::polygon<P, VP, VR, true, std::allocator, std::allocator> Y;
- Y poly;
- poly.outer().push_back(P(0,0));
- poly.outer().push_back(P(2,0));
- poly.outer().push_back(P(2,2));
- poly.outer().push_back(P(0,2));
-
- bg::correct(poly);
-
- // multi
- typedef bg::multi_polygon<Y, VP, std::allocator> MY;
- MY multi;
- multi.push_back(poly);
-
- double a = bg::area(poly);
- a = bg::area(multi);
-
- //double d = bg::distance(P(0,1), poly);
-
- Y simp;
- bg::simplify(poly, simp, 3);
- MY msimp;
- bg::simplify(multi, msimp, 3);
-
- typedef bg::model::box<P> box_type;
- box_type box1;
- bg::envelope(poly, box1);
- box_type box2;
- bg::envelope(multi, box2);
-
- P ctr;
- bg::centroid(poly, ctr);
-
- // within
- bg::model::d2::point_xy<double> circ_centre(10,10);
-
- bool w = bg::within(P(1, 1), poly);
- //w = bg::within(poly, b); tbd
- w = bg::within(P(1, 1), multi);
-
- //bg::circle circ(circ_centre, 10);
- //w = bg::within(poly, circ);
- //w = bg::within(multi, circ);
- //w = bg::within(multi, b); tbd
-
- // For each, const
- /* TODO: Fix for_each/functor
- const_functor<P> cf;
- std::for_each(poly.outer().begin(), poly.outer().end(), cf);
-
- const Y& cp = poly;
- const MY& cm = multi;
-
- bg::for_each_point(cp, cf);
- bg::for_each_point(cm, cf);
- bg::for_each_segment(cp, cf);
- bg::for_each_segment(cm, cf);
-
- // For each, modifying
- modifying_functor<P> mf;
- Y& mp = poly;
- MY& mm = multi;
- std::for_each(poly.outer().begin(), poly.outer().end(), mf);
- bg::for_each_point(mp, mf);
- bg::for_each_point(mm, mf);
- bg::for_each_segment(mp, mf);
- bg::for_each_segment(mm, mf);
- */
-}
-
-
-int main()
-{
- check_linestring<double, std::vector>();
- check_linestring<float, std::vector>();
- check_linestring<int, std::vector>();
- check_linestring<char, std::vector>();
-
- //check_linestring<double, std::list>();
- check_linestring<double, std::deque>();
-
- check_polygon<double, std::vector, std::vector>();
- check_polygon<float, std::vector, std::vector>();
- check_polygon<int, std::vector, std::vector>();
- check_polygon<char, std::vector, std::vector>();
-
- //check_polygon<double, std::list, std::vector>();
- check_polygon<double, std::deque, std::vector>();
- //check_polygon<double, std::list, std::list>();
- check_polygon<double, std::deque, std::deque>();
-
- return 0;
-}
-
Deleted: branches/release/libs/geometry/test/compile_test.sln
==============================================================================
--- branches/release/libs/geometry/test/compile_test.sln 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compile_test", "compile_test.vcproj", "{618D4B05-A06E-443B-87C0-94964CEA7164}"
- ProjectSection(ProjectDependencies) = postProject
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A} = {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ggl_headers", "ggl_headers.vcproj", "{B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {618D4B05-A06E-443B-87C0-94964CEA7164}.Debug|Win32.ActiveCfg = Debug|Win32
- {618D4B05-A06E-443B-87C0-94964CEA7164}.Debug|Win32.Build.0 = Debug|Win32
- {618D4B05-A06E-443B-87C0-94964CEA7164}.Release|Win32.ActiveCfg = Release|Win32
- {618D4B05-A06E-443B-87C0-94964CEA7164}.Release|Win32.Build.0 = Release|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Debug|Win32.ActiveCfg = Debug|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Debug|Win32.Build.0 = Debug|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Release|Win32.ActiveCfg = Release|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: branches/release/libs/geometry/test/compile_test.vcproj
==============================================================================
--- branches/release/libs/geometry/test/compile_test.vcproj 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="compile_test"
- ProjectGUID="{618D4B05-A06E-443B-87C0-94964CEA7164}"
- RootNamespace="compile_test"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\compile_test"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- RuntimeLibrary="1"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\compile_test"
- ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="0"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\compile_test.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\algorithms\area.hpp"
- >
- </File>
- <File
- RelativePath="..\astext.hpp"
- >
- </File>
- <File
- RelativePath="..\geometries\box.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\centroid.hpp"
- >
- </File>
- <File
- RelativePath="..\geometries\circle.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\distance.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\envelope.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\foreach.hpp"
- >
- </File>
- <File
- RelativePath="..\geometry.hpp"
- >
- </File>
- <File
- RelativePath="..\util\grow.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\intersection_linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\intersection_polygon.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\intersection_segment.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\length.hpp"
- >
- </File>
- <File
- RelativePath="..\normalize.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\overlaps.hpp"
- >
- </File>
- <File
- RelativePath="..\geometries\segment.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\simplify.hpp"
- >
- </File>
- <File
- RelativePath="..\algorithms\within.hpp"
- >
- </File>
- <Filter
- Name="util"
- >
- <File
- RelativePath="..\util\equals.hpp"
- >
- </File>
- <File
- RelativePath="..\util\reserve.hpp"
- >
- </File>
- <File
- RelativePath="..\util\selecttypetraits.hpp"
- >
- </File>
- <File
- RelativePath="..\util\side.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="strategies"
- >
- <File
- RelativePath="..\strategies\strategies_point_ll.hpp"
- >
- </File>
- <File
- RelativePath="..\strategies\strategies_point_xy.hpp"
- >
- </File>
- <File
- RelativePath="..\strategies\strategy_traits.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: branches/release/libs/geometry/test/custom_tests.sln
==============================================================================
--- branches/release/libs/geometry/test/custom_tests.sln 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point_concept_well_formed_point", "point_concept\well_formed_point.vcproj", "{B63710DE-960E-4C00-B79A-7C8F80D6BC15}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point_concept_well_formed_point_traits", "point_concept\well_formed_point_traits.vcproj", "{4F767915-5FC0-4BEB-8948-F371896BBD59}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point_concept_array_point", "point_concept\array_point.vcproj", "{436E02F5-A4E6-40F8-8E41-57560875D67F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point_concept_point_with_incorrect_coord_count", "point_concept\point_with_incorrect_coord_count.vcproj", "{B696EDCA-4602-4962-8A1C-043B3F44B978}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B63710DE-960E-4C00-B79A-7C8F80D6BC15}.Debug|Win32.ActiveCfg = Debug|Win32
- {B63710DE-960E-4C00-B79A-7C8F80D6BC15}.Debug|Win32.Build.0 = Debug|Win32
- {B63710DE-960E-4C00-B79A-7C8F80D6BC15}.Release|Win32.ActiveCfg = Release|Win32
- {B63710DE-960E-4C00-B79A-7C8F80D6BC15}.Release|Win32.Build.0 = Release|Win32
- {4F767915-5FC0-4BEB-8948-F371896BBD59}.Debug|Win32.ActiveCfg = Debug|Win32
- {4F767915-5FC0-4BEB-8948-F371896BBD59}.Debug|Win32.Build.0 = Debug|Win32
- {4F767915-5FC0-4BEB-8948-F371896BBD59}.Release|Win32.ActiveCfg = Release|Win32
- {4F767915-5FC0-4BEB-8948-F371896BBD59}.Release|Win32.Build.0 = Release|Win32
- {436E02F5-A4E6-40F8-8E41-57560875D67F}.Debug|Win32.ActiveCfg = Debug|Win32
- {436E02F5-A4E6-40F8-8E41-57560875D67F}.Debug|Win32.Build.0 = Debug|Win32
- {436E02F5-A4E6-40F8-8E41-57560875D67F}.Release|Win32.ActiveCfg = Release|Win32
- {436E02F5-A4E6-40F8-8E41-57560875D67F}.Release|Win32.Build.0 = Release|Win32
- {B696EDCA-4602-4962-8A1C-043B3F44B978}.Debug|Win32.ActiveCfg = Debug|Win32
- {B696EDCA-4602-4962-8A1C-043B3F44B978}.Debug|Win32.Build.0 = Debug|Win32
- {B696EDCA-4602-4962-8A1C-043B3F44B978}.Release|Win32.ActiveCfg = Release|Win32
- {B696EDCA-4602-4962-8A1C-043B3F44B978}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Modified: branches/release/libs/geometry/test/geometries/boost_polygon.cpp
==============================================================================
--- branches/release/libs/geometry/test/geometries/boost_polygon.cpp (original)
+++ branches/release/libs/geometry/test/geometries/boost_polygon.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -77,8 +77,8 @@
boost::polygon::rectangle_data<T> boost_polygon_box;
bg::model::box<bg_point_type> boost_geometry_box;
- bg::assign(boost_polygon_box, 0, 1, 5, 6);
- bg::assign(boost_geometry_box, 0, 1, 5, 6);
+ bg::assign_values(boost_polygon_box, 0, 1, 5, 6);
+ bg::assign_values(boost_geometry_box, 0, 1, 5, 6);
T boost_polygon_area = bg::area(boost_polygon_box);
T boost_geometry_area = bg::area(boost_geometry_box);
T boost_polygon_area_by_boost_polygon = boost::polygon::area(boost_polygon_box);
Modified: branches/release/libs/geometry/test/geometries/box.cpp
==============================================================================
--- branches/release/libs/geometry/test/geometries/box.cpp (original)
+++ branches/release/libs/geometry/test/geometries/box.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -30,8 +30,8 @@
{
P p1;
P p2;
- bg::assign(p1, 1, 2, 5);
- bg::assign(p2, 3, 4, 6);
+ bg::assign_values(p1, 1, 2, 5);
+ bg::assign_values(p2, 3, 4, 6);
return bg::model::box<P>(p1, p2);
}
Deleted: branches/release/libs/geometry/test/ggl_headers.sln
==============================================================================
--- branches/release/libs/geometry/test/ggl_headers.sln 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ggl_headers", "ggl_headers.vcproj", "{B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Debug|Win32.ActiveCfg = Debug|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Debug|Win32.Build.0 = Debug|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Release|Win32.ActiveCfg = Release|Win32
- {B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: branches/release/libs/geometry/test/ggl_headers.vcproj
==============================================================================
--- branches/release/libs/geometry/test/ggl_headers.vcproj 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
+++ (empty file)
@@ -1,1339 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ggl_headers"
- ProjectGUID="{B3B37654-5AB4-49F3-A1D3-DFDE73EA5E1A}"
- RootNamespace="ggl_headers"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="10"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="10"
- InheritedPropertySheets=".\boost.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="ggl"
- >
- <File
- RelativePath="..\..\..\boost\ggl\ggl.hpp"
- >
- </File>
- <Filter
- Name="iterators"
- >
- <File
- RelativePath="..\..\..\boost\ggl\iterators\base.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\iterators\circular_iterator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\iterators\ever_circling_iterator.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\iterators\section_iterators.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\iterators\segment_iterator.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="algorithms"
- >
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\append.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\area.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\assign.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\buffer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\centroid.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\clear.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\combine.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\convert.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\convex_hull.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\correct.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\envelope.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\for_each.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\intermediate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\intersection.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\intersection_linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\intersection_polygon.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\intersection_segment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\labelinfo.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\length.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\make.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\num_points.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\overlaps.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\parse.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\perimeter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\point_on_line.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\sectionalize.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\selected.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\simplify.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\transform.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\within.hpp"
- >
- </File>
- <Filter
- Name="detail"
- >
- <File
- RelativePath="..\..\..\boost\ggl\algorithms\detail\calculate_null.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="arithmetic"
- >
- <File
- RelativePath="..\..\..\boost\ggl\arithmetic\arithmetic.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\arithmetic\dot_product.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="core"
- >
- <File
- RelativePath="..\..\..\boost\ggl\core\access.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\coordinate_dimension.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\coordinate_system.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\coordinate_type.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\cs.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\exterior_ring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\geometry_id.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\interior_rings.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\is_linear.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\is_multi.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\point_type.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\radian_access.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\radius.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\replace_point_type.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\reverse_dispatch.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\ring_type.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\tag.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\tags.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\topological_dimension.hpp"
- >
- </File>
- <Filter
- Name="concepts"
- >
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\box_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\linestring_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\nsphere_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\point_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\polygon_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\ring_concept.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\core\concepts\segment_concept.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="geometries"
- >
- <File
- RelativePath="..\..\..\boost\ggl\geometries\box.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\cartesian2d.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\cartesian3d.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\geometries.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\latlong.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\linear_ring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\nsphere.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\point.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\point_ll.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\point_xy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\polygon.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\segment.hpp"
- >
- </File>
- <Filter
- Name="adapted"
- >
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\boost_array_as_linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\boost_array_as_ring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\c_array.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\c_array_cartesian.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\c_array_geographic.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\std_as_linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\std_as_ring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\tuple.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\tuple_cartesian.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\adapted\tuple_geographic.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="register"
- >
- <File
- RelativePath="..\..\..\boost\ggl\geometries\register\register_box.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\geometries\register\register_point.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="multi"
- >
- <Filter
- Name="algorithms"
- >
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\area.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\convex_hull.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\correct.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\envelope.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\foreach.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\intersection.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\length.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\num_points.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\perimeter.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\simplify.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\within.hpp"
- >
- </File>
- <Filter
- Name="detail"
- >
- <File
- RelativePath="..\..\..\boost\ggl\multi\algorithms\detail\multi_sum.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="geometries"
- >
- <File
- RelativePath="..\..\..\boost\ggl\multi\geometries\multi_linestring.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\geometries\multi_point.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\geometries\multi_polygon.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="io"
- >
- <Filter
- Name="wkt"
- >
- <File
- RelativePath="..\..\..\boost\ggl\multi\io\wkt\read_wkt.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\io\wkt\write_wkt.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="core"
- >
- <File
- RelativePath="..\..\..\boost\ggl\multi\core\geometry_id.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\core\is_multi.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\core\point_type.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\core\tags.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\multi\core\topological_dimension.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="io"
- >
- <Filter
- Name="wkt"
- >
- <File
- RelativePath="..\..\..\boost\ggl\io\wkt\read_wkt.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\io\wkt\stream_wkt.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\io\wkt\write_wkt.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="veshape"
- >
- <File
- RelativePath="..\..\..\boost\ggl\io\veshape\write_veshape.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="wkb"
- >
- <File
- RelativePath="..\..\..\boost\ggl\io\wkb\read_wkb.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\io\wkb\utility.hpp"
- >
- </File>
- <Filter
- Name="detail"
- >
- <File
- RelativePath="..\..\..\boost\ggl\io\wkb\detail\ogc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\io\wkb\detail\parser.hpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="projections"
- >
- <File
- RelativePath="..\..\..\boost\ggl\projections\epsg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\epsg_traits.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\factory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\parameters.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\project_inverse_transformer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\project_transformer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\projection.hpp"
- >
- </File>
- <Filter
- Name="impl"
- >
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\aasincos.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\adjlon.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\base_dynamic.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\base_static.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\factory_entry.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\function_overloads.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_auth.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_datum_set.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_datums.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_ell_set.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_ellps.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_fwd.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_gauss.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_init.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_inv.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_mlfn.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_msfn.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_param.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_phi2.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_qsfn.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_tsfn.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_units.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\pj_zpoly1.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\proj_mdist.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\impl\projects.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="proj"
- >
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\aea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\aeqd.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\airy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\aitoff.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\august.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\bacon.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\bipc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\boggs.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\bonne.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\cass.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\cc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\cea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\chamb.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\collg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\crast.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\denoy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eck1.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eck2.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eck3.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eck4.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eck5.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eqc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\eqdc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\fahey.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\fouc_s.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\gall.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\geocent.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\geos.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\gins8.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\gn_sinu.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\gnom.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\goode.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\gstmerc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\hammer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\hatano.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\imw_p.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\krovak.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\labrd.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\laea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\lagrng.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\larr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\lask.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\latlong.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\lcc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\lcca.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\loxim.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\lsat.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\mbt_fps.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\mbtfpp.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\mbtfpq.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\merc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\mill.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\mod_ster.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\moll.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\nell.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\nell_h.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\nocol.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\nsper.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\nzmg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\ob_tran.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\ocea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\oea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\omerc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\ortho.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\poly.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\putp2.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\putp3.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\putp4p.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\putp5.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\putp6.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\robin.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\rouss.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\rpoly.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\sconics.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\somerc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\stere.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\sterea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\sts.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\tcc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\tcea.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\tmerc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\tpeqd.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\urm5.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\urmfps.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\vandg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\vandg2.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\vandg4.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\wag2.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\wag3.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\wag7.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\wink1.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\projections\proj\wink2.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="index"
- >
- <Filter
- Name="rtree"
- >
- <File
- RelativePath="..\..\..\boost\ggl\index\rtree\helpers.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\index\rtree\rtree.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\index\rtree\rtree_leaf.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\index\rtree\rtree_node.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="strategies"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\distance_result.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\intersection_policies.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\intersection_result.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\strategies.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\strategy_traits.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\strategy_transform.hpp"
- >
- </File>
- <Filter
- Name="agnostic"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\agnostic\agn_convex_hull.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\agnostic\agn_simplify.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\agnostic\agn_within.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="cartesian"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_area.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_centroid.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_compare.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_envelope.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_intersect.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_side.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\cartesian\cart_within.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="geographic"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\geographic\geo_distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\geographic\geo_parse.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="spherical"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\spherical\sph_area.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\spherical\sph_distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\spherical\sph_envelope.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="transform"
- >
- <File
- RelativePath="..\..\..\boost\ggl\strategies\transform\inverse_transformer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\transform\map_transformer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\strategies\transform\matrix_transformers.hpp"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="util"
- >
- <File
- RelativePath="..\..\..\boost\ggl\util\as_range.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\assign_box_corner.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\builder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\copy.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\for_each_coordinate.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\graticule.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\loop.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\math.hpp"
- >
- </File>
- <File
- RelativePath="..\..\..\boost\ggl\util\promotion_traits.hpp"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: branches/release/libs/geometry/test/strategies/cross_track.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/cross_track.cpp (original)
+++ branches/release/libs/geometry/test/strategies/cross_track.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -60,9 +60,9 @@
Point p1, p2, p3;
- bg::assign(p1, lon1, lat1);
- bg::assign(p2, lon2, lat2);
- bg::assign(p3, lon3, lat3);
+ bg::assign_values(p1, lon1, lat1);
+ bg::assign_values(p2, lon2, lat2);
+ bg::assign_values(p3, lon3, lat3);
strategy_type strategy;
Modified: branches/release/libs/geometry/test/strategies/haversine.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/haversine.cpp (original)
+++ branches/release/libs/geometry/test/strategies/haversine.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -60,8 +60,8 @@
haversine_type strategy(radius);
Point p1, p2;
- bg::assign(p1, lon1, lat1);
- bg::assign(p2, lon2, lat2);
+ bg::assign_values(p1, lon1, lat1);
+ bg::assign_values(p2, lon2, lat2);
return_type d = strategy.apply(p1, p2);
BOOST_CHECK_CLOSE(d, expected, tolerance);
@@ -102,10 +102,10 @@
}
P1 p1;
- bg::assign(p1, 4, 52);
+ bg::assign_values(p1, 4, 52);
P2 p2;
- bg::assign(p2, 2, 48);
+ bg::assign_values(p2, 2, 48);
// ~ Amsterdam/Paris, 467 kilometers
double const km = 1000.0;
@@ -177,8 +177,8 @@
{
boost::timer t;
P p1, p2;
- bg::assign(p1, 1, 1);
- bg::assign(p2, 2, 2);
+ bg::assign_values(p1, 1, 1);
+ bg::assign_values(p2, 2, 2);
Strategy strategy;
typename Strategy::return_type s = 0;
for (int i = 0; i < n; i++)
Modified: branches/release/libs/geometry/test/strategies/projected_point.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/projected_point.cpp (original)
+++ branches/release/libs/geometry/test/strategies/projected_point.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -36,11 +36,11 @@
void test_services()
{
PS p1, p2;
- bg::assign(p1, 0, 0);
- bg::assign(p2, 0, 4);
+ bg::assign_values(p1, 0, 0);
+ bg::assign_values(p2, 0, 4);
P p;
- bg::assign(p, 2, 0);
+ bg::assign_values(p, 2, 0);
CalculationType const sqr_expected = 4;
CalculationType const expected = 2;
Modified: branches/release/libs/geometry/test/strategies/pythagoras.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/pythagoras.cpp (original)
+++ branches/release/libs/geometry/test/strategies/pythagoras.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -45,9 +45,9 @@
void test_null_distance_3d()
{
P1 p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
P2 p2;
- bg::assign(p2, 1, 2, 3);
+ bg::assign_values(p2, 1, 2, 3);
typedef bg::strategy::distance::pythagoras<P1, P2> pythagoras_type;
typedef typename bg::strategy::distance::services::return_type<pythagoras_type>::type return_type;
@@ -62,9 +62,9 @@
void test_axis_3d()
{
P1 p1;
- bg::assign(p1, 0, 0, 0);
+ bg::assign_values(p1, 0, 0, 0);
P2 p2;
- bg::assign(p2, 1, 0, 0);
+ bg::assign_values(p2, 1, 0, 0);
typedef bg::strategy::distance::pythagoras<P1, P2> pythagoras_type;
typedef typename bg::strategy::distance::services::return_type<pythagoras_type>::type return_type;
@@ -74,11 +74,11 @@
return_type result = pythagoras.apply(p1, p2);
BOOST_CHECK_EQUAL(result, return_type(1));
- bg::assign(p2, 0, 1, 0);
+ bg::assign_values(p2, 0, 1, 0);
result = pythagoras.apply(p1, p2);
BOOST_CHECK_EQUAL(result, return_type(1));
- bg::assign(p2, 0, 0, 1);
+ bg::assign_values(p2, 0, 0, 1);
result = pythagoras.apply(p1, p2);
BOOST_CHECK_CLOSE(result, return_type(1), 0.001);
}
@@ -87,9 +87,9 @@
void test_arbitrary_3d()
{
P1 p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
P2 p2;
- bg::assign(p2, 9, 8, 7);
+ bg::assign_values(p2, 9, 8, 7);
{
typedef bg::strategy::distance::pythagoras<P1, P2> strategy_type;
@@ -125,10 +125,10 @@
P1 p1;
- bg::assign(p1, 1, 2, 3);
+ bg::assign_values(p1, 1, 2, 3);
P2 p2;
- bg::assign(p2, 4, 5, 6);
+ bg::assign_values(p2, 4, 5, 6);
double const sqr_expected = 3*3 + 3*3 + 3*3; // 27
double const expected = sqrt(sqr_expected); // sqrt(27)=5.1961524227
@@ -201,8 +201,8 @@
point_type p1, p2;
- bg::assign(p1, x1, y1);
- bg::assign(p2, x2, y2);
+ bg::assign_values(p1, x1, y1);
+ bg::assign_values(p2, x2, y2);
return_type d = pythagoras.apply(p1, p2);
/***
@@ -258,8 +258,8 @@
{
boost::timer t;
P p1, p2;
- bg::assign(p1, 1, 1);
- bg::assign(p2, 2, 2);
+ bg::assign_values(p1, 1, 1);
+ bg::assign_values(p2, 2, 2);
Strategy strategy;
typename bg::strategy::distance::services::return_type<Strategy>::type s = 0;
for (int i = 0; i < n; i++)
Modified: branches/release/libs/geometry/test/strategies/segment_intersection.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/segment_intersection.cpp (original)
+++ branches/release/libs/geometry/test/strategies/segment_intersection.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -93,10 +93,10 @@
typedef segment<const P> segment_type;
P p1, p2, p3, p4;
- bg::assign(p1, x1, y1);
- bg::assign(p2, x2, y2);
- bg::assign(p3, x3, y3);
- bg::assign(p4, x4, y4);
+ bg::assign_values(p1, x1, y1);
+ bg::assign_values(p2, x2, y2);
+ bg::assign_values(p3, x3, y3);
+ bg::assign_values(p4, x4, y4);
segment_type s12(p1,p2);
segment_type s34(p3,p4);
Modified: branches/release/libs/geometry/test/strategies/segment_intersection_collinear.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/segment_intersection_collinear.cpp (original)
+++ branches/release/libs/geometry/test/strategies/segment_intersection_collinear.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -67,10 +67,10 @@
typedef bg::segment<const P> segment_type;
P p1, p2, p3, p4;
- bg::assign(p1, x1, y1);
- bg::assign(p2, x2, y2);
- bg::assign(p3, x3, y3);
- bg::assign(p4, x4, y4);
+ bg::assign_values(p1, x1, y1);
+ bg::assign_values(p2, x2, y2);
+ bg::assign_values(p3, x3, y3);
+ bg::assign_values(p4, x4, y4);
segment_type s12(p1,p2);
segment_type s34(p3,p4);
Modified: branches/release/libs/geometry/test/strategies/side_by_cross_track.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/side_by_cross_track.cpp (original)
+++ branches/release/libs/geometry/test/strategies/side_by_cross_track.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -29,9 +29,9 @@
typedef bg::strategy::side::side_by_cross_track<double> strategy;
Point p1, p2, p3;
- bg::assign(p1, lon1, lat1);
- bg::assign(p2, lon2, lat2);
- bg::assign(p3, lon3, lat3);
+ bg::assign_values(p1, lon1, lat1);
+ bg::assign_values(p2, lon2, lat2);
+ bg::assign_values(p3, lon3, lat3);
int s = strategy::apply(p1, p2, p3);
}
Modified: branches/release/libs/geometry/test/strategies/transformer.cpp
==============================================================================
--- branches/release/libs/geometry/test/strategies/transformer.cpp (original)
+++ branches/release/libs/geometry/test/strategies/transformer.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -46,7 +46,7 @@
void test_all()
{
P p;
- bg::assign(p, 1, 1);
+ bg::assign_values(p, 1, 1);
{
bg::strategy::transform::translate_transformer<P, P> trans(1, 1);
Modified: branches/release/libs/geometry/test/util/for_each_coordinate.cpp
==============================================================================
--- branches/release/libs/geometry/test/util/for_each_coordinate.cpp (original)
+++ branches/release/libs/geometry/test/util/for_each_coordinate.cpp 2011-04-16 19:24:35 EDT (Sat, 16 Apr 2011)
@@ -55,7 +55,7 @@
void test_all()
{
P p;
- bg::assign(p, 1, 2, 3);
+ bg::assign_values(p, 1, 2, 3);
bg::for_each_coordinate(p, test_operation());
BOOST_CHECK(bg::get<0>(p) == 10);
BOOST_CHECK(bg::get<1>(p) == 20);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk