Remove auto usage in tests, create public name for uniform_point_distribution

Author: tinko92

extensions/example/random/random_example.cpp

@@ -47,10 +47,10 @@ int main()
             bg::append(mp, point(x, y));
         }
     }
-    auto box_dist = bg::random::uniform_point_distribution(b);
-    auto mp_dist = bg::random::uniform_point_distribution(mp);
-    auto seg_dist = bg::random::uniform_point_distribution(s);
-    auto poly_dist = bg::random::uniform_point_distribution(poly);
+    bg::random::uniform_point_distribution<box> box_dist(b);
+    bg::random::uniform_point_distribution<multi_point> mp_dist(mp);
+    bg::random::uniform_point_distribution<segment> seg_dist(s);
+    bg::random::uniform_point_distribution<polygon> poly_dist(poly);
     std::ofstream svg("random.svg");
     bg::svg_mapper<point> mapper(svg, 720, 720);
     mapper.add(poly);
@@ -70,7 +70,7 @@ int main()
     typedef bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree>> point_spherical;
     typedef bg::model::box<point_spherical> box_spherical;
     box_spherical sb(point_spherical(0, 0), point_spherical(90, 90));
-    auto sb_dist = bg::random::uniform_point_distribution(sb);
+    bg::random::uniform_point_distribution<box_spherical> sb_dist(sb);
     for (int i = 0 ; i < 10*samples ; ++i)
     {
         point_spherical p = sb_dist(generator);

extensions/test/random/random.cpp

@@ -28,7 +28,7 @@ void test_geographic()
     //to great circle arc length.
     typedef bg::model::linestring<point2d_geog> linestring;
     linestring ls {{ 0.0, 0.0 }, { 45.0, 45.0 }, { 60.0, 60.0 }};
-    auto l_dist = bg::random::uniform_point_distribution(ls);
+    bg::random::uniform_point_distribution<linestring> l_dist(ls);
     std::mt19937 generator(0);
     int sample_count = 2000;
     int count_below_45 = 0;
@@ -51,7 +51,7 @@ void test_geographic()
     //known area ratios of spherical caps.
     typedef bg::model::box<point2d_geog> box;
     box b {{ 0.0, 0.0 }, { 90.0, 90.0 }};
-    auto b_dist = bg::random::uniform_point_distribution(b);
+    bg::random::uniform_point_distribution<box> b_dist(b);
     int under_60 = 0;
     for (int i = 0 ; i < sample_count ; ++i)
     {
@@ -75,8 +75,8 @@ void test_polygon()
     bg::read_wkt(
         "POLYGON((16 21,17.1226 17.5451,20.7553 17.5451, 17.8164 15.4098,18.9389 11.9549,16 14.0902,13.0611 11.9549, 14.1836 15.4098,11.2447 17.5451,14.8774 17.5451,16 21))",
         poly);
-    auto poly_dist = bg::random::uniform_point_distribution(poly);
-    decltype(poly_dist) poly_dist2;
+    bg::random::uniform_point_distribution<polygon> poly_dist(poly);
+    bg::random::uniform_point_distribution<polygon> poly_dist2;
     BOOST_CHECK( !(poly_dist == poly_dist2) );
     std::stringstream ss;
     ss << poly_dist;
@@ -122,7 +122,7 @@ void test_multipoint()
     typedef bg::model::multi_point<point3d_cart> multipoint;
     multipoint mp {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}};
     int first = 0;
-    auto mp_dist = bg::random::uniform_point_distribution(mp);
+    bg::random::uniform_point_distribution<multipoint> mp_dist(mp);
     std::mt19937 generator(0);
     int sample_count = 1000;
     for (int i = 0 ; i < sample_count ; ++i)

include/boost/geometry/extensions/random/uniform_point_distribution.hpp

@@ -19,10 +19,24 @@ template
     typename DomainGeometry,
     typename Point = typename geometry::point_type<DomainGeometry>::type
 >
-inline dispatch::uniform_point_distribution<DomainGeometry, Point>
-    uniform_point_distribution(DomainGeometry const& domain)
+class uniform_point_distribution :
+    public dispatch::uniform_point_distribution<DomainGeometry, Point>
 {
-    return dispatch::uniform_point_distribution<DomainGeometry, Point>(domain);
+public:
+    typedef dispatch::uniform_point_distribution<DomainGeometry, Point> base;
+    using base::base;
+    uniform_point_distribution(DomainGeometry const& domain) : base(domain) {}
+};
+
+template
+<
+    typename DomainGeometry,
+    typename Point = typename geometry::point_type<DomainGeometry>::type
+>
+inline uniform_point_distribution<DomainGeometry, Point>
+    return_uniform_point_distribution(DomainGeometry const& domain)
+{
+    return uniform_point_distribution<DomainGeometry, Point>(domain);
 }
 
 }}} // namespace boost::geometry::random
@@ -37,7 +51,7 @@ template
 inline std::basic_ostream<Char, Traits>& operator<<
     (
         std::basic_ostream<Char, Traits> &os,
-        boost::geometry::random::dispatch::uniform_point_distribution
+        boost::geometry::random::uniform_point_distribution
             <
                 DomainGeometry, Point
             > const& dist
@@ -57,7 +71,7 @@ template
 inline std::basic_istream<Char, Traits>& operator>>
     (
         std::basic_istream<Char, Traits> &is,
-        boost::geometry::random::dispatch::uniform_point_distribution
+        boost::geometry::random::uniform_point_distribution
             <
                 DomainGeometry, Point
             > & dist
@@ -67,7 +81,7 @@ inline std::basic_istream<Char, Traits>& operator>>
     std::getline(is, line);
     DomainGeometry g;
     namespace bg = boost::geometry;
-    typedef typename bg::random::dispatch::uniform_point_distribution
+    typedef typename bg::random::uniform_point_distribution
         <
             DomainGeometry, Point
         >::param_type param_type;