Merge pull request #59 from jcarpent/devel

Restoring previous removed code

Author: jcarpent

cmake

@@ -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;
   };
 

include/eigenpy/details.hpp

@@ -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")