townforge/geometry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert [67111] (addition of boost/detail/iomanip.hpp) and all the commits that depend on it. ([68137], [68140], [68141], [68154], and [68165]).

Browse Source 
[SVN r68168]
This commit is contained in:
Steven Watanabe 2011-01-15 08:11:51 +00:00
parent dff17a97aa
commit d234480b24
22 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
example/07_a_graph_route_example.cpp
View File

@ -12,7 +12,7 @@
#include <iostream>
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <limits>
#include <boost/tuple/tuple.hpp>
@ -301,7 +301,7 @@ int main()
double const km = 1000.0;
std::cout << "distances, all in KM" << std::endl
<< std::fixed << boost::detail::setprecision(0);
<< std::fixed << std::setprecision(0);
// Main functionality: calculate shortest routes from/to all cities
@ -332,12 +332,12 @@ int main()
double acof = boost::geometry::distance(city1.get<0>(), city2.get<0>()) / km;
std::cout
<< boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
<< std::setiosflags (std::ios_base::left) << std::setw(15)
<< city1.get<1>() << " - "
<< boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
<< std::setiosflags (std::ios_base::left) << std::setw(15)
<< city2.get<1>()
<< " -> through the air: " << boost::detail::setw(4) << acof
<< " , over the road: " << boost::detail::setw(4) << distance
<< " -> through the air: " << std::setw(4) << acof
<< " , over the road: " << std::setw(4) << distance
<< std::endl;
if (first)

12
example/07_b_graph_route_example.cpp
View File

@ -16,7 +16,7 @@
#include <iostream>
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <limits>
#include <boost/tuple/tuple.hpp>
@ -289,7 +289,7 @@ int main()
double const km = 1000.0;
std::cout << "distances, all in KM" << std::endl
<< std::fixed << boost::detail::setprecision(0);
<< std::fixed << std::setprecision(0);
// Main functionality: calculate shortest routes from/to all cities
@ -320,12 +320,12 @@ int main()
double acof = boost::geometry::distance(city1.get<0>(), city2.get<0>()) / km;
std::cout
<< boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
<< std::setiosflags (std::ios_base::left) << std::setw(15)
<< city1.get<1>() << " - "
<< boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
<< std::setiosflags (std::ios_base::left) << std::setw(15)
<< city2.get<1>()
<< " -> through the air: " << boost::detail::setw(4) << acof
<< " , over the road: " << boost::detail::setw(4) << distance
<< " -> through the air: " << std::setw(4) << acof
<< " , over the road: " << std::setw(4) << distance
<< std::endl;
if (first)

4
example/extensions/gis/latlong/point_ll_example.cpp
View File

@ -9,7 +9,7 @@
// Point Example - showing geographic (latitude longitude) points
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <boost/geometry/geometry.hpp>
@ -86,7 +86,7 @@ int main()
std::cout << "Amsterdam: " << boost::geometry::dsv(amsterdam) << std::endl;
// Calculate the distance using the default strategy (Andoyer), and Vincenty
std::cout << boost::detail::setprecision(9);
std::cout << std::setprecision(9);
std::cout << "Distance Paris-Lima, Andoyer (default) "
<< 0.001 * distance(paris, lima)
<< " km" << std::endl;

8
include/boost/geometry/extensions/contrib/ttmath/ttmathuint.h
View File

@ -47,7 +47,7 @@
*/
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include "ttmathtypes.h"
@ -102,12 +102,12 @@ public:
int c = 1;
for(int i=value_size-1 ; i>=0 ; --i)
{
output << "0x" << boost::detail::setfill('0');
output << "0x" << std::setfill('0');
#ifdef TTMATH_PLATFORM32
output << boost::detail::setw(8);
output << std::setw(8);
#else
output << boost::detail::setw(16);
output << std::setw(16);
#endif
output << std::hex << table[i];

4
include/boost/geometry/extensions/gis/io/wkb/utility.hpp
View File

@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_IO_WKB_UTILITY_HPP
#define BOOST_GEOMETRY_IO_WKB_UTILITY_HPP
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <iterator>
#include <sstream>
#include <string>
@ -71,7 +71,7 @@ bool wkb2hex(Iterator begin, Iterator end, std::string& hex)
hexbyte[0] = hexalpha[(byte >> 4) & 0xf];
hexbyte[1] = hexalpha[byte & 0xf];
hexbyte[2] = '\0';
oss << boost::detail::setw(2) << hexbyte;
oss << std::setw(2) << hexbyte;
++it;
}

