octave-lyh: liboctave/CSparse.cc comparison

sanity checks for loading sparse matrices

comparison

equal deleted inserted replaced

-:5af462716bff
+:c6edba80dfae
 }
 std::istream&
 operator >> (std::istream& is, SparseComplexMatrix& a)
 {
-octave_idx_type nr = a.rows ();
+typedef SparseComplexMatrix::element_type elt_type;
-octave_idx_type nc = a.cols ();
-octave_idx_type nz = a.nzmax ();
+return read_sparse_matrix<elt_type> (is, a, octave_read_value<Complex>);
-if (nr > 0 && nc > 0)
-{
-octave_idx_type itmp, jtmp, jold = 0;
-Complex tmp;
-octave_idx_type ii = 0;
-a.cidx (0) = 0;
-for (octave_idx_type i = 0; i < nz; i++)
-	{
-	  is >> itmp;
-	  itmp--;
-	  is >> jtmp;
-	  jtmp--;
-	  tmp = octave_read_complex (is);
-	  if (is)
-	    {
-	      if (jold != jtmp)
-		{
-		  for (octave_idx_type j = jold; j < jtmp; j++)
-		    a.cidx(j+1) = ii;
-		  jold = jtmp;
-		}
-	      a.data (ii) = tmp;
-	      a.ridx (ii++) = itmp;
-	    }
-	  else
-	    goto done;
-	}
-for (octave_idx_type j = jold; j < nc; j++)
-	a.cidx(j+1) = ii;
-}
-done:
-return is;
 }
 SparseComplexMatrix
 operator * (const SparseComplexMatrix& m, const SparseMatrix& a)
 {

Mercurial > hg > octave-lyh