core: change variable naming to pyArray

Author: jcarpent

include/eigenpy/details.hpp

@@ -279,27 +279,27 @@ namespace eigenpy
   struct EigenFromPy
   {
     /// \brief Determine if pyObj can be converted into a MatType object
-    static void* convertible(PyArrayObject* pyObj)
+    static void* convertible(PyArrayObject* pyArray)
     {
-      if (!PyArray_Check(pyObj))
+      if (!PyArray_Check(pyArray))
         return 0;
 
       if(MatType::IsVectorAtCompileTime)
       {
         // Special care of scalar matrix of dimension 1x1.
-        if(PyArray_DIMS(pyObj)[0] == 1 && PyArray_DIMS(pyObj)[1] == 1)
-          return pyObj;
+        if(PyArray_DIMS(pyArray)[0] == 1 && PyArray_DIMS(pyArray)[1] == 1)
+          return pyArray;
 
-        if(PyArray_DIMS(pyObj)[0] > 1 && PyArray_DIMS(pyObj)[1] > 1)
+        if(PyArray_DIMS(pyArray)[0] > 1 && PyArray_DIMS(pyArray)[1] > 1)
         {
 #ifndef NDEBUG
           std::cerr << "The number of dimension of the object does not correspond to a vector" << std::endl;
 #endif
           return 0;
         }
 
-        if(((PyArray_DIMS(pyObj)[0] == 1) && (MatType::ColsAtCompileTime == 1))
-           || ((PyArray_DIMS(pyObj)[1] == 1) && (MatType::RowsAtCompileTime == 1)))
+        if(((PyArray_DIMS(pyArray)[0] == 1) && (MatType::ColsAtCompileTime == 1))
+           || ((PyArray_DIMS(pyArray)[1] == 1) && (MatType::RowsAtCompileTime == 1)))
         {
 #ifndef NDEBUG
           if(MatType::ColsAtCompileTime == 1)
@@ -311,9 +311,9 @@ namespace eigenpy
         }
       }
 
-      if (PyArray_NDIM(pyObj) != 2)
+      if (PyArray_NDIM(pyArray) != 2)
       {
-        if ( (PyArray_NDIM(pyObj) !=1) || (! MatType::IsVectorAtCompileTime) )
+        if ( (PyArray_NDIM(pyArray) !=1) || (! MatType::IsVectorAtCompileTime) )
         {
 #ifndef NDEBUG
           std::cerr << "The number of dimension of the object is not correct." << std::endl;
@@ -322,10 +322,10 @@ namespace eigenpy
         }
       }
 
-      if (PyArray_NDIM(pyObj) == 2)
+      if (PyArray_NDIM(pyArray) == 2)
       {
-        const int R = (int)PyArray_DIMS(pyObj)[0];
-        const int C = (int)PyArray_DIMS(pyObj)[1];
+        const int R = (int)PyArray_DIMS(pyArray)[0];
+        const int C = (int)PyArray_DIMS(pyArray)[1];
 
         if( (MatType::RowsAtCompileTime!=R)
            && (MatType::RowsAtCompileTime!=Eigen::Dynamic) )
@@ -336,7 +336,7 @@ namespace eigenpy
       }
 
       // Check if the Scalar type of the obj_ptr is compatible with the Scalar type of MatType
-      if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyObj), 0)) == NPY_INT)
+      if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyArray), 0)) == NPY_INT)
       {
         if(!FromTypeToType<int,typename MatType::Scalar>::value)
         {
@@ -346,7 +346,7 @@ namespace eigenpy
           return 0;
         }
       }
-      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyObj), 0)) == NPY_LONG)
+      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyArray), 0)) == NPY_LONG)
       {
         if(!FromTypeToType<long,typename MatType::Scalar>::value)
         {
@@ -356,7 +356,7 @@ namespace eigenpy
           return 0;
         }
       }
-      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyObj), 0)) == NPY_FLOAT)
+      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyArray), 0)) == NPY_FLOAT)
       {
         if(!FromTypeToType<float,typename MatType::Scalar>::value)
         {
@@ -366,7 +366,7 @@ namespace eigenpy
           return 0;
         }
       }
-      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyObj), 0)) == NPY_DOUBLE)
+      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyArray), 0)) == NPY_DOUBLE)
       {
         if(!FromTypeToType<double,typename MatType::Scalar>::value)
         {
@@ -376,7 +376,7 @@ namespace eigenpy
           return 0;
         }
       }
-      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyObj), 0))
+      else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(pyArray), 0))
           != NumpyEquivalentType<typename MatType::Scalar>::type_code)
       {
 #ifndef NDEBUG
@@ -387,9 +387,9 @@ namespace eigenpy
       }
 
 #ifdef NPY_1_8_API_VERSION
-      if (!(PyArray_FLAGS(pyObj)))
+      if (!(PyArray_FLAGS(pyArray)))
 #else
-        if (!(PyArray_FLAGS(obj_ptr) & NPY_ALIGNED))
+      if (!(PyArray_FLAGS(pyArray) & NPY_ALIGNED))
 #endif
         {
 #ifndef NDEBUG
@@ -398,7 +398,7 @@ namespace eigenpy
           return 0;
         }
 
-      return pyObj;
+      return pyArray;
     }
 
     /// \brief Allocate memory and copy pyObj in the new storage