2
test/algorithms/overlay/assemble.cpp
View File

@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>

4
test/algorithms/overlay/ccw_traverse.cpp
View File

@ -7,7 +7,7 @@
#include <fstream>
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <boost/foreach.hpp>
@ -151,7 +151,7 @@ inline typename bg::coordinate_type<Geometry1>::type intersect(Geometry1 const&
out
<< boost::detail::setprecision(3)
<< std::setprecision(3)
<< "dist: " << turn.operations[0].enriched.distance
<< " / " << turn.operations[1].enriched.distance
<< std::endl;

2
test/algorithms/overlay/enrich_intersection_points.cpp
View File

@ -53,7 +53,7 @@ struct test_enrich_intersection_points
bg::enrich_intersection_points(ips, true);
std::ostringstream out;
out << boost::detail::setprecision(2);
out << std::setprecision(2);
bool first = true;
for (iterator it = boost::begin(ips); it != boost::end(ips); ++it, first = false)

2
test/algorithms/overlay/get_turns.cpp
View File

@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <geometry_test_common.hpp>

2
test/algorithms/overlay/robustness/random_ellipses_stars.cpp
View File

@ -8,7 +8,7 @@
#include <iostream>
#include <sstream>
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR

2
test/algorithms/overlay/robustness/recursive_polygons.cpp
View File

@ -8,7 +8,7 @@
#include <iostream>
#include <sstream>
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR

4
test/algorithms/overlay/robustness/test_overlay_p_q.hpp
View File

@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_OVERLAY_P_Q_HPP
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
// #define BOOST_GEOMETRY_ROBUSTNESS_USE_DIFFERENCE
@ -91,7 +91,7 @@ static bool test_overlay_p_q(std::string const& caseid,
<< " sum d: " << sum_d
#endif
<< std::endl
<< boost::detail::setprecision(20)
<< std::setprecision(20)
<< " p: " << bg::wkt(p) << std::endl
<< " q: " << bg::wkt(q) << std::endl
;

4
test/algorithms/overlay/self_intersection_points.cpp
View File

@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>
#include <geometry_test_common.hpp>
@ -65,7 +65,7 @@ struct test_self_intersection_points
x /= n;
y /= n;
}
/*std::cout << boost::detail::setprecision(8) << x << ", " << y << " "
/*std::cout << std::setprecision(8) << x << ", " << y << " "
<< expected_count_and_center.get<1>()
<< " " << expected_count_and_center.get<2>()
<< std::endl;

2
test/algorithms/overlay/split_rings.cpp
View File

@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>
#include <geometry_test_common.hpp>

8
test/algorithms/overlay/traverse.cpp
View File

@ -7,7 +7,7 @@
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <fstream>
#include <sstream>
#include <string>
@ -104,7 +104,7 @@ struct test_traverse
G2 cg2 = g2;
bg::correct(cg1);
bg::correct(cg2);
std::cout << boost::detail::setprecision(12)
std::cout << std::setprecision(12)
<< bg::wkt(cg1) << std::endl
<< bg::wkt(cg2) << std::endl;
}
@ -269,7 +269,7 @@ struct test_traverse
/*out
<< boost::detail::setprecision(3)
<< std::setprecision(3)
<< "dist: " << boost::numeric_cast<double>(turn.operations[0].enriched.distance)
<< " / " << boost::numeric_cast<double>(turn.operations[1].enriched.distance)
<< std::endl
@ -304,7 +304,7 @@ struct test_traverse
<< "/" << turn.operations[1].enriched.travels_to_vertex_index
<< std::endl
<< boost::detail::setprecision(3)
<< std::setprecision(3)
<< "dist: " << turn.operations[0].enriched.distance
<< " / " << turn.operations[1].enriched.distance
<< std::endl

8
test/algorithms/overlay/traverse_gmp.cpp
View File

@ -15,7 +15,7 @@
#include <iostream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <string>
#include <fstream>
@ -158,9 +158,9 @@ void test_traverse_gmp(std::string const& caseid)
{
typedef bg::model::polygon<P> polygon;
std::cout << typeid(typename bg::coordinate_type<P>::type).name() << std::endl;
std::cout << boost::detail::setprecision(30) << std::numeric_limits<float>::epsilon() << std::endl;
std::cout << boost::detail::setprecision(30) << std::numeric_limits<double>::epsilon() << std::endl;
std::cout << boost::detail::setprecision(30) << std::numeric_limits<long double>::epsilon() << std::endl;
std::cout << std::setprecision(30) << std::numeric_limits<float>::epsilon() << std::endl;
std::cout << std::setprecision(30) << std::numeric_limits<double>::epsilon() << std::endl;
std::cout << std::setprecision(30) << std::numeric_limits<long double>::epsilon() << std::endl;
static std::string brandon[3] =
{

4
test/algorithms/test_centroid.hpp
View File

@ -59,7 +59,7 @@ void test_with_other_calculation_type(Geometry const& geometry, Point& c1)
bg::centroid(geometry, c2,
bg::strategy::centroid::bashein_detmer<point_type, point_type, CalculationType>());
std::cout << typeid(CalculationType).name() << ": " << boost::detail::setprecision(20)
std::cout << typeid(CalculationType).name() << ": " << std::setprecision(20)
<< bg::get<0>(c2) << " " << bg::get<1>(c2)
<< " -> difference: " << bg::distance(c1, c2)
<< std::endl;
@ -76,7 +76,7 @@ void test_centroid(std::string const& wkt, T const& x, T const& y, T const& z =
check_result<bg::dimension<Geometry>::type::value>::apply(c1, x, y, z);
#ifdef REPORT_RESULTS
std::cout << "normal: " << boost::detail::setprecision(20) << bg::get<0>(c1) << " " << bg::get<1>(c1) << std::endl;
std::cout << "normal: " << std::setprecision(20) << bg::get<0>(c1) << " " << bg::get<1>(c1) << std::endl;
//test_with_other_calculation_type<long long>(geometry, c1);
test_with_other_calculation_type<float>(geometry, c1);

2
test/algorithms/test_difference.hpp
View File

@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_DIFFERENCE_HPP
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>

4
test/algorithms/test_intersection.hpp
View File

@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_INTERSECTION_HPP
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>
@ -97,7 +97,7 @@ double test_intersection(std::string const& caseid, G1 const& g1, G2 const& g2,
/*
std::cout << std::endl << "case " << caseid << " ";
std::cout
<< boost::detail::setprecision(20)
<< std::setprecision(20)
<< bg::dsv(*it) << std::endl;
*/
}

2
test/extensions/algorithms/buffer/test_buffer.hpp
View File

@ -25,7 +25,7 @@
#endif
#include <fstream>
#include <boost/detail/iomanip.hpp>
#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>

4
test/extensions/gis/projections/projections.cpp
View File

@ -70,7 +70,7 @@ void test_forward(std::string const& name,
P xy;
prj->forward(ll, xy);
//std::cout << boost::detail::setprecision(16) << bg::get<0>(xy) << " " << bg::get<1>(xy) << std::endl;
//std::cout << std::setprecision(16) << bg::get<0>(xy) << " " << bg::get<1>(xy) << std::endl;
check(bg::get<0>(xy), x, name, "x");
check(bg::get<1>(xy), y, name, "y");
@ -98,7 +98,7 @@ void test_inverse(std::string const& name,
lonlat_type ll;
prj->inverse(xy, ll);
//std::cout << boost::detail::setprecision(16) << bg::get<0>(ll) << " " << bg::get<1>(ll) << std::endl;
//std::cout << std::setprecision(16) << bg::get<0>(ll) << " " << bg::get<1>(ll) << std::endl;
check(bg::get<0>(ll), lon, name, "lon");
check(bg::get<1>(ll), lat, name, "lat");

2
test/strategies/pythagoras.cpp
View File

@ -201,7 +201,7 @@ void test_big_2d_with(AssignType const& x1, AssignType const& y1,
/***
std::cout << typeid(CalculationType).name()
<< " " << std::fixed << boost::detail::setprecision(20) << d
<< " " << std::fixed << std::setprecision(20) << d
<< std::endl << std::endl;
***/