1 | 7/13/09:
|
---|
2 |
|
---|
3 | [jschierm@astrid meshpart]$ diff fiedler_old.m fiedler.m
|
---|
4 | 61c61,65
|
---|
5 | < p = symmmd(L);
|
---|
6 | ---
|
---|
7 | > if exist('symamd')
|
---|
8 | > p = symamd(L);
|
---|
9 | > else
|
---|
10 | > p = symmmd(L);
|
---|
11 | > end
|
---|
12 |
|
---|
13 |
|
---|
14 | 7/15/09:
|
---|
15 |
|
---|
16 | [jschierm@astrid meshpart]$ diff meshdemo_old.m meshdemo.m
|
---|
17 | 100c100 [enable mlchaco]
|
---|
18 | < usechaco = 0;
|
---|
19 | ---
|
---|
20 | > usechaco = 1;
|
---|
21 |
|
---|
22 |
|
---|
23 | [jschierm@astrid chaco]$ diff Makefile_old Makefile
|
---|
24 | 27c27,28
|
---|
25 | < MATLAB = /usr/local/libexec/matlab
|
---|
26 | ---
|
---|
27 | > #MATLAB = /usr/local/libexec/matlab
|
---|
28 | > MATLAB = /usr/local/matlab780
|
---|
29 | 30c31,32
|
---|
30 | < CHACO = ../../Chaco-2.0/code
|
---|
31 | ---
|
---|
32 | > #CHACO = ../../Chaco-2.0/code
|
---|
33 | > CHACO = ../../Chaco-2.2/code
|
---|
34 | 34,35c36,37
|
---|
35 | < #CC = gcc
|
---|
36 | < CC = cc
|
---|
37 | ---
|
---|
38 | > CC = gcc
|
---|
39 | > #CC = cc
|
---|
40 | 39,40c41,44
|
---|
41 | < AR = /usr/ccs/bin/ar rcv # for solaris 2
|
---|
42 | < RANLIB = /usr/ccs/bin/ranlib # for solaris 2
|
---|
43 | ---
|
---|
44 | > #AR = /usr/ccs/bin/ar rcv # for solaris 2
|
---|
45 | > AR = /usr/bin/ar rcv # for solaris 2
|
---|
46 | > #RANLIB = /usr/ccs/bin/ranlib # for solaris 2
|
---|
47 | > RANLIB = /usr/bin/ranlib # for solaris 2
|
---|
48 | 91a96,97 [unresolved symbol]
|
---|
49 | > ${CHACO}/klvspiff/flatten.c \
|
---|
50 | > ${CHACO}/klvspiff/flow.c \
|
---|
51 | 99a106 [unresolved symbol]
|
---|
52 | > ${CHACO}/coarsen/makeccoords.c \
|
---|
53 | 102a110 [unresolved symbol]
|
---|
54 | > ${CHACO}/coarsen/makefgraph.c \
|
---|
55 | 108a117 [unresolved symbol]
|
---|
56 | > ${CHACO}/coarsen/maxmatch5.c \
|
---|
57 | 254a264,267
|
---|
58 | > #mlchaco: ${MLFILES.c} chaco.a Makefile
|
---|
59 | > # mex -V4 -output mlchaco ${MLFILES.c} chaco.a -I${CHACO}/main
|
---|
60 | > # mv mlchaco.mex* ${DEST_DIR}
|
---|
61 | >
|
---|
62 | 256c269
|
---|
63 | < mex -V4 -output mlchaco ${MLFILES.c} chaco.a -I${CHACO}/main
|
---|
64 | ---
|
---|
65 | > mex -output mlchaco -largeArrayDims ${MLFILES.c} chaco.a -I${CHACO}/main
|
---|
66 |
|
---|
67 |
|
---|
68 | [jschierm@astrid chaco]$ diff mlchaco_old.c mlchaco.c
|
---|
69 | 34a35
|
---|
70 | > #include <time.h> /* CLOCKS_PER_SEC */
|
---|
71 | 56,61c57,62
|
---|
72 | < void mexFunction(
|
---|
73 | < int nlhs, /* number of expected outputs */
|
---|
74 | < Matrix *plhs[], /* matrix pointer array returning outputs */
|
---|
75 | < int nrhs, /* number of inputs */
|
---|
76 | < Matrix *prhs[] /* matrix pointer array for inputs */
|
---|
77 | < )
|
---|
78 | ---
|
---|
79 | > void mexFunction(
|
---|
80 | > int nlhs, /* number of expected outputs */
|
---|
81 | > mxArray *plhs[], /* array of pointers to output arguments
|
---|
82 | > */
|
---|
83 | > int nrhs, /* number of inputs */
|
---|
84 | > const mxArray *prhs[] /* array of pointers to input arguments */
|
---|
85 | > )
|
---|
86 | 87a89
|
---|
87 | > mwIndex *mwstart,*mwadjacency;
|
---|
88 | 104c106,110
|
---|
89 | < start = mxGetJc(A_in);
|
---|
90 | ---
|
---|
91 | > /* start = mxGetJc(A_in);*/
|
---|
92 | > mwstart = mxGetJc(A_in);
|
---|
93 | > start = mxMalloc((mxGetN(A_in)+1)*sizeof(int));
|
---|
94 | > for (i=0; i<(mxGetN(A_in)+1); i++)
|
---|
95 | > start[i]= (int)mwstart[i];
|
---|
96 | 106c112,116
|
---|
97 | < adjacency = mxGetIr(A_in);
|
---|
98 | ---
|
---|
99 | > /* adjacency = mxGetIr(A_in);*/
|
---|
100 | > mwadjacency = mxGetIr(A_in);
|
---|
101 | > adjacency = mxMalloc(mxGetNzmax(A_in)*sizeof(int));
|
---|
102 | > for (i=0; i<mxGetNzmax(A_in); i++)
|
---|
103 | > adjacency[i]= (int)mwadjacency[i];
|
---|
104 | 169c179
|
---|
105 | < plhs [1] = mxCreateFull (1, 1, REAL) ;
|
---|
106 | ---
|
---|
107 | > plhs [1] = mxCreateDoubleMatrix (1, 1, mxREAL) ;
|
---|
108 | 173c183
|
---|
109 | < ((double) CLK_TCK) ;
|
---|
110 | ---
|
---|
111 | > ((double) CLOCKS_PER_SEC) ;
|
---|
112 | 179c189
|
---|
113 | < map_out = mxCreateFull(1,nvtxs,REAL);
|
---|
114 | ---
|
---|
115 | > map_out = mxCreateDoubleMatrix(1,nvtxs,mxREAL);
|
---|
116 | 185a196,197
|
---|
117 | > if (start != NULL) mxFree((char *) start);
|
---|
118 | > if (adjacency != NULL) mxFree((char *) adjacency);
|
---|
119 |
|
---|