Changeset 12776

Timestamp:

07/27/12 14:36:27 (13 years ago)

Author:

Eric.Larour

Message:

Extended I/O capability

Location:

issm/trunk-jpl/src/c/python/io

Files:

• FetchPythonData.cpp (modified) (3 diffs)
• pythonio.h (modified) (1 diff)

issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp ¶

@@ -15 +15 @@
 #include "../../include/include.h"
 #include "../../shared/shared.h"
+#include "../../io/io.h"
 
 /*Primitive data types*/
@@ -81 +82 @@
 }
 /*}}}*/
+/*FUNCTION FetchData(int** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{*/
+void FetchData(int** pmatrix,int* pM,int *pN,PyObject* py_matrix){
+
+        /*output: */
+        double* dmatrix=NULL;
+        int* matrix=NULL;
+        int M,N;
+
+        /*intermediary:*/
+        int i;
+        int ndim;
+        npy_intp*  dims=NULL;
+
+        /*retrive dimensions: */
+        ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
+        if(ndim!=2)_error2_("expecting an MxN matrix in input!");
+        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
+        M=dims[0]; N=dims[1];
+        
+        /*retrieve internal value: */
+        dmatrix=(double*)PyArray_DATA((PyArrayObject*)py_matrix);
+
+        /*transform into integer matrix: */
+        matrix=xNew<int>(M*N);
+        for(i=0;i<M*N;i++)matrix[i]=(int)dmatrix[i];
+
+        /*output: */
+        if(pM)*pM=M;
+        if(pN)*pN=N;
+        if(pmatrix)*pmatrix=matrix;
+}
+/*}}}*/
 /*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{*/
 void FetchData(double** pvector,int* pM,PyObject* py_vector){
@@ -102 +135 @@
         if(pM)*pM=M;
         if(pvector)*pvector=vector;
+}
+/*}}}*/
+/*FUNCTION FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments){{{*/
+void FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments){
+
+        /*Initialize output*/
+        Options* options=new Options();
+
+        _pprintLine_("FetchData for Options not implemented yet, ignoring them!");
+
+        /*Assign output pointers:*/
+        *poptions=options;
+
 }
 /*}}}*/

issm/trunk-jpl/src/c/python/io/pythonio.h ¶

@@ -47 +47 @@
 void FetchData(double** pvector,int* pM,PyObject* py_ref);
 void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_array);
+void FetchData(int** pmatrix,int* pM,int *pN,PyObject* py_matrix);
 void FetchData(char** pstring,PyObject* py_unicode);
 void FetchData(double* pscalar,PyObject* py_float);
 void FetchData(int* pinteger,PyObject* py_long);
 void FetchData(bool* pbool,PyObject* py_boolean);
+void FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments);
 
 int CheckNumPythonArguments(PyObject* inputs,int NRHS, void (*function)( void ));