boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 13:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test issue - the test was comparing out1 with itself rather than out2, and started failing when corrected because inappropriately implemented for CS transformations.

Browse Source
This commit is contained in:
Bruno Lalande 2014-01-08 17:54:17 +00:00
parent 6646a16d7f
commit 3019f29a5b
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
test/algorithms/transform.cpp
View File

@ -18,24 +18,18 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/transform.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <test_common/test_point.hpp>
template <typename P1, typename P2>
void test_transform_point(
typename bg::select_most_precise
<
typename bg::coordinate_type<P1>::type,
double
>::type value)
template <typename P1, typename P2, typename Value>
void test_transform_point(Value value)
{
P1 p1;
bg::set<0>(p1, 1);
@ -47,28 +41,37 @@ void test_transform_point(
BOOST_CHECK_CLOSE(value * bg::get<1>(p1), bg::get<1>(p2), 0.001);
}
template <typename P1, typename P2>
void test_transform_linestring()
template <typename P1, typename P2, typename Value>
void test_transform_linestring(Value value)
{
bg::model::linestring<P1> line1;
line1.push_back(bg::make<P1>(1, 1));
line1.push_back(bg::make<P1>(2, 2));
bg::model::linestring<P2> line2;
BOOST_CHECK(bg::transform(line1, line2));
BOOST_CHECK_EQUAL(line1.size(), line2.size());
std::ostringstream out1, out2;
out1 << bg::wkt(line1);
out2 << bg::wkt(line2);
BOOST_CHECK_EQUAL(out1.str(), out1.str());
bg::model::linestring<P2> expected;
for (BOOST_AUTO(p, line1.begin()); p != line1.end(); ++p)
{
P2 new_point;
bg::assign(new_point, *p);
bg::multiply_value(new_point, value);
expected.push_back(new_point);
}
BOOST_CHECK(bg::transform(line1, line2));
std::ostringstream result_wkt, expected_wkt;
result_wkt << bg::wkt(line2);
expected_wkt << bg::wkt(expected);
BOOST_CHECK_EQUAL(result_wkt.str(), expected_wkt.str());
}
template <typename P1, typename P2>
void test_all(double value = 1.0)
template <typename P1, typename P2, typename Value>
void test_all(Value value)
{
test_transform_point<P1, P2>(value);
test_transform_linestring<P1, P2>();
test_transform_linestring<P1, P2>(value);
}
template <typename T, typename DegreeOrRadian>
@ -89,9 +92,6 @@ void test_transformations(double phi, double theta, double r)
BOOST_CHECK_CLOSE(bg::get<0>(sph1), bg::get<0>(sph2), 0.001);
BOOST_CHECK_CLOSE(bg::get<1>(sph1), bg::get<1>(sph2), 0.001);
//std::cout << dsv(p) << std::endl;
//std::cout << dsv(sph2) << std::endl;
}
// 2: using spherical coordinates on unit sphere
@ -104,16 +104,14 @@ void test_transformations(double phi, double theta, double r)
BOOST_CHECK_CLOSE(bg::get<0>(sph1), bg::get<0>(sph2), 0.001);
BOOST_CHECK_CLOSE(bg::get<1>(sph1), bg::get<1>(sph2), 0.001);
//std::cout << dsv(sph1) << " " << dsv(p) << " " << dsv(sph2) << std::endl;
}
}
int test_main(int, char* [])
{
typedef bg::model::d2::point_xy<double > P;
test_all<P, P>();
test_all<bg::model::d2::point_xy<int>, bg::model::d2::point_xy<float> >();
test_all<P, P>(1.0);
test_all<bg::model::d2::point_xy<int>, bg::model::d2::point_xy<float> >(1.0);
test_all<bg::model::point<double, 2, bg::cs::spherical<bg::degree> >,
bg::model::point<double, 2, bg::cs::spherical<bg::radian> > >(bg::math::d2r);