Changeset 12434 for issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp
- Timestamp:
- 06/15/12 16:43:53 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp
r12365 r12434 39 39 ndims=mxGetNumberOfDimensions(mxmatrix); 40 40 ipt =mxGetDimensions(mxmatrix); 41 size = (int *) xcalloc(ndims,sizeof(int));42 for (i=0; i<ndims;i++) size[i]=(int)ipt[i];41 size =xNew<int>(ndims); 42 for (i=0;i<ndims;i++) size[i]=(int)ipt[i]; 43 43 44 44 /*Ok, first check if we are dealing with a sparse or full matrix: */ … … 51 51 nz=(int)((double)nnz/(double)rows); 52 52 53 matrix= (double*)xcalloc(rows*cols,sizeof(double));53 matrix=xNewInit<double>(rows*cols,0.0); 54 54 55 55 /*Now, get ir,jc and pr: */ … … 74 74 75 75 /*Create serial matrix: */ 76 matrix= (double*)xcalloc(numel,sizeof(double));77 78 dims= (int *) xcalloc(ndims,sizeof(int));76 matrix=xNewInit<double>(numel,0.0); 77 78 dims=xNew<int>(ndims); 79 79 for(i=0;i<numel;i++){ 80 80 ColumnWiseDimsFromIndex(dims,i,size,ndims); … … 82 82 *(matrix+j)=*(mxmatrix_ptr+i); 83 83 } 84 x free((void**)&dims);84 xDelete<int>(dims); 85 85 86 86 } … … 119 119 ndims=mxGetNumberOfDimensions(mxmatrix); 120 120 ipt =mxGetDimensions(mxmatrix); 121 size = (int *) xcalloc(ndims,sizeof(int));122 for (i=0; i<ndims;i++) size[i]=(int)ipt[i];121 size =xNew<int>(ndims); 122 for (i=0;i<ndims;i++) size[i]=(int)ipt[i]; 123 123 124 124 /*Ok, first check if we are dealing with a sparse or full matrix: */ … … 131 131 nz=(int)((double)nnz/(double)rows); 132 132 133 matrix= (bool*)xcalloc(rows*cols,sizeof(bool));133 matrix=xNewInit<bool>(rows*cols,false); 134 134 135 135 /*Now, get ir,jc and pm: */ … … 154 154 155 155 /*Create serial matrix: */ 156 matrix=(bool*)xcalloc(numel,sizeof(bool)); 157 158 dims=(int *) xcalloc(ndims,sizeof(int)); 156 matrix=xNew<bool>(numel); 157 dims=xNew<int>(ndims); 159 158 for(i=0;i<numel;i++){ 160 159 ColumnWiseDimsFromIndex(dims,i,size,ndims); … … 162 161 *(matrix+j)=(bool)*(mxmatrix_ptr+i); 163 162 } 164 xfree((void**)&dims); 165 163 xDelete<int>(dims); 166 164 } 167 165 … … 199 197 ndims=mxGetNumberOfDimensions(mxmatrix); 200 198 ipt =mxGetDimensions(mxmatrix); 201 size = (int *) xcalloc(ndims,sizeof(int));202 for (i=0; i<ndims;i++) size[i]=(int)ipt[i];199 size =xNew<int>(ndims); 200 for (i=0;i<ndims;i++) size[i]=(int)ipt[i]; 203 201 204 202 /*Ok, first check if we are dealing with a sparse or full matrix: */ … … 211 209 nz=(int)((double)nnz/(double)rows); 212 210 213 matrix= (char*)xcalloc(rows*cols,sizeof(double));211 matrix=xNew<char>(rows*cols); 214 212 215 213 /*Now, get ir,jc and pm: */ … … 234 232 235 233 /*Create serial matrix: */ 236 matrix= (char*)xcalloc(numel+1,sizeof(mxChar));234 matrix=xNew<char>(numel+1); 237 235 238 236 /*looping code adapted from Matlab example explore.c: */
Note:
See TracChangeset
for help on using the changeset viewer.