Mercurial > hg > octave-thorsten
changeset 4629:ed92d574b55b
[project @ 2003-11-17 20:43:13 by jwe]
| author | jwe |
|---|---|
| date | Mon, 17 Nov 2003 20:43:13 +0000 |
| parents | c0121a3b9cbe |
| children | ca70857bdbd1 |
| files | scripts/ChangeLog scripts/miscellaneous/path.m src/ChangeLog src/DLD-FUNCTIONS/qz.cc |
| diffstat | 4 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,7 +1,14 @@ +2003-11-17 John W. Eaton <jwe@bevo.che.wisc.edu> + + * miscellaneous/path.m: Fix thinko in previous change. + 2003-11-14 Gabriele Pannocchia <g.pannocchia@ing.unipi.it> - * control/base/dare.m: - * control/base/dlqr.m: + * control/base/dare.m: Check positive (semi)definiteness and + dimensions of r (and q). + * control/base/dlqr.m: Check stabilizability of (A,B), + detectability of (A,Q), and whether (A,Q) has non minimal modes + near unit circle. * control/system/is_detectable.m: Use Hautus Lemma. Correct the behavior for discrete-time systems.
--- a/scripts/miscellaneous/path.m +++ b/scripts/miscellaneous/path.m @@ -40,8 +40,9 @@ if (nargin == 0) if (nargout == 0) - puts ("\nLOADPATH contains the following directories:\n\n %s\n\n", - strrep (DEFAULT_LOADPATH, ":", "\n "); + puts ("\nLOADPATH contains the following directories:\n\n "); + puts (strrep (DEFAULT_LOADPATH, ":", "\n ")); + puts ("\n\n"); else p = LOADPATH; endif
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2003-11-17 John W. Eaton <jwe@bevo.che.wisc.edu> + * DLD-FUNCTIONS/qz.cc (qz): Use x.data()+offset instead of &a(i,j). + First and third args for dlag2 are const. + * DLD-FUNCTIONS/sort.cc (Fsort): Use const qualifier as appropriate. * DLD-FUNCTIONS/balance.cc (balance): Use data() instead of
--- a/src/DLD-FUNCTIONS/qz.cc +++ b/src/DLD-FUNCTIONS/qz.cc @@ -107,7 +107,7 @@ F77_CHAR_ARG_LEN_DECL); F77_RET_T - F77_FUNC (dlag2, DLAG2) (double* A, const int& LDA, double* B, + F77_FUNC (dlag2, DLAG2) (const double* A, const int& LDA, const double* B, const int& LDB, const double& SAFMIN, double& SCALE1, double& SCALE2, double& WR1, double& WR2, double& WI); @@ -760,8 +760,10 @@ // fortran_vec instead of &aa(jj,jj) here. double scale1, scale2, wr1, wr2, wi; + const double *aa_ptr = aa.data () + jj*nn+jj; + const double *bb_ptr = bb.data () + jj*nn+jj; F77_XFCN (dlag2, DLAG2, - (&aa(jj,jj), nn, &bb(jj,jj), nn, safmin, + (aa_ptr, nn, bb_ptr, nn, safmin, scale1, scale2, wr1, wr2, wi)); #ifdef DEBUG_EIG