Skip to content

Commit 9476f88

Browse files
committed
core: switch to np.array type by default
1 parent f0236e8 commit 9476f88

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

include/eigenpy/details.hpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ namespace eigenpy
155155

156156
enum NP_TYPE
157157
{
158-
DEFAULT_TYPE,
159158
MATRIX_TYPE,
160159
ARRAY_TYPE
161160
};
@@ -176,16 +175,6 @@ namespace eigenpy
176175

177176
bp::object make(PyObject* pyObj, bool copy = false)
178177
{
179-
if (getType() == DEFAULT_TYPE) {
180-
std::cerr <<
181-
"eigenpy warning: you use the deprecated class numpy.matrix without explicily asking for it. "
182-
"The default behaviour will change to numpy.array at next major release.\n"
183-
"- Either call eigenpy.switchToNumpyMatrix() before using eigenpy to suppress this warning\n"
184-
"- or call eigenpy.switchToNumpyArray() and adapt your code accordingly.\n"
185-
"See https://github.com/stack-of-tasks/eigenpy/issues/87 for further details."
186-
<< std::endl;
187-
switchToNumpyMatrix();
188-
}
189178
bp::object m;
190179
if(PyType_IsSubtype(reinterpret_cast<PyTypeObject*>(CurrentNumpyType.ptr()),NumpyMatrixType))
191180
m = NumpyMatrixObject(bp::object(bp::handle<>(pyObj)), bp::object(), copy);
@@ -268,8 +257,8 @@ namespace eigenpy
268257
//NumpyAsMatrixObject = pyModule.attr("asmatrix");
269258
//NumpyAsMatrixType = reinterpret_cast<PyTypeObject*>(NumpyAsMatrixObject.ptr());
270259

271-
CurrentNumpyType = NumpyMatrixObject; // default conversion
272-
getType() = DEFAULT_TYPE;
260+
CurrentNumpyType = NumpyArrayObject; // default conversion
261+
getType() = ARRAY_TYPE;
273262
}
274263

275264
bp::object CurrentNumpyType;

0 commit comments

Comments
 (0)