Mercurial > octave
diff libinterp/corefcn/pr-output.cc @ 18849:aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
Making all permutation matrices column permutations allows permutation
matrices to be iterated over in column-major order just like any other
matrix.
* PermMatrix.h, PermMatrix.cc (PermMatrix::_colp): Delete member
variable and all uses.
(PermMatrix::transpose): Create new matrix with internal
representation flipped.
(PermMatrix::pos_power): New function.
(PermMatrix::eye): Call the one-argument constructor which already
defaults to the identity matrix.
(PermMatrix::is_col_perm): Unconditionally return true.
(PermMatrix::is_row_perm): Unconditionally return false.
(PermMatrix::data, PermMatrix::fortran_vec, PermMatrix::pvec): Delete.
(PermMatrix::col_perm_vec): New function.
* lu.cc: New test.
* base-lu.cc (base_lu<lu_type>::base_lu): Call transpose in ipvt
initialization.
* find.cc, kron.cc, pr-output.cc, ov-perm.cc, PermMatrix.cc,
PermMatrix.h, Sparse.cc, dMatrix.cc, fMatrix.cc, CmplxQRP.cc,
base-lu.cc, dbleQRP.cc, fCmplxQRP.cc, floatQRP.cc,
Sparse-perm-op-defs.h, mx-op-defs.h: Adapt to PermMatrix changes.
author | David Spies <dnspies@gmail.com> |
---|---|
date | Wed, 18 Jun 2014 19:38:40 -0600 |
parents | e275d15c27b5 |
children | ec10705dbd83 |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Thu Jun 19 10:35:39 2014 -0700 +++ b/libinterp/corefcn/pr-output.cc Wed Jun 18 19:38:40 2014 -0600 @@ -2485,11 +2485,10 @@ if (pr_as_read_syntax) { - Array<octave_idx_type> pvec = m.pvec (); - bool colp = m.is_col_perm (); + Array<octave_idx_type> pvec = m.col_perm_vec (); os << "eye ("; - if (colp) os << ":, "; + os << ":, "; octave_idx_type col = 0; while (col < nc) @@ -2520,7 +2519,6 @@ else os << " ...\n"; } - if (! colp) os << ", :"; os << ")"; } else