Skip to content
Snippets Groups Projects
Commit d7d1337d authored by Valenza Florian's avatar Valenza Florian Committed by jcarpent
Browse files

[Python] Rename file into joint-derived.hpp to correspond to the type it...

[Python] Rename file into joint-derived.hpp to correspond to the type it exposes. i.e it does the exposition for each derived joint model ( that are in the joint model variant
parent 99ff778b
No related branches found
No related tags found
No related merge requests found
......@@ -172,7 +172,7 @@ SET(${PROJECT_NAME}_PYTHON_HEADERS
python/force.hpp
python/motion.hpp
python/inertia.hpp
python/joint-dense.hpp
python/joint-derived.hpp
python/joints-models.hpp
python/joints-variant.hpp
python/frame.hpp
......
......@@ -25,11 +25,11 @@
namespace eigenpy
{
template<class JointModelDense>
template<class JointModelDerived>
struct UnalignedEquivalentTypes
{
typedef Eigen::Matrix<double, JointModelDense::NQ, 1, Eigen::DontAlign> MatrixNQd_fx;
typedef Eigen::Matrix<double, JointModelDense::NV, 1, Eigen::DontAlign> MatrixNVd_fx;
typedef Eigen::Matrix<double, JointModelDerived::NQ, 1, Eigen::DontAlign> MatrixNQd_fx;
typedef Eigen::Matrix<double, JointModelDerived::NV, 1, Eigen::DontAlign> MatrixNVd_fx;
};
} // namespace eigenpy
......@@ -39,16 +39,16 @@ namespace se3
{
namespace bp = boost::python;
template<class JointModelDense>
template<class JointModelDerived>
struct JointPythonVisitor
: public boost::python::def_visitor< JointPythonVisitor<JointModelDense> >
: public boost::python::def_visitor< JointPythonVisitor<JointModelDerived> >
{
typedef typename eigenpy::UnalignedEquivalentTypes<JointModelDense>::MatrixNQd_fx MatrixNQd_fx;
typedef typename eigenpy::UnalignedEquivalentTypes<JointModelDense>::MatrixNVd_fx MatrixNVd_fx;
typedef typename eigenpy::UnalignedEquivalentTypes<JointModelDerived>::MatrixNQd_fx MatrixNQd_fx;
typedef typename eigenpy::UnalignedEquivalentTypes<JointModelDerived>::MatrixNVd_fx MatrixNVd_fx;
public:
static PyObject* convert(JointModelDense const& jm)
static PyObject* convert(JointModelDerived const& jm)
{
return boost::python::incref(boost::python::object(jm).ptr());
}
......@@ -66,11 +66,11 @@ namespace se3
.add_property("nv",&JointPythonVisitor::getNv);
}
static JointIndex getId( const JointModelDense & self ) { return self.id(); }
static int getIdx_q(const JointModelDense & self) {return self.idx_q();}
static int getIdx_v(const JointModelDense & self) {return self.idx_v();}
static int getNq(const JointModelDense & self) {return self.nq();}
static int getNv(const JointModelDense & self) {return self.nv();}
static JointIndex getId( const JointModelDerived & self ) { return self.id(); }
static int getIdx_q(const JointModelDerived & self) {return self.idx_q();}
static int getIdx_v(const JointModelDerived & self) {return self.idx_v();}
static int getNq(const JointModelDerived & self) {return self.nq();}
static int getNv(const JointModelDerived & self) {return self.nv();}
static void expose()
{
......
......@@ -21,7 +21,7 @@
#include "pinocchio/python/force.hpp"
#include "pinocchio/python/motion.hpp"
#include "pinocchio/python/inertia.hpp"
#include "pinocchio/python/joint-dense.hpp"
#include "pinocchio/python/joint-derived.hpp"
#include "pinocchio/python/joints-variant.hpp"
#include "pinocchio/python/frame.hpp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment