diff --git a/doc/src/examples/algorithms/Jamfile.v2 b/doc/src/examples/algorithms/Jamfile.v2 index 9731ce0f8..f50d32c1c 100644 --- a/doc/src/examples/algorithms/Jamfile.v2 +++ b/doc/src/examples/algorithms/Jamfile.v2 @@ -23,9 +23,9 @@ 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_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 ; diff --git a/doc/src/examples/algorithms/assign_with_range.cpp b/doc/src/examples/algorithms/assign_points.cpp similarity index 97% rename from doc/src/examples/algorithms/assign_with_range.cpp rename to doc/src/examples/algorithms/assign_points.cpp index 771ef233f..c74775963 100644 --- a/doc/src/examples/algorithms/assign_with_range.cpp +++ b/doc/src/examples/algorithms/assign_points.cpp @@ -7,7 +7,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -//[assign_with_range +//[assign_points //` Shows usage of Boost.Geometry's assign, Boost.Assign, and Boost.Range to assign ranges of a linestring #include @@ -59,7 +59,7 @@ int main() //] -//[assign_with_range_output +//[assign_points_output /*` Output: [pre diff --git a/test/algorithms/algorithms_tests.sln b/test/algorithms/algorithms_tests.sln index f929e0ba5..6880312aa 100644 --- a/test/algorithms/algorithms_tests.sln +++ b/test/algorithms/algorithms_tests.sln @@ -54,6 +54,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reverse", "reverse.vcproj", 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 @@ Global {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 diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp index be7cc2d70..eef613c81 100644 --- a/test/algorithms/assign.cpp +++ b/test/algorithms/assign.cpp @@ -143,7 +143,7 @@ void test_assign_conversion() bg::assign_values(p, 1, 2); box_type b; - bg::assign(p, 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); @@ -157,7 +157,7 @@ void test_assign_conversion() bg::set(b, 4); ring_type ring; - bg::assign(b, ring); + bg::assign(ring, b); //std::cout << bg::wkt(b) << std::endl; //std::cout << bg::wkt(ring) << std::endl; @@ -183,10 +183,10 @@ void test_assign_conversion() polygon_type polygon; - bg::assign(ring, polygon); + bg::assign(polygon, ring); BOOST_CHECK_EQUAL(bg::num_points(polygon), 5u); - bg::assign(polygon, ring); + bg::assign_rev(ring, polygon); BOOST_CHECK_EQUAL(bg::num_points(ring), 5u); } diff --git a/test/algorithms/detail/convert.cpp b/test/algorithms/convert.cpp similarity index 93% rename from test/algorithms/detail/convert.cpp rename to test/algorithms/convert.cpp index fb1e704f3..185aceb11 100644 --- a/test/algorithms/detail/convert.cpp +++ b/test/algorithms/convert.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include @@ -35,7 +35,7 @@ void test_all() bg::assign_values(p, 1, 2); box_type b; - bg::detail::convert(p, b); + bg::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); @@ -59,7 +59,7 @@ void test_std() bg::set(b, 4); ring_type ring; - bg::detail::convert(b, ring); + bg::convert(b, ring); //std::cout << bg::wkt(b) << std::endl; //std::cout << bg::wkt(ring) << std::endl; @@ -85,10 +85,10 @@ void test_std() polygon_type polygon; - bg::detail::convert(ring, polygon); + bg::convert(ring, polygon); BOOST_CHECK_EQUAL(bg::num_points(polygon), 5u); - bg::detail::convert(polygon, ring); + bg::convert(polygon, ring); BOOST_CHECK_EQUAL(bg::num_points(ring), 5u); } diff --git a/test/algorithms/detail/convert.vcproj b/test/algorithms/convert.vcproj similarity index 92% rename from test/algorithms/detail/convert.vcproj rename to test/algorithms/convert.vcproj index b3a11404f..c75bf0ee5 100644 --- a/test/algorithms/detail/convert.vcproj +++ b/test/algorithms/convert.vcproj @@ -20,7 +20,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)\convert" ConfigurationType="1" - InheritedPropertySheets="..\..\boost.vsprops;..\..\ttmath.vsprops" + InheritedPropertySheets="..\boost.vsprops;..\ttmath.vsprops" CharacterSet="1" > @@ -114,7 +114,7 @@ />