Commit 15355e6e authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub

Merge pull request #59 from jcarpent/devel

Restoring previous removed code
parents 2d313304 f5da7517
Pipeline #4420 failed with stage
in 4 minutes and 58 seconds
Subproject commit cfc25686d5e13c40cd8c47946c5d694b4b085670
Subproject commit 61e5574a0615706aab06986f6aecf665ddc31141
......@@ -104,6 +104,8 @@ namespace eigenpy
NumpyMatrixType = reinterpret_cast<PyTypeObject*>(NumpyMatrixObject.ptr());
NumpyArrayObject = pyModule.attr("ndarray");
NumpyArrayType = reinterpret_cast<PyTypeObject*>(NumpyArrayObject.ptr());
NumpyAsMatrixObject = pyModule.attr("asmatrix");
NumpyAsMatrixType = reinterpret_cast<PyTypeObject*>(NumpyAsMatrixObject.ptr());
CurrentNumpyType = NumpyMatrixObject; // default conversion
}
......@@ -113,6 +115,7 @@ namespace eigenpy
// Numpy types
bp::object NumpyMatrixObject; PyTypeObject * NumpyMatrixType;
bp::object NumpyAsMatrixObject; PyTypeObject * NumpyAsMatrixType;
bp::object NumpyArrayObject; PyTypeObject * NumpyArrayType;
};
......
......@@ -35,4 +35,4 @@ ENDIF()
ADD_PYTHON_UNIT_TEST("py-matrix" "unittest/python/test_matrix.py" "unittest")
ADD_PYTHON_UNIT_TEST("py-geometry" "unittest/python/test_geometry.py" "unittest")
ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "unittest")
ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "python/eigenpy")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment