[cleanup] remove HAVE_TTMATH and other occurances of ttmath

This commit is contained in:
Barend Gehrels 2020-10-07 14:03:45 +02:00
parent 869e72fc01
commit 45d624af9b
151 changed files with 13 additions and 829 deletions

View File

@ -11,7 +11,6 @@
project boost-geometry
:
requirements
<include>../../boost/geometry/extensions/contrib/ttmath
<toolset>msvc:<asynch-exceptions>on
;

View File

@ -8,7 +8,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//[assign_2d_point
//` Shows the usage of assign to set point coordinates, and, besides that, shows how you can initialize ttmath points with high precision
//` Shows the usage of assign to set point coordinates
#include <iostream>
#include <iomanip>
@ -16,11 +16,6 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#if defined(HAVE_TTMATH)
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
int main()
{
using boost::geometry::assign_values;
@ -29,21 +24,9 @@ int main()
boost::geometry::model::d2::point_xy<double> p1;
assign_values(p1, 1.2345, 2.3456);
#if defined(HAVE_TTMATH)
boost::geometry::model::d2::point_xy<ttmath::Big<1,4> > p2;
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.
>*/
#endif
std::cout
<< std::setprecision(20)
<< boost::geometry::dsv(p1) << std::endl
#if defined(HAVE_TTMATH)
<< boost::geometry::dsv(p2) << std::endl
#endif
;
<< boost::geometry::dsv(p1) << std::endl;
return 0;
}

View File

@ -147,7 +147,7 @@ private:
// For high precision arithmetic, we have to be
// more relaxed then using ==
// Because 2/sqrt( (0,0)<->(2,2) ) == 1/sqrt( (0,0)<->(1,1) )
// is not always true (at least, it is not for ttmath)
// is not always true (at least, not for some user defined types)
return math::equals_with_epsilon(dx, other.dx)
&& math::equals_with_epsilon(dy, other.dy);
}

View File

@ -162,8 +162,7 @@ public:
if ( BOOST_GEOMETRY_CONDITION(EnableDistance) )
{
// Oops getting hard here
// (again, problem is that ttmath cannot divide by doubles, which is OK)
// Some types cannot divide by doubles
CT const c6 = 6;
CT const c47 = 47;
CT const c74 = 74;

View File

@ -19,7 +19,7 @@
// BSG 2011-02-03
// We don't include stream.hpp by default. That tries to stream anything not known
// by default (such as ttmath) and reports errors.
// by default and reports errors.
// Users can include stream.hpp themselves (if they want to)
#endif // BOOST_GEOMETRY_IO_WKT_WKT_HPP

View File

@ -191,7 +191,7 @@ namespace detail
// Phi = first, theta is second, r is third, see documentation on cs::spherical
// (calculations are splitted to implement ttmath)
// (calculations are splitted to implement user defined types)
T r_sin_theta = r;
T r_cos_theta = r;

View File

@ -40,7 +40,7 @@ struct default_integral
/*!
\details Selects the most appropriate:
- if calculation type is specified (not void), that one is used
- else if type is non-fundamental (user defined e.g. ttmath), that one
- else if type is non-fundamental (user defined e.g. Boost.Multiprecision), that one
- else if type is floating point, the specified default FP is used
- else it is integral and the specified default integral is used
*/

View File

@ -28,7 +28,6 @@ namespace detail
/*!
\brief cast coordinates from a string to a coordinate type
\detail By default it uses lexical_cast. However, lexical_cast seems not to support
ttmath / partial specializations. Therefore this small utility is added.
See also "define_pi" where the same issue is solved
*/
template <typename CoordinateType>

View File

@ -13,7 +13,6 @@ project boost-geometry-index-test
requirements
<include>. # libs/geometry/index/test
<include>../../test # libs/geometry/test
#<include>../../../../boost/geometry/extensions/contrib/ttmath
<toolset>msvc:<asynch-exceptions>on
<toolset>msvc:<cxxflags>/bigobj
<host-os>windows,<toolset>intel:<cxxflags>/bigobj

View File

@ -57,14 +57,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P3fc> >("POLYGON((0 1 2,2 4 6))", 24.0);
test_geometry<bg::model::box<P3dc> >("POLYGON((0 1 2,2 4 6))", 24.0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc> >("POLYGON((0 1,2 4))", 6.0);
test_geometry<bg::model::box<P3ttmc> >("POLYGON((0 1 2,2 4 6))", 24.0);
#endif
test_large_integers();
return 0;

View File

@ -56,14 +56,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P2dc> >("POLYGON((0 1,2 4))", "POLYGON((2 1,3 4))", 0.0);
test_geometry<bg::model::box<P2dc> >("POLYGON((0 1,2 4))", "POLYGON((2 4,3 5))", 0.0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc> >("POLYGON((0 1,2 4))", "POLYGON((1 2,3 5))", 2.0);
test_geometry<bg::model::box<P3ttmc> >("POLYGON((0 1 2,2 4 6))", "POLYGON((1 2 3,3 5 7))", 6.0);
#endif
test_large_integers();
return 0;

View File

@ -96,14 +96,6 @@ int test_main(int, char* [])
test_box<bg::model::box<P3fc> >("POLYGON((0 1 2,2 4 6))", true);
test_box<bg::model::box<P3dc> >("POLYGON((0 1 2,2 4 6))", true);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc> >("POLYGON((0 1,2 4))", true);
test_geometry<bg::model::box<P3ttmc> >("POLYGON((0 1 2,2 4 6))", true);
#endif
test_large_integers();
return 0;

View File

@ -50,14 +50,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P3fc> >("POLYGON((0 1 2,2 4 6))", 9.0);
test_geometry<bg::model::box<P3dc> >("POLYGON((0 1 2,2 4 6))", 9.0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc> >("POLYGON((0 1,2 4))", 10.0);
test_geometry<bg::model::box<P3ttmc> >("POLYGON((0 1 2,2 4 6))", 52.0);
#endif
test_large_integers();
// test_empty_input<bg::model::d2::point_xy<int> >();

View File

@ -87,14 +87,6 @@ int test_main(int, char* [])
test_indexable<bg::model::box<P2ic> >(P2ic(1, 2), "POLYGON((1 2,3 5))", 4.0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_indexable<bg::model::box<P2ttmc> >(P2ttmc(1, 2), "POLYGON((0 1,2 4))", 5.0);
test_indexable<bg::model::box<P3ttmc> >(P3ttmc(1, 2, 3), "POLYGON((0 1 2,2 4 6))", 14.0);
#endif
test_large_integers();
return 0;

View File

@ -116,17 +116,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P2fc>, L2fc>("POLYGON((0 1,2 4))", "LINESTRING(0 0, 3 0, 3 2, 0 2)", true, 6);
test_geometry<bg::model::box<P2fc>, L2fc>("POLYGON((0 1,2 4))", "LINESTRING(1 2, 3 3, 0 3)", true, 0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
typedef bg::model::linestring<P2ttmc> L2ttmc;
typedef bg::model::linestring<P3ttmc> L3ttmc;
test_geometry<bg::model::box<P2ttmc>, L2ttmc>("POLYGON((0 1,2 4))", "LINESTRING(0 0, 2 5)", true, 1.0/5);
test_geometry<bg::model::box<P3ttmc>, L3ttmc>("POLYGON((0 1 2,2 4 6))", "LINESTRING(0 0 0, 2 5 7)", true, 2.0/7);
#endif
test_large_integers();
return 0;

View File

@ -115,14 +115,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P2fc>, P2fc>("POLYGON((0 1,2 4))", "POINT(0.5 2)", "POINT(1.5 3)", true, 0.0f);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc>, P2ttmc>("POLYGON((0 1,2 4))", "POINT(0 0)", "POINT(2 5)", true, 1.0f/5);
test_geometry<bg::model::box<P3ttmc>, P3ttmc>("POLYGON((0 1 2,2 4 6))", "POINT(0 0 0)", "POINT(2 5 7)", true, 2.0f/7);
#endif
test_large_integers();
return 0;

View File

@ -56,14 +56,6 @@ int test_main(int, char* [])
test_geometry<bg::model::box<P2dc> >("POLYGON((0 1,2 4))", "POLYGON((2 1,3 4))", 9.0);
test_geometry<bg::model::box<P2dc> >("POLYGON((0 1,2 4))", "POLYGON((2 4,3 5))", 12.0);
#ifdef HAVE_TTMATH
typedef bg::model::point<ttmath_big, 2, bg::cs::cartesian> P2ttmc;
typedef bg::model::point<ttmath_big, 3, bg::cs::cartesian> P3ttmc;
test_geometry<bg::model::box<P2ttmc> >("POLYGON((0 1,2 4))", "POLYGON((1 2,3 5))", 12.0);
test_geometry<bg::model::box<P3ttmc> >("POLYGON((0 1 2,2 4 6))", "POLYGON((1 2 3,3 5 7))", 60.0);
#endif
test_large_integers();
return 0;

View File

@ -19,7 +19,6 @@ project boost-geometry-test
:
requirements
<include>.
<include>../../../boost/geometry/extensions/contrib/ttmath
<toolset>msvc:<asynch-exceptions>on
<toolset>msvc:<cxxflags>/bigobj
<toolset>clang:<cxxflags>-Wno-unneeded-internal-declaration # supress warning by Boost.None

View File

@ -167,9 +167,5 @@ int test_main(int, char* [])
test_all<bg::model::point<float, 2, bg::cs::cartesian> >();
test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
#ifdef HAVE_TTMATH
test_all<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -227,11 +227,6 @@ int test_main(int, char* [])
test_poles_ccw<pt_sph>();
test_poles_ccw<pt_geo >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
test_spherical_geo<ttmath_big>();
#endif
test_large_integers();
test_variant();

View File

@ -47,9 +47,5 @@ int test_main( int , char* [] )
{
test_all<double>();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -54,7 +54,6 @@ void test_spherical_geo()
bg::model::polygon<pt> geometry;
// unit-sphere has area of 4-PI. Polygon covering 1/8 of it:
// calculations splitted for ttmath
std::string poly = "POLYGON((0 0,0 90,90 0,0 0))";
bg::strategy::area::spherical

View File

@ -310,17 +310,5 @@ int test_main(int, char* [])
test_assign_linestring_2d<bg::model::point<float, 2, bg::cs::cartesian> >();
test_assign_linestring_2d<bg::model::point<double, 2, bg::cs::cartesian> >();
#ifdef HAVE_TTMATH
// Next 3 need extra traits for c-array with custom type:
// test_assign_point_2d<ttmath_big[2]>();
// test_assign_point_3d<ttmath_big[3]>();
// test_assign_box_2d<ttmath_big[2]>();
test_assign_point_2d<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
test_assign_point_3d<bg::model::point<ttmath_big, 3, bg::cs::cartesian> >();
test_assign_box_or_segment_2d<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
test_assign_linestring_2d<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -257,11 +257,6 @@ int test_main(int, char* [])
test_5d<boost::tuple<double, double, double, double, double> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::d2::point_xy<ttmath_big> >();
test_3d<boost::tuple<ttmath_big, ttmath_big, ttmath_big> >();
#endif
#ifndef NDEBUG
// The test currently fails in release mode. TODO: fix this
test_large_integers();

View File

@ -186,10 +186,6 @@ int test_main(int, char* [])
//test_2d<bg::model::d2::point_xy<long long> >(true);
//test_2d<bg::model::d2::point_xy<long double> >();
#ifdef HAVE_TTMATH
test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
test_exceptions<bg::model::d2::point_xy<double> >();
test_empty<bg::model::d2::point_xy<double> >();

View File

@ -55,9 +55,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -496,10 +496,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
// test variant support
test_variant_different_default_strategy<double>::apply();
@ -511,9 +507,6 @@ int test_main(int, char* [])
test_variant_with_strategy<float>::apply();
test_variant_with_strategy<long double>::apply();
test_variant_with_strategy<int, double>::apply();
#ifdef HAVE_TTMATH
test_variant_with_strategy<ttmath_big>::apply();
#endif
test_variant_boxes<double>::apply();
test_variant_boxes<int>::apply();

View File

@ -81,9 +81,5 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -83,9 +83,5 @@ int test_main(int, char* [])
//test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -175,9 +175,5 @@ int test_main(int, char* [])
test_ring_polygon<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_ring_polygon<bg::model::point<double, 2, bg::cs::geographic<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -52,9 +52,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -186,12 +186,5 @@ int test_main( int , char* [] )
test_mixed();
test_3d();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
test_eps<bg::model::d2::point_xy<ttmath_big> >();
//test_spherical<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -48,9 +48,5 @@ int test_main( int , char* [] )
//test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -312,9 +312,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -123,10 +123,5 @@ int test_main( int , char* [] )
test_cs<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_cs<bg::model::point<double, 2, bg::cs::geographic<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_cs<bg::model::point<ttmath_big, 2, bg::cs::geographic<bg::degree> > >();;
#endif
return 0;
}

View File

@ -97,10 +97,6 @@ int test_main( int , char* [] )
test_2d<bg::model::d2::point_xy<int> >();
test_2d<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
return 0;

View File

@ -111,9 +111,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -156,10 +156,5 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -32,11 +32,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -381,7 +376,4 @@ BOOST_AUTO_TEST_CASE( test_areal_areal_all )
{
test_areal_areal<double>();
test_areal_areal<int>();
#ifdef HAVE_TTMATH
test_areal_areal<ttmath_big>();
#endif
}

View File

@ -32,11 +32,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -532,7 +527,4 @@ BOOST_AUTO_TEST_CASE( test_linear_areal_all )
{
test_linear_areal<double>();
test_linear_areal<int>();
#ifdef HAVE_TTMATH
test_linear_areal<ttmath_big>();
#endif
}

View File

@ -33,10 +33,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -373,7 +369,4 @@ BOOST_AUTO_TEST_CASE( test_linear_linear_all )
{
test_linear_linear<double>();
test_linear_linear<int>();
#ifdef HAVE_TTMATH
test_linear_linear<ttmath_big>();
#endif
}

View File

@ -34,10 +34,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -286,7 +282,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_areal_all )
{
test_pointlike_areal<double>();
test_pointlike_areal<int>();
#ifdef HAVE_TTMATH
test_pointlike_areal<ttmath_big>();
#endif
}

View File

@ -33,10 +33,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -385,7 +381,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_linear_all )
{
test_pointlike_linear<double>();
test_pointlike_linear<int>();
#ifdef HAVE_TTMATH
test_pointlike_linear<ttmath_big>();
#endif
}

View File

@ -33,10 +33,6 @@
#include <from_wkt.hpp>
#ifdef HAVE_TTMATH
#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
#endif
namespace bg = ::boost::geometry;
//============================================================================
@ -181,7 +177,4 @@ BOOST_AUTO_TEST_CASE( test_pointlike_pointlike_all )
{
test_pointlike_pointlike<double>();
test_pointlike_pointlike<int>();
#ifdef HAVE_TTMATH
test_pointlike_pointlike<ttmath_big>();
#endif
}

View File

@ -110,10 +110,6 @@ int test_main(int, char* [])
//test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -118,10 +118,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
return 0;

View File

@ -292,10 +292,5 @@ int test_main( int , char* [] )
test_all<float>();
test_all<double>();
#ifdef HAVE_TTMATH
common_tests<bg::model::d2::point_xy<ttmath_big> >();
common_tests<bg::model::point<ttmath_big, 3, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -319,9 +319,5 @@ int test_main( int , char* [] )
test_linestring_linestring_radians<point_rad>();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -505,10 +505,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
test_empty_input<bg::model::d2::point_xy<int> >();
// below are the test cases moved here from the distance unit test
@ -522,11 +518,6 @@ int test_main(int, char* [])
test_mixed<bg::model::d2::point_xy<float>, bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_2d<bg::model::d2::point_xy<ttmath_big> >();
test_mixed<bg::model::d2::point_xy<ttmath_big>, bg::model::d2::point_xy<double> >();
#endif
test_empty_input<bg::model::d2::point_xy<int> >();
test_variant<double>();

View File

@ -226,10 +226,5 @@ int test_main(int, char* [])
test_invalid<bg::model::d2::point_xy<float> >();
test_invalid<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_2d<bg::model::d2::point_xy<ttmath_big> >();
test_3d<boost::tuple<ttmath_big, ttmath_big, ttmath_big> >();
#endif
return 0;
}

View File

@ -54,10 +54,5 @@ int test_main( int , char* [] )
test_3d<boost::tuple<float, float, float> >();
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
#ifdef HAVE_TTMATH
test_2d<bg::model::d2::point_xy<ttmath_big> >();
test_2d<bg::model::point<ttmath_big, 3, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -153,12 +153,5 @@ int test_main(int, char* [])
test_spherical_degree<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_spherical_radian<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::radian> > >();
#if defined(HAVE_TTMATH)
test_3d<bg::model::point<ttmath_big, 3, bg::cs::cartesian> >();
test_spherical_degree<bg::model::point<ttmath_big, 2, bg::cs::spherical<bg::degree> > >();
test_spherical_radian<bg::model::point<ttmath_big, 2, bg::cs::spherical<bg::radian> > >();
#endif
return 0;
}

View File

@ -303,16 +303,9 @@ void verify()
int test_main( int , char* [] )
{
//verify<double>();
#if defined(HAVE_TTMATH)
verify<ttmath_big>();
#endif
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -44,9 +44,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -174,10 +174,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_se )
<
bgm::point<double, 2, cs_type>, bgm::point<long double, 2, cs_type>
>::apply("se");
#if defined(HAVE_TTMATH)
test_point_point<bgm::point<ttmath_big, 2, cs_type> >::apply("se");
#endif
}
BOOST_AUTO_TEST_CASE( equals_point_point_with_height_se )
@ -198,10 +194,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_with_height_se )
<
bgm::point<double, 3, cs_type>, bgm::point<long double, 3, cs_type>
>::apply("seh");
#if defined(HAVE_TTMATH)
test_point_point<bgm::point<ttmath_big, 3, cs_type> >::apply("seh");
#endif
}
BOOST_AUTO_TEST_CASE( equals_point_point_geo )
@ -222,10 +214,6 @@ BOOST_AUTO_TEST_CASE( equals_point_point_geo )
<
bgm::point<double, 2, cs_type>, bgm::point<long double, 2, cs_type>
>::apply("se");
#if defined(HAVE_TTMATH)
test_point_point<bgm::point<ttmath_big, 2, cs_type> >::apply("geo");
#endif
}
BOOST_AUTO_TEST_CASE( equals_segment_segment_se )
@ -235,10 +223,6 @@ BOOST_AUTO_TEST_CASE( equals_segment_segment_se )
test_segment_segment<bgm::point<int, 2, cs_type> >("se");
test_segment_segment<bgm::point<double, 2, cs_type> >("se");
test_segment_segment<bgm::point<long double, 2, cs_type> >("se");
#if defined(HAVE_TTMATH)
test_segment_segment<bgm::point<ttmath_big, 2, cs_type> >("se");
#endif
}
BOOST_AUTO_TEST_CASE( equals_segment_segment_geo )
@ -248,8 +232,4 @@ BOOST_AUTO_TEST_CASE( equals_segment_segment_geo )
test_segment_segment<bgm::point<int, 2, cs_type> >("geo");
test_segment_segment<bgm::point<double, 2, cs_type> >("geo");
test_segment_segment<bgm::point<long double, 2, cs_type> >("geo");
#if defined(HAVE_TTMATH)
test_segment_segment<bgm::point<ttmath_big, 2, cs_type> >("geo");
#endif
}

View File

@ -147,9 +147,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -138,9 +138,5 @@ int test_main(int, char* [])
{
test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -89,9 +89,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -219,9 +219,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<boost::rational<int> > >();
#endif
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -164,9 +164,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<boost::rational<int> > >();
#endif
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -54,10 +54,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<double> >();
test_all<bg::model::d2::point_xy<double>, bg::model::point<double, 2, bg::cs::cartesian> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -125,9 +125,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<boost::rational<int> > >();
#endif
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -261,9 +261,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -77,10 +77,5 @@ int test_main( int , char* [] )
test_cs<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_cs<bg::model::point<double, 2, bg::cs::geographic<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
test_cs<bg::model::point<ttmath_big, 2, bg::cs::geographic<bg::degree> > >();;
#endif
return 0;
}

View File

@ -45,10 +45,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
// test_empty_input<bg::model::d2::point_xy<int> >();
return 0;

View File

@ -109,10 +109,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<double,
bg::cs::geographic<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_empty_input<bg::model::d2::point_xy<double,
// bg::cs::geographic<bg::degree> > >();

View File

@ -28,10 +28,6 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
// test_empty_input<bg::model::d2::point_xy<int> >();
return 0;

View File

@ -77,10 +77,6 @@ int test_main(int, char* [])
test_all_haversine<bg::model::d2::point_xy<double,
bg::cs::spherical_equatorial<bg::degree> > >(mean_radius);
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_empty_input<bg::model::d2::point_xy<int> >();
return 0;

View File

@ -124,14 +124,7 @@ int test_main(int, char* [])
test_2d<bg::model::point<float, 2, bg::cs::cartesian> >();
test_2d<bg::model::point<double, 2, bg::cs::cartesian> >();
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
test_3d<bg::model::point<ttmath_big, 3, bg::cs::cartesian> >();
#endif
return 0;
}

View File

@ -49,9 +49,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -42,9 +42,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -62,9 +62,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -55,9 +55,5 @@ int test_main( int , char* [] )
test_2d<bg::model::d2::point_xy<int> >();
test_2d<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -65,9 +65,5 @@ int test_main( int , char* [] )
test_2d<bg::model::d2::point_xy<int> >();
test_2d<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -55,10 +55,6 @@ int test_main( int , char* [] )
test_2d<bg::model::d2::point_xy<int> >();
test_2d<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
return 0;

View File

@ -145,9 +145,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_cs<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif
return 0;
}

View File

@ -395,9 +395,6 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}

View File

@ -55,8 +55,5 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}

View File

@ -77,8 +77,5 @@ int test_main(int, char* [])
// test_all<long double>();
//#endif
//#if defined(HAVE_TTMATH)
// test_all<ttmath_big>();
//#endif
return 0;
}

View File

@ -227,8 +227,5 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}

View File

@ -234,8 +234,5 @@ int test_main(int, char* [])
// test_all<long double>();
//#endif
//#if defined(HAVE_TTMATH)
// test_all<ttmath_big>();
//#endif
return 0;
}

View File

@ -541,9 +541,6 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}

View File

@ -435,8 +435,5 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}

View File

@ -909,7 +909,7 @@ static std::string ggl_list_20110716_enrico[2] =
// Send on ggl-list by Christoph/Angus at 2011-08-19/20
// This polygon combination fails to union in <float> but do in <double> or <ttmath>
// This polygon combination fails to union in <float> but do in <double>
// It had previosly an error which has been fixed at 2011-08-30
static std::string ggl_list_20110820_christophe[2] =
{

View File

@ -10,7 +10,6 @@
#define BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO
//#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
//#define BOOST_GEOMETRY_OVERLAY_NO_THROW
//#define HAVE_TTMATH
#include <iostream>
#include <iomanip>
@ -20,10 +19,6 @@
#include <boost/type_traits/is_same.hpp>
#ifdef HAVE_TTMATH
# include <boost/geometry/contrib/ttmath_stub.hpp>
#endif
#include <geometry_test_common.hpp>
@ -891,7 +886,7 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
#endif
// Calculate intersection/union of two triangles. Robustness case.
// ttmath can form a very small intersection triangle
// some precise types can form a very small intersection triangle
// (which is even not accomplished by SQL Server/PostGIS)
std::string const caseid = "ggl_list_20110820_christophe";
test_traverse_intersection::apply(caseid,
@ -1028,9 +1023,6 @@ int test_main(int, char* [])
test_all<long double>();
#endif
#ifdef HAVE_TTMATH
test_all<ttmath_big>();
#endif
#endif
return 0;

View File

@ -53,10 +53,6 @@ int test_main(int, char* [])
test_open<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
// test_empty_input<bg::model::d2::point_xy<int> >();
return 0;

View File

@ -56,10 +56,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
// test_empty_input<bg::model::d2::point_xy<int> >();
return 0;

View File

@ -115,10 +115,6 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<double,
bg::cs::geographic<bg::degree> > >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -80,9 +80,5 @@ int test_main(int, char* [])
test_all_haversine<bg::model::d2::point_xy<double,
bg::cs::spherical_equatorial<bg::degree> > >(mean_radius);
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -29,9 +29,5 @@ int test_main( int , char* [] )
{
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -426,9 +426,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -107,9 +107,5 @@ int test_main( int , char* [] )
test_all<bg::model::point<float, 2, cs_t> >();
test_all<bg::model::point<double, 2, cs_t> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::point<ttmath_big, 2, cs_t> >();
#endif
return 0;
}

View File

@ -528,9 +528,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -411,9 +411,5 @@ int test_main( int , char* [] )
test_all<bg::model::point<float, 2, cs_t> >();
test_all<bg::model::point<double, 2, cs_t> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::point<ttmath_big, 2, cs_t> >();
#endif
return 0;
}

View File

@ -438,9 +438,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -443,9 +443,5 @@ int test_main( int , char* [] )
test_all<bg::model::point<float, 2, cs_t> >();
test_all<bg::model::point<double, 2, cs_t> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::point<ttmath_big, 2, cs_t> >();
#endif
return 0;
}

View File

@ -246,9 +246,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -67,9 +67,5 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -43,9 +43,5 @@ int test_main( int , char* [] )
test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<double> >();
#ifdef HAVE_TTMATH
test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
}

View File

@ -34,7 +34,7 @@ void test_spikes_in_ticket_8364()
typedef bg::model::polygon<P, ClockWise, Closed> polygon;
typedef bg::model::multi_polygon<polygon> multi_polygon;
// The difference of polygons below result in a spike. The spike should be there, it is also generated in ttmath,
// The difference of polygons below result in a spike. The spike should be there, it was also generated in ttmath,
// and (e.g.) in SQL Server. However, using int-coordinates, the spike makes the polygon invalid. Therefore it is now (since August 2013) checked and removed.
#ifdef BOOST_GEOMETRY_TEST_FAILURES

Some files were not shown because too many files have changed in this diff Show More