Changeset 11761

Timestamp:

03/20/12 16:53:19 (13 years ago)

Author:

Eric.Larour

Message:

More checks on empty matrices and vectors

Location:

issm/trunk-jpl/src/c/toolkits/double

Files:

• MatlabMatrixToDoubleMatrix.cpp (modified) (3 diffs)
• MatlabVectorToDoubleVector.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/double/MatlabMatrixToDoubleMatrix.cpp

@@ -38 +38 @@
                 rows=mxGetM(mxmatrix);
                 cols=mxGetN(mxmatrix);
-                matrix=(double*)xcalloc(rows*cols,sizeof(double));
+                
+                if(rows*cols){
+                        matrix=(double*)xcalloc(rows*cols,sizeof(double));
 
-                /*Now, get ir,jc and pr: */
-                ir=mxGetIr(mxmatrix);
-                jc=mxGetJc(mxmatrix);
+                        /*Now, get ir,jc and pr: */
+                        ir=mxGetIr(mxmatrix);
+                        jc=mxGetJc(mxmatrix);
 
-                /*Now, start inserting data into double* matrix: */
-                count=0;
-                for(i=0;i<cols;i++){
-                        for(j=0;j<(jc[i+1]-jc[i]);j++){
-                                matrix[rows*ir[count]+i]=pmxdoublematrix[count];
-                                count++;
+                        /*Now, start inserting data into double* matrix: */
+                        count=0;
+                        for(i=0;i<cols;i++){
+                                for(j=0;j<(jc[i+1]-jc[i]);j++){
+                                        matrix[rows*ir[count]+i]=pmxdoublematrix[count];
+                                        count++;
+                                }
                         }
                 }
@@ -61 +64 @@
                 
                 /*Create serial matrix: */
-                matrix=(double*)xcalloc(rows*cols,sizeof(double));
+                if(rows*cols){
+                        matrix=(double*)xcalloc(rows*cols,sizeof(double));
 
-                for(i=0;i<rows;i++){
-                        for(j=0;j<cols;j++){
-                                matrix[cols*i+j]=(double)pmxdoublematrix[rows*j+i];
+                        for(i=0;i<rows;i++){
+                                for(j=0;j<cols;j++){
+                                        matrix[cols*i+j]=(double)pmxdoublematrix[rows*j+i];
+                                }
                         }
                 }
@@ -76 +81 @@
 
                 /*Create serial matrix: */
-                matrix=(double*)xcalloc(rows*cols,sizeof(double));
+                if(rows*cols){
+                        matrix=(double*)xcalloc(rows*cols,sizeof(double));
 
-                for(i=0;i<rows;i++){
-                        for(j=0;j<cols;j++){
-                                matrix[cols*i+j]=(double)pmxsinglematrix[rows*j+i];
+                        for(i=0;i<rows;i++){
+                                for(j=0;j<cols;j++){
+                                        matrix[cols*i+j]=(double)pmxsinglematrix[rows*j+i];
+                                }
                         }
                 }

issm/trunk-jpl/src/c/toolkits/double/MatlabVectorToDoubleVector.cpp

@@ -52 +52 @@
                 nz=(int)((double)nnz/(double)rows);
 
-                vector=(double*)xcalloc(rows,sizeof(double));
+                if(rows){
+                        vector=(double*)xcalloc(rows,sizeof(double));
 
-                /*Now, get ir,jc and pr: */
-                pr=mxGetPr(mxvector);
-                ir=mxGetIr(mxvector);
-                jc=mxGetJc(mxvector);
+                        /*Now, get ir,jc and pr: */
+                        pr=mxGetPr(mxvector);
+                        ir=mxGetIr(mxvector);
+                        jc=mxGetJc(mxvector);
 
-                /*Now, start inserting data into sparse vector: */
-                count=0;
-                for(i=0;i<cols;i++){
-                        for(j=0;j<(jc[i+1]-jc[i]);j++){
-                                vector[ir[count]]=pr[count];
-                                count++;
+                        /*Now, start inserting data into sparse vector: */
+                        count=0;
+                        for(i=0;i<cols;i++){
+                                for(j=0;j<(jc[i+1]-jc[i]);j++){
+                                        vector[ir[count]]=pr[count];
+                                        count++;
+                                }
                         }
                 }