Mercurial > forge

changeset 11334:b2b6748b0a9d octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
:%s/->k/->nc :%s/->m/->nr (for new rsb.h)
author michelemartone
date Thu, 27 Dec 2012 19:44:36 +0000
parents 5dcfb21f808a
children a9cdb3c433f4
files main/sparsersb/src/sparsersb.cc
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/sparsersb.cc	Thu Dec 27 18:05:55 2012 +0000
+++ b/main/sparsersb/src/sparsersb.cc	Thu Dec 27 19:44:36 2012 +0000
@@ -384,8 +384,8 @@
 		dim_vector dims (void) const { return (dim_vector(this->rows(),this->cols())); }
 		octave_idx_type dim1 (void) const { return this->rows(); }
 		octave_idx_type dim2 (void) const { return this->cols(); }
-		octave_idx_type rows (void) const { RSBOI_0_EMCHECK(this->A);return this->A->m; }
-		octave_idx_type cols (void) const { RSBOI_0_EMCHECK(this->A);return this->A->k; }
+		octave_idx_type rows (void) const { RSBOI_0_EMCHECK(this->A);return this->A->nr; }
+		octave_idx_type cols (void) const { RSBOI_0_EMCHECK(this->A);return this->A->nc; }
 		octave_idx_type columns (void) const { return this->cols(); }
 		octave_idx_type nzmax (void) const { return this->nnz(); }
 		octave_idx_type capacity (void) const { return this->nnz(); }
@@ -972,7 +972,7 @@
 	RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
 	RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
 	CAST_UNOP_ARG (const octave_sparse_rsb_mtx&);
-	const octave_idx_type rn=v.A->m,cn=v.A->k;
+	const octave_idx_type rn=v.A->nr,cn=v.A->nc;
 	Matrix v2(rn,cn);
 	octave_value retval=v2;
 	rsb_err_t errval=RSB_ERR_NO_ERROR;
@@ -986,7 +986,7 @@
 	RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
 	RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
 	CAST_UNOP_ARG (const octave_sparse_rsb_mtx&);
-	const octave_idx_type rn=v.A->m,cn=v.A->k;
+	const octave_idx_type rn=v.A->nr,cn=v.A->nc;
 	Matrix v2(rn,cn);
 	octave_value retval=v2;
 	rsb_err_t errval=RSB_ERR_NO_ERROR;