From aacde1619b9883420e75732a6148a410aa329b7f Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Thu, 11 Jan 2018 13:53:26 +0100
Subject: [PATCH] [Core] Move stride to a dedicated file
---
CMakeLists.txt | 1 +
src/map.hpp | 1 +
src/ref.hpp | 14 ++------------
src/stride.hpp | 37 +++++++++++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 12 deletions(-)
create mode 100644 src/stride.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b57443e..86250e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ SET(HEADERS
registration.hpp
angle-axis.hpp
quaternion.hpp
+ stride.hpp
ref.hpp
)
diff --git a/src/map.hpp b/src/map.hpp
index 2a2fb4b..c741435 100644
--- a/src/map.hpp
+++ b/src/map.hpp
@@ -17,6 +17,7 @@
#include "eigenpy/fwd.hpp"
#include <numpy/arrayobject.h>
#include "eigenpy/exception.hpp"
+#include "eigenpy/stride.hpp"
namespace eigenpy
{
diff --git a/src/ref.hpp b/src/ref.hpp
index c651e1d..367bf0f 100644
--- a/src/ref.hpp
+++ b/src/ref.hpp
@@ -18,6 +18,7 @@
#define __eigenpy_ref_hpp__
#include "eigenpy/fwd.hpp"
+#include "eigenpy/stride.hpp"
// For old Eigen versions, EIGEN_DEVICE_FUNC is not defined.
// We must define it just in the scope of this file.
@@ -27,18 +28,7 @@
namespace eigenpy
{
- template<typename MatType, int IsVectorAtCompileTime = MatType::IsVectorAtCompileTime>
- struct StrideType
- {
- typedef Eigen::Stride<Eigen::Dynamic,Eigen::Dynamic> type;
- };
-
- template<typename MatType>
- struct StrideType<MatType,1>
- {
- typedef Eigen::InnerStride<Eigen::Dynamic> type;
- };
-
+
template<typename PlainObjectType>
struct Ref : Eigen::Ref<PlainObjectType,EIGENPY_DEFAULT_ALIGNMENT_VALUE,typename StrideType<PlainObjectType>::type>
{
diff --git a/src/stride.hpp b/src/stride.hpp
new file mode 100644
index 0000000..438b818
--- /dev/null
+++ b/src/stride.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018, Justin Carpentier <jcarpent@laas.fr>, LAAS-CNRS
+ *
+ * This file is part of eigenpy.
+ * eigenpy is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ * eigenpy is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details. You should
+ * have received a copy of the GNU Lesser General Public License along
+ * with eigenpy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __eigenpy_stride_hpp__
+#define __eigenpy_stride_hpp__
+
+#include <Eigen/Core>
+
+namespace eigenpy
+{
+ template<typename MatType, int IsVectorAtCompileTime = MatType::IsVectorAtCompileTime>
+ struct StrideType
+ {
+ typedef Eigen::Stride<Eigen::Dynamic,Eigen::Dynamic> type;
+ };
+
+ template<typename MatType>
+ struct StrideType<MatType,1>
+ {
+ typedef Eigen::InnerStride<Eigen::Dynamic> type;
+ };
+}
+
+#endif // ifndef __eigenpy_stride_hpp__
--
GitLab