Merge pull request #747 from awulkiew/feature/traits_make

Add optional traits::make and use it in cross_product() and make().

Author: awulkiew

include/boost/geometry/algorithms/make.hpp

@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// Copyright (c) 2020, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -14,8 +17,12 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_MAKE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_MAKE_HPP
 
+#include <type_traits>
+
 #include <boost/geometry/algorithms/assign.hpp>
 
+#include <boost/geometry/core/make.hpp>
+
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 namespace boost { namespace geometry
@@ -32,12 +39,10 @@ namespace detail { namespace make
 \tparam Range \tparam_range_point
 \param range \param_range_point
 \return The constructed geometry, here: a linestring or a ring
-
 \qbk{distinguish, with a range}
 \qbk{
 [heading Example]
 [make_with_range] [make_with_range_output]
-
 [heading See also]
 \* [link geometry.reference.algorithms.assign.assign_points assign]
 }
@@ -75,7 +80,12 @@ inline Geometry make_points(Range const& range)
 \* [link geometry.reference.algorithms.assign.assign_values_3_2_coordinate_values assign]
 }
 */
-template <typename Geometry, typename Type>
+template
+<
+    typename Geometry,
+    typename Type,
+    std::enable_if_t<! traits::make<Geometry>::is_specialized, int> = 0
+>
 inline Geometry make(Type const& c1, Type const& c2)
 {
     concepts::check<Geometry>();
@@ -90,6 +100,23 @@ inline Geometry make(Type const& c1, Type const& c2)
     return geometry;
 }
 
+
+template
+<
+    typename Geometry,
+    typename Type,
+    std::enable_if_t<traits::make<Geometry>::is_specialized, int> = 0
+>
+constexpr inline Geometry make(Type const& c1, Type const& c2)
+{
+    concepts::check<Geometry>();
+
+    // NOTE: This is not fully equivalent to the above because assign uses
+    //       numeric_cast which can't be used here since it's not constexpr.
+    return traits::make<Geometry>::apply(c1, c2);
+}
+
+
 /*!
 \brief Construct a geometry
 \ingroup make
@@ -109,7 +136,12 @@ inline Geometry make(Type const& c1, Type const& c2)
 \* [link geometry.reference.algorithms.assign.assign_values_4_3_coordinate_values assign]
 }
  */
-template <typename Geometry, typename Type>
+template
+<
+    typename Geometry,
+    typename Type,
+    std::enable_if_t<! traits::make<Geometry>::is_specialized, int> = 0
+>
 inline Geometry make(Type const& c1, Type const& c2, Type const& c3)
 {
     concepts::check<Geometry>();
@@ -124,6 +156,22 @@ inline Geometry make(Type const& c1, Type const& c2, Type const& c3)
     return geometry;
 }
 
+template
+<
+    typename Geometry,
+    typename Type,
+    std::enable_if_t<traits::make<Geometry>::is_specialized, int> = 0
+>
+constexpr inline Geometry make(Type const& c1, Type const& c2, Type const& c3)
+{
+    concepts::check<Geometry>();
+
+    // NOTE: This is not fully equivalent to the above because assign uses
+    //       numeric_cast which can't be used here since it's not constexpr.
+    return traits::make<Geometry>::apply(c1, c2, c3);
+}
+
+
 template <typename Geometry, typename Type>
 inline Geometry make(Type const& c1, Type const& c2, Type const& c3, Type const& c4)
 {

include/boost/geometry/arithmetic/cross_product.hpp

@@ -20,6 +20,7 @@
 #include <type_traits>
 
 #include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/make.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/static_assert.hpp>
 
@@ -84,9 +85,10 @@ struct cross_product<3>
         assert_dimension<P2, 3>();
         assert_dimension<ResultP, 3>();
 
-        return ResultP(get<1>(p1) * get<2>(p2) - get<2>(p1) * get<1>(p2),
-                       get<2>(p1) * get<0>(p2) - get<0>(p1) * get<2>(p2),
-                       get<0>(p1) * get<1>(p2) - get<1>(p1) * get<0>(p2));
+        return traits::make<ResultP>::apply(
+                get<1>(p1) * get<2>(p2) - get<2>(p1) * get<1>(p2),
+                get<2>(p1) * get<0>(p2) - get<0>(p1) * get<2>(p2),
+                get<0>(p1) * get<1>(p2) - get<1>(p1) * get<0>(p2));
     }
 };
 
@@ -110,13 +112,7 @@ template
     std::enable_if_t
         <
             dimension<ResultP>::value != 3
-         || ! std::is_constructible
-                <
-                    ResultP,
-                    typename coordinate_type<ResultP>::type const&,
-                    typename coordinate_type<ResultP>::type const&,
-                    typename coordinate_type<ResultP>::type const&
-                >::value,
+         || ! traits::make<ResultP>::is_specialized,
             int
         > = 0
 >
@@ -137,13 +133,7 @@ template
     std::enable_if_t
         <
             dimension<ResultP>::value == 3
-         && std::is_constructible
-                <
-                    ResultP,
-                    typename coordinate_type<ResultP>::type const&,
-                    typename coordinate_type<ResultP>::type const&,
-                    typename coordinate_type<ResultP>::type const&
-                >::value,
+         && traits::make<ResultP>::is_specialized,
             int
         > = 0
 >
