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

[geometry] Integer coordinates are now not rescaled

Browse Source 
which fixes corresponding tests
This commit is contained in:
Barend Gehrels 2014-01-17 19:58:31 +01:00
parent fc681ba236
commit 175032c841
4 changed files with 99 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
include/boost/geometry/algorithms/detail/zoom_to_robust.hpp
View File

@ -304,13 +304,30 @@ static inline void init_rescale_policy(Geometry1 const& geometry1,
assign_values(min_robust_point, boost::long_long_type(-range/2.0), boost::long_long_type(-range/2.0));
}
template <typename Point>
namespace detail { namespace rescale
{
template
<
typename Point,
bool IsFloatingPoint
>
struct rescale_policy_type
{
typedef typename geometry::coordinate_type<Point>::type coordinate_type;
typedef Point robust_point_type;
typedef no_rescale_policy type;
};
// We rescale only all FP types
template
<
typename Point
>
struct rescale_policy_type<Point, true>
{
typedef model::point
<
typename geometry::robust_type<coordinate_type>::type,
typename geometry::robust_type<typename geometry::coordinate_type<Point>::type>::type,
geometry::dimension<Point>::value,
typename geometry::coordinate_system<Point>::type
> robust_point_type;
@ -318,44 +335,93 @@ struct rescale_policy_type
typedef detail::zoom_to_robust::rescale_strategy<Point, robust_point_type, double> type;
};
template <typename Policy>
struct get_rescale_policy
{
template <typename Geometry>
static inline Policy apply(Geometry const& geometry)
{
typedef typename point_type<Geometry>::type point_type;
typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
typedef model::point
<
typename geometry::robust_type<coordinate_type>::type,
geometry::dimension<point_type>::value,
typename geometry::coordinate_system<point_type>::type
> robust_point_type;
point_type min_point;
robust_point_type min_robust_point;
double factor;
init_rescale_policy(geometry, min_point, min_robust_point, factor);
return Policy(min_point, min_robust_point, factor);
}
template <typename Geometry1, typename Geometry2>
static inline Policy apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
{
typedef typename point_type<Geometry1>::type point_type;
typedef typename geometry::coordinate_type<Geometry1>::type coordinate_type;
typedef model::point
<
typename geometry::robust_type<coordinate_type>::type,
geometry::dimension<point_type>::value,
typename geometry::coordinate_system<point_type>::type
> robust_point_type;
point_type min_point;
robust_point_type min_robust_point;
double factor;
init_rescale_policy(geometry1, geometry2, min_point, min_robust_point, factor);
return Policy(min_point, min_robust_point, factor);
}
};
// Specialization for no-rescaling
template <>
struct get_rescale_policy<no_rescale_policy>
{
template <typename Geometry>
static inline no_rescale_policy apply(Geometry const& )
{
no_rescale_policy result;
return result;
}
template <typename Geometry1, typename Geometry2>
static inline no_rescale_policy apply(Geometry1 const& , Geometry2 const& )
{
no_rescale_policy result;
return result;
}
};
}} // namespace detail::rescale
template<typename Point>
struct rescale_policy_type
: public detail::rescale::rescale_policy_type
<
Point,
boost::is_floating_point
<
typename geometry::coordinate_type<Point>::type
>::type::value
>
{};
template <typename Policy, typename Geometry>
inline Policy get_rescale_policy(Geometry const& geometry)
{
typedef typename point_type<Geometry>::type point_type;
typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
typedef model::point
<
typename geometry::robust_type<coordinate_type>::type,
geometry::dimension<point_type>::value,
typename geometry::coordinate_system<point_type>::type
> robust_point_type;
point_type min_point;
robust_point_type min_robust_point;
double factor;
init_rescale_policy(geometry, min_point, min_robust_point, factor);
return Policy(min_point, min_robust_point, factor);
return detail::rescale::get_rescale_policy<Policy>::apply(geometry);
}
template <typename Policy, typename Geometry1, typename Geometry2>
inline Policy get_rescale_policy(Geometry1 const& geometry1, Geometry2 const& geometry2)
{
typedef typename point_type<Geometry1>::type point_type;
typedef typename geometry::coordinate_type<Geometry1>::type coordinate_type;
typedef model::point
<
typename geometry::robust_type<coordinate_type>::type,
geometry::dimension<point_type>::value,
typename geometry::coordinate_system<point_type>::type
> robust_point_type;
point_type min_point;
robust_point_type min_robust_point;
double factor;
init_rescale_policy(geometry1, geometry2, min_point, min_robust_point, factor);
return Policy(min_point, min_robust_point, factor);
return detail::rescale::get_rescale_policy<Policy>::apply(geometry1, geometry2);
}

1
test/algorithms/difference.cpp
View File

@ -516,7 +516,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<double> >();
// TODO: integer should never be rescaled
test_specific<bg::model::d2::point_xy<int>, false, false>();
#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)

3
test/multi/algorithms/multi_difference_spike.cpp
View File

@ -89,13 +89,10 @@ int test_main(int, char* [])
test_spikes_in_ticket_8365<bg::model::d2::point_xy<double>, true, true>();
test_spikes_in_ticket_8365<bg::model::d2::point_xy<double>, false, false>();
#if ! defined(BOOST_GEOMETRY_RESCALE_TO_ROBUST)
// TODO: integer does not need rescaling
test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, true, true>();
test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, false, false>();
test_spikes_in_ticket_8365<bg::model::d2::point_xy<int>, true, true >();
test_spikes_in_ticket_8365<bg::model::d2::point_xy<int>, false, false >();
#endif
#ifdef HAVE_TTMATH
std::cout << "Testing TTMATH" << std::endl;

3
test/multi/algorithms/multi_intersection.cpp
View File

@ -157,12 +157,9 @@ void test_point_output()
typedef bg::model::polygon<P> polygon;
typedef bg::model::multi_polygon<polygon> multi_polygon;
#if ! defined(BOOST_GEOMETRY_RESCALE_TO_ROBUST)
// TODO: fix, not yet adapted for rescaling
test_point_output<multi_polygon, multi_polygon>(case_multi_simplex[0], case_multi_simplex[1], 10);
test_point_output<linestring, multi_polygon>("linestring(4 0,0 4)", case_multi_simplex[0], 4);
test_point_output<box, multi_polygon>("box(3 0,4 6)", case_multi_simplex[0], 8);
#endif
}
template <typename MultiPolygon, typename MultiLineString>