File tree Expand file tree Collapse file tree 3 files changed +3
-30
lines changed Expand file tree Collapse file tree 3 files changed +3
-30
lines changed Original file line number Diff line number Diff line change 11/*
2- * Copyright 2014, Nicolas Mansard, LAAS-CNRS
2+ * Copyright 2014-2017 , Nicolas Mansard and Justin Carpentier , LAAS-CNRS
33 *
44 * This file is part of eigenpy.
55 * eigenpy is free software: you can redistribute it and/or
2222
2323namespace eigenpy
2424{
25- typedef UnalignedEquivalent<Eigen::MatrixXd>::type MatrixXd_fx;
26- typedef UnalignedEquivalent<Eigen::Matrix3d>::type Matrix3d_fx;
27- typedef UnalignedEquivalent<Eigen::Matrix4d>::type Matrix4d_fx;
28- typedef UnalignedEquivalent<Eigen::VectorXd>::type VectorXd_fx;
29- typedef UnalignedEquivalent<Eigen::Vector3d>::type Vector3d_fx;
30- typedef UnalignedEquivalent<Eigen::Vector4d>::type Vector4d_fx;
31-
3225 /* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
3326 void enableEigenPy ();
3427
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2014, Nicolas Mansard, LAAS-CNRS
2+ * Copyright 2014-2017 , Nicolas Mansard and Justin Carpentier , LAAS-CNRS
33 *
44 * This file is part of eigenpy.
55 * eigenpy is free software: you can redistribute it and/or
2424#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
2525#endif
2626
27- namespace eigenpy
28- {
29- template <typename D, typename Scalar = typename D::Scalar>
30- struct UnalignedEquivalent
31- {
32- typedef Eigen::MatrixBase<D> MatType;
33- typedef Eigen::Matrix<Scalar,
34- D::RowsAtCompileTime,
35- D::ColsAtCompileTime,
36- #ifndef EIGENPY_ALIGNED
37- D::Options | Eigen::DontAlign,
38- #else
39- D::Options,
40- #endif
41- D::MaxRowsAtCompileTime,
42- D::MaxColsAtCompileTime> type;
43- };
44-
45- } // namespace eigenpy
46-
4727#endif // ifndef __eigenpy_fwd_hpp__
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ Eigen::Matrix3d naturals(bool verbose)
5353}
5454
5555template <typename MatType>
56- Eigen::MatrixXd reflex (const typename eigenpy::UnalignedEquivalent< MatType>::type & M, bool verbose)
56+ Eigen::MatrixXd reflex (const MatType & M, bool verbose)
5757{
5858 if (verbose)
5959 std::cout << " EigenMat = " << M << std::endl;
You can’t perform that action at this time.
0 commit comments