From 3552ce68bc7654df35da471bd937b09a9fde101f Mon Sep 17 00:00:00 2001 From: Arnur Nigmetov Date: Wed, 19 Jul 2017 16:33:37 -0700 Subject: Include cmath instead of math.h --- geom_bottleneck/bottleneck/include/basic_defs_bt.h | 14 +++++++------- geom_matching/wasserstein/include/basic_defs_ws.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/geom_bottleneck/bottleneck/include/basic_defs_bt.h b/geom_bottleneck/bottleneck/include/basic_defs_bt.h index 759f18e..5d6d264 100644 --- a/geom_bottleneck/bottleneck/include/basic_defs_bt.h +++ b/geom_bottleneck/bottleneck/include/basic_defs_bt.h @@ -28,12 +28,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "def_debug_bt.h" @@ -59,7 +59,7 @@ struct Point { #endif }; -struct DiagramPoint +struct DiagramPoint { // Points above the diagonal have type NORMAL // Projections onto the diagonal have type DIAG @@ -83,16 +83,16 @@ public: return x; //if (DiagramPoint::NORMAL == type) //return x; - //else + //else //return 0.5 * ( x + y); - } + } CoordinateType inline getRealY() const // return the y-coord { return y; //if (DiagramPoint::NORMAL == type) //return y; - //else + //else //return 0.5 * ( x + y); } @@ -185,7 +185,7 @@ void DiagramPointSet::fillIn(PairIterator start, PairIterator end) } template -DiagramPointSet::DiagramPointSet(PairIterator start, PairIterator end) +DiagramPointSet::DiagramPointSet(PairIterator start, PairIterator end) { fillIn(start, end); } diff --git a/geom_matching/wasserstein/include/basic_defs_ws.h b/geom_matching/wasserstein/include/basic_defs_ws.h index a87ccd3..db305c0 100644 --- a/geom_matching/wasserstein/include/basic_defs_ws.h +++ b/geom_matching/wasserstein/include/basic_defs_ws.h @@ -29,12 +29,12 @@ derivative works thereof, in binary and source code form. #define BASIC_DEFS_WS_H #include -#include +#include #include #include #include #include -#include +#include #ifdef _WIN32 #include -- cgit v1.2.3