From cfbbbca0ee3b09820e90b730270bac5463c32b05 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Wed, 5 Aug 2015 00:49:51 +0200
Subject: [PATCH] [disjoint] For Box/Box and Point/Box take into account
 machine epsilon.

---
 .../algorithms/detail/disjoint/box_box.hpp      | 17 +++++++++--------
 .../algorithms/detail/disjoint/point_box.hpp    | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
index 84671f257..2710caa06 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
@@ -1,12 +1,12 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2014.
-// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2015.
+// Modifications copyright (c) 2013-2015, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -28,6 +28,7 @@
 
 #include <boost/geometry/algorithms/dispatch/disjoint.hpp>
 
+#include <boost/geometry/util/math.hpp>
 
 namespace boost { namespace geometry
 {
@@ -46,11 +47,11 @@ struct box_box
 {
     static inline bool apply(Box1 const& box1, Box2 const& box2)
     {
-        if (get<max_corner, Dimension>(box1) < get<min_corner, Dimension>(box2))
+        if (math::smaller(get<max_corner, Dimension>(box1), get<min_corner, Dimension>(box2)))
         {
             return true;
         }
-        if (get<min_corner, Dimension>(box1) > get<max_corner, Dimension>(box2))
+        if (math::larger(get<min_corner, Dimension>(box1), get<max_corner, Dimension>(box2)))
         {
             return true;
         }
diff --git a/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
index 12213db05..c5ffecd20 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
@@ -1,12 +1,12 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland
 
-// This file was modified by Oracle on 2013-2014.
-// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2015.
+// Modifications copyright (c) 2013-2015, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -29,6 +29,7 @@
 
 #include <boost/geometry/algorithms/dispatch/disjoint.hpp>
 
+#include <boost/geometry/util/math.hpp>
 
 namespace boost { namespace geometry
 {
@@ -47,8 +48,8 @@ struct point_box
 {
     static inline bool apply(Point const& point, Box const& box)
     {
-        if (get<Dimension>(point) < get<min_corner, Dimension>(box)
-            || get<Dimension>(point) > get<max_corner, Dimension>(box))
+        if ( math::smaller(get<Dimension>(point), get<min_corner, Dimension>(box))
+          || math::larger(get<Dimension>(point), get<max_corner, Dimension>(box)) )
         {
             return true;
         }