From: <mic...@us...> - 2011-12-13 02:19:59
|
Revision: 9372 http://octave.svn.sourceforge.net/octave/?rev=9372&view=rev Author: michelemartone Date: 2011-12-13 02:19:53 +0000 (Tue, 13 Dec 2011) Log Message: ----------- sparsersb: using the new rsb_util_determine_uplo_flags function to find upper/lower flags. Modified Paths: -------------- trunk/octave-forge/main/sparsersb/src/sparsersb.cc Modified: trunk/octave-forge/main/sparsersb/src/sparsersb.cc =================================================================== --- trunk/octave-forge/main/sparsersb/src/sparsersb.cc 2011-12-12 09:03:34 UTC (rev 9371) +++ trunk/octave-forge/main/sparsersb/src/sparsersb.cc 2011-12-13 02:19:53 UTC (rev 9372) @@ -237,14 +237,12 @@ Array<rsb_coo_index_t> JAv( dim_vector(1,nnz) ); #endif rsb_err_t errval=RSB_ERR_NO_ERROR; - bool islowtri=true,isupptri=true; #if RSBOI_WANT_DOUBLE_COMPLEX rsb_type_t typecode=iscomplex?RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX:RSB_NUMERICAL_TYPE_DOUBLE; #else rsb_type_t typecode=RSBOI_TYPECODE; #endif const rsb_coo_index_t *IA=NULL,*JA=NULL; - RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); #if RSBOI_WANT_IDX_VECTOR_CONST @@ -254,14 +252,7 @@ IA=(const rsb_coo_index_t*)IM.data(); JA=(const rsb_coo_index_t*)JM.data(); #endif - for (octave_idx_type n = 0; n < nnz; n++) - { - rsb_coo_index_t i=IA[n]-1,j=JA[n]-1; - if(i>j)isupptri=false; - else if(i<j)islowtri=false; - } - if(isupptri) RSB_DO_FLAG_ADD(eflags,RSB_FLAG_UPPER_TRIANGULAR); - if(islowtri) RSB_DO_FLAG_ADD(eflags,RSB_FLAG_LOWER_TRIANGULAR); + RSB_DO_FLAG_ADD(eflags,rsb_util_determine_uplo_flags(IA,JA,nnz)); if(!(this->A=rsb_allocate_rsb_sparse_matrix_const(SMp,IA,JA,nnz,typecode,nr,nc,RSBOI_RB,RSBOI_CB,RSBOI_RF|eflags ,&errval))) RSBOI_ERROR(RSBOI_0_ALERRMSG); RSBOI_MP(this->A); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |