From 235c80b46ba4d6aae49bb2950d95cbb7d90d8939 Mon Sep 17 00:00:00 2001
From: JasonChmn <jason.chemin@hotmail.fr>
Date: Thu, 4 Jul 2019 11:34:02 +0200
Subject: [PATCH] [piecewise_curve] Set MARGIN as a static const class variable
---
include/curves/piecewise_curve.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/curves/piecewise_curve.h b/include/curves/piecewise_curve.h
index 0278c43..022cad8 100644
--- a/include/curves/piecewise_curve.h
+++ b/include/curves/piecewise_curve.h
@@ -8,8 +8,6 @@
#ifndef _CLASS_PIECEWISE_CURVE
#define _CLASS_PIECEWISE_CURVE
-#define MARGIN 1e-3
-
#include "curve_abc.h"
#include "curve_conversion.h"
@@ -188,8 +186,12 @@ struct piecewise_curve : public curve_abc<Time, Numeric, Dim, Safe, Point>
t_time_t time_curves_; // for curves 0/1/2 : [ Tmin0, Tmax0,Tmax1,Tmax2 ]
std::size_t size_; // Number of segments in piecewise curve = size of curves_
Time T_min_, T_max_;
+ static const double MARGIN;
};
+template<typename Time, typename Numeric, std::size_t Dim, bool Safe, typename Point, typename T_Point, typename Curve>
+const double piecewise_curve<Time, Numeric, Dim, Safe, Point, T_Point, Curve>::MARGIN(0.001);
+
} // end namespace
--
GitLab