/[ascend]/trunk/base/generic/solver/mtx_perms.c
ViewVC logotype

Diff of /trunk/base/generic/solver/mtx_perms.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 707 by johnpye, Wed Jun 21 07:00:45 2006 UTC revision 708 by johnpye, Tue Jun 27 07:34:31 2006 UTC
# Line 1234  mtx_block_t *mtx_block_partition( mtx_ma Line 1234  mtx_block_t *mtx_block_partition( mtx_ma
1234    vars.vstack = reg->row.high + 1;  /* was symbolic_rank */    vars.vstack = reg->row.high + 1;  /* was symbolic_rank */
1235    if (vars.vstack > 0) {    if (vars.vstack > 0) {
1236      vars.lowlink = vars.blocksize =      vars.lowlink = vars.blocksize =
1237        (int32 *)ascmalloc(vars.vstack*sizeof(int32));        ASC_NEW_ARRAY(int32,vars.vstack);
1238    } else {    } else {
1239      vars.lowlink = vars.blocksize = NULL;      vars.lowlink = vars.blocksize = NULL;
1240    }    }
# Line 1316  void mtx_partition( mtx_matrix_t mtx) Line 1316  void mtx_partition( mtx_matrix_t mtx)
1316    
1317    vars.vstack = mtx->data->symbolic_rank;    vars.vstack = mtx->data->symbolic_rank;
1318    vars.lowlink = vars.blocksize = vars.vstack > 0 ?    vars.lowlink = vars.blocksize = vars.vstack > 0 ?
1319      (int32 *)ascmalloc( vars.vstack*sizeof(int32) ) : NULL;      ASC_NEW_ARRAY(int32,vars.vstack) : NULL;
1320    vars.done = 0;    vars.done = 0;
1321    vars.nblocks = 0;    vars.nblocks = 0;
1322    
# Line 1329  void mtx_partition( mtx_matrix_t mtx) Line 1329  void mtx_partition( mtx_matrix_t mtx)
1329      ascfree(mtx->data->block);      ascfree(mtx->data->block);
1330    mtx->data->nblocks = vars.nblocks;    mtx->data->nblocks = vars.nblocks;
1331    mtx->data->block = vars.nblocks > 0 ?    mtx->data->block = vars.nblocks > 0 ?
1332      (mtx_region_t *)ascmalloc( vars.nblocks*sizeof(mtx_region_t) ) : NULL;      ASC_NEW_ARRAY(mtx_region_t,vars.nblocks) : NULL;
1333    for( start=blocknum=0 ; blocknum < vars.nblocks ; blocknum++ ) {    for( start=blocknum=0 ; blocknum < vars.nblocks ; blocknum++ ) {
1334      size = vars.blocksize[start];      size = vars.blocksize[start];
1335      mtx->data->block[blocknum].row.low =      mtx->data->block[blocknum].row.low =
# Line 1383  void mtx_ut_partition( mtx_matrix_t mtx) Line 1383  void mtx_ut_partition( mtx_matrix_t mtx)
1383    
1384    vars.vstack = mtx->data->symbolic_rank;    vars.vstack = mtx->data->symbolic_rank;
1385    vars.lowlink = vars.blocksize = vars.vstack > 0 ?    vars.lowlink = vars.blocksize = vars.vstack > 0 ?
1386      (int32 *)ascmalloc( vars.vstack*sizeof(int32) ) : NULL;      ASC_NEW_ARRAY(int32,vars.vstack) : NULL;
1387    vars.done = 0;    vars.done = 0;
1388    vars.nblocks = 0;    vars.nblocks = 0;
1389    
# Line 1398  void mtx_ut_partition( mtx_matrix_t mtx) Line 1398  void mtx_ut_partition( mtx_matrix_t mtx)
1398    }    }
1399    mtx->data->nblocks = vars.nblocks;    mtx->data->nblocks = vars.nblocks;
1400    mtx->data->block = vars.nblocks > 0 ?    mtx->data->block = vars.nblocks > 0 ?
1401      (mtx_region_t *)ascmalloc( vars.nblocks*sizeof(mtx_region_t) ) : NULL;      ASC_NEW_ARRAY(mtx_region_t,vars.nblocks) : NULL;
1402    for( start=blocknum=0 ; blocknum < vars.nblocks ; blocknum++ ) {    for( start=blocknum=0 ; blocknum < vars.nblocks ; blocknum++ ) {
1403      size = vars.blocksize[start];      size = vars.blocksize[start];
1404      mtx->data->block[blocknum].row.low =      mtx->data->block[blocknum].row.low =

Legend:
Removed from v.707  
changed lines
  Added in v.708

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22