Mercurial > hg > octave-max
changeset 4172:2e94b2abfe6d
[project @ 2002-11-12 21:14:04 by jwe]
| author | jwe |
|---|---|
| date | Tue, 12 Nov 2002 21:14:04 +0000 |
| parents | 04694e5b4239 |
| children | 2aea727f516f |
| files | scripts/ChangeLog scripts/signal/bartlett.m src/ChangeLog src/sighandlers.cc src/toplev.cc src/toplev.h |
| diffstat | 6 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2002-11-12 John W. Eaton <jwe@bevo.che.wisc.edu> + + * signal/bartlett.m: Avoid row/column mismatch error. + 2002-11-12 Paul Kienzle <pkienzle@users.sf.net> * statistics/base/var.m: Use better formula for improved accuracy.
--- a/scripts/signal/bartlett.m +++ b/scripts/signal/bartlett.m @@ -44,10 +44,7 @@ else m = m - 1; n = fix (m / 2); - c (1 : n+1) = 2 * (0 : n)' / m; - c (n+2 : m+1) = 2 - 2 * (n+1 : m)'/m; + c = [2*(0:n)/m, 2-2*(n+1:m)/m]'; endif - c = c'; - endfunction
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2002-11-12 John W. Eaton <jwe@bevo.che.wisc.edu> + * toplev.cc (octave_initialized): New global variable. + (main_loop): Set it to true here. + * sighandlers.cc (sigint_handler): Exit immediately if we have not + finished init process. + * load-save.cc (extract_keyword): Return std::string, not char *. Change all uses. (read_ascii_data): Likewise.
--- a/src/sighandlers.cc +++ b/src/sighandlers.cc @@ -283,6 +283,9 @@ MAYBE_REINSTALL_SIGHANDLER (sig, sigint_handler); + if (! octave_initialized) + exit (1); + if (can_interrupt) { #if defined (USE_EXCEPTIONS_FOR_INTERRUPTS)
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -78,6 +78,9 @@ // TRUE means we are exiting via the builtin exit or quit functions. static bool quitting_gracefully = false; +// TRUE means we've processed all the init code and we are good to go. +bool octave_initialized = false; + // Current command to execute. tree_statement_list *global_command = 0; @@ -108,6 +111,8 @@ octave_catch_interrupts (); + octave_initialized = true; + // The big loop. int retval = 0;