[Octave-cvsupdate] SF.net SVN: octave:[9316] trunk/octave-forge/main/sparsersb/src/sparsersb. cc

[<mic...@us...>]

Revision: 9316
          http://octave.svn.sourceforge.net/octave/?rev=9316&view=rev
Author:   michelemartone
Date:     2011-12-09 01:02:43 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
sparsersb: using librsb's from-csc constructor by default. 

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-09 00:14:51 UTC (rev 9315)
+++ trunk/octave-forge/main/sparsersb/src/sparsersb.cc	2011-12-09 01:02:43 UTC (rev 9316)
@@ -286,6 +286,7 @@
 			rsb_type_t typecode=RSB_NUMERICAL_TYPE_DOUBLE;
 			octave_idx_type nr = sm.rows (); octave_idx_type nc = sm.cols ();
 
+#if 0
 			if(nnz==0)/* FIXME: this branch is temporary */
 			{
 			for (octave_idx_type j = 0; j < nc; j++)
@@ -307,6 +308,7 @@
 				RSBOI_ERROR(RSBOI_0_ALLERRMSG);
 			}
 			else
+#endif
 			{
 			if(!(this->A=rsb_allocate_rsb_sparse_matrix_from_csc_const(sm.data(),sm.ridx(),sm.cidx(), nnz=sm.nnz(),typecode, nr, nc, RSBOI_RB, RSBOI_CB, eflags,&errval)))
 				RSBOI_ERROR(RSBOI_0_ALLERRMSG);
@@ -336,7 +338,7 @@
 			bool islowtri=true,isupptri=true;
 			rsb_flags_t eflags=RSBOI_RF;
 			rsb_type_t typecode=RSB_NUMERICAL_TYPE_DOUBLE_COMPLEX;
-
+#if 0
 			for (octave_idx_type j = 0; j < nc; j++)
 			{
 				for (octave_idx_type k = sm.cidx(j); k < sm.cidx(j+1); k++)
@@ -354,6 +356,10 @@
 
 			if(!(this->A=rsb_allocate_rsb_sparse_matrix_const(sm.data(), (rsb_coo_index_t*)IA.data(), (rsb_coo_index_t*)JA.data(), nnz,typecode, nr, nc, RSBOI_RB, RSBOI_CB, eflags,&errval)))
 				RSBOI_ERROR(RSBOI_0_ALLERRMSG);
+#else
+			if(!(this->A=rsb_allocate_rsb_sparse_matrix_from_csc_const(sm.data(),sm.ridx(),sm.cidx(), nnz=sm.nnz(),typecode, nr, nc, RSBOI_RB, RSBOI_CB, eflags,&errval)))
+				RSBOI_ERROR(RSBOI_0_ALLERRMSG);
+#endif
 			RSBOI_PERROR(errval);
 			if(!this->A)
 				RSBOI_0_ERROR(RSBOI_0_ALLERRMSG);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.