7/13/09: [jschierm@astrid meshpart]$ diff fiedler_old.m fiedler.m 61c61,65 < p = symmmd(L); --- > if exist('symamd') > p = symamd(L); > else > p = symmmd(L); > end 7/15/09: [jschierm@astrid meshpart]$ diff meshdemo_old.m meshdemo.m 100c100 [enable mlchaco] < usechaco = 0; --- > usechaco = 1; [jschierm@astrid chaco]$ diff Makefile_old Makefile 27c27,28 < MATLAB = /usr/local/libexec/matlab --- > #MATLAB = /usr/local/libexec/matlab > MATLAB = /usr/local/matlab780 30c31,32 < CHACO = ../../Chaco-2.0/code --- > #CHACO = ../../Chaco-2.0/code > CHACO = ../../Chaco-2.2/code 34,35c36,37 < #CC = gcc < CC = cc --- > CC = gcc > #CC = cc 39,40c41,44 < AR = /usr/ccs/bin/ar rcv # for solaris 2 < RANLIB = /usr/ccs/bin/ranlib # for solaris 2 --- > #AR = /usr/ccs/bin/ar rcv # for solaris 2 > AR = /usr/bin/ar rcv # for solaris 2 > #RANLIB = /usr/ccs/bin/ranlib # for solaris 2 > RANLIB = /usr/bin/ranlib # for solaris 2 91a96,97 [unresolved symbol] > ${CHACO}/klvspiff/flatten.c \ > ${CHACO}/klvspiff/flow.c \ 99a106 [unresolved symbol] > ${CHACO}/coarsen/makeccoords.c \ 102a110 [unresolved symbol] > ${CHACO}/coarsen/makefgraph.c \ 108a117 [unresolved symbol] > ${CHACO}/coarsen/maxmatch5.c \ 254a264,267 > #mlchaco: ${MLFILES.c} chaco.a Makefile > # mex -V4 -output mlchaco ${MLFILES.c} chaco.a -I${CHACO}/main > # mv mlchaco.mex* ${DEST_DIR} > 256c269 < mex -V4 -output mlchaco ${MLFILES.c} chaco.a -I${CHACO}/main --- > mex -output mlchaco -largeArrayDims ${MLFILES.c} chaco.a -I${CHACO}/main [jschierm@astrid chaco]$ diff mlchaco_old.c mlchaco.c 34a35 > #include /* CLOCKS_PER_SEC */ 56,61c57,62 < void mexFunction( < int nlhs, /* number of expected outputs */ < Matrix *plhs[], /* matrix pointer array returning outputs */ < int nrhs, /* number of inputs */ < Matrix *prhs[] /* matrix pointer array for inputs */ < ) --- > void mexFunction( > int nlhs, /* number of expected outputs */ > mxArray *plhs[], /* array of pointers to output arguments > */ > int nrhs, /* number of inputs */ > const mxArray *prhs[] /* array of pointers to input arguments */ > ) 87a89 > mwIndex *mwstart,*mwadjacency; 104c106,110 < start = mxGetJc(A_in); --- > /* start = mxGetJc(A_in);*/ > mwstart = mxGetJc(A_in); > start = mxMalloc((mxGetN(A_in)+1)*sizeof(int)); > for (i=0; i<(mxGetN(A_in)+1); i++) > start[i]= (int)mwstart[i]; 106c112,116 < adjacency = mxGetIr(A_in); --- > /* adjacency = mxGetIr(A_in);*/ > mwadjacency = mxGetIr(A_in); > adjacency = mxMalloc(mxGetNzmax(A_in)*sizeof(int)); > for (i=0; i adjacency[i]= (int)mwadjacency[i]; 169c179 < plhs [1] = mxCreateFull (1, 1, REAL) ; --- > plhs [1] = mxCreateDoubleMatrix (1, 1, mxREAL) ; 173c183 < ((double) CLK_TCK) ; --- > ((double) CLOCKS_PER_SEC) ; 179c189 < map_out = mxCreateFull(1,nvtxs,REAL); --- > map_out = mxCreateDoubleMatrix(1,nvtxs,mxREAL); 185a196,197 > if (start != NULL) mxFree((char *) start); > if (adjacency != NULL) mxFree((char *) adjacency);