Mercurial > octave-nkf

comparison liboctave/operators/Sparse-perm-op-defs.h @ 18883:aa9ca67f09fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ebb3ef964372
children 4197fc428c7d
comparison
equal deleted inserted replaced
18880:3d33fe79816c 18883:aa9ca67f09fb
65 { 65 {
66 gripe_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ()); 66 gripe_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ());
67 return SM (); 67 return SM ();
68 } 68 }
69 69
70 if (p.is_row_perm ()) 70 return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a);
71 {
72 // Form the column permutation and then call the colpm_sm routine.
73 const octave_idx_type *prow = p.pvec ().data ();
74 OCTAVE_LOCAL_BUFFER (octave_idx_type, pcol, nr);
75 for (octave_idx_type i = 0; i < nr; ++i)
76 pcol[prow[i]] = i;
77 return octinternal_do_mul_colpm_sm (pcol, a);
78 }
79 else
80 return octinternal_do_mul_colpm_sm (p.pvec ().data (), a);
81 } 71 }
82 72
83 template <typename SM> 73 template <typename SM>
84 SM octinternal_do_mul_sm_rowpm (const SM& a, const octave_idx_type *prow) 74 SM octinternal_do_mul_sm_rowpm (const SM& a, const octave_idx_type *prow)
85 // For a row permutation, iterate across the source a and stuff the 75 // For a row permutation, iterate across the source a and stuff the
161 { 151 {
162 gripe_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ()); 152 gripe_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ());
163 return SM (); 153 return SM ();
164 } 154 }
165 155
166 if (p.is_row_perm ()) 156 return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ());
167 return octinternal_do_mul_sm_rowpm (a, p.pvec ().data ());
168 else
169 return octinternal_do_mul_sm_colpm (a, p.pvec ().data ());
170 } 157 }
171 158
172 #endif // octave_Sparse_perm_op_defs_h 159 #endif // octave_Sparse_perm_op_defs_h