Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8956] trunk/octave-forge/extra/control-devel/src
|
From: <par...@us...> - 2011-11-03 18:49:17
|
Revision: 8956
http://octave.svn.sourceforge.net/octave/?rev=8956&view=rev
Author: paramaniac
Date: 2011-11-03 18:49:11 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
control-devel: fix layout of error and warning messages
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/src/slab09hd.cc
trunk/octave-forge/extra/control-devel/src/slab09id.cc
trunk/octave-forge/extra/control-devel/src/slab09jd.cc
Modified: trunk/octave-forge/extra/control-devel/src/slab09hd.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slab09hd.cc 2011-11-03 17:21:17 UTC (rev 8955)
+++ trunk/octave-forge/extra/control-devel/src/slab09hd.cc 2011-11-03 18:49:11 UTC (rev 8956)
@@ -185,35 +185,33 @@
{
switch (info)
{
- // FIXME: The code below looks nice, but the error message does not
- // because there is much white space after each line break
case 1:
- error ("bstmodred: 1: the computation of the ordered real Schur form of A\
- failed");
+ error ("bstmodred: 1: the computation of the ordered real Schur form of A "
+ "failed");
case 2:
- error ("bstmodred: 2: the reduction of the Hamiltonian matrix to real\
- Schur form failed");
+ error ("bstmodred: 2: the reduction of the Hamiltonian matrix to real "
+ "Schur form failed");
case 3:
- error ("bstmodred: 3: the reordering of the real Schur form of the\
- Hamiltonian matrix failed");
+ error ("bstmodred: 3: the reordering of the real Schur form of the "
+ "Hamiltonian matrix failed");
case 4:
- error ("bstmodred: 4: the Hamiltonian matrix has less than N stable\
- eigenvalues");
+ error ("bstmodred: 4: the Hamiltonian matrix has less than N stable "
+ "eigenvalues");
case 5:
- error ("bstmodred: 5: the coefficient matrix U11 in the linear system\
- X*U11 = U21 to determine X is singular to working\
- precision");
+ error ("bstmodred: 5: the coefficient matrix U11 in the linear system "
+ "X*U11 = U21 to determine X is singular to working "
+ "precision");
case 6:
error ("bstmodred: 6: BETA = 0 and D has not a maximal row rank");
case 7:
error ("bstmodred: 7: the computation of Hankel singular values failed");
case 8:
- error ("bstmodred: 8: the separation of the ALPHA-stable/unstable diagonal\
- blocks failed because of very close eigenvalues");
+ error ("bstmodred: 8: the separation of the ALPHA-stable/unstable diagonal "
+ "blocks failed because of very close eigenvalues");
case 9:
- error ("bstmodred: 9: the resulting order of reduced stable part is less\
- than the number of unstable zeros of the stable\
- part");
+ error ("bstmodred: 9: the resulting order of reduced stable part is less "
+ "than the number of unstable zeros of the stable "
+ "part");
default:
error ("bstmodred: unknown error, info = %d", info);
}
@@ -225,26 +223,26 @@
switch (iwarn)
{
case 1:
- warning ("bstmodred: 1: with ORDSEL = 'F', the selected order NR is greater\
- than NSMIN, the sum of the order of the\
- ALPHA-unstable part and the order of a minimal\
- realization of the ALPHA-stable part of the given\
- system; in this case, the resulting NR is set equal\
- to NSMIN.");
+ warning ("bstmodred: 1: with ORDSEL = 'F', the selected order NR is greater "
+ "than NSMIN, the sum of the order of the "
+ "ALPHA-unstable part and the order of a minimal "
+ "realization of the ALPHA-stable part of the given "
+ "system; in this case, the resulting NR is set equal "
+ "to NSMIN.");
break;
case 2:
- warning ("bstmodred: 2: with ORDSEL = 'F', the selected order NR corresponds\
- to repeated singular values for the ALPHA-stable\
- part, which are neither all included nor all\
- excluded from the reduced model; in this case, the\
- resulting NR is automatically decreased to exclude\
- all repeated singular values.");
+ warning ("bstmodred: 2: with ORDSEL = 'F', the selected order NR corresponds "
+ "to repeated singular values for the ALPHA-stable "
+ "part, which are neither all included nor all "
+ "excluded from the reduced model; in this case, the "
+ "resulting NR is automatically decreased to exclude "
+ "all repeated singular values.");
break;
case 3:
- warning ("bstmodred: 3: with ORDSEL = 'F', the selected order NR is less\
- than the order of the ALPHA-unstable part of the\
- given system; in this case NR is set equal to the\
- order of the ALPHA-unstable part.");
+ warning ("bstmodred: 3: with ORDSEL = 'F', the selected order NR is less "
+ "than the order of the ALPHA-unstable part of the "
+ "given system; in this case NR is set equal to the "
+ "order of the ALPHA-unstable part.");
break;
default:
warning ("bstmodred: unknown warning, iwarn = %d", info);
Modified: trunk/octave-forge/extra/control-devel/src/slab09id.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slab09id.cc 2011-11-03 17:21:17 UTC (rev 8955)
+++ trunk/octave-forge/extra/control-devel/src/slab09id.cc 2011-11-03 18:49:11 UTC (rev 8956)
@@ -326,41 +326,39 @@
{
switch (info)
{
- // FIXME: The code below looks nice, but the error message does not
- // because there is much white space after each line break
case 1:
- error ("modred: 1: the computation of the ordered real Schur form of A\
- failed");
+ error ("modred: 1: the computation of the ordered real Schur form of A "
+ "failed");
case 2:
- error ("modred: 2: the separation of the ALPHA-stable/unstable\
- diagonal blocks failed because of very close\
- eigenvalues");
+ error ("modred: 2: the separation of the ALPHA-stable/unstable "
+ "diagonal blocks failed because of very close "
+ "eigenvalues");
case 3:
- error ("modred: 3: the reduction to a real Schur form of the state\
- matrix of a minimal realization of V failed");
+ error ("modred: 3: the reduction to a real Schur form of the state "
+ "matrix of a minimal realization of V failed");
case 4:
- error ("modred: 4: a failure was detected during the ordering of the\
- real Schur form of the state matrix of a minimal\
- realization of V or in the iterative process to\
- compute a left coprime factorization with inner\
- denominator");
+ error ("modred: 4: a failure was detected during the ordering of the "
+ "real Schur form of the state matrix of a minimal "
+ "realization of V or in the iterative process to "
+ "compute a left coprime factorization with inner "
+ "denominator");
case 5:
- error ("modred: 5: if DICO = 'C' and the matrix AV has an observable\
- eigenvalue on the imaginary axis, or DICO = 'D' and\
- AV has an observable eigenvalue on the unit circle");
+ error ("modred: 5: if DICO = 'C' and the matrix AV has an observable "
+ "eigenvalue on the imaginary axis, or DICO = 'D' and "
+ "AV has an observable eigenvalue on the unit circle");
case 6:
- error ("modred: 6: the reduction to a real Schur form of the state\
- matrix of a minimal realization of W failed");
+ error ("modred: 6: the reduction to a real Schur form of the state "
+ "matrix of a minimal realization of W failed");
case 7:
- error ("modred: 7: a failure was detected during the ordering of the\
- real Schur form of the state matrix of a minimal\
- realization of W or in the iterative process to\
- compute a right coprime factorization with inner\
- denominator");
+ error ("modred: 7: a failure was detected during the ordering of the "
+ "real Schur form of the state matrix of a minimal "
+ "realization of W or in the iterative process to "
+ "compute a right coprime factorization with inner "
+ "denominator");
case 8:
- error ("modred: 8: if DICO = 'C' and the matrix AW has a controllable\
- eigenvalue on the imaginary axis, or DICO = 'D' and\
- AW has a controllable eigenvalue on the unit circle");
+ error ("modred: 8: if DICO = 'C' and the matrix AW has a controllable "
+ "eigenvalue on the imaginary axis, or DICO = 'D' and "
+ "AW has a controllable eigenvalue on the unit circle");
case 9:
error ("modred: 9: the computation of eigenvalues failed");
case 10:
@@ -376,31 +374,31 @@
switch (iwarn)
{
case 1:
- warning ("modred: 1: with ORDSEL = 'F', the selected order NR is greater\
- than NSMIN, the sum of the order of the\
- ALPHA-unstable part and the order of a minimal\
- realization of the ALPHA-stable part of the given\
- system; in this case, the resulting NR is set equal\
- to NSMIN.");
+ warning ("modred: 1: with ORDSEL = 'F', the selected order NR is greater "
+ "than NSMIN, the sum of the order of the "
+ "ALPHA-unstable part and the order of a minimal "
+ "realization of the ALPHA-stable part of the given "
+ "system; in this case, the resulting NR is set equal "
+ "to NSMIN.");
break;
case 2:
- warning ("modred: 2: with ORDSEL = 'F', the selected order NR corresponds\
- to repeated singular values for the ALPHA-stable\
- part, which are neither all included nor all\
- excluded from the reduced model; in this case, the\
- resulting NR is automatically decreased to exclude\
- all repeated singular values.");
+ warning ("modred: 2: with ORDSEL = 'F', the selected order NR corresponds "
+ "to repeated singular values for the ALPHA-stable "
+ "part, which are neither all included nor all "
+ "excluded from the reduced model; in this case, the "
+ "resulting NR is automatically decreased to exclude "
+ "all repeated singular values.");
break;
case 3:
- warning ("modred: 3: with ORDSEL = 'F', the selected order NR is less\
- than the order of the ALPHA-unstable part of the\
- given system; in this case NR is set equal to the\
- order of the ALPHA-unstable part.");
+ warning ("modred: 3: with ORDSEL = 'F', the selected order NR is less "
+ "than the order of the ALPHA-unstable part of the "
+ "given system; in this case NR is set equal to the "
+ "order of the ALPHA-unstable part.");
break;
default:
- warning ("modred: 10+%d: %d violations of the numerical stability condition\
- occured during the assignment of eigenvalues in the\
- SLICOT Library routines SB08CD and/or SB08DD.", info, info);
+ warning ("modred: 10+%d: %d violations of the numerical stability condition "
+ "occured during the assignment of eigenvalues in the "
+ "SLICOT Library routines SB08CD and/or SB08DD.", info, info);
}
}
Modified: trunk/octave-forge/extra/control-devel/src/slab09jd.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slab09jd.cc 2011-11-03 17:21:17 UTC (rev 8955)
+++ trunk/octave-forge/extra/control-devel/src/slab09jd.cc 2011-11-03 18:49:11 UTC (rev 8956)
@@ -302,71 +302,69 @@
{
switch (info)
{
- // FIXME: The code below looks nice, but the error message does not
- // because there is much white space after each line break
case 1:
- error ("hnamodred: 1: the computation of the ordered real Schur form of A\
- failed");
+ error ("hnamodred: 1: the computation of the ordered real Schur form of A "
+ "failed");
case 2:
- error ("hnamodred: 2: the separation of the ALPHA-stable/unstable\
- diagonal blocks failed because of very close eigenvalues");
+ error ("hnamodred: 2: the separation of the ALPHA-stable/unstable "
+ "diagonal blocks failed because of very close eigenvalues");
case 3:
error ("hnamodred: 3: the reduction of AV to a real Schur form failed");
case 4:
error ("hnamodred: 4: the reduction of AW to a real Schur form failed");
case 5:
- error ("hnamodred: 5: the reduction to generalized Schur form of the\
- descriptor pair corresponding to the inverse of V\
- failed");
+ error ("hnamodred: 5: the reduction to generalized Schur form of the "
+ "descriptor pair corresponding to the inverse of V "
+ "failed");
case 6:
- error ("hnamodred: 6: the reduction to generalized Schur form of the\
- descriptor pair corresponding to the inverse of W\
- failed");
+ error ("hnamodred: 6: the reduction to generalized Schur form of the "
+ "descriptor pair corresponding to the inverse of W "
+ "failed");
case 7:
error ("hnamodred: 7: the computation of Hankel singular values failed");
case 8:
- error ("hnamodred: 8: the computation of stable projection in the\
- Hankel-norm approximation algorithm failed");
+ error ("hnamodred: 8: the computation of stable projection in the "
+ "Hankel-norm approximation algorithm failed");
case 9:
- error ("hnamodred: 9: the order of computed stable projection in the\
- Hankel-norm approximation algorithm differs\
- from the order of Hankel-norm approximation");
+ error ("hnamodred: 9: the order of computed stable projection in the "
+ "Hankel-norm approximation algorithm differs "
+ "from the order of Hankel-norm approximation");
case 10:
- error ("hnamodred: 10: the reduction of AV-BV*inv(DV)*CV to a\
- real Schur form failed");
+ error ("hnamodred: 10: the reduction of AV-BV*inv(DV)*CV to a "
+ "real Schur form failed");
case 11:
- error ("hnamodred: 11: the reduction of AW-BW*inv(DW)*CW to a\
- real Schur form failed");
+ error ("hnamodred: 11: the reduction of AW-BW*inv(DW)*CW to a "
+ "real Schur form failed");
case 12:
- error ("hnamodred: 12: the solution of the Sylvester equation failed\
- because the poles of V (if JOBV = 'V') or of\
- conj(V) (if JOBV = 'C') are not distinct from\
- the poles of G1 (see METHOD)");
+ error ("hnamodred: 12: the solution of the Sylvester equation failed "
+ "because the poles of V (if JOBV = 'V') or of "
+ "conj(V) (if JOBV = 'C') are not distinct from "
+ "the poles of G1 (see METHOD)");
case 13:
- error ("hnamodred: 13: the solution of the Sylvester equation failed\
- because the poles of W (if JOBW = 'W') or of\
- conj(W) (if JOBW = 'C') are not distinct from\
- the poles of G1 (see METHOD)");
+ error ("hnamodred: 13: the solution of the Sylvester equation failed "
+ "because the poles of W (if JOBW = 'W') or of "
+ "conj(W) (if JOBW = 'C') are not distinct from "
+ "the poles of G1 (see METHOD)");
case 14:
- error ("hnamodred: 14: the solution of the Sylvester equation failed\
- because the zeros of V (if JOBV = 'I') or of\
- conj(V) (if JOBV = 'R') are not distinct from\
- the poles of G1sr (see METHOD)");
+ error ("hnamodred: 14: the solution of the Sylvester equation failed "
+ "because the zeros of V (if JOBV = 'I') or of "
+ "conj(V) (if JOBV = 'R') are not distinct from "
+ "the poles of G1sr (see METHOD)");
case 15:
- error ("hnamodred: 15: the solution of the Sylvester equation failed\
- because the zeros of W (if JOBW = 'I') or of\
- conj(W) (if JOBW = 'R') are not distinct from\
- the poles of G1sr (see METHOD)");
+ error ("hnamodred: 15: the solution of the Sylvester equation failed "
+ "because the zeros of W (if JOBW = 'I') or of "
+ "conj(W) (if JOBW = 'R') are not distinct from "
+ "the poles of G1sr (see METHOD)");
case 16:
- error ("hnamodred: 16: the solution of the generalized Sylvester system\
- failed because the zeros of V (if JOBV = 'I') or\
- of conj(V) (if JOBV = 'R') are not distinct from\
- the poles of G1sr (see METHOD)");
+ error ("hnamodred: 16: the solution of the generalized Sylvester system "
+ "failed because the zeros of V (if JOBV = 'I') or "
+ "of conj(V) (if JOBV = 'R') are not distinct from "
+ "the poles of G1sr (see METHOD)");
case 17:
- error ("hnamodred: 17: the solution of the generalized Sylvester system\
- failed because the zeros of W (if JOBW = 'I') or\
- of conj(W) (if JOBW = 'R') are not distinct from\
- the poles of G1sr (see METHOD)");
+ error ("hnamodred: 17: the solution of the generalized Sylvester system "
+ "failed because the zeros of W (if JOBW = 'I') or "
+ "of conj(W) (if JOBW = 'R') are not distinct from "
+ "the poles of G1sr (see METHOD)");
case 18:
error ("hnamodred: 18: op(V) is not antistable");
case 19:
@@ -386,18 +384,18 @@
switch (iwarn)
{
case 1:
- warning ("hnamodred: 1: with ORDSEL = 'F', the selected order NR is greater\
- than NSMIN, the sum of the order of the\
- ALPHA-unstable part and the order of a minimal\
- realization of the ALPHA-stable part of the given\
- system. In this case, the resulting NR is set equal\
- to NSMIN.");
+ warning ("hnamodred: 1: with ORDSEL = 'F', the selected order NR is greater "
+ "than NSMIN, the sum of the order of the "
+ "ALPHA-unstable part and the order of a minimal "
+ "realization of the ALPHA-stable part of the given "
+ "system. In this case, the resulting NR is set equal "
+ "to NSMIN.");
break;
case 2:
- warning ("hnamodred: 2: with ORDSEL = 'F', the selected order NR is less\
- than the order of the ALPHA-unstable part of the\
- given system. In this case NR is set equal to the\
- order of the ALPHA-unstable part.");
+ warning ("hnamodred: 2: with ORDSEL = 'F', the selected order NR is less "
+ "than the order of the ALPHA-unstable part of the "
+ "given system. In this case NR is set equal to the "
+ "order of the ALPHA-unstable part.");
break;
default:
warning ("hnamodred: unknown warning, iwarn = %d", info);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
