Skip to content

Commit 02e96c2

Browse files
committed
[Core] Register by default both MatType and Ref<MatType>
1 parent 0ad69ef commit 02e96c2

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

src/eigenpy.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015 LAAS-CNRS
2+
* Copyright (c) 2015-2018 LAAS-CNRS
33
*
44
* This file is part of eigenpy.
55
* eigenpy is free software: you can redistribute it and/or
@@ -22,17 +22,18 @@ namespace eigenpy
2222
/* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
2323
void enableEigenPy()
2424
{
25+
using namespace Eigen;
2526
Exception::registerException();
2627

27-
enableEigenPySpecific<Eigen::MatrixXd>();
28-
enableEigenPySpecific<Eigen::Matrix2d>();
29-
enableEigenPySpecific<Eigen::Matrix3d>();
30-
enableEigenPySpecific<Eigen::Matrix4d>();
31-
32-
enableEigenPySpecific<Eigen::VectorXd>();
33-
enableEigenPySpecific<Eigen::Vector2d>();
34-
enableEigenPySpecific<Eigen::Vector3d>();
35-
enableEigenPySpecific<Eigen::Vector4d>();
28+
ENABLE_SPECIFIC_MATRIX_TYPE(MatrixXd);
29+
ENABLE_SPECIFIC_MATRIX_TYPE(Matrix2d);
30+
ENABLE_SPECIFIC_MATRIX_TYPE(Matrix3d);
31+
ENABLE_SPECIFIC_MATRIX_TYPE(Matrix4d);
32+
33+
ENABLE_SPECIFIC_MATRIX_TYPE(VectorXd);
34+
ENABLE_SPECIFIC_MATRIX_TYPE(Vector2d);
35+
ENABLE_SPECIFIC_MATRIX_TYPE(Vector3d);
36+
ENABLE_SPECIFIC_MATRIX_TYPE(Vector4d);
3637
}
3738

3839
} // namespace eigenpy

src/eigenpy.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@
1818
#define __eigenpy_eigenpy_hpp__
1919

2020
#include "eigenpy/fwd.hpp"
21-
#include "eigenpy/memory.hpp"
2221
#include "eigenpy/deprecated.hh"
22+
#include "eigenpy/ref.hpp"
23+
24+
#define ENABLE_SPECIFIC_MATRIX_TYPE(TYPE) \
25+
enableEigenPySpecific<TYPE>(); \
26+
enableEigenPySpecific< eigenpy::Ref<TYPE> >();
2327

2428
namespace eigenpy
2529
{
2630
/* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
2731
void enableEigenPy();
2832

29-
3033
template<typename MatType>
3134
void enableEigenPySpecific();
3235

0 commit comments

Comments
 (0)