# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1321507596 18000 # Node ID 1bf8c244040afa63a335440b9a8380845c1b2d17 # Parent 779e15b69738f4c530b8721798217f205e7bfda4 Clarify error message when raising matrices to powers * sparse-xpow.cc: Rephrase error messages * xpow.cc: Ditto diff --git a/src/sparse-xpow.cc b/src/sparse-xpow.cc --- a/src/sparse-xpow.cc +++ b/src/sparse-xpow.cc @@ -63,7 +63,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -136,7 +136,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) diff --git a/src/xpow.cc b/src/xpow.cc --- a/src/xpow.cc +++ b/src/xpow.cc @@ -104,7 +104,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { EIG b_eig (b); @@ -155,7 +155,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { EIG b_eig (b); @@ -194,7 +194,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -280,7 +280,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -324,7 +324,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { EIG a_eig (a); @@ -372,7 +372,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { EIG b_eig (b); @@ -420,7 +420,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { EIG b_eig (b); @@ -459,7 +459,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -545,7 +545,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { EIG a_eig (a); @@ -579,7 +579,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { ComplexDiagMatrix r (nr, nc); @@ -1553,7 +1553,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { FloatEIG b_eig (b); @@ -1605,7 +1605,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { FloatEIG b_eig (b); @@ -1644,7 +1644,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -1730,7 +1730,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -1762,7 +1762,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { FloatEIG a_eig (a); @@ -1810,7 +1810,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { FloatEIG b_eig (b); @@ -1858,7 +1858,7 @@ octave_idx_type nc = b.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for x^A, A must be square"); + error ("for x^A, A must be a square matrix"); else { FloatEIG b_eig (b); @@ -1897,7 +1897,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { if (static_cast (b) == b) @@ -1983,7 +1983,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { FloatEIG a_eig (a); @@ -2017,7 +2017,7 @@ octave_idx_type nc = a.cols (); if (nr == 0 || nc == 0 || nr != nc) - error ("for A^b, A must be square"); + error ("for A^b, A must be a square matrix"); else { FloatComplexDiagMatrix r (nr, nc);