@@ -177,13 +167,7 @@ template
     std::enable_if_t
         <
             dimension<P>::value != 3
-         || ! std::is_constructible
-                <
-                    P,
-                    typename coordinate_type<P>::type const&,
-                    typename coordinate_type<P>::type const&,
-                    typename coordinate_type<P>::type const&
-                >::value,
+         || ! traits::make<P>::is_specialized,
             int
         > = 0
 >
@@ -204,13 +188,7 @@ template
     std::enable_if_t
         <
             dimension<P>::value == 3
-         && std::is_constructible
-                <
-                    P,
-                    typename coordinate_type<P>::type const&,
-                    typename coordinate_type<P>::type const&,
-                    typename coordinate_type<P>::type const&
-                >::value,
+         && traits::make<P>::is_specialized,
             int
         > = 0
 >

include/boost/geometry/core/make.hpp

@@ -0,0 +1,46 @@
+// Boost.Geometry
+
+// Copyright (c) 2020, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_CORE_MAKE_HPP
+#define BOOST_GEOMETRY_CORE_MAKE_HPP
+
+namespace boost { namespace geometry
+{
+
+namespace traits
+{
+
+/*!
+\brief Traits class to create an object of Geometry type.
+\details This trait is optional and allows to define efficient way of creating Geometries.
+\ingroup traits
+\par Geometries:
+    - points
+    - boxes
+    - segments
+\par Specializations should provide:
+    - static const bool is_specialized = true;
+    - static member function apply() taking:
+      - N coordinates (points)
+      - 2 points, min and max (boxes)
+      - 2 points, first and second (segments)
+\tparam Geometry geometry
+*/
+template <typename Geometry>
+struct make
+{
+    static const bool is_specialized = false;
+};
+
+} // namespace traits
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_CORE_MAKE_HPP

include/boost/geometry/geometries/box.hpp

@@ -24,6 +24,13 @@
 #include <boost/concept/assert.hpp>
 
 #include <boost/geometry/algorithms/convert.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/make.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 
 #if defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
@@ -84,18 +91,14 @@ class box
     */
     template
     <
-        typename P1 = Point,
-        typename P2 = Point,
+        typename P = Point,
         std::enable_if_t
             <
-                ! std::is_copy_constructible<P1>::value
-             || ! std::is_copy_constructible<P2>::value
-             || ! std::is_convertible<P1 const&, Point>::value
-             || ! std::is_convertible<P2 const&, Point>::value,
+                ! std::is_copy_constructible<P>::value,
                 int
             > = 0
     >
-    box(P1 const& min_corner, P2 const& max_corner)
+    box(Point const& min_corner, Point const& max_corner)
     {
         geometry::convert(min_corner, m_min_corner);
         geometry::convert(max_corner, m_max_corner);
@@ -110,21 +113,17 @@ class box
     */
     template
     <
-        typename P1 = Point,
-        typename P2 = Point,
+        typename P = Point,
         std::enable_if_t
             <
-                std::is_copy_constructible<P1>::value
-             && std::is_copy_constructible<P2>::value
-             && std::is_convertible<P1 const&, Point>::value
-             && std::is_convertible<P2 const&, Point>::value,
+                std::is_copy_constructible<P>::value,
                 int
             > = 0
     >
 #if ! defined(BOOST_GEOMETRY_ENABLE_ACCESS_DEBUGGING)
     constexpr
 #endif
-    box(P1 const& min_corner, P2 const& max_corner)
+    box(Point const& min_corner, Point const& max_corner)
         : m_min_corner(min_corner)
         , m_max_corner(max_corner)
     {
@@ -234,6 +233,20 @@ struct indexed_access<model::box<Point>, max_corner, Dimension>
     }
 };
 
+template <typename Point>
+struct make<model::box<Point> >
+{
+    typedef model::box<Point> box_type;
+
+    static const bool is_specialized = true;
+
+    static constexpr box_type apply(Point const& min_corner, Point const& max_corner)
+    {
+        return box_type(min_corner, max_corner);
+    }
+};
+
+
 } // namespace traits
 #endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
 

include/boost/geometry/geometries/concepts/check.hpp

@@ -219,7 +219,7 @@ struct checker<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const>
     \ingroup concepts
 */
 template <typename Geometry>
-inline void check()
+constexpr inline void check()
 {
     detail::checker<Geometry> c;
     boost::ignore_unused(c);
@@ -232,7 +232,7 @@ inline void check()
     \ingroup concepts
 */
 template <typename Geometry1, typename Geometry2>
-inline void check_concepts_and_equal_dimensions()
+constexpr inline void check_concepts_and_equal_dimensions()
 {
     check<Geometry1>();
     check<Geometry2>();

include/boost/geometry/geometries/geometries.hpp

@@ -4,6 +4,10 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -14,15 +18,15 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_HPP
 
-#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/geometries/polygon.hpp>
-
-#include <boost/geometry/geometries/multi_point.hpp>
 #include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
 #include <boost/geometry/geometries/multi_polygon.hpp>
-
-#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point_xyz.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/segment.hpp>