# HG changeset patch # User Rik # Date 1282420954 25200 # Node ID 9ee5a0a1b93df20fa335d0552efbf7931f8dd008 # Parent 69a2e9ccb2fb53cf02d9a1be55640ac90e892722 Return permutation vector from QR as a row, not column, vector. Fixes Bug #30832. diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2010-08-21 Rik + + * CmplxQRP.cc, CmplxQRP.h, dbleQRP.cc, dbleQRP.h, fCmplxQRP.cc, + fCmplxQRP.h, floatQRP.cc, floatQRP.h: Declare Pvec as RowVector, + not ColumnVector. Bug #30832. + 2010-08-18 Jaroslav Hajek * mx-inlines.cc (mx_inline_all_finite): New check. diff --git a/liboctave/CmplxQRP.cc b/liboctave/CmplxQRP.cc --- a/liboctave/CmplxQRP.cc +++ b/liboctave/CmplxQRP.cc @@ -97,10 +97,10 @@ form (n, afact, tau, qr_type); } -ColumnVector +RowVector ComplexQRP::Pvec (void) const { Array pa (p.pvec ()); - ColumnVector pv (MArray (pa) + 1.0); + RowVector pv (MArray (pa) + 1.0); return pv; } diff --git a/liboctave/CmplxQRP.h b/liboctave/CmplxQRP.h --- a/liboctave/CmplxQRP.h +++ b/liboctave/CmplxQRP.h @@ -58,7 +58,7 @@ PermMatrix P (void) const { return p; } - ColumnVector Pvec (void) const; + RowVector Pvec (void) const; friend std::ostream& operator << (std::ostream&, const ComplexQRP&); diff --git a/liboctave/dbleQRP.cc b/liboctave/dbleQRP.cc --- a/liboctave/dbleQRP.cc +++ b/liboctave/dbleQRP.cc @@ -95,10 +95,10 @@ form (n, afact, tau, qr_type); } -ColumnVector +RowVector QRP::Pvec (void) const { Array pa (p.pvec ()); - ColumnVector pv (MArray (pa) + 1.0); + RowVector pv (MArray (pa) + 1.0); return pv; } diff --git a/liboctave/dbleQRP.h b/liboctave/dbleQRP.h --- a/liboctave/dbleQRP.h +++ b/liboctave/dbleQRP.h @@ -59,7 +59,7 @@ PermMatrix P (void) const { return p; } - ColumnVector Pvec (void) const; + RowVector Pvec (void) const; friend std::ostream& operator << (std::ostream&, const QRP&); diff --git a/liboctave/fCmplxQRP.cc b/liboctave/fCmplxQRP.cc --- a/liboctave/fCmplxQRP.cc +++ b/liboctave/fCmplxQRP.cc @@ -97,10 +97,10 @@ form (n, afact, tau, qr_type); } -FloatColumnVector +FloatRowVector FloatComplexQRP::Pvec (void) const { Array pa (p.pvec ()); - FloatColumnVector pv (MArray (pa) + 1.0f); + FloatRowVector pv (MArray (pa) + 1.0f); return pv; } diff --git a/liboctave/fCmplxQRP.h b/liboctave/fCmplxQRP.h --- a/liboctave/fCmplxQRP.h +++ b/liboctave/fCmplxQRP.h @@ -58,7 +58,7 @@ PermMatrix P (void) const { return p; } - FloatColumnVector Pvec (void) const; + FloatRowVector Pvec (void) const; friend std::ostream& operator << (std::ostream&, const FloatComplexQRP&); diff --git a/liboctave/floatQRP.cc b/liboctave/floatQRP.cc --- a/liboctave/floatQRP.cc +++ b/liboctave/floatQRP.cc @@ -95,10 +95,10 @@ form (n, afact, tau, qr_type); } -FloatColumnVector +FloatRowVector FloatQRP::Pvec (void) const { Array pa (p.pvec ()); - FloatColumnVector pv (MArray (pa) + 1.0f); + FloatRowVector pv (MArray (pa) + 1.0f); return pv; } diff --git a/liboctave/floatQRP.h b/liboctave/floatQRP.h --- a/liboctave/floatQRP.h +++ b/liboctave/floatQRP.h @@ -59,7 +59,7 @@ PermMatrix P (void) const { return p; } - FloatColumnVector Pvec (void) const; + FloatRowVector Pvec (void) const; friend std::ostream& operator << (std::ostream&, const FloatQRP&);