From: <mic...@us...> - 2011-12-17 10:29:14
|
Revision: 9423 http://octave.svn.sourceforge.net/octave/?rev=9423&view=rev Author: michelemartone Date: 2011-12-17 10:29:07 +0000 (Sat, 17 Dec 2011) Log Message: ----------- sparsersb: adapted order of arguments to rsb_clone_transformed according to the new style. 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-17 04:17:38 UTC (rev 9422) +++ trunk/octave-forge/main/sparsersb/src/sparsersb.cc 2011-12-17 10:29:07 UTC (rev 9423) @@ -765,6 +765,7 @@ return rsboi_get_scaled_copy(one/alpha);/* FIXME: is this correct ? */ } +#if RSBOI_WANT_DOUBLE_COMPLEX octave_value rsboi_get_scaled_copy_inv(const Complex alpha)const { rsb_err_t errval=RSB_ERR_NO_ERROR; @@ -773,6 +774,7 @@ RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); return rsboi_get_scaled_copy(one/alpha);/* FIXME: is this correct ? */ } +#endif octave_value rsboi_get_scaled_copy(const RSBOI_T alpha)const { @@ -780,11 +782,11 @@ octave_sparse_rsb_matrix * m = NULL; RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); if(is_real_type()) - m = new octave_sparse_rsb_matrix( rsb_clone_transformed(this->A,RSB_TRANSPOSITION_N,&alpha,RSB_NUMERICAL_TYPE_DOUBLE) ); + m = new octave_sparse_rsb_matrix( rsb_clone_transformed(RSB_NUMERICAL_TYPE_DOUBLE,RSB_TRANSPOSITION_N,&alpha,this->A) ); else #if RSBOI_WANT_DOUBLE_COMPLEX {Complex calpha;calpha+=alpha; - m = new octave_sparse_rsb_matrix( rsb_clone_transformed(this->A,RSB_TRANSPOSITION_N,&calpha,RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX) ); + m = new octave_sparse_rsb_matrix( rsb_clone_transformed(RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX,RSB_TRANSPOSITION_N,&calpha,this->A) ); } #else {RSBOI_0_ERROR(RSBOI_0_NOCOERRMSG);} @@ -798,7 +800,7 @@ rsb_err_t errval=RSB_ERR_NO_ERROR; octave_sparse_rsb_matrix * m = NULL; RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); - m = new octave_sparse_rsb_matrix( rsb_clone_transformed(this->A,RSB_TRANSPOSITION_N,&alpha,RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX) ); + m = new octave_sparse_rsb_matrix( rsb_clone_transformed(RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX,RSB_TRANSPOSITION_N,&alpha,this->A) ); return m; } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |