Merged Boost.Geometry from revision 71123 to 71336

[SVN r71339]
This commit is contained in:
Barend Gehrels
2011-04-16 23:24:35 +00:00
parent 5a25db7b35
commit ac0807a26f
104 changed files with 2045 additions and 2496 deletions

View File

@@ -30,14 +30,14 @@ template <typename P>
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 @@ template <typename P>
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 @@ template <typename P>
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 @@ template <typename P>
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 @@ void test_all()
test_subtraction<P>();
test_multiplication<P>();
test_division<P>();
test_assign<P>();
}