Mercurial > octave-nkf
changeset 14181:6b28e8a8c777 stable
Merge in Carn̈́ë's changes
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Mon, 09 Jan 2012 15:19:21 -0500 |
| parents | 4942b3011541 (current diff) a7a020cd6106 (diff) |
| children | f8d99761244c |
| files | doc/interpreter/octave_logo.svg libcruft/arpack/LICENSE libcruft/arpack/README libcruft/arpack/docs/README libcruft/arpack/docs/debug.doc libcruft/arpack/docs/ex-complex.doc libcruft/arpack/docs/ex-nonsym.doc libcruft/arpack/docs/ex-sym.doc libcruft/arpack/docs/stat.doc libcruft/arpack/module.mk libcruft/arpack/src/cgetv0.f libcruft/arpack/src/cnaitr.f libcruft/arpack/src/cnapps.f libcruft/arpack/src/cnaup2.f libcruft/arpack/src/cnaupd.f libcruft/arpack/src/cneigh.f libcruft/arpack/src/cneupd.f libcruft/arpack/src/cngets.f libcruft/arpack/src/csortc.f libcruft/arpack/src/cstatn.f libcruft/arpack/src/debug.h libcruft/arpack/src/dgetv0.f libcruft/arpack/src/dlaqrb.f libcruft/arpack/src/dnaitr.f libcruft/arpack/src/dnapps.f libcruft/arpack/src/dnaup2.f libcruft/arpack/src/dnaupd.f libcruft/arpack/src/dnconv.f libcruft/arpack/src/dneigh.f libcruft/arpack/src/dneupd.f libcruft/arpack/src/dngets.f libcruft/arpack/src/dsaitr.f libcruft/arpack/src/dsapps.f libcruft/arpack/src/dsaup2.f libcruft/arpack/src/dsaupd.f libcruft/arpack/src/dsconv.f libcruft/arpack/src/dseigt.f libcruft/arpack/src/dsesrt.f libcruft/arpack/src/dseupd.f libcruft/arpack/src/dsgets.f libcruft/arpack/src/dsortc.f libcruft/arpack/src/dsortr.f libcruft/arpack/src/dstatn.f libcruft/arpack/src/dstats.f libcruft/arpack/src/dstqrb.f libcruft/arpack/src/sgetv0.f libcruft/arpack/src/slaqrb.f libcruft/arpack/src/snaitr.f libcruft/arpack/src/snapps.f libcruft/arpack/src/snaup2.f libcruft/arpack/src/snaupd.f libcruft/arpack/src/snconv.f libcruft/arpack/src/sneigh.f libcruft/arpack/src/sneupd.f libcruft/arpack/src/sngets.f libcruft/arpack/src/ssaitr.f libcruft/arpack/src/ssapps.f libcruft/arpack/src/ssaup2.f libcruft/arpack/src/ssaupd.f libcruft/arpack/src/ssconv.f libcruft/arpack/src/sseigt.f libcruft/arpack/src/ssesrt.f libcruft/arpack/src/sseupd.f libcruft/arpack/src/ssgets.f libcruft/arpack/src/ssortc.f libcruft/arpack/src/ssortr.f libcruft/arpack/src/sstatn.f libcruft/arpack/src/sstats.f libcruft/arpack/src/sstqrb.f libcruft/arpack/src/stat.h libcruft/arpack/src/version.h libcruft/arpack/src/zgetv0.f libcruft/arpack/src/znaitr.f libcruft/arpack/src/znapps.f libcruft/arpack/src/znaup2.f libcruft/arpack/src/znaupd.f libcruft/arpack/src/zneigh.f libcruft/arpack/src/zneupd.f libcruft/arpack/src/zngets.f libcruft/arpack/src/zsortc.f libcruft/arpack/src/zstatn.f libcruft/arpack/util/cmout.f libcruft/arpack/util/cvout.f libcruft/arpack/util/dmout.f libcruft/arpack/util/dvout.f libcruft/arpack/util/icnteq.f libcruft/arpack/util/icopy.f libcruft/arpack/util/iset.f libcruft/arpack/util/iswap.f libcruft/arpack/util/ivout.f libcruft/arpack/util/second.f libcruft/arpack/util/smout.f libcruft/arpack/util/svout.f libcruft/arpack/util/zmout.f libcruft/arpack/util/zvout.f scripts/deprecated/sphcat.m scripts/deprecated/spvcat.m src/oct-parse.yy test/test_contin.m test/test_index-wfi-f.m test/test_index-wfi-t.m test/test_logical-wfi-f.m test/test_logical-wfi-t.m |
| diffstat | 2072 files changed, 6067 insertions(+), 41845 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Sat Dec 24 23:15:29 2011 +0000 +++ b/.hgsubstate Mon Jan 09 15:19:21 2012 -0500 @@ -1,1 +1,1 @@ -bb052d4a7416accaad0747e84bd2a0accbfcf923 gnulib +3559997a03e82d650aaa708447362fe20a6eaf15 gnulib
--- a/.hgtags Sat Dec 24 23:15:29 2011 +0000 +++ b/.hgtags Mon Jan 09 15:19:21 2012 -0500 @@ -55,3 +55,4 @@ b0e70a71647b671ebcfa7a79af1ae6d3c0f52065 release-3-4-3 3781981be535e80d44c85373b8fdaa60ca5cd097 ss-3-5-90 ff5588774680d4f54567311fc109c8e351950f1c ss-3-5-91 +a737b3fb9c4d89d3694da6b4e623aeee64b212e1 ss-3-5-92
--- a/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. #
--- a/NEWS Sat Dec 24 23:15:29 2011 +0000 +++ b/NEWS Mon Jan 09 15:19:21 2012 -0500 @@ -3,6 +3,10 @@ ** The PCRE library is now required to build Octave. + ** The ARPACK library is no longer distributed with Octave. + If you need the eigs() or svds() functions you must provide an external + ARPACK through a package manager or by compiling it yourself. + ** Many of Octave's binary operators (.*, .^, +, -, ...) now perform automatic broadcasting for array operations that allows you to use operator notation instead of calling bsxfun or expanding arrays (and @@ -42,13 +46,13 @@ += -= .+= .-= .*= ./= .\= .^= .**= &= |= - See the new "Broadcasting Operations" chapter in the manual for more - details. + See the "Broadcasting" section in the new "Vectorization and Faster + Code Execution" chapter of the manual for more details. ** Octave now features a profiler, thanks to the work of Daniel Kraft under the Google Summer of Code mentorship program. The manual has been updated to reflect this addition. The new user-visible - functions are profexplore, profile, and profshow. + functions are profile, profshow, and profexplore. ** Overhaul of statistical distribution functions @@ -167,10 +171,12 @@ ** Other new functions added in 3.6.0: - is_dq_string nthargout usejava - is_sq_string python waitbar - narginchk recycle zscore - + bicg nthargout usejava + is_dq_string narginchk waitbar + is_sq_string python zscore + is_function_handle register_graphics_toolkit + loaded_graphics_toolkits recycle + ** Deprecated functions. The following functions were deprecated in Octave 3.2 and have been
--- a/README Sat Dec 24 23:15:29 2011 +0000 +++ b/README Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ GNU Octave -- a high-level language for numerical computations. -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Overview --------
--- a/build-aux/bootstrap Sat Dec 24 23:15:29 2011 +0000 +++ b/build-aux/bootstrap Mon Jan 09 15:19:21 2012 -0500 @@ -4,7 +4,7 @@ # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2011 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by
--- a/build-aux/bootstrap.conf Sat Dec 24 23:15:29 2011 +0000 +++ b/build-aux/bootstrap.conf Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ getopt-gnu gettimeofday glob + isatty link lstat mkdir @@ -48,8 +49,10 @@ opendir pathmax progname + readdir readlink rename + rewinddir rmdir round roundf
--- a/build-aux/common.mk Sat Dec 24 23:15:29 2011 +0000 +++ b/build-aux/common.mk Mon Jan 09 15:19:21 2012 -0500 @@ -243,6 +243,10 @@ READLINE_LIBS = @READLINE_LIBS@ TERM_LIBS = @TERM_LIBS@ +ARPACK_CPPFLAGS = @ARPACK_CPPFLAGS@ +ARPACK_LDFLAGS = @ARPACK_LDFLAGS@ +ARPACK_LIBS = @ARPACK_LIBS@ + DL_LIBS = @DL_LIBS@ LIBS = @LIBS@ @@ -452,6 +456,9 @@ -e "s|%OCTAVE_CONF_AMD_LIBS%|\"${AMD_LIBS}\"|" \ -e "s|%OCTAVE_CONF_AR%|\"${AR}\"|" \ -e "s|%OCTAVE_CONF_ARFLAGS%|\"${ARFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_ARPACK_CPPFLAGS%|\"${ARPACK_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_ARPACK_LDFLAGS%|\"${ARPACK_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_ARPACK_LIBS%|\"${ARPACK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_BLAS_LIBS%|\"${BLAS_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CAMD_CPPFLAGS%|\"${CAMD_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_CAMD_LDFLAGS%|\"${CAMD_LDFLAGS}\"|" \
--- a/build-aux/mk-opts.pl Sat Dec 24 23:15:29 2011 +0000 +++ b/build-aux/mk-opts.pl Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/configure.ac Sat Dec 24 23:15:29 2011 +0000 +++ b/configure.ac Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 1993-2011 John W. Eaton +dnl Copyright (C) 1993-2012 John W. Eaton ### ### This file is part of Octave. ### @@ -27,14 +27,14 @@ EXTERN_CFLAGS="$CFLAGS" EXTERN_CXXFLAGS="$CXXFLAGS" -AC_INIT([GNU Octave], [3.5.91+], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [3.5.92+], [http://octave.org/bugs.html], [octave]) dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="46" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2011-12-23" -OCTAVE_COPYRIGHT="Copyright (C) 2011 John W. Eaton and others." +OCTAVE_RELEASE_DATE="2012-01-06" +OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER) AC_SUBST(OCTAVE_API_VERSION) @@ -1173,6 +1173,19 @@ LIBS="$save_LIBS" fi +save_LIBS="$LIBS" +LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" +OCTAVE_CHECK_LIBRARY(arpack, ARPACK, + [ARPACK not found. The eigs function will be disabled.], + [], + [dseupd], + [Fortran 77], [don't use the ARPACK library, disable eigs function], + [warn_arpack= + OCTAVE_CHECK_ARPACK_OK([ + AC_DEFINE(HAVE_ARPACK, 1, [Define if ARPACK is available.])], [ + warn_arpack="ARPACK library found, but seems not to work properly -- disabling eigs function"])]) +LIBS="$save_LIBS" + ### Enable dynamic linking. --enable-shared implies this, so ### --enable-dl is only need if you are only building static libraries ### and want to try dynamic linking too (works on some systems, for @@ -1613,7 +1626,7 @@ AC_CHECK_FUNCS(basename canonicalize_file_name \ chmod dup2 endgrent endpwent execvp expm1 expm1f fork \ getegid geteuid getgid getgrent getgrgid getgrnam getpgrp getpid \ - getppid getpwent getpwuid getuid getwd _kbhit kill \ + getppid getpwent getpwuid getuid getwd _kbhit \ lgamma lgammaf lgamma_r lgammaf_r localtime_r log1p log1pf \ mkstemp pipe putenv \ realpath resolvepath rindex roundl select setgrent setlocale \ @@ -2150,6 +2163,9 @@ AMD CPPFLAGS: $AMD_CPPFLAGS AMD LDFLAGS: $AMD_LDFLAGS AMD libraries: $AMD_LIBS + ARPACK CPPFLAGS: $ARPACK_CPPFLAGS + ARPACK LDFLAGS: $ARPACK_LDFLAGS + ARPACK libraries: $ARPACK_LIBS BLAS libraries: $BLAS_LIBS CAMD CPPFLAGS: $CAMD_CPPFLAGS CAMD LDFLAGS: $CAMD_LDFLAGS @@ -2395,7 +2411,7 @@ AC_MSG_WARN([Make. This should work automatically for gfortran. If]) AC_MSG_WARN([you use another compiler, you will need to set this]) AC_MSG_WARN([variable on the configure command line. You must also]) - AC_MSG_WARN([compile the BLAS, LAPACK, QRUPDATE, and SuiteSparse]) + AC_MSG_WARN([compile the ARPACK, BLAS, LAPACK, QRUPDATE, and SuiteSparse]) AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) AC_MSG_WARN([]) warn_msg_printed=true
--- a/doc/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's doc/interpreter directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. #
--- a/doc/faq/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/faq/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's doc/faq directory # -# Copyright (C) 1996-2011 John W. Eaton +# Copyright (C) 1996-2012 John W. Eaton # # This file is part of Octave. #
--- a/doc/faq/OctaveFAQ.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/faq/OctaveFAQ.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -% Copyright (C) 1997-2011 John W. Eaton +% Copyright (C) 1997-2012 John W. Eaton % % This file is part of Octave. %
--- a/doc/icons/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/icons/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's doc/icons directory # -# Copyright (C) 2011 John W. Eaton +# Copyright (C) 2012 John W. Eaton # # This file is part of Octave. #
--- a/doc/interpreter/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's doc/interpreter directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. # @@ -148,7 +148,8 @@ system.texi \ testfun.texi \ tips.texi \ - var.texi + var.texi \ + vectorize.texi TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi)
--- a/doc/interpreter/arith.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/arith.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -189,10 +189,6 @@ @DOCSTRING(sumsq) -@DOCSTRING(accumarray) - -@DOCSTRING(accumdim) - @node Utility Functions @section Utility Functions
--- a/doc/interpreter/audio.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/audio.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 Kurt Hornik +@c Copyright (C) 1996-2012 Kurt Hornik @c @c This file is part of Octave. @c
--- a/doc/interpreter/basics.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/basics.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/bugs.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/bugs.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/container.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/container.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -507,9 +507,7 @@ The simplest way to process data in a structure is within a @code{for} loop (@pxref{Looping Over Structure Elements}). A similar effect can be achieved with the @code{structfun} function, where a user defined -function is applied to each field of the structure. - -@DOCSTRING(structfun) +function is applied to each field of the structure. @xref{doc-structfun}. Alternatively, to process the data in a structure, the structure might be converted to another type of container before being treated. @@ -887,9 +885,7 @@ is to iterate through it using one or more @code{for} loops. The same idea can be implemented more easily through the use of the @code{cellfun} function that calls a user-specified function on all elements of a cell -array. - -@DOCSTRING(cellfun) +array. @xref{doc-cellfun}. An alternative is to convert the data to a different container, such as a matrix or a data structure. Depending on the data this is possible
--- a/doc/interpreter/contrib.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/contrib.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,5 @@ -@c Copyright (C) 2008-2011 Jaroslav Hajek +@c Copyright (C) 2012 John W. Eaton +@c Copyright (C) 2008-2012 Jaroslav Hajek @c @c This file is part of Octave. @c @@ -25,6 +26,8 @@ @menu * How to Contribute:: +* Building the Development Sources:: +* Basics of Generating a Changeset:: * General Guidelines:: * Octave Sources (m-files):: * C++ Sources:: @@ -41,6 +44,86 @@ (@url{http://octave.sf.net}). Note that the Octave project is inherently more conservative and follows narrower rules. +@node Building the Development Sources +@section Building the Development Sources + +In addition to all the tools (both optional and required) that are +listed in @ref{Build Dependencies} you will need: + +@table @asis +@item Mercurial +Distributed version control system (@url{http://mercurial.selenic.com}). +Octave's sources are stored in a Mercurial archive. + +@item Git +Distributed version control system (@url{http://git-scm.com}). The +gnulib sources that Octave depends on are stored in a Git archive. +@end table + +Once you have the required tools installed, you can build Octave by +doing + +@itemize @bullet +@item +Check out a copy of the Octave sources: +@example +hg clone http://hg.savannah.gnu.org/hgweb/octave +@end example + +@item +Change to the top-level directory of the newly checked out sources: +@example +cd octave +@end example + +@item +Generate the necessary configuration files: +@example +./autogen.sh +@end example + +@item +Create a build directory and change to it: +@example +mkdir build +cd build +@end example +By using a separate build directory, you will keep the source directory +clean and it will be easy to completely remove all files generated by +the build. You can also have parallel build trees for different +purposes that all share the same sources. For example, one build tree +may be configured to disable compiler optimization in order to allow for +easier debugging while another may be configured to test building with +other specialized compiler flags. + +@item +Run Octave's configure script from the build directory: +@example +../configure +@end example + +@item +Run make in the build directory: +@example +make +@end example +@end itemize + +Once the build is finished, you will see a message like the following: + +@example +@group +Octave successfully built. Now choose from the following: + + ./run-octave - to run in place to test before installing + make check - to run the tests + make install - to install (PREFIX=...) +@end group +@end example + +@node Basics of Generating a Changeset +@section Basics of Generating a Changeset + The preferable form of contribution is creating a Mercurial changeset and sending it via e-mail to the octave-maintainers mailing list. Mercurial is the source code management system currently used to develop @@ -115,7 +198,7 @@ comment header (use appropriate year, name and comment marks): @example -## Copyright (C) 1996-2011 John W. Eaton <jwe@@octave.org> +## Copyright (C) 1996-2012 John W. Eaton <jwe@@octave.org> ## ## This file is part of Octave. ##
--- a/doc/interpreter/contributors.in Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/contributors.in Mon Jan 09 15:19:21 2012 -0500 @@ -3,6 +3,7 @@ Giles Anderson Joel Andersson Muthiah Annamalai +Marco Atzeri Shai Ayal Roger Banks Ben Barrowes @@ -15,12 +16,16 @@ Don Bindner Jakub Bogusz Moritz Borgmann +Paul Boven Richard Bovey +John Bradshaw Marcus Brinkmann Remy Bruno +Ansgar Burchard Marco Caliari Daniel Calvelo John C. Campbell +Juan Pablo Carbajal Jean-Francois Cardoso Joao Cardoso Larrie Carr @@ -36,14 +41,18 @@ Martin Dalecki Jorge Barros de Abreu Carlo de Falco +Jacob Dawid Thomas D. Dean Philippe Defert Bill Denney +Fabian Deutsch Christos Dimitrakakis David M. Doolin +Carnë Draug Pascal A. Dupuis John W. Eaton Dirk Eddelbuettel +Pieter Eendebak Paul Eggert Stephen Eglen Peter Ekberg @@ -71,6 +80,7 @@ David Grundberg Peter Gustafson Kai Habel +Patrick Häcker William P. Y. Hadisoeseno Jaroslav Hajek Benjamin Hall @@ -98,6 +108,7 @@ Cai Jianming Steven G. Johnson Heikki Junes +Matthias Jüschke Atsushi Kajita Jarkko Kaleva Mohamed Kamoun @@ -109,11 +120,13 @@ Paul Kienzle Aaron A. King Arno J. Klaassen +Alexander Klein Geoffrey Knauth Heine Kolltveit Ken Kouno Kacper Kowalik Daniel Kraft +Aravindh Krishnamoorthy Oyvind Kristiansen Piotr Krzyzanowski Volker Kuhlmann @@ -127,16 +140,19 @@ Dirk Laurie Maurice LeBrun Friedrich Leisch +Jyh-miin Lin Timo Lindfors Benjamin Lindner Ross Lippert David Livings +Sebastien Loisel Erik de Castro Lopo Massimo Lorenzin Emil Lucretiu Hoxide Ma James Macnicol Jens-Uwe Mager +Rob Mahurin Ricardo Marranita Orestes Mas Makoto Matsumoto @@ -175,23 +191,30 @@ Jim Peterson Danilo Piazzalunga Nicholas Piper +Elias Pipping Robert Platt Hans Ekkehard Plesser Tom Poage Orion Poplawski Ondrej Popp Jef Poskanzer -Francesco Potorti +Francesco Potortì Konstantinos Poulios +Jarno Rajahalme James B. Rawlings Eric S. Raymond Balint Reczey +Joshua Redstone +Lukas Reichlin Michael Reifenberger +Anthony Richardson Jason Riedy +E. Joshua Rigler Petter Risholm Matthew W. Roberts Andrew Ross Mark van Rossum +Joe Rothweiler Kevin Ruland Kristian Rumberg Ryan Rusaw @@ -201,7 +224,7 @@ Radek Salac Ben Sapp Aleksej Saushev -Alois Schloegl +Alois Schlögl Michel D. Schmid Julian Schnidder Nicol N. Schraudolph @@ -213,15 +236,18 @@ Vanya Sergeev Baylis Shanks Andriy Shinkarchuck +Robert T. Short Joseph P. Skudlarek John Smith Julius Smith Shan G. Smith +Peter L. Sondergaard Joerg Specht Quentin H. Spencer Christoph Spiel Richard Stallman Russell Standish +Brett Stewart Doug Stewart Jonathan Stickel Judd Storrs @@ -230,27 +256,31 @@ John Swensen Daisuke Takago Ariel Tankus +Matthew Tenny Georg Thimm Duncan Temple Lang Kris Thielemans Olaf Till Christophe Tournery Thomas Treichl +Karsten Trulsen Frederick Umminger Utkarsh Upadhyay Stefan van der Walt -David Wells Peter Van Wieren James R. Van Zandt Gregory Vanuxem Ivana Varekova Thomas Walter +Andreas Weber Olaf Weber Thomas Weber Rik Wehbring Bob Weigel Andreas Weingessel +Martin Weiser Michael Weitzel +David Wells Fook Fah Yap Sean Young Michael Zeising
--- a/doc/interpreter/cp-idx.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/cp-idx.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/data.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/data.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/debug.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/debug.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/diagperm.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/diagperm.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2009-2011 Jaroslav Hajek +@c Copyright (C) 2009-2012 Jaroslav Hajek @c @c This file is part of Octave. @c
--- a/doc/interpreter/diffeq.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/diffeq.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/doccheck/aspell-octave.en.pws Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/doccheck/aspell-octave.en.pws Mon Jan 09 15:19:21 2012 -0500 @@ -38,6 +38,7 @@ autoloaded autoloading Autoloading +Automake autoregression autoregressions autoscaled @@ -82,7 +83,9 @@ brackety breakpoint Brenan +broadcastable Brockwell +BSX builtin builtins ButtonDownFcn @@ -162,6 +165,10 @@ ctranspose CTRL CTS +cummax +cummin +cumprod +cumsum cURL Cuthill cxsparse @@ -226,6 +233,7 @@ eigenvectors eigs Ekerdt +elementwise Elfers elseif emacs @@ -299,6 +307,7 @@ fprintf FreeBSD freespacing +FreeType freetype frnd frob @@ -333,6 +342,7 @@ globbing glpk GLS +gnulib gnuplot Gnuplot gnuplot's @@ -342,6 +352,7 @@ Goto gotos GPL +GPLK gplot grabdemo GradObj @@ -397,6 +408,7 @@ Hypergeometric hypergeometric IEEE +ifelse iff ifft ifftn @@ -478,6 +490,7 @@ libcurl liblapack liboctave +Libtool licensors lineanchors linefeeds @@ -544,6 +557,7 @@ mex Michelsen Microsystems +MinGW minima Minimizers Minitab @@ -565,6 +579,7 @@ mpoles mpower mrdivide +MSYS mtimes Multi multi @@ -601,6 +616,7 @@ nocompute nolabel noncommercially +nonconformant nonsmooth nonzeros noperm @@ -616,6 +632,7 @@ nthargout NTSC nul +Numpy Nx nzmax oct @@ -736,6 +753,8 @@ Reindent relicensing ren +renderer +repelems repmat resampled resampling @@ -771,6 +790,7 @@ SCO screenful se +sed seealso semidefinite Sep @@ -781,6 +801,7 @@ SIGNUM sim SIMAX +SIMD simplechol simplecholperm simplematrix @@ -864,6 +885,7 @@ substring substrings SuiteSparse +sumsq SunOS superiorto supradiagonal @@ -897,6 +919,7 @@ tinv Tisseur Tisseur's +tmp Toeplitz tokenExtents TolF @@ -1034,6 +1057,7 @@ ydata yerrorbar yerrorbars +ylim yy YY yyyy @@ -1044,3 +1068,4 @@ zer Ziggurat zlib +zlim
--- a/doc/interpreter/doccheck/mk_undocumented_list Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/doccheck/mk_undocumented_list Mon Jan 09 15:19:21 2012 -0500 @@ -9,7 +9,7 @@ where = cellfun (\@which, funclist, \"UniformOutput\", 0)' _END_OCT_SCRIPT_ -die "Unable to invoke 'run-octave'. Exiting\n" unless (@octave_output); +unless (@octave_output) { die "Unable to invoke 'run-octave'. Exiting\n" ;} ################################################################################ # Winnow list of functions that require a DOCSTRING @@ -86,9 +86,9 @@ F_DUPFD F_GETFD F_GETFL +fact finite fmod -fntests F_SETFD F_SETFL gammaln
--- a/doc/interpreter/dynamic.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/dynamic.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2007-2011 John W. Eaton and David Bateman +@c Copyright (C) 2007-2012 John W. Eaton and David Bateman @c Copyright (C) 2007 Paul Thomas and Christoph Spiel @c @c This file is part of Octave.
--- a/doc/interpreter/emacs.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/emacs.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 Kurt Hornik +@c Copyright (C) 1996-2012 Kurt Hornik @c @c This file is part of Octave. @c
--- a/doc/interpreter/errors.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/errors.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/eval.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/eval.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/expr.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/expr.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -512,36 +512,39 @@ @cindex complex-conjugate transpose The following arithmetic operators are available, and work on scalars -and matrices. +and matrices. The element-by-element operators and functions broadcast +(@pxref{Broadcasting}). @table @asis @item @var{x} + @var{y} @opindex + Addition. If both operands are matrices, the number of rows and columns -must both agree. If one operand is a scalar, its value is added to -all the elements of the other operand. +must both agree, or they must be broadcastable to the same shape. @item @var{x} .+ @var{y} @opindex .+ -Element by element addition. This operator is equivalent to @code{+}. +Element-by-element addition. This operator is equivalent to @code{+}. @item @var{x} - @var{y} @opindex - Subtraction. If both operands are matrices, the number of rows and -columns of both must agree. +columns of both must agree, or they must be broadcastable to the same +shape. @item @var{x} .- @var{y} -Element by element subtraction. This operator is equivalent to @code{-}. +Element-by-element subtraction. This operator is equivalent to @code{-}. @item @var{x} * @var{y} @opindex * -Matrix multiplication. The number of columns of @var{x} must agree -with the number of rows of @var{y}. +Matrix multiplication. The number of columns of @var{x} must agree with +the number of rows of @var{y}, or they must be broadcastable to the same +shape. @item @var{x} .* @var{y} @opindex .* -Element by element multiplication. If both operands are matrices, the -number of rows and columns must both agree. +Element-by-element multiplication. If both operands are matrices, the +number of rows and columns must both agree, or they must be +broadcastable to the same shape. @item @var{x} / @var{y} @opindex / @@ -559,7 +562,7 @@ @item @var{x} ./ @var{y} @opindex ./ -Element by element right division. +Element-by-element right division. @item @var{x} \ @var{y} @opindex \ @@ -577,7 +580,7 @@ @item @var{x} .\ @var{y} @opindex .\ -Element by element left division. Each element of @var{y} is divided +Element-by-element left division. Each element of @var{y} is divided by each corresponding element of @var{x}. @item @var{x} ^ @var{y} @@ -598,8 +601,13 @@ @itemx @var{x} .** @var{y} @opindex .** @opindex .^ -Element by element power operator. If both operands are matrices, the -number of rows and columns must both agree. +Element-by-element power operator. If both operands are matrices, the +number of rows and columns must both agree, or they must be +broadcastable to the same shape. If several complex results are +possible, the one with smallest non-negative argument (angle) is taken. +This rule may return a complex root even when a real root is also possible. +Use @code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a +real result is preferred. @item -@var{x} @opindex - @@ -624,7 +632,7 @@ Transpose. @end table -Note that because Octave's element by element operators begin with a +Note that because Octave's element-by-element operators begin with a @samp{.}, there is a possible ambiguity for statements like @example @@ -715,7 +723,8 @@ All of Octave's comparison operators return a value of 1 if the comparison is true, or 0 if it is false. For matrix values, they all -work on an element-by-element basis. For example: +work on an element-by-element basis. Broadcasting rules apply. +@xref{Broadcasting}. For example: @example @group @@ -725,9 +734,9 @@ @end group @end example -If one operand is a scalar and the other is a matrix, the scalar is -compared to each element of the matrix in turn, and the result is the -same size as the matrix. +According to broadcasting rules, if one operand is a scalar and the +other is a matrix, the scalar is compared to each element of the matrix +in turn, and the result is the same size as the matrix. @table @code @item @var{x} < @var{y} @@ -862,8 +871,8 @@ @var{boolean} is false. @end table -For matrix operands, these operators work on an element-by-element -basis. For example, the expression +These operators work on an element-by-element basis. For example, the +expression @example [1, 0; 0, 1] & [1, 0; 2, 3] @@ -872,8 +881,8 @@ @noindent returns a two by two identity matrix. -For the binary operators, the dimensions of the operands must conform if -both are matrices. If one of the operands is a scalar and the other a +For the binary operators, broadcasting rules apply. @xref{Broadcasting}. +In particular, if one of the operands is a scalar and the other a matrix, the operator is applied to the scalar and each element of the matrix.
--- a/doc/interpreter/fn-idx.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/fn-idx.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/func.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/func.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -1145,6 +1145,8 @@ @end group @end example +@DOCSTRING(is_function_handle) + @DOCSTRING(functions) @DOCSTRING(func2str) @@ -1225,8 +1227,6 @@ @DOCSTRING(formula) -@DOCSTRING(vectorize) - @DOCSTRING(symvar) @node Commands @@ -1350,6 +1350,9 @@ @item polynomial Functions for manipulating polynomials. +@item prefs +Functions implementing user-defined preferences. + @item set Functions for creating and manipulating sets of unique values.
--- a/doc/interpreter/geometry.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/geometry.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2007-2011 John W. Eaton and David Bateman +@c Copyright (C) 2007-2012 John W. Eaton and David Bateman @c @c This file is part of Octave. @c
--- a/doc/interpreter/geometryimages.m Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/geometryimages.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/doc/interpreter/grammar.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/grammar.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/gui.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/gui.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2011 Rik Wehbring +@c Copyright (C) 2012 Rik Wehbring @c @c This file is part of Octave. @c
--- a/doc/interpreter/image.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/image.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/install.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/install.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -44,7 +44,188 @@ @cindex installing Octave The procedure for installing Octave from source on a Unix-like system is -described below. Building on other platforms will follow similar steps. +described below. Building on other platforms will follow similar +steps. Note that this description applies to Octave releases. Building +the development sources from the Mercurial archive requires additional +steps as described in @ref{Building the Development Sources}. + +@menu +* Build Dependencies:: +* Running Configure and Make:: +* Compiling Octave with 64-bit Indexing:: +* Installation Problems:: +@end menu + +@node Build Dependencies +@section Build Dependencies + +Octave is a fairly large program with many build dependencies. You may +be able to find pre-packaged versions of the dependencies distributed as +part of your system, or you may have to build some or all of them +yourself. + +The following tools are required: + +@table @asis +@item C++, C, and Fortran compilers +The Octave sources are primarily written in C++, but some portions are +also written in C and Fortran. The Octave sources are intended to be +portable. Recent versions of the GNU compiler collection (GCC) should +work (@url{http://gcc.gnu.org}). If you use GCC, you should avoid +mixing versions. For example, be sure that you are not using the +obsolete @code{g77} Fortran compiler with modern versions of @code{gcc} +and @code{g++}. + +@item GNU Make +Tool for building software (@url{http://www.gnu.org/software/make}). +Octave's build system requires GNU Make. Other versions of Make will +not work. Fortunately, GNU Make is highly portable and easy to install. + +@item AWK, sed, and other Unix utilities +Basic Unix system utilities are required for building Octave. All will +be available with any modern Unix system and also on Windows with either +Cygwin or MinGW and MSYS. +@end table + +Additionally, the following tools may be needed: + +@table @asis +@item Bison +Parser generator (@url{http://www.gnu.org/software/bison}). +You will need Bison if you modify the @code{oct-parse.yy} source file or +if you delete the files that are generated from it. + +@item Flex +Lexer analyzer (@url{http://www.gnu.org/software/flex}). You will need +Flex if you modify the @code{lex.ll} source file or if you delete the +files that are generated from it. + +@item Autoconf +Package for software configuration +(@url{http://www.gnu.org/software/autoconf}). Autoconf is required if +you modify Octave's @code{configure.ac} file or other files that it +requires. + +@item Automake +Package for Makefile generation +(@url{http://www.gnu.org/software/automake}). Automake is required if +you modify Octave's @code{Makefile.am} files or other files that they +depend on. + +@item Libtool +Package for building software libraries +(@url{http://www.gnu.org/software/libtool}). Libtool is required by +Automake. +@end table + +The following external packages are required: + +@table @asis +@item BLAS +Basic Linear Algebra Subroutine library +(@url{http://www.netlib.org/blas}). Accelerated BLAS libraries such as +ATLAS (@url{http://math-atlas.sourceforge.net}) are recommeded for +better performance. +@item LAPACK +Linear Algebra Package (@url{http://www.netlib.org/lapack}). +@item PCRE +The Perl Compatible Regular Expression library (http://www.pcre.org). +@end table + +The following external package is optional but strongly recommended: + +@table @asis +@item GNU Readline +Command-line editing library (@url{www.gnu.org/s/readline}). +@end table + +If you wish to build Octave without GNU readline installed, you must use +the @code{--disable-readline} option when running the configure script. + +The following external software packages are optional but recommended: + +@table @asis +@item ARPACK +Library for the solution of large-scale eigenvalue problems +(@url{http://forge.scilab.org/index.php/p/arpack-ng}). ARPACK is +required to provide the functions @code{eigs} and @code{svds}. + +@item cURL +Library for transferring data with URL syntax +(@url{http://curl.haxx.se}). cURL is required to provide the +@code{urlread} and @code{urlwrite} functions and the @code{ftp} class. + +@item FFTW3 +Library for computing discrete Fourier transforms +(@url{http://www.fftw.org}). FFTW3 is used to provide better +performance for functions that compute discrete Fourier transforms +(@code{fft}, @code{ifft}, @code{fft2}, etc.) + +@item FLTK +Portable GUI toolkit (@url{http://www.fltk.org}). FLTK is currently +used to provide windows for Octave's OpenGL-based graphics functions. + +@item fontconfig +Library for configuring and customizing font access +(@url{http://www.freedesktop.org/wiki/Software/fontconfig}). Fontconfig +is used to manage fonts for Octave's OpenGL-based graphics functions. + +@item FreeType +Portable font engine (@url{http://www.freetype.org}). FreeType is used +to perform font rendering for Octave's OpenGL-based graphics functions. + +@item GLPK +GNU Linear Programming Kit (@url{http://www.gnu.org/software/glpk}). +GPLK is required for the function @code{glpk}. + +@item gnuplot +Interactive graphics program (@url{http://www.gnuplot.info}). gnuplot +is currently the default graphics renderer for Octave. + +@item GraphicsMagick++ +Image processing library (@url{http://www.graphicsmagick.org}). +GraphicsMagick++ is used to provide the @code{imread} and @code{imwrite} +functions. + +@item HDF5 +Library for manipulating portable data files +(@url{http://www.hdfgroup.org/HDF5}). HDF5 is required for Octave's +@code{load} and @code{save} commands to read and write HDF data files. + +@item OpenGL +API for portable 2D and 3D graphics (@url{http://www.opengl.org}). An +OpenGL implementation is required to provide Octave's OpenGL-based +graphics functions. Octave's OpenGL-based graphics functions usually +outperform the gnuplot-based graphics functions because plot data can be +rendered directly instead of sending data and commands to gnuplot for +interpretation and rendering. + +@item Qhull +Computational geometry library (@url{http://www.qhull.org}). Qhull is +required to provide the functions @code{convhull}, @code{convhulln}, +@code{delaunay}, @code{delaunay3}, @code{delaunayn}, @code{voronoi}, and +@code{voronoin}. + +@item QRUPDATE +QR factorization updating library +(@url{http://sourceforge.net/projects/qrupdate}). QRUPDATE is used to +provide improved performance for the functions @code{qrdelete}, +@code{qrinsert}, @code{qrshift}, and @code{qrupdate}. + +@item SuiteSparse +Sparse matrix factorization library +(@url{http://www.cise.ufl.edu/research/sparse/SuiteSparse}). +SuiteSparse is required to provide sparse matrix factorizations and +solution of linear equations for sparse systems. + +@item zlib +Data compression library (@url{http://zlib.net}). The zlib library is +required for Octave's @code{load} and @code{save} commands to handle +compressed data, including @sc{Matlab} v5 MAT files. +@end table + +@node Running Configure and Make +@section Running Configure and Make @itemize @bullet @item @@ -314,13 +495,8 @@ @end table @end itemize -@menu -* Compiling Octave with 64-bit Indexing:: -* Installation Problems:: -@end menu - @node Compiling Octave with 64-bit Indexing -@appendixsec Compiling Octave with 64-bit Indexing +@section Compiling Octave with 64-bit Indexing Note: the following only applies to systems that have 64-bit pointers. Configuring Octave with @option{--enable-64} cannot magically make a @@ -585,7 +761,7 @@ @end itemize @node Installation Problems -@appendixsec Installation Problems +@section Installation Problems This section contains a list of problems (and some apparent problems that don't really mean anything is wrong) that may show up during
--- a/doc/interpreter/interp.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/interp.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2007-2011 John W. Eaton +@c Copyright (C) 2007-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/interpimages.m Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/interpimages.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/doc/interpreter/intro.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/intro.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/io.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/io.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/linalg.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/linalg.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/matrix.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/matrix.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -29,7 +29,6 @@ @menu * Finding Elements and Checking Conditions:: * Rearranging Matrices:: -* Applying a Function to an Array:: * Special Utility Matrices:: * Famous Matrices:: @end menu @@ -140,13 +139,6 @@ @DOCSTRING(blkdiag) -@node Applying a Function to an Array -@section Applying a Function to an Array - -@DOCSTRING(arrayfun) - -@DOCSTRING(bsxfun) - @node Special Utility Matrices @section Special Utility Matrices
--- a/doc/interpreter/mk_doc_cache.m Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/mk_doc_cache.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 John W. Eaton +## Copyright (C) 2009-2012 John W. Eaton ## ## This program is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by
--- a/doc/interpreter/mkoctfile.1 Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/mkoctfile.1 Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2000-2011 Dirk Eddelbuettel +.\" Copyright (C) 2000-2012 Dirk Eddelbuettel .\" .\" This file is part of Octave. .\"
--- a/doc/interpreter/munge-texi.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/munge-texi.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/doc/interpreter/nonlin.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/nonlin.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/numbers.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/numbers.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/obsolete.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/obsolete.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2010-2011 John W. Eaton +@c Copyright (C) 2010-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/octave-config.1 Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/octave-config.1 Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2003-2011 Dirk Eddelbuettel +.\" Copyright (C) 2003-2012 Dirk Eddelbuettel .\" .\" This file is part of Octave. .\"
--- a/doc/interpreter/octave.1 Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/octave.1 Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -.\" Copyright (C) 1996-2011 John W. Eaton +.\" Copyright (C) 1996-2012 John W. Eaton .\" .\" This file is part of Octave. .\"
--- a/doc/interpreter/octave.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/octave.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. % @@ -197,8 +197,9 @@ * Plotting:: * Matrix Manipulation:: * Arithmetic:: -* Linear Algebra:: -* Nonlinear Equations:: +* Linear Algebra:: +* Vectorization and Faster Code Execution:: +* Nonlinear Equations:: * Diagonal and Permutation Matrices:: * Sparse Matrices:: * Numerical Integration:: @@ -600,7 +601,6 @@ * Finding Elements and Checking Conditions:: * Rearranging Matrices:: -* Applying a Function to an Array:: * Special Utility Matrices:: * Famous Matrices:: @@ -624,6 +624,15 @@ * Functions of a Matrix:: * Specialized Solvers:: +Vectorization and Faster Code Execution + +* Basic Vectorization:: +* Broadcasting:: +* Function Application:: +* Accumulation:: +* Miscellaneous Techniques:: +* Examples:: + Nonlinear Equations * Solvers:: @@ -844,7 +853,6 @@ Tips and Standards * Style Tips:: Writing clean and robust programs. -* Coding Tips:: Making code run faster. * Comment Tips:: Conventions for writing comments. * Function Headers:: Standard headers for functions. * Documentation Tips:: Writing readable documentation strings. @@ -852,6 +860,8 @@ Contributing Guidelines * How to Contribute:: +* Building the Development Sources:: +* Basics of Generating a Changeset:: * General Guidelines:: * Octave Sources (m-files):: * C++ Sources:: @@ -872,6 +882,9 @@ Installation +* Build Dependencies:: +* Running Configure and Make:: +* Compiling Octave with 64-bit Indexing:: * Installation Problems:: Emacs Octave Support @@ -910,6 +923,7 @@ @include matrix.texi @include arith.texi @include linalg.texi +@include vectorize.texi @include nonlin.texi @include diagperm.texi @include sparse.texi
--- a/doc/interpreter/octave_logo.svg Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,259 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" - id="svg2" - version="1.1" - inkscape:version="0.48.0 r9654" - sodipodi:docname="test.svg"> - <defs - id="defs4"> - <linearGradient - inkscape:collect="always" - id="linearGradient5943"> - <stop - style="stop-color:#005e80;stop-opacity:1;" - offset="0" - id="stop5945" /> - <stop - style="stop-color:#005e80;stop-opacity:0;" - offset="1" - id="stop5947" /> - </linearGradient> - <linearGradient - id="linearGradient5748" - osb:paint="solid"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop5750" /> - </linearGradient> - <linearGradient - id="linearGradient4308"> - <stop - id="stop4310" - offset="0" - style="stop-color:#008cbe;stop-opacity:1;" /> - <stop - id="stop4312" - offset="1" - style="stop-color:#000000;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient3976"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3978" /> - <stop - style="stop-color:#ff8c00;stop-opacity:1;" - offset="1" - id="stop3980" /> - </linearGradient> - <linearGradient - id="linearGradient3840"> - <stop - style="stop-color:#000000;stop-opacity:0.58035713;" - offset="0" - id="stop3842" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3844" /> - </linearGradient> - <linearGradient - id="linearGradient3755"> - <stop - style="stop-color:#008cbe;stop-opacity:1;" - offset="0" - id="stop3757" /> - <stop - style="stop-color:#b2ffff;stop-opacity:1;" - offset="1" - id="stop3759" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient5882" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.1825621,-3.1825621,10.616125,10.616125,-4957.7085,-4957.9174)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient5884" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.1825621,-3.1825621,10.616125,10.616125,-4957.7085,-4957.9174)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5943" - id="linearGradient5949" - x1="553.82886" - y1="268.30722" - x2="553.82886" - y2="754.65405" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.57247179,0,0,0.57247179,158.30205,-21.246556)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient3028" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.22914334,-0.22914334,0.7643572,0.7643572,-264.43967,-118.04761)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient3031" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.1825621,-3.1825621,10.616125,10.616125,-4957.7085,-4957.9174)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient3033" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.22914334,-0.24901479,0.7643572,0.83064268,-274.64232,-161.59239)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3755" - id="radialGradient3918" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.22914334,-0.24901479,0.7643572,0.83064268,-139.56064,-80.672649)" - cx="182.9837" - cy="395.04871" - fx="182.9837" - fy="395.04871" - r="148.95309" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.7194903" - inkscape:cx="400.83771" - inkscape:cy="794.65978" - inkscape:document-units="px" - inkscape:current-layer="g3033" - showgrid="false" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1366" - inkscape:window-height="706" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g3033" - transform="matrix(2.6880349,0,0,2.6880349,-128.19445,-235.26709)"> - <g - id="g3025" - transform="matrix(3.1442941,0,0,3.1442941,-137.08563,-202.09652)"> - <path - inkscape:connector-curvature="0" - id="path5874" - d="m 66.432103,97.488679 c -5.19584,5.646431 -3.93661,16.169031 2.81107,23.501871 6.74768,7.33285 16.42898,8.69955 21.62483,3.05312 5.19585,-5.64643 3.9402,-16.16946 -2.80749,-23.5023 -6.74768,-7.332861 -16.43256,-8.699131 -21.62841,-3.052691 z m 4.71149,2.34553 c 4.08256,-4.43659 11.589,-3.47152 16.76741,2.155961 5.17842,5.6275 6.06647,13.78491 1.98391,18.2215 -4.08256,4.43658 -11.59097,3.47369 -16.76939,-2.15381 -5.17842,-5.6275 -6.06449,-13.78704 -1.98193,-18.223651 z" - style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none" - inkscape:export-filename="C:\Users\fotios\Desktop\text5905.png" - inkscape:export-xdpi="47.908585" - inkscape:export-ydpi="47.908585" /> - <rect - ry="0.76958966" - y="99.493881" - x="85.381561" - height="4.349854" - width="4.349854" - id="rect5876" - style="fill:#ff7f2a;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:0.74403799;stroke-miterlimit:4;stroke-dasharray:none" - inkscape:export-filename="C:\Users\fotios\Desktop\text5905.png" - inkscape:export-xdpi="47.908585" - inkscape:export-ydpi="47.908585" /> - <rect - style="fill:#ff7f2a;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:0.74403799;stroke-miterlimit:4;stroke-dasharray:none" - id="rect5878" - width="10.245436" - height="10.245436" - x="60.92659" - y="105.2245" - ry="1.8126545" - inkscape:export-filename="C:\Users\fotios\Desktop\text5905.png" - inkscape:export-xdpi="47.908585" - inkscape:export-ydpi="47.908585" /> - <rect - ry="1.0951102" - y="118.63705" - x="87.404739" - height="6.1897531" - width="6.1897531" - id="rect5880" - style="fill:#ff7f2a;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:0.74403799;stroke-miterlimit:4;stroke-dasharray:none" - inkscape:export-filename="C:\Users\fotios\Desktop\text5905.png" - inkscape:export-xdpi="47.908585" - inkscape:export-ydpi="47.908585" /> - </g> - </g> - <flowRoot - xml:space="preserve" - id="flowRoot3016" - style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:ZapfEllipt BT;font-style:normal;font-weight:normal;font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:ZapfEllipt BT;font-stretch:normal;font-variant:normal"><flowRegion - id="flowRegion3018"><rect - id="rect3020" - width="835.43738" - height="362.30096" - x="-17.876692" - y="14.322274" /></flowRegion><flowPara - id="flowPara3022" /></flowRoot> </g> -</svg>
--- a/doc/interpreter/oop.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/oop.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2008-2011 David Bateman +@c Copyright (C) 2008-2012 David Bateman @c Copyright (C) 2009 VZLU Prague @c @c This file is part of Octave.
--- a/doc/interpreter/op-idx.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/op-idx.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/optim.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/optim.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/package.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/package.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2007-2011 S�ren Hauberg +@c Copyright (C) 2007-2012 S�ren Hauberg @c @c This file is part of Octave. @c
--- a/doc/interpreter/plot.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/plot.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -3283,6 +3283,10 @@ @DOCSTRING(available_graphics_toolkits) +@DOCSTRING(loaded_graphics_toolkits) + +@DOCSTRING(register_graphics_toolkit) + @menu * Customizing Toolkit Behavior:: @end menu
--- a/doc/interpreter/plotimages.m Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/plotimages.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton and David Bateman +## Copyright (C) 2007-2012 John W. Eaton and David Bateman ## ## This file is part of Octave. ##
--- a/doc/interpreter/poly.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/poly.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/preface.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/preface.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/quad.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/quad.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/set.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/set.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/signal.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/signal.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/sparse.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/sparse.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2004-2011 David Bateman +@c Copyright (C) 2004-2012 David Bateman @c @c This file is part of Octave. @c @@ -223,8 +223,6 @@ @DOCSTRING(speye) -@DOCSTRING(spfun) - @DOCSTRING(spones) @DOCSTRING(sprand)
--- a/doc/interpreter/sparseimages.m Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/sparseimages.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/doc/interpreter/stats.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/stats.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/stmt.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/stmt.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/strings.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/strings.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/system.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/system.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/interpreter/testfun.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/testfun.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 2005-2011 David Bateman +@c Copyright (C) 2005-2012 David Bateman @c Copyright (C) 2002-2005 Paul Kienzle @c @c This file is part of Octave.
--- a/doc/interpreter/tips.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/tips.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c @@ -28,7 +28,6 @@ @menu * Style Tips:: Writing clean and robust programs. -* Coding Tips:: Making code run faster. * Comment Tips:: Conventions for writing comments. * Function Headers:: Standard headers for functions. * Documentation Tips:: Writing readable documentation strings. @@ -75,203 +74,6 @@ copyright to anyone else, then place your name in the copyright notice. @end itemize -@node Coding Tips -@section Tips for Making Code Run Faster. -@cindex execution speed -@cindex speedups - -Here are some ways of improving the execution speed of Octave programs. - -@itemize @bullet -@item -Vectorize loops. For instance, rather than - -@example -@group -for i = 1:n-1 - a(i) = b(i+1) - b(i); -endfor -@end group -@end example - -@noindent -write - -@example -a = b(2:n) - b(1:n-1); -@end example - -This is especially important for loops with "cheap" bodies. Often it suffices -to vectorize just the innermost loop to get acceptable performance. A general -rule of thumb is that the "order" of the vectorized body should be greater or -equal to the "order" of the enclosing loop. - -@item -Use built-in and library functions if possible. Built-in and compiled functions -are very fast. Even with a m-file library function, chances are good that it is -already optimized, or will be optimized more in a future release. - -For instance, even better than - -@example -a = b(2:n) - b(1:n-1); -@end example - -@noindent -is - -@example -a = diff (b); -@end example - - -@item -Avoid computing costly intermediate results multiple times. Octave currently -does not eliminate common subexpressions. -Also, certain internal computation results are cached for variables. -For instance, if a matrix variable is used multiple times as an index, -checking the indices (and internal conversion to integers) is only done once. - -@item -Be aware of lazy copies (copy-on-write). When a copy of an object -is created, the data is not immediately copied, but rather shared. The actual -copying is postponed until the copied data needs to be modified. For example: - -@example -@group -a = zeros (1000); # create a 1000x1000 matrix -b = a; # no copying done here -b(1) = 1; # copying done here -@end group -@end example - -Lazy copying applies to whole Octave objects such as matrices, cells, struct, -and also individual cell or struct elements (not array elements). - -Additionally, index expressions also use lazy copying when Octave can determine -that the indexed portion is contiguous in memory. For example: - -@example -@group -a = zeros (1000); # create a 1000x1000 matrix -b = a(:,10:100); # no copying done here -b = a(10:100,:); # copying done here -@end group -@end example - -This applies to arrays (matrices), cell arrays, and structs indexed using (). -Index expressions generating cs-lists can also benefit of shallow copying -in some cases. In particular, when @var{a} is a struct array, expressions like -@code{@{a.x@}, @{a(:,2).x@}} will use lazy copying, so that data can be shared -between a struct array and a cell array. - -Most indexing expressions do not live longer than their `parent' objects. -In rare cases, however, a lazily copied slice outlasts its parent, in which -case it becomes orphaned, still occupying unnecessarily more memory than needed. -To provide a remedy working in most real cases, -Octave checks for orphaned lazy slices at certain situations, when a value -is stored into a "permanent" location, such as a named variable or cell or -struct element, and possibly economizes them. For example: - -@example -@group -a = zeros (1000); # create a 1000x1000 matrix -b = a(:,10:100); # lazy slice -a = []; # the original a array is still allocated -c@{1@} = b; # b is reallocated at this point -@end group -@end example - -@item -Avoid deep recursion. Function calls to m-file functions carry a relatively -significant overhead, so rewriting a recursion as a loop often helps. Also, -note that the maximum level of recursion is limited. - -@item -Avoid resizing matrices unnecessarily. When building a single result -matrix from a series of calculations, set the size of the result matrix -first, then insert values into it. Write - -@example -@group -result = zeros (big_n, big_m) -for i = over:and_over - r1 = @dots{} - r2 = @dots{} - result (r1, r2) = new_value (); -endfor -@end group -@end example - -@noindent -instead of - -@example -@group -result = []; -for i = ever:and_ever - result = [ result, new_value() ]; -endfor -@end group -@end example - -Sometimes the number of items can't be computed in advance, and stack-like -operations are needed. When elements are being repeatedly inserted at/removed -from the end of an array, Octave detects it as stack usage and attempts to use a -smarter memory management strategy pre-allocating the array in bigger chunks. -Likewise works for cell and struct arrays. - -@example -@group -a = []; -while (condition) - @dots{} - a(end+1) = value; # "push" operation - @dots{} - a(end) = []; # "pop" operation - @dots{} -endwhile -@end group -@end example - -@item -Use @code{cellfun} intelligently. The @code{cellfun} function is a useful tool -for avoiding loops. @xref{Processing Data in Cell Arrays}. -@code{cellfun} is often used with anonymous function handles; however, calling -an anonymous function involves an overhead quite comparable to the overhead -of an m-file function. Passing a handle to a built-in function is faster, -because the interpreter is not involved in the internal loop. For example: - -@example -@group -a = @{@dots{}@} -v = cellfun (@@(x) det(x), a); # compute determinants -v = cellfun (@@det, a); # faster -@end group -@end example - -@item -Octave includes a number of other functions that can replace common types of -loops, including @code{bsxfun}, @code{arrayfun}, @code{structfun}, -@code{accumarray}. These functions can take an arbitrary function as a handle. -Be sure to get familiar with them if you want to become an Octave expert. - -@item -Avoid calling @code{eval} or @code{feval} excessively, because -they require Octave to parse input or look up the name of a function in -the symbol table. - -If you are using @code{eval} as an exception handling mechanism and not -because you need to execute some arbitrary text, use the @code{try} -statement instead. @xref{The @code{try} Statement}. - -@item -If you are calling lots of functions but none of them will need to -change during your run, set the variable -@code{ignore_function_time_stamp} to @code{"all"} so that Octave doesn't -waste a lot of time checking to see if you have updated your function -files. -@end itemize @node Comment Tips @section Tips on Writing Comments
--- a/doc/interpreter/var.txi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/interpreter/var.txi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/interpreter/vectorize.txi Mon Jan 09 15:19:21 2012 -0500 @@ -0,0 +1,678 @@ +@c Copyright (C) 2012 Jordi Gutiérrez Hermoso +@c +@c This file is part of Octave. +@c +@c Octave is free software; you can redistribute it and/or modify it +@c under the terms of the GNU General Public License as published by the +@c Free Software Foundation; either version 3 of the License, or (at +@c your option) any later version. +@c +@c Octave is distributed in the hope that it will be useful, but WITHOUT +@c ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@c FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +@c for more details. +@c +@c You should have received a copy of the GNU General Public License +@c along with Octave; see the file COPYING. If not, see +@c <http://www.gnu.org/licenses/>. + +@node Vectorization and Faster Code Execution +@chapter Vectorization and Faster Code Execution +@cindex vectorization +@cindex vectorize + +Vectorization is a programming technique that uses vector operations +instead of element-by-element loop-based operations. Besides frequently +producing more succinct Octave code, vectorization also allows for better +optimization in the subsequent implementation. The optimizations may occur +either in Octave's own Fortran, C, or C++ internal implementation, or even at a +lower level depending on the compiler and external numerical libraries used to +build Octave. The ultimate goal is to make use of your hardware's vector +instructions if possible or to perform other optimizations in software. + +Vectorization is not a concept unique to Octave, but it is particularly +important because Octave is a matrix-oriented language. Vectorized +Octave code will see a dramatic speed up (10X--100X) in most cases. + +This chapter discusses vectorization and other techniques for writing faster +code. + +@menu +* Basic Vectorization:: Basic techniques for code optimization +* Broadcasting:: Broadcasting operations +* Function Application:: Applying functions to arrays, cells, and structs +* Accumulation:: Accumulation functions +* Miscellaneous Techniques:: Other techniques for speeding up code +* Examples:: +@end menu + +@node Basic Vectorization +@section Basic Vectorization + +To a very good first approximation, the goal in vectorization is to +write code that avoids loops and uses whole-array operations. As a +trivial example, consider + +@example +@group +for i = 1:n + for j = 1:m + c(i,j) = a(i,j) + b(i,j); + endfor +endfor +@end group +@end example + +@noindent +compared to the much simpler + +@example +c = a + b; +@end example + +@noindent +This isn't merely easier to write; it is also internally much easier to +optimize. Octave delegates this operation to an underlying +implementation which, among other optimizations, may use special vector +hardware instructions or could conceivably even perform the additions in +parallel. In general, if the code is vectorized, the underlying +implementation has more freedom about the assumptions it can make +in order to achieve faster execution. + +This is especially important for loops with "cheap" bodies. Often it +suffices to vectorize just the innermost loop to get acceptable +performance. A general rule of thumb is that the "order" of the +vectorized body should be greater or equal to the "order" of the +enclosing loop. + +As a less trivial example, instead of + +@example +@group +for i = 1:n-1 + a(i) = b(i+1) - b(i); +endfor +@end group +@end example + +@noindent +write + +@example +a = b(2:n) - b(1:n-1); +@end example + +This shows an important general concept about using arrays for indexing +instead of looping over an index variable. @xref{Index Expressions}. +Also use boolean indexing generously. If a condition needs to be tested, +this condition can also be written as a boolean index. For instance, +instead of + +@example +@group +for i = 1:n + if a(i) > 5 + a(i) -= 20 + endif +endfor +@end group +@end example + +@noindent +write + +@example +a(a>5) -= 20; +@end example + +@noindent +which exploits the fact that @code{a > 5} produces a boolean index. + +Use elementwise vector operators whenever possible to avoid looping +(operators like @code{.*} and @code{.^}). @xref{Arithmetic Ops}. For +simple inline functions, the @code{vectorize} function can do this +automatically. + +@DOCSTRING(vectorize) + +Also exploit broadcasting in these elementwise operators both to avoid +looping and unnecessary intermediate memory allocations. +@xref{Broadcasting}. + +Use built-in and library functions if possible. Built-in and compiled +functions are very fast. Even with an m-file library function, chances +are good that it is already optimized, or will be optimized more in a +future release. + +For instance, even better than + +@example +a = b(2:n) - b(1:n-1); +@end example + +@noindent +is + +@example +a = diff (b); +@end example + +Most Octave functions are written with vector and array arguments in +mind. If you find yourself writing a loop with a very simple operation, +chances are that such a function already exists. The following functions +occur frequently in vectorized code: + +@itemize @bullet +@item +Index manipulation + +@itemize +@item +find + +@item +sub2ind + +@item +ind2sub + +@item +sort + +@item +unique + +@item +lookup + +@item +ifelse / merge +@end itemize + +@item +Repetition +@itemize +@item +repmat + +@item +repelems +@end itemize + +@item +Vectorized arithmetic +@itemize +@item +sum + +@item +prod + +@item +cumsum + +@item +cumprod + +@item +sumsq + +@item +diff + +@item +dot + +@item +cummax + +@item +cummin +@end itemize + +@item +Shape of higher dimensional arrays +@itemize +@item +reshape + +@item +resize + +@item +permute + +@item +squeeze + +@item +deal +@end itemize + +@end itemize + +@node Broadcasting +@section Broadcasting +@cindex broadcast +@cindex broadcasting +@cindex BSX +@cindex recycling +@cindex SIMD + +Broadcasting refers to how Octave binary operators and functions behave +when their matrix or array operands or arguments differ in size. Since +version 3.6.0, Octave now automatically broadcasts vectors, matrices, +and arrays when using elementwise binary operators and functions. +Broadly speaking, smaller arrays are ``broadcast'' across the larger +one, until they have a compatible shape. The rule is that corresponding +array dimensions must either + +@enumerate +@item +be equal, or + +@item +one of them must be 1. +@end enumerate + +@noindent +In case all dimensions are equal, no broadcasting occurs and ordinary +element-by-element arithmetic takes place. For arrays of higher +dimensions, if the number of dimensions isn't the same, then missing +trailing dimensions are treated as 1. When one of the dimensions is 1, +the array with that singleton dimension gets copied along that dimension +until it matches the dimension of the other array. For example, consider + +@example +@group +x = [1 2 3; + 4 5 6; + 7 8 9]; + +y = [10 20 30]; + +x + y +@end group +@end example + +@noindent +Without broadcasting, @code{x + y} would be an error because the dimensions +do not agree. However, with broadcasting it is as if the following +operation were performed: + +@example +@group +x = [1 2 3 + 4 5 6 + 7 8 9]; + +y = [10 20 30 + 10 20 30 + 10 20 30]; + +x + y +@result{} 11 22 33 + 14 25 36 + 17 28 39 +@end group +@end example + +@noindent +That is, the smaller array of size @code{[1 3]} gets copied along the +singleton dimension (the number of rows) until it is @code{[3 3]}. No +actual copying takes place, however. The internal implementation reuses +elements along the necessary dimension in order to achieve the desired +effect without copying in memory. + +Both arrays can be broadcast across each other, for example, all +pairwise differences of the elements of a vector with itself: + +@example +@group +y - y' +@result{} 0 10 20 + -10 0 10 + -20 -10 0 +@end group +@end example + +@noindent +Here the vectors of size @code{[1 3]} and @code{[3 1]} both get +broadcast into matrices of size @code{[3 3]} before ordinary matrix +subtraction takes place. + +A special case of broadcasting that may be familiar is when all +dimensions of the array being broadcast are 1, i.e. the array is a +scalar. Thus for example, operations like @code{x - 42} and @code{max +(x, 2)} are basic examples of broadcasting. + +For a higher-dimensional example, suppose @code{img} is an RGB image of +size @code{[m n 3]} and we wish to multiply each color by a different +scalar. The following code accomplishes this with broadcasting, + +@example +img .*= permute ([0.8, 0.9, 1.2], [1, 3, 2]); +@end example + +@noindent +Note the usage of permute to match the dimensions of the +@code{[0.8, 0.9, 1.2]} vector with @code{img}. + +For functions that are not written with broadcasting semantics, +@code{bsxfun} can be useful for coercing them to broadcast. + +@DOCSTRING(bsxfun) + +Broadcasting is only applied if either of the two broadcasting +conditions hold. As usual, however, broadcasting does not apply when two +dimensions differ and neither is 1: + +@example +@group +x = [1 2 3 + 4 5 6]; +y = [10 20 + 30 40]; +x + y +@end group +@end example + +@noindent +This will produce an error about nonconformant arguments. + +Besides common arithmetic operations, several functions of two arguments +also broadcast. The full list of functions and operators that broadcast +is + +@example + plus + .+ + minus - .- + times .* + rdivide ./ + ldivide .\ + power .^ .** + lt < + le <= + eq == + gt > + ge >= + ne != ~= + and & + or | + atan2 + hypot + max + min + mod + rem + xor + + += -= .+= .-= .*= ./= .\= .^= .**= &= |= +@end example + +Beware of resorting to broadcasting if a simpler operation will suffice. +For matrices @var{a} and @var{b}, consider the following: + +@example +@var{c} = sum (permute (@var{a}, [1, 3, 2]) .* permute (@var{b}, [3, 2, 1]), 3); +@end example + +@noindent +This operation broadcasts the two matrices with permuted dimensions +across each other during elementwise multiplication in order to obtain a +larger 3-D array, and this array is then summed along the third dimension. +A moment of thought will prove that this operation is simply the much +faster ordinary matrix multiplication, @code{@var{c} = @var{a}*@var{b};}. + +A note on terminology: ``broadcasting'' is the term popularized by the +Numpy numerical environment in the Python programming language. In other +programming languages and environments, broadcasting may also be known +as @emph{binary singleton expansion} (BSX, in @sc{matlab}, and the +origin of the name of the @code{bsxfun} function), @emph{recycling} (R +programming language), @emph{single-instruction multiple data} (SIMD), +or @emph{replication}. + +@subsection Broadcasting and Legacy Code + +The new broadcasting semantics almost never affect code that worked +in previous versions of Octave. Consequently, all code inherited from +@sc{matlab} that worked in previous versions of Octave should still work +without change in Octave. The only exception is code such as + +@example +@group +try + c = a.*b; +catch + c = a.*a; +end_try_catch +@end group +@end example + +@noindent +that may have relied on matrices of different size producing an error. +Due to how broadcasting changes semantics with older versions of Octave, +by default Octave warns if a broadcasting operation is performed. To +disable this warning, refer to its ID (@pxref{doc-warning_ids}): + +@example +warning ("off", "Octave:broadcast"); +@end example + +@noindent +If you want to recover the old behavior and produce an error, turn this +warning into an error: + +@example +warning ("error", "Octave:broadcast"); +@end example + +@noindent +For broadcasting on scalars that worked in previous versions of Octave, +this warning will not be emitted. + +@node Function Application +@section Function Application +@cindex map +@cindex apply +@cindex function application + +As a general rule, functions should already be written with matrix +arguments in mind and should consider whole matrix operations in a +vectorized manner. Sometimes, writing functions in this way appears +difficult or impossible for various reasons. For those situations, +Octave provides facilities for applying a function to each element of an +array, cell, or struct. + +@DOCSTRING(arrayfun) + +@DOCSTRING(spfun) + +@DOCSTRING(cellfun) + +@DOCSTRING(structfun) + +@node Accumulation +@section Accumulation + +Whenever it's possible to categorize according to indices the elements +of an array when performing a computation, accumulation functions can be +useful. + +@DOCSTRING(accumarray) + +@DOCSTRING(accumdim) + +@node Miscellaneous Techniques +@section Miscellaneous Techniques +@cindex execution speed +@cindex speedups +@cindex optimization + +Here are some other ways of improving the execution speed of Octave +programs. + +@itemize @bullet + +@item Avoid computing costly intermediate results multiple times. +Octave currently does not eliminate common subexpressions. Also, certain +internal computation results are cached for variables. For instance, if +a matrix variable is used multiple times as an index, checking the +indices (and internal conversion to integers) is only done once. + +@item Be aware of lazy copies (copy-on-write). +@cindex copy-on-write +@cindex COW +@cindex memory management +When a copy of an object is created, the data is not immediately copied, but +rather shared. The actual copying is postponed until the copied data needs to +be modified. For example: + +@example +@group +a = zeros (1000); # create a 1000x1000 matrix +b = a; # no copying done here +b(1) = 1; # copying done here +@end group +@end example + +Lazy copying applies to whole Octave objects such as matrices, cells, +struct, and also individual cell or struct elements (not array +elements). + +Additionally, index expressions also use lazy copying when Octave can +determine that the indexed portion is contiguous in memory. For example: + +@example +@group +a = zeros (1000); # create a 1000x1000 matrix +b = a(:,10:100); # no copying done here +b = a(10:100,:); # copying done here +@end group +@end example + +This applies to arrays (matrices), cell arrays, and structs indexed +using @samp{()}. Index expressions generating comma-separated lists can also +benefit from shallow copying in some cases. In particular, when @var{a} is a +struct array, expressions like @code{@{a.x@}, @{a(:,2).x@}} will use lazy +copying, so that data can be shared between a struct array and a cell array. + +Most indexing expressions do not live longer than their parent +objects. In rare cases, however, a lazily copied slice outlasts its +parent, in which case it becomes orphaned, still occupying unnecessarily +more memory than needed. To provide a remedy working in most real cases, +Octave checks for orphaned lazy slices at certain situations, when a +value is stored into a "permanent" location, such as a named variable or +cell or struct element, and possibly economizes them. For example: + +@example +@group +a = zeros (1000); # create a 1000x1000 matrix +b = a(:,10:100); # lazy slice +a = []; # the original a array is still allocated +c@{1@} = b; # b is reallocated at this point +@end group +@end example + +@item Avoid deep recursion. +Function calls to m-file functions carry a relatively significant overhead, so +rewriting a recursion as a loop often helps. Also, note that the maximum level +of recursion is limited. + +@item Avoid resizing matrices unnecessarily. +When building a single result matrix from a series of calculations, set the +size of the result matrix first, then insert values into it. Write + +@example +@group +result = zeros (big_n, big_m) +for i = over:and_over + ridx = @dots{} + cidx = @dots{} + result(ridx, cidx) = new_value (); +endfor +@end group +@end example + +@noindent +instead of + +@example +@group +result = []; +for i = ever:and_ever + result = [ result, new_value() ]; +endfor +@end group +@end example + +Sometimes the number of items can not be computed in advance, and +stack-like operations are needed. When elements are being repeatedly +inserted or removed from the end of an array, Octave detects it as stack +usage and attempts to use a smarter memory management strategy by +pre-allocating the array in bigger chunks. This strategy is also applied +to cell and struct arrays. + +@example +@group +a = []; +while (condition) + @dots{} + a(end+1) = value; # "push" operation + @dots{} + a(end) = []; # "pop" operation + @dots{} +endwhile +@end group +@end example + +@item Avoid calling @code{eval} or @code{feval} excessively. +Parsing input or looking up the name of a function in the symbol table are +relatively expensive operations. + +If you are using @code{eval} merely as an exception handling mechanism, and not +because you need to execute some arbitrary text, use the @code{try} +statement instead. @xref{The @code{try} Statement}. + +@item Use @code{ignore_function_time_stamp} when appropriate. +If you are calling lots of functions, and none of them will need to change +during your run, set the variable @code{ignore_function_time_stamp} to +@code{"all"}. This will stop Octave from checking the time stamp of a function +file to see if it has been updated while the program is being run. +@end itemize + +@node Examples +@section Examples + +The following are examples of vectorization questions asked by actual +users of Octave and their solutions. + +@c FIXME: We need a lot more examples here. + +@itemize @bullet +@item +For a vector @code{A}, the following loop + +@example +@group +n = length (A); +B = zeros (n, 2); +for i = 1:length(A) + ## this will be two columns, the first is the difference and + ## the second the mean of the two elements used for the diff. + B(i,:) = [A(i+1)-A(i), (A(i+1) + A(i))/2)]; +endfor +@end group +@end example + +@noindent +can be turned into the following one-liner: + +@example +B = [diff(A)(:), 0.5*(A(1:end-1)+A(2:end))(:)] +@end example + +Note the usage of colon indexing to flatten an intermediate result into +a column vector. This is a common vectorization trick. + +@end itemize
--- a/doc/liboctave/array.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/array.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/bugs.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/bugs.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/cp-idx.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/cp-idx.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/dae.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/dae.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/diffeq.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/diffeq.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/error.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/error.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/factor.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/factor.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/fn-idx.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/fn-idx.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/gpl.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/gpl.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/install.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/install.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/intro.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/intro.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/liboctave.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/liboctave.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. %
--- a/doc/liboctave/matvec.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/matvec.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/nleqn.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/nleqn.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/nlfunc.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/nlfunc.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1997-2011 John W. Eaton +@c Copyright (C) 1997-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/ode.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/ode.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/optim.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/optim.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/preface.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/preface.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/quad.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/quad.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/liboctave/range.texi Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/liboctave/range.texi Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -@c Copyright (C) 1996-2011 John W. Eaton +@c Copyright (C) 1996-2012 John W. Eaton @c @c This file is part of Octave. @c
--- a/doc/refcard/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/refcard/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's doc/refcard directory # -# Copyright (C) 1996-2011 John W. Eaton +# Copyright (C) 1996-2012 John W. Eaton # # This file is part of Octave. #
--- a/doc/refcard/refcard-a4.tex Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/refcard/refcard-a4.tex Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ % % Make a reference card that will fit on A4 paper. % -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. %
--- a/doc/refcard/refcard-legal.tex Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/refcard/refcard-legal.tex Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ % % Make a reference card that will fit on US legal paper. % -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. %
--- a/doc/refcard/refcard-letter.tex Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/refcard/refcard-letter.tex Mon Jan 09 15:19:21 2012 -0500 @@ -3,7 +3,7 @@ % Make a reference card that will fit on US letter paper % (8-1/2 by 11 inches). % -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. %
--- a/doc/refcard/refcard.tex Sat Dec 24 23:15:29 2011 +0000 +++ b/doc/refcard/refcard.tex Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ % % This file is TeX source for a reference card describing Octave. % -% Copyright (C) 1996-2011 John W. Eaton +% Copyright (C) 1996-2012 John W. Eaton % % This file is part of Octave. %
--- a/etc/HACKING Sat Dec 24 23:15:29 2011 +0000 +++ b/etc/HACKING Mon Jan 09 15:19:21 2012 -0500 @@ -189,7 +189,7 @@ ################################################################################ -Copyright (C) 2009,2011 John W. Eaton +Copyright (C) 2009,2012 John W. Eaton This file is part of Octave.
--- a/etc/README.Cygwin Sat Dec 24 23:15:29 2011 +0000 +++ b/etc/README.Cygwin Mon Jan 09 15:19:21 2012 -0500 @@ -7,17 +7,19 @@ This is a known problem with a long history and it is STRONGLY encouraged to use gcc-4.3.2-1 or later. -Current binary versions are built with gcc-4.3.4-3 while -binary version 3.0.2-2 was built with gcc-4.3.2-1. +Current binary versions are built with gcc-4.5.3-3. + -The latest development Octave development sources (octave-3.3.54+) +------- SUGGESTED CONFIGURATION --------------------------- + +The latest development Octave development sources (octave-3.5.91+) are built with: configure --enable-shared \ --enable-float-truncate \ CC=gcc-4 F77=gfortran-4 CXX=g++-4 CPP=cpp-4 lt_cv_deplibs_check_method=pass_all \ - LDFLAGS=-no-undefined + LDFLAGS=-Wl,-no-undefined "--enable-float-truncate" is needed for the following bug: http://thread.gmane.org/gmane.comp.gnu.octave.bugs/12361/focus=12404 @@ -29,6 +31,42 @@ incorrect libtool detection of system capabilities and to allow shared libs building. +"LDFLAGS=-Wl,-no-undefined" is better than previous +"LDFLAGS=-no-undefined" as gcc-4 is now complaining about +unknown command and the "undefined" is for the linker. + +The additional patch used for 3.4.3-3 package can also be +needed for 3.6.x (see below). + +------- SUGGESTION FOR FORK ISSUE -------------------------- + +The build process can fails in building images for documentation +due to fork issue of the octave dll just built. In such case +I suggest to rebase the built dll's with: + +$ find build_tree -name "*.dll" > rebase_list + +and after closing all cygwin process, from a dash shell + +$ rebaseall -s 'dll|so|oct' -T /full_path/rebase_list + +After rebasing the "make" should be able to complete the +creation of the images and the documentation. + +------------------------------------------------------ + +Octave-3.4.3-3 package was built using: + +configure --libexecdir=/usr/lib \ + --enable-shared \ + --enable-float-truncate \ + F77=gfortran-4 \ + lt_cv_deplibs_check_method=pass_all \ + LDFLAGS=-no-undefined + +plus and additional patch to solve a specific cygwin +fltk print issue, see: +https://savannah.gnu.org/bugs/?31641 Octave-3.2.4 was built using: @@ -38,14 +76,14 @@ CC=gcc-4 F77=gfortran-4 CXX=g++-4 CPP=cpp-4 CFLAGS="-Dtimezone=_timezone" - +------------------------------------------------------ Current Cygwin package maintainer for Octave: Marco Atzeri http://matzeri.altervista.org Marco Atzeri -marco_atzeri@yahoo.it +marco.atzeri@gmail.com Italy -Last updated: Mon Jan 3 18:53:41 WEST 2011 +Last updated: Tue Jan 3 14:40:58 WEST 2012
--- a/examples/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/examples/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's examples directory # -# Copyright (C) 1996-2011 John W. Eaton +# Copyright (C) 1996-2012 John W. Eaton # # This file is part of Octave. #
--- a/libcruft/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's libcruft directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. # @@ -69,7 +69,6 @@ EXTRA_DIST = include amos/module.mk -include arpack/module.mk include blas-xtra/module.mk include daspk/module.mk include dasrt/module.mk
--- a/libcruft/arpack/LICENSE Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -BSD Software License - -Pertains to ARPACK and P_ARPACK - -Copyright (c) 1996-2008 Rice University. -Developed by D.C. Sorensen, R.B. Lehoucq, C. Yang, and K. Maschhoff. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer listed - in this license in the documentation and/or other materials - provided with the distribution. - -- Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/libcruft/arpack/README Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -1. You have successfully unbundled ARPACK and are now in the ARPACK - directory that was created for you. - -2. Recent bug fixes are included in patch.tar.gz and ppatch.tar.gz - If you have not retrieved these files, please do so and place them in - the directory right above the current directory. (They should - be in the same directory where arpack96.tar and parpack96.tar reside). - Use uncompress or gunzip to unzip the tar files, and use 'tar -xvf ' - to unbundle these patches. The source codes in these patches will - overwrite those contained in arpack96.tar and parpack96.tar. - -3. Upon executing the 'ls | more ' command you should see - - BLAS - DOCUMENTS - EXAMPLES - LAPACK - README - SRC - UTIL - Makefile - ARmake.inc - ARMAKES - PARPACK - - The following entries are directories: - - ARMAKES, BLAS, DOCUMENTS, EXAMPLES, LAPACK, SRC, UTIL, PARPACK - - The directory SRC contains the top level routines including - the highest level reverse communication interface routines - - ssaupd, dsaupd - symmetric single and double precision - snaupd, dnaupd - non-symmetric single and double precision - cnaupd, znaupd - complex non-symmetric single and double precision - - The headers of these routines contain full documentation of calling - sequence and usage. Additional information is in the DOCUMENTS directory. - - The directory PARPACK contains the Parallel ARPACK routines. - - -3. Example driver programs that illustrate all the computational modes, - data types and precisions may be found in the EXAMPLES directory. - Upon executing the 'ls EXAMPLES | more ' command you should see - - BAND - COMPLEX - NONSYM - README - SIMPLE - SVD - SYM - - Example programs for banded, complex, nonsymmetric, symmetric, - and singular value decomposition may be found in the directories - BAND, COMPLEX, NONSYM, SYM, SVD respectively. Look at the README - file for further information. To get started, get into the SIMPLE - directory to see example programs that illustrate the use of ARPACK in - the simplest modes of operation for the most commonly posed - standard eigenvalue problems. - - - Example programs for Parallel ARPACK may be found in the directory - PARPACK/EXAMPLES. Look at the README file for further information. - - The following instructions explain how to make the ARPACK library. - -4. Before you can compile anything, you must first edit and correct the file - ARmake.inc. Sample ARmake.inc's can be found in the ARMAKES directory. - If you plan on using Parallel ARPACK you will need to use those sample - files which contain either BLACS or MPI in their name. For example, - ARmake.MPI-$(PLAT) or ARmake.BLACS-$(PLAT). - Edit "ARmake.inc" and change the definition "home" to the root of the - source tree (Top level of ARPACK directory) - - The makefile is set up to build a self-contained library which includes - the needed BLAS 1/2/3 and LAPACK routines. If you already have the - BLAS and LAPACK libraries installed on your system you might want to - change the definition of DIRS as indicated in the ARmake.inc file. - - *** NOTE *** The LAPACK library on your system MUST be the public release. - The current release is version 2.0. If you are not certain if the public - release has been installed, we strongly recommend that you compile and link - to the subset of LAPACK included here. - - -5. You will also need to change the file "second.f" in the UTIL directory - to whatever is appropriate for timing on your system. The "second" routine - provided works on most workstations. If you are running on a Cray, - copy the file "second.f.CRAYT3D" to "second.f" to use the rtf system - function. - - -6. Do "make lib" in the current directory to build the standard library - "libarpack_$(PLAT).a" (serial code) - - To build the the parallel library, "parpack_$(COMMLIB)-$(PLAT).a", - type "make plib". When using the parallel routines you must link to - both the serial library and the parallel library. - - -7. Within DOCUMENTS directory there are three files - - ex-sym.doc - ex-nonsym.doc and - ex-complex.doc - - for templates on how to invoke the computational modes of ARPACK. - Also look in the README file for explanations concerning the - other documents. - - - Danny Sorensen at sorensen@caam.rice.edu - Richard Lehoucq at rblehou@sandia.gov - Chao Yang at cyang@lbl.gov - Kristi Maschhoff at kristyn@tera.com - - Good luck and enjoy. -
--- a/libcruft/arpack/docs/README Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - There are five documents within the DOCUMENT subdirectory. - In summary, - - ex-nonsym.doc, ex-sym.doc and ex-complex.doc - ------------- ---------- -------------- - Example Templates of how to invoke the different computational - modes offered by [D,S]NAUPD, [D,S]SAUPD and [C,Z]NAUPD. - - stat.doc - -------- - File that gets timing statistics for the different parts - of the Arnoldi update iteration codes within ARPACK. - - debug.doc - --------- - File that explains the different printing options of the - Arnoldi update iteration codes within ARPACK.
--- a/libcruft/arpack/docs/debug.doc Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,339 +0,0 @@ - ARPACK provides a means to trace the progress of the computation - as it proceeds. Various levels of output may be specified - from no output, level = 0, to voluminous, level = 3. - The following statements may be used within the calling program to - initiate and request this output. - - include 'debug.h' - ndigit = -3 - logfil = 6 - msgets = 0 - msaitr = 0 - msapps = 0 - msaupd = 1 - msaup2 = 0 - mseigt = 0 - mseupd = 0 - - The parameter "logfil" specifies the logical unit number of the output - file. The parameter "ndigit" specifies the number of decimal digits - and the width of the output lines. A positive value of "ndigit" - specifies that 132 columns are used during output and a negative - value specifies eighty columns are to be used. The values of the remaining - parameters indicate the output levels from the indicated routines. - - For the above example, "msaitr" indicates the level of output requested - for the subroutine ssaitr or dsaitr. The above configuration will - give a breakdown of the number of matrix vector products required, - the total number of iterations, the number of re-orthogonalization - steps and an estimate of the time spent in each routine and phase of the - computation. The following output is produced: - ---------------------------------------------------------------------- - ========================================== - = Symmetric implicit Arnoldi update code = - = Version Number: 2.1 = - = Version Date: 11/15/95 = - ========================================== - = Summary of timing statistics = - ========================================== - - - Total number update iterations = 8 - Total number of OP*x operations = 125 - Total number of B*x operations = 0 - Total number of reorthogonalization steps = 125 - Total number of iterative refinement steps = 0 - Total number of restart steps = 0 - Total time in user OP*x operation = 0.020002 - Total time in user B*x operation = 0.000000 - Total time in Arnoldi update routine = 0.210021 - Total time in ssaup2 routine = 0.190019 - Total time in basic Arnoldi iteration loop = 0.110011 - Total time in reorthogonalization phase = 0.070007 - Total time in (re)start vector generation = 0.000000 - Total time in trid eigenvalue subproblem = 0.040004 - Total time in getting the shifts = 0.000000 - Total time in applying the shifts = 0.040004 - Total time in convergence testing = 0.000000 - ---------------------------------------------------------------------- - - The user is encouraged to experiment with the other settings - once some familiarity has been gained with the routines. - - The include statement sets up the storage declarations that are - solely associated with this trace debugging feature. "debug.h" - has the following structure: - ---------------------------------------------------------------------- -c -c\SCCS Information: @(#) -c FILE: debug.h SID: 2.3 DATE OF SID: 11/16/95 RELEASE: 2 -c -c %---------------------------------% -c | See debug.doc for documentation | -c %---------------------------------% - integer logfil, ndigit, mgetv0, - & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, - & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, - & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd - common /debug/ - & logfil, ndigit, mgetv0, - & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, - & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, - & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd ---------------------------------------------------------------------- - - - The parameters "msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd" - are for the symmetric codes, while - "mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd" are for the - nonsymmetric codes and, finally, - "mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd" are for the complex - arithmetic codes. A comprehensive break down of each parameter is given - below. - - ========================================================== - === Common to symmetric, nonsymmetric and complex code === - ========================================================== - - - logfil: unit number where the logfile (debug) is written - - ndigit: number of digits used in the debug output - ndigit < 0: printing is done with 72 columns. - ndigit > 0: printing is done with 132 columns. - - mgetv0 > 0: print residual vector generated. - - ====================================== - === Specific to the symmetric code === - ====================================== - - msaupd > 0: *Print the number of iterations taken, - number of "converged" eigenvalues, - final Ritz values and corresponding Ritz estimates. - *Print various timing statistics. - - msaup2 > 0: *Print major iteration number, - number of "converged" Ritz values on exit, - B-norm of the residual vector of length NCV factorization, - B-norm of the residual vector of length NEV factorization, - residual norm before exit, - Ritz values and corresponding Ritz estimates before exit. - msaup2 > 1: print number of unreduced submatrices, - Ritz values and corresponding Ritz estimates of the current - T matrix, actual values for NEV and NP, - wanted Ritz values and corresponding Ritz estimates, - shifts selected. - msaup2 > 2: print "unwanted" Ritz values and corresponding Ritz - estimates, order NCV matrix T (diagonal and off-diagonal), - unwanted Ritz values and error bounds. - - msaitr > 0: print iteration number, residual norm, restart info - print if an off diagonal element of T became negative. - msaitr > 1: print the final matrix T. - msaitr > 2: print Arnoldi vector no. generate at iteration j, - b-norm of residual vector at each iteration, - print rnorm and rnorm1 for iterative refinement, - print wnorm and rnorm used for Re-orthogonalization, - V^T * B * (resid/B-norm(resid)), - print the results of whether the current residual vector is - orthogonal to the current Lanczos basis. - msaitr > 3: print the matrix T at each iteration. - print the residual vector and arnoldi vectors. - - mseigt > 0: print the current matrix T. - - msgets > 0: print NEV and NP, - eigenvalues of and corresponding Ritz estimates of the - current T matrix. - - msapps > 0: print information about deflation at row/column no. - msapps > 1: print initial matrix T - print sigmak, betak and matrix T after all shifts - msapps > 2: print the matrix T after the application of each shift. - msapps > 3: updated residual for next iteration. - - mseupd > 1: print eigenvalues of the final T matrix, - the last row of the eigenvector matrix for T, - if reordered, reordered last row of the eigenvector matrix, - reordered NCV Ritz values of the final T matrix, - if type = 'REGULAR', untransformed "converged" Ritz values - and corresponding Ritz estimates, - NCV Ritz values of the final T matrix, - last row of the eigenvector matrix for T, - if reordered, reordered last row of the eigenvector matrix, - reordered NCV Ritz values of the final T. - - mseupd > 2: print the matrix T. - - ========================================= - === Specific to the nonsymmetric code === - ========================================= - - mnaupd > 0: *Print the number of iterations taken, - number of "converged" eigenvalues, - real and imaginary parts of the converged Ritz values - and their corresponding Ritz estimates, - *Print various timing statistics. - - mnaup2 > 0: *Print major iteration number. - *Print the number of "converged" Ritz values on exit, - and the real and imaginary parts of the "converged" Ritz - values and corresponding Ritz estimates. - mnaup2 > 1: *Print the length of the Arnoldi Factorization, - and the B-norm of its residual vector. - *Print NEV and NP, real and imaginary parts of the "wanted" - Ritz values and associated Ritz estimates at each - iteration. - *Print the B-norm of the residual of the compressed - factorization and the compressed upper Hessenberg matrix H. - mnaup2 > 2: *Print the real and imaginary parts of all the Ritz values - and associated Ritz estimates, NEV, NP, NUMCNV, NCONV. - *Print the real and imaginary parts of the shifts. If the - exact shift strategy is used, print the associated Ritz - estimates of the shifts. - *Print the real and imaginary parts of the Ritz values - and the corresponding Ritz estimates obtained from _neigh. - - mnaitr > 0: *Print if a restart is needed. - mnaitr > 1: *Print the number of Arnoldi vector being generated and - the B-norm of the current residual. - mnaitr > 2: *Print j-th column of the Hessenberg matrix H. - *Print reorthogonalization and iterative refinement information, - *Print the final upper Hessenberg matrix of order K+NEV. - mnaitr > 3: *Print V^T*B*resid/(B-norm(resid)). - mnaitr > 4: *Print current upper Hessenberg matrix. - mnaitr > 5: *Print updated arnoldi vectors and the residual vector. - - mneigh > 1: *Print the last row of the Schur matrix for H, and - the last row of the eigenvector matrix for H. - mneigh > 2: *Print the entering upper Hessenberg matrix. - *Print the real and imaginary part of eigenvalues - of the current Hessenberg matrix, and associated - Ritz estimates. - - mngets > 0: *Print the real and imaginary parts of the Ritz values - of the Hessenberg matrix and their the corresponding - error bounds, KEV, NP. - - mnapps > 0: *Print information about where deflation occured. - mnapps > 1: *Print sigmak, betak, order of the final Hessenberg matrix, - and the final compressed upper Hessenberg matrix. - mnapps > 2: *Print implicit application of shift number, real and imaginary - part of the shift. - *Print the indices of the submatrix that the shift is applied. - mnapps > 3: *Print the matrix H before and after the application of - each shift, updated residual for next iteration. - mnapps > 4: *Print the accumulated orthogonal Hessenberg matrix Q, - updated matrix of Arnoldi vectors. - - mneupd > 0: *Print the number of converged Ritz values, B-norm of the - residual, all NCV Ritz values and error bounds. - mneupd > 1: *Print the final upper Hessenberg matrix computed by _naupd. - *If Ritz vectors are requested, print real and imaginary parts - of the eigenvalues and the last row of the Schur vectors as - computed by _neupd. - mneupd > 2: *If Ritz vectors are requested, print the threshold eigenvalue - used for re-ordering. - *If Ritz vectors are requested, print the number of eigenvalues - to reorder and the number of converged Ritz values. - *If Ritz vectors are requested, print the upper quasi-matrix - computed by _neupd. - *If Ritz vectors are requested, print the real and imaginary - part of the Ritz values. - *If Ritz vectors are requested, print the last row of the - eigenvector matrix. - *Print the NCV Ritz estimates in the original system. - mneupd > 3: *Print the integer array of pointers. - *If Ritz vectors are requested, print the eigenvector matrix. - *If Ritz vectors are requested, print the reordered upper - quasi-triangular matrix. - mneupd > 4: *If Ritz vectors are requested, print the Q matrix of the QR - factorization of the matrix representing the wanted invariant - subspace. - *If Ritz vectors are requested, print the Schur vectors. - *If Ritz vectors are requested, print the reordered Schur vectors. - - - ==================================== - === Specific to the complex code === - ==================================== - - mcaupd > 0: *Print the number of iterations taken, - number of "converged" eigenvalues, the converged Ritz values - and their corresponding Ritz estimates, - *Print various timing statistics. - - mcaup2 > 0: *Print major iteration number. - *Print the number of "converged" Ritz values on exit, and the - "converged" Ritz values and corresponding Ritz estimates. - mcaup2 > 1: *Print the length of the Arnoldi Factorization, - and the B-norm of its residual vector. - *Print NEV and NP, the "wanted" Ritz values and associated Ritz - estimates at each iteration. - *Print the B-norm of the residual of the compressed - factorization and the compressed upper Hessenberg matrix H. - mcaup2 > 2: *Print the all the Ritz values and associated Ritz estimates, - NEV, NP, NUMCNV, NCONV. - *Print the shifts. If the exact shift strategy is used, print the - associated Ritz estimates of the shifts. - *Print the Ritz values and the corresponding Ritz estimates obtained - from _neigh. - - mcaitr > 0: *Print if a restart is needed. - mcaitr > 1: *Print the number of Arnoldi vector being generated and - the B-norm of the current residual. - mcaitr > 2: *Print j-th column of the Hessenberg matrix H. - *Print reorthogonalization and iterative refinement information, - *Print the final upper Hessenberg matrix of order K+NEV. - mcaitr > 3: *Print V^T*B*resid/(B-norm(resid)). - mcaitr > 4: *Print current upper Hessenberg matrix. - mcaitr > 5: *Print updated Arnoldi vectors and the residual vector. - - mceigh > 1: *Print the last row of the Schur matrix for H, and - the last row of the eigenvector matrix for H. - mceigh > 2: *Print the entering upper Hessenberg matrix. - *Print the eigenvalues of the current Hessenberg matrix, and - associated Ritz estimates. - - mcgets > 0: *Print the real and imaginary parts of the Ritz values - of the Hessenberg matrix and their the corresponding - error bounds, KEV, NP. - - mcapps > 0: *Print information about where deflation occured. - mcapps > 1: *Print sigmak, betak, order of the final Hessenberg matrix, - and the final compressed upper Hessenberg matrix. - mcapps > 2: *Print implicit application of shift number, the shift. - *Print the indices of the submatrix that the shift is applied. - mcapps > 3: *Print the matrix H before and after the application of - each shift, updated residual for next iteration. - mcapps > 4: *Print the accumulated unitary Hessenberg matrix Q, and the - updated matrix of Arnoldi vectors. - - mceupd > 0: *Print the number of converged Ritz values, B-norm of the - residual, all NCV Ritz values and error bounds. - mceupd > 1: *Print the final upper Hessenberg matrix computed by _naupd. - *If Ritz vectors are requested, print the eigenvalues and the - last row of the Schur vectors as computed by _neupd. - mceupd > 2: *If Ritz vectors are requested, print the threshold eigenvalue - used for re-ordering. - *If Ritz vectors are requested, print the number of eigenvalues - to reorder and the number of converged Ritz values. - *If Ritz vectors are requested, print the upper quasi-matrix - computed by _neupd. - *If Ritz vectors are requested, print the Ritz values. - *If Ritz vectors are requested, print the last row of the - eigenvector matrix. - *Print the NCV Ritz estimates in the original system. - mceupd > 3: *Print the integer array of pointers. - *If Ritz vectors are requested, print the eigenvector matrix. - mceupd > 4: *If Ritz vectors are requested, print the Q matrix of the QR - factorization of the matrix representing the wanted invariant - subspace. - *If Ritz vectors are requested, print the Schur vectors. - - -
--- a/libcruft/arpack/docs/ex-complex.doc Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,152 +0,0 @@ -c----------------------------------------------------------------------- -c -c\Example-1 -c ... Suppose want to solve A*x = lambda*x in regular mode -c ... so OP = A and B = I. -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 1 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, rwork, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, rwork, info ) -c stop -c end -c -c\Example-2 -c ... Suppose want to solve A*x = lambda*x in shift-invert mode -c ... so OP = inv[A - sigma*I] and B = I -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*I]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iaparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, rwork, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call solve (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, rwork, info ) -c stop -c end -c -c\Example-3 -c ... Suppose want to solve A*x = lambda*M*x in regular mode -c ... so OP = inv[M]*A and B = M. -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume "call solveM(n,rhs,x)" solves M*x = rhs -c ... Assume user will supplied shifts -c ... -c ido = 0 -c iparam(7) = 2 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, rwork, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), temp_array) -c call solveM (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c -c ... delete this last conditional if want to use exact shifts -c else if (ido .eq. 3) then -c ... compute shifts and put in workl starting from the position -c ... pointed by ipntr(14). -c np = iparam(8) -c call scopy (np, shifts, 1, workl(ipntr(14), 1) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, rwork, info ) -c stop -c end -c -c\Example-4 -c ... Suppose want to solve A*x = lambda*M*x in shift-invert mode -c ... so OP = inv[A - sigma*M]*M and B = M -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, rwork, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), temp_array) -c call solve (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, rwork, info ) -c stop -c end -c\EndDoc
--- a/libcruft/arpack/docs/ex-nonsym.doc Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ -c----------------------------------------------------------------------- -c -c\Example-1 -c ... Suppose want to solve A*x = lambda*x in regular mode -c ... so OP = A and B = I. -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 1 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c stop -c end -c -c\Example-2 -c ... Suppose want to solve A*x = lambda*x in shift-invert mode -c ... so OP = inv[A - sigma*I] and B = I, sigma has zero -c ... imaginary part -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*I]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iaparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call solve (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c stop -c end -c -c\Example-3 -c ... Suppose want to solve A*x = lambda*M*x in regular mode -c ... so OP = inv[M]*A and B = M. -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume "call solveM(n,rhs,x)" solves M*x = rhs -c ... Assume user will supplied shifts -c ... -c ido = 0 -c iparam(7) = 2 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), temp_array) -c call solveM (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c -c ... delete this last conditional if want to use exact shifts -c else if (ido .eq. 3) then -c ... compute shifts and put in workl starting from the position -c ... pointed by ipntr(14). -c np = iparam(8) -c call scopy (np, shifts, 1, workl(ipntr(14), 1) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c stop -c end -c -c\Example-4 -c ... Suppose want to solve A*x = lambda*M*x in shift-invert mode -c ... so OP = inv[A - sigma*M]*M and B = M, sigma has zero -c ... imaginary part -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), temp_array) -c call solve (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c stop -c end -c -c\Example-5 -c ... Suppose want to solve A*x = lambda*M*x in shift-invert mode -c ... So OP = Real_Part{inv[A-SIGMA*M]*M and B=M, sigma has -c ... nonzero imaginary part -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... in complex arithmetic -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), temp_array) -c call solve(n, temp_array, complex_array) -c do i = 1, n -c workd(ipntr(2)+i-1) = real(complex_array(i)) -c end do -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), complex_array) -c do i = 1, n -c workd(ipntr(2)+i-1) = real(complex_array(i)) -c end do -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess. -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c ... Use Rayleigh quotient to transform d(:,1) and d(:,2) -c to the approximation to the original problem. -c stop -c end -c -c\Example-6 -c ... Suppose want to solve A*x = lambda*M*x in shift-invert mode -c ... So OP = Imaginary_Part{inv[A-SIGMA*M]*M and B=M, sigma must -c ... have nonzero imaginary part -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... in complex arithmetic -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _naupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, -c & iparam, ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), temp_array) -c call solve(n, temp_array, complex_array) -c do i = 1, n -c workd(ipntr(2)+i-1) = aimag(complex_array(i)) -c end do -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), complex_array) -c do i = 1, n -c workd(ipntr(2)+i-1) = aimag(complex_array(i)) -c end do -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _neupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _neupd ( rvec, 'All', select, d, d(1,2), v, ldv, -c & sigmar, sigmai, workev, bmat, n, which, nev, tol, -c & resid, ncv, v, ldv, iparam, ipntr, workd, workl, -c & lworkl, info ) -c ... Use Rayleigh quotient to transform d(:,1) and d(:,2) -c to the Ritz approximation to the original problem. -c stop -c end -c -c\EndDoc -
--- a/libcruft/arpack/docs/ex-sym.doc Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -c----------------------------------------------------------------------- -c -c\Example-1 -c ... Suppose want to solve A*x = lambda*x in regular mode -c ... so OP = A and B = I. -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 1 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... Call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c -c stop -c end -c -c\Example-2 -c ... Suppose want to solve A*x = lambda*x in shift-invert mode -c ... so OP = inv[A - sigma*I] and B = I. -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*I]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'I', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call solve (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... Call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c -c\Example-3 -c ... Suppose want to solve A*x = lambda*M*x in regular mode -c ... so OP = inv[M]*A and B = M. -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume "call solveM(n,rhs,x)" solves M*x = rhs -c ... Assume user will supplied shifts -c ... -c ido = 0 -c iparam(7) = 2 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1 .or. ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), temp_array) -c call _scopy (n, temp_array, 1, workd(ipntr(1)), 1) -c call solveM (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c -c ... delete this last conditional if want to use exact shifts -c else if (ido .eq. 3) then -c ... compute shifts and put in the first np locations of work -c np = iparam(8) -c call _copy (np, shifts, 1, workl(ipntr(11), 1) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c stop -c end -c -c\Example-4 -c ... Suppose want to solve A*x = lambda*M*x in shift-invert mode -c ... so OP = (inv[A - sigma*M])*M and B = M. -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 3 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), temp_array) -c call solve (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c -c stop -c end -c -c\Example-5 -c ... Suppose want to solve K*x = lambda*KG*x in Buckling mode -c ... so OP = (inv[K - sigma*KG])*K and B = K. -c ... Assume "call matvecM(n,x,y)" computes y = KG*x -c ... Assume "call matvecA(n,x,y)" computes y = K*x -c ... Assume "call solve(n,rhs,x)" solves [K - sigma*KG]*x = rhs -c ... Assume exact shifts are used -c -c ido = 0 -c iparam(7) = 4 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecA (n, workd(ipntr(1)), temp_array) -c solve (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 1) then -c call solve (n, workd(ipntr(3)), workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecA (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c stop -c end -c -c\Example-6 -c ... Suppose want to solve A*x = lambda*M*x in Cayley mode -c ... so OP = inv[A - sigma*M]*[A + sigma*M] and B = M. -c ... Assume "call matvecM(n,x,y)" computes y = M*x -c ... Assume "call matvecA(n,x,y)" computes y = A*x -c ... Assume "call solve(n,rhs,x)" solves [A - sigma*M]*x = rhs -c ... Assume exact shifts are used -c ... -c ido = 0 -c iparam(7) = 5 -c -c %------------------------------------% -c | Beginning of reverse communication | -c %------------------------------------% -c 10 continue -c call _saupd ( ido, 'G', n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c if (ido .eq. -1) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c call matvecA (n, workd(ipntr(1)), temp_array) -c call _axpy (n, sigma, workd(inptr(2)), 1, temp_array, 1) -c call solve (n, temp_array, workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 1) then -c call matvecA (n, workd(ipntr(1)), workd(ipntr(2))) -c call _axpy (n, sigma, workd(inptr(3)), 1, workd(ipntr(2)), 1) -c call _copy (n, workd(inptr(2)), 1, workd(ipntr(3)), 1) -c call solve (n, workd(ipntr(3)), workd(ipntr(2))) -c go to 10 -c else if (ido .eq. 2) then -c call matvecM (n, workd(ipntr(1)), workd(ipntr(2))) -c go to 10 -c end if -c %------------------------------% -c | End of Reverse communication | -c %------------------------------% -c -c ... call _seupd to postprocess -c ... want the Ritz vectors set rvec = .true. else rvec = .false. -c call _seupd ( rvec, 'All', select, d, z, ldz, sigma, bmat, -c & n, which, nev, tol, resid, ncv, v, ldv, iparam, -c & ipntr, workd, workl, lworkl, info ) -c stop -c end -c\EndDoc -c
--- a/libcruft/arpack/docs/stat.doc Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -c----------------------------------------------------------------------- -c -c Include this file to get timing statistics for the different parts -c of the Arnoldi update iteration. An easy way to initialize all the -c timing information to zero at the beginning is by: -c -c call sstats <-- symmetric code -c call sstatn <-- nonsymmetric code -c call cstatn <-- complex code -c -c----------------------------------------------------------------------- -c -c nopx = total number of user OP*x operation -c nbx = total number of user B*x operation (same as copy when B = I) -c nrorth = total number of reorthogonalization steps taken -c nitref = total number of it. refinement steps in reorthogonalization -c nrstrt = total number of restart steps -c -c----------------------------------------------------------------------- -c -c======================================================== -c=== Common to both symmetric and nonsymmetric code === -c======================================================== -c -c tgetv0 = total time spent in generating starting vector and -c restarted vector for the Arnoldi sequence. -c titref = total time spent in iterative refinement phase in SSAITR. -c trvec = total time spent in computing the Ritz vectors before exit. -c -c==================================== -c=== Specific to symmetric code === -c==================================== -c -c tsaupd = total time spent in SSAUPD. -c tsaup2 = total time spent in SSAUP2. -c tsaitr = total time spent in the basic Arnoldi iteration loop, -c including iterative refinement in SSAITR. -c tseigt = total time spent in computing the tridiagonal eigenvalue -c subproblem at each iteration. -c tsgets = total time spent in getting the shifts at each iteration. -c tsapps = total time spent in applying the shifts at each iteration. -c tsconv = total time spent in convergence test at each iteration. -c -c======================================= -c=== Specific to nonsymmetric code === -c======================================= -c -c tnaupd = total time spent in SNAUPD. -c tnaup2 = total time spent in SNAUP2. -c tnaitr = total time spent in the basic Arnoldi iteration loop, -c including iterative refinement in SNAITR. -c tneigh = total time spent in computing the Hessenberg eigenvalue -c subproblem at each iteration. -c tngets = total time spent in getting the shifts at each iteration. -c tnapps = total time spent in applying the shifts at each iteration. -c tnconv = total time spent in convergence test at each iteration. -c -c================================== -c=== Specific to complex code === -c================================== -c -c tcaupd = total time spent in CNAUPD. -c tcaup2 = total time spent in CNAUP2. -c tcaitr = total time spent in the basic Arnoldi iteration loop, -c including iterative refinement in CNAITR. -c tceigh = total time spent in computing the Hessenberg eigenvalue -c subproblem at each iteration. -c tcgets = total time spent in getting the shifts at each iteration. -c tcapps = total time spent in applying the shifts at each iteration. -c tcconv = total time spent in convergence test at each iteration. -c -c================== -c=== User time === -c================== -c -c tmvopx = total time spent in computing Y = OP * X -c tmvbx = total time spent in computing Y = B * X -c -c======================================================================= -c
--- a/libcruft/arpack/module.mk Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -EXTRA_DIST += \ - arpack/LICENSE \ - arpack/README \ - arpack/docs/README \ - arpack/docs/debug.doc \ - arpack/docs/ex-complex.doc \ - arpack/docs/ex-nonsym.doc \ - arpack/docs/ex-sym.doc \ - arpack/docs/stat.doc \ - arpack/module.mk \ - arpack/src/debug.h \ - arpack/src/stat.h \ - arpack/src/version.h - -libcruft_la_SOURCES += \ - arpack/src/cgetv0.f \ - arpack/src/cnaitr.f \ - arpack/src/cnapps.f \ - arpack/src/cnaup2.f \ - arpack/src/cnaupd.f \ - arpack/src/cneigh.f \ - arpack/src/cneupd.f \ - arpack/src/cngets.f \ - arpack/src/csortc.f \ - arpack/src/cstatn.f \ - arpack/src/dgetv0.f \ - arpack/src/dlaqrb.f \ - arpack/src/dnaitr.f \ - arpack/src/dnapps.f \ - arpack/src/dnaup2.f \ - arpack/src/dnaupd.f \ - arpack/src/dnconv.f \ - arpack/src/dneigh.f \ - arpack/src/dneupd.f \ - arpack/src/dngets.f \ - arpack/src/dsaitr.f \ - arpack/src/dsapps.f \ - arpack/src/dsaup2.f \ - arpack/src/dsaupd.f \ - arpack/src/dsconv.f \ - arpack/src/dseigt.f \ - arpack/src/dsesrt.f \ - arpack/src/dseupd.f \ - arpack/src/dsgets.f \ - arpack/src/dsortc.f \ - arpack/src/dsortr.f \ - arpack/src/dstatn.f \ - arpack/src/dstats.f \ - arpack/src/dstqrb.f \ - arpack/src/sgetv0.f \ - arpack/src/slaqrb.f \ - arpack/src/snaitr.f \ - arpack/src/snapps.f \ - arpack/src/snaup2.f \ - arpack/src/snaupd.f \ - arpack/src/snconv.f \ - arpack/src/sneigh.f \ - arpack/src/sneupd.f \ - arpack/src/sngets.f \ - arpack/src/ssaitr.f \ - arpack/src/ssapps.f \ - arpack/src/ssaup2.f \ - arpack/src/ssaupd.f \ - arpack/src/ssconv.f \ - arpack/src/sseigt.f \ - arpack/src/ssesrt.f \ - arpack/src/sseupd.f \ - arpack/src/ssgets.f \ - arpack/src/ssortc.f \ - arpack/src/ssortr.f \ - arpack/src/sstatn.f \ - arpack/src/sstats.f \ - arpack/src/sstqrb.f \ - arpack/src/zgetv0.f \ - arpack/src/znaitr.f \ - arpack/src/znapps.f \ - arpack/src/znaup2.f \ - arpack/src/znaupd.f \ - arpack/src/zneigh.f \ - arpack/src/zneupd.f \ - arpack/src/zngets.f \ - arpack/src/zsortc.f \ - arpack/src/zstatn.f \ - arpack/util/cmout.f \ - arpack/util/cvout.f \ - arpack/util/dmout.f \ - arpack/util/dvout.f \ - arpack/util/icnteq.f \ - arpack/util/icopy.f \ - arpack/util/iset.f \ - arpack/util/iswap.f \ - arpack/util/ivout.f \ - arpack/util/second.f \ - arpack/util/smout.f \ - arpack/util/svout.f \ - arpack/util/zmout.f \ - arpack/util/zvout.f
--- a/libcruft/arpack/src/cgetv0.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,414 +0,0 @@ -c\BeginDoc -c -c\Name: cgetv0 -c -c\Description: -c Generate a random initial residual vector for the Arnoldi process. -c Force the residual vector to be in the range of the operator OP. -c -c\Usage: -c call cgetv0 -c ( IDO, BMAT, ITRY, INITV, N, J, V, LDV, RESID, RNORM, -c IPNTR, WORKD, IERR ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to cgetv0. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B in the (generalized) -c eigenvalue problem A*x = lambda*B*x. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c ITRY Integer. (INPUT) -c ITRY counts the number of times that cgetv0 is called. -c It should be set to 1 on the initial call to cgetv0. -c -c INITV Logical variable. (INPUT) -c .TRUE. => the initial residual vector is given in RESID. -c .FALSE. => generate a random initial residual vector. -c -c N Integer. (INPUT) -c Dimension of the problem. -c -c J Integer. (INPUT) -c Index of the residual vector to be generated, with respect to -c the Arnoldi process. J > 1 in case of a "restart". -c -c V Complex N by J array. (INPUT) -c The first J-1 columns of V contain the current Arnoldi basis -c if this is a "restart". -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c RESID Complex array of length N. (INPUT/OUTPUT) -c Initial residual vector to be generated. If RESID is -c provided, force RESID into the range of the operator OP. -c -c RNORM Real scalar. (OUTPUT) -c B-norm of the generated residual. -c -c IPNTR Integer array of length 3. (OUTPUT) -c -c WORKD Complex work array of length 2*N. (REVERSE COMMUNICATION). -c On exit, WORK(1:N) = B*RESID to be used in SSAITR. -c -c IERR Integer. (OUTPUT) -c = 0: Normal exit. -c = -1: Cannot generate a nontrivial restarted residual vector -c in the range of the operator OP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c cvout ARPACK utility routine that prints vectors. -c clarnv LAPACK routine for generating a random vector. -c cgemv Level 2 BLAS routine for matrix vector multiplication. -c ccopy Level 1 BLAS that copies one vector to another. -c cdotc Level 1 BLAS that computes the scalar product of two vectors. -c scnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: getv0.F SID: 2.3 DATE OF SID: 08/27/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cgetv0 - & ( ido, bmat, itry, initv, n, j, v, ldv, resid, rnorm, - & ipntr, workd, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - logical initv - integer ido, ierr, itry, j, ldv, n - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Complex - & resid(n), v(ldv,j), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - Real - & rzero - parameter (one = (1.0E+0, 0.0E+0), zero = (0.0E+0, 0.0E+0), - & rzero = 0.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical first, inits, orth - integer idist, iseed(4), iter, msglvl, jj - Real - & rnorm0 - Complex - & cnorm - save first, iseed, inits, iter, msglvl, orth, rnorm0 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external ccopy, cgemv, clarnv, cvout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & scnrm2, slapy2 - Complex - & cdotc - external cdotc, scnrm2, slapy2 -c -c %-----------------% -c | Data Statements | -c %-----------------% -c - data inits /.true./ -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-----------------------------------% -c | Initialize the seed of the LAPACK | -c | random number generator | -c %-----------------------------------% -c - if (inits) then - iseed(1) = 1 - iseed(2) = 3 - iseed(3) = 5 - iseed(4) = 7 - inits = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mgetv0 -c - ierr = 0 - iter = 0 - first = .FALSE. - orth = .FALSE. -c -c %-----------------------------------------------------% -c | Possibly generate a random starting vector in RESID | -c | Use a LAPACK random number generator used by the | -c | matrix generation routines. | -c | idist = 1: uniform (0,1) distribution; | -c | idist = 2: uniform (-1,1) distribution; | -c | idist = 3: normal (0,1) distribution; | -c %-----------------------------------------------------% -c - if (.not.initv) then - idist = 2 - call clarnv (idist, iseed, n, resid) - end if -c -c %----------------------------------------------------------% -c | Force the starting vector into the range of OP to handle | -c | the generalized problem when B is possibly (singular). | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nopx = nopx + 1 - ipntr(1) = 1 - ipntr(2) = n + 1 - call ccopy (n, resid, 1, workd, 1) - ido = -1 - go to 9000 - end if - end if -c -c %----------------------------------------% -c | Back from computing B*(initial-vector) | -c %----------------------------------------% -c - if (first) go to 20 -c -c %-----------------------------------------------% -c | Back from computing B*(orthogonalized-vector) | -c %-----------------------------------------------% -c - if (orth) go to 40 -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) -c -c %------------------------------------------------------% -c | Starting vector is now in the range of OP; r = OP*r; | -c | Compute B-norm of starting vector. | -c %------------------------------------------------------% -c - call arscnd (t2) - first = .TRUE. - if (bmat .eq. 'G') then - nbx = nbx + 1 - call ccopy (n, workd(n+1), 1, resid, 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd, 1) - end if -c - 20 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - first = .FALSE. - if (bmat .eq. 'G') then - cnorm = cdotc (n, resid, 1, workd, 1) - rnorm0 = sqrt(slapy2(real(cnorm),aimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm0 = scnrm2(n, resid, 1) - end if - rnorm = rnorm0 -c -c %---------------------------------------------% -c | Exit if this is the very first Arnoldi step | -c %---------------------------------------------% -c - if (j .eq. 1) go to 50 -c -c %---------------------------------------------------------------- -c | Otherwise need to B-orthogonalize the starting vector against | -c | the current Arnoldi basis using Gram-Schmidt with iter. ref. | -c | This is the case where an invariant subspace is encountered | -c | in the middle of the Arnoldi factorization. | -c | | -c | s = V^{T}*B*r; r = r - V*s; | -c | | -c | Stopping criteria used for iter. ref. is discussed in | -c | Parlett's book, page 107 and in Gragg & Reichel TOMS paper. | -c %---------------------------------------------------------------% -c - orth = .TRUE. - 30 continue -c - call cgemv ('C', n, j-1, one, v, ldv, workd, 1, - & zero, workd(n+1), 1) - call cgemv ('N', n, j-1, -one, v, ldv, workd(n+1), 1, - & one, resid, 1) -c -c %----------------------------------------------------------% -c | Compute the B-norm of the orthogonalized starting vector | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call ccopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd, 1) - end if -c - 40 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - cnorm = cdotc (n, resid, 1, workd, 1) - rnorm = sqrt(slapy2(real(cnorm),aimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm = scnrm2(n, resid, 1) - end if -c -c %--------------------------------------% -c | Check for further orthogonalization. | -c %--------------------------------------% -c - if (msglvl .gt. 2) then - call svout (logfil, 1, rnorm0, ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') - call svout (logfil, 1, rnorm, ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if -c - if (rnorm .gt. 0.717*rnorm0) go to 50 -c - iter = iter + 1 - if (iter .le. 1) then -c -c %-----------------------------------% -c | Perform iterative refinement step | -c %-----------------------------------% -c - rnorm0 = rnorm - go to 30 - else -c -c %------------------------------------% -c | Iterative refinement step "failed" | -c %------------------------------------% -c - do 45 jj = 1, n - resid(jj) = zero - 45 continue - rnorm = rzero - ierr = -1 - end if -c - 50 continue -c - if (msglvl .gt. 0) then - call svout (logfil, 1, rnorm, ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then - call cvout (logfil, n, resid, ndigit, - & '_getv0: initial / restarted starting vector') - end if - ido = 99 -c - call arscnd (t1) - tgetv0 = tgetv0 + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of cgetv0 | -c %---------------% -c - end
--- a/libcruft/arpack/src/cnaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,850 +0,0 @@ -c\BeginDoc -c -c\Name: cnaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step nonsymmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in cnaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call cnaitr -c ( IDO, BMAT, N, K, NP, NB, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and do not need to be -c recomputed in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. See cnaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M**x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current size of V and H. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c NB Integer. (INPUT) -c Blocksize to be used in the recurrence. -c Only work for NB = 1 right now. The goal is to have a -c program that implement both the block and non-block method. -c -c RESID Complex array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Real scalar. (INPUT/OUTPUT) -c B-norm of the starting residual on input. -c B-norm of the updated residual r_{k+p} on output. -c -c V Complex N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex (K+NP) by (K+NP) array. (INPUT/OUTPUT) -c H is used to store the generated upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Complex work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On input, WORKD(1:N) = B*RESID and is used to save some -c computation at the first step. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of the spanning invariant subspace of OP found. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c cgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c cmout ARPACK utility routine that prints matrices -c cvout ARPACK utility routine that prints vectors. -c clanhs LAPACK routine that computes various norms of a matrix. -c clascl LAPACK routine for careful scaling of a matrix. -c slabad LAPACK routine for defining the underflow and overflow -c limits. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c cgemv Level 2 BLAS routine for matrix vector multiplication. -c caxpy Level 1 BLAS that computes a vector triad. -c ccopy Level 1 BLAS that copies one vector to another . -c cdotc Level 1 BLAS that computes the scalar product of two vectors. -c cscal Level 1 BLAS that scales a vector. -c csscal Level 1 BLAS that scales a complex vector by a real number. -c scnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naitr.F SID: 2.3 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c ( At present tol is zero ) -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in cnaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c H(:,j) = w_{j}; -c H(j,j-1) = rnorm -c rnorm = || r_(j) || -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cnaitr - & (ido, bmat, n, k, np, nb, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, nb, np - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Complex - & h(ldh,k+np), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - Real - & rone, rzero - parameter (one = (1.0E+0, 0.0E+0), zero = (0.0E+0, 0.0E+0), - & rone = 1.0E+0, rzero = 0.0E+0) -c -c %--------------% -c | Local Arrays | -c %--------------% -c - Real - & rtemp(2) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer ierr, i, infol, ipj, irj, ivj, iter, itry, j, msglvl, - & jj - Real - & ovfl, smlnum, tst1, ulp, unfl, betaj, - & temp1, rnorm1, wnorm - Complex - & cnorm -c - save first, orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, ovfl, - & betaj, rnorm1, smlnum, ulp, unfl, wnorm -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external caxpy, ccopy, cscal, csscal, cgemv, cgetv0, - & slabad, cvout, cmout, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Complex - & cdotc - Real - & slamch, scnrm2, clanhs, slapy2 - external cdotc, scnrm2, clanhs, slamch, slapy2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic aimag, real, max, sqrt -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------% -c | Set machine-dependent constants for the | -c | the splitting and deflation criterion. | -c | If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine clahqr | -c %-----------------------------------------% -c - unfl = slamch( 'safe minimum' ) - ovfl = real(one / unfl) - call slabad( unfl, ovfl ) - ulp = slamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. - j = k + 1 - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. when .... | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | cgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %-----------------------------% -c | Else this is the first step | -c %-----------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% - - 1000 continue -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: generating Arnoldi vector number') - call svout (logfil, 1, rnorm, ndigit, - & '_naitr: B-norm of the current residual is') - end if -c -c %---------------------------------------------------% -c | STEP 1: Check if the B norm of j-th residual | -c | vector is zero. Equivalent to determine whether | -c | an exact j-step Arnoldi factorization is present. | -c %---------------------------------------------------% -c - betaj = rnorm - if (rnorm .gt. rzero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - betaj = rzero - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call cgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tcaitr = tcaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call ccopy (n, resid, 1, v(1,j), 1) - if ( rnorm .ge. unfl) then - temp1 = rone / rnorm - call csscal (n, temp1, v(1,j), 1) - call csscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine clascl | -c %-----------------------------------------% -c - call clascl ('General', i, i, rnorm, rone, - & n, 1, v(1,j), n, infol) - call clascl ('General', i, i, rnorm, rone, - & n, 1, workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call ccopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | -c | if step3 = .true. | -c %----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call ccopy (n, workd(irj), 1, resid, 1) -c -c %---------------------------------------% -c | STEP 4: Finish extending the Arnoldi | -c | factorization to length j. | -c %---------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd(ipj), 1) - end if - 60 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j} | -c | if step4 = .true. | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - if (bmat .eq. 'G') then - cnorm = cdotc (n, resid, 1, workd(ipj), 1) - wnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - wnorm = scnrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - call cgemv ('C', n, j, one, v, ldv, workd(ipj), 1, - & zero, h(1,j), 1) -c -c %--------------------------------------% -c | Orthogonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call cgemv ('N', n, j, -one, v, ldv, h(1,j), 1, - & one, resid, 1) -c - if (j .gt. 1) h(j,j-1) = cmplx(betaj, rzero) -c - call arscnd (t4) -c - orth1 = .true. -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call ccopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - cnorm = cdotc (n, resid, 1, workd(ipj), 1) - rnorm = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm = scnrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c | The following test determines whether the sine of the | -c | angle between OP*x and the computed residual is less | -c | than or equal to 0.717. | -c %-----------------------------------------------------------% -c - if ( rnorm .gt. 0.717*wnorm ) go to 100 -c - iter = 0 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - rtemp(1) = wnorm - rtemp(2) = rnorm - call svout (logfil, 2, rtemp, ndigit, - & '_naitr: re-orthogonalization; wnorm and rnorm are') - call cvout (logfil, j, h(1,j), ndigit, - & '_naitr: j-th column of H') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call cgemv ('C', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %---------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) | -c | + v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j. | -c %---------------------------------------------% -c - call cgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) - call caxpy (j, one, workd(irj), 1, h(1,j), 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call ccopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - cnorm = cdotc (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt( slapy2(real(cnorm),aimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm1 = scnrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm - rtemp(2) = rnorm1 - call svout (logfil, 2, rtemp, ndigit, - & '_naitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if ( rnorm1 .gt. 0.717*rnorm ) then -c -c %---------------------------------------% -c | No need for further refinement. | -c | The cosine of the angle between the | -c | corrected residual vector and the old | -c | residual vector is greater than 0.717 | -c | In other words the corrected residual | -c | and the old residual vector share an | -c | angle of less than arcCOS(0.717) | -c %---------------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = rzero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tcaitr = tcaitr + (t1 - t0) - ido = 99 - do 110 i = max(1,k), k+np-1 -c -c %--------------------------------------------% -c | Check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine clahqr | -c %--------------------------------------------% -c - tst1 = slapy2(real(h(i,i)),aimag(h(i,i))) - & + slapy2(real(h(i+1,i+1)), aimag(h(i+1,i+1))) - if( tst1.eq.real(zero) ) - & tst1 = clanhs( '1', k+np, h, ldh, workd(n+1) ) - if( slapy2(real(h(i+1,i)),aimag(h(i+1,i))) .le. - & max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 110 continue -c - if (msglvl .gt. 2) then - call cmout (logfil, k+np, k+np, h, ldh, ndigit, - & '_naitr: Final upper Hessenberg matrix H of order K+NP') - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of cnaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/cnapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,507 +0,0 @@ -c\BeginDoc -c -c\Name: cnapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP implicit shifts resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix which is the product of rotations -c and reflections resulting from the NP bulge change sweeps. -c The updated Arnoldi factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call cnapps -c ( N, KEV, NP, SHIFT, V, LDV, H, LDH, RESID, Q, LDQ, -c WORKL, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. size of matrix A. -c -c KEV Integer. (INPUT/OUTPUT) -c KEV+NP is the size of the input matrix H. -c KEV is the size of the updated matrix HNEW. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFT Complex array of length NP. (INPUT) -c The shifts to be applied. -c -c V Complex N by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, V contains the current KEV+NP Arnoldi vectors. -c On OUTPUT, V contains the updated KEV Arnoldi vectors -c in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex (KEV+NP) by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, H contains the current KEV+NP by KEV+NP upper -c Hessenberg matrix of the Arnoldi factorization. -c On OUTPUT, H contains the updated KEV by KEV upper Hessenberg -c matrix in the KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Complex array of length N. (INPUT/OUTPUT) -c On INPUT, RESID contains the the residual vector r_{k+p}. -c On OUTPUT, RESID is the update residual vector rnew_{k} -c in the first KEV locations. -c -c Q Complex KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations and reflections -c during the bulge chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex work array of length (KEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c WORKD Complex work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c cmout ARPACK utility routine that prints matrices -c cvout ARPACK utility routine that prints vectors. -c clacpy LAPACK matrix copy routine. -c clanhs LAPACK routine that computes various norms of a matrix. -c clartg LAPACK Givens rotation construction routine. -c claset LAPACK matrix initialization routine. -c slabad LAPACK routine for defining the underflow and overflow -c limits. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c cgemv Level 2 BLAS routine for matrix vector multiplication. -c caxpy Level 1 BLAS that computes a vector triad. -c ccopy Level 1 BLAS that copies one vector to another. -c cscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: napps.F SID: 2.3 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the sublocks of -c the Hessenberg matrix H and not just to the submatrix that it -c comes from. Deflation as in LAPACK routine clahqr (QR algorithm -c for upper Hessenberg matrices ) is used. -c Upon output, the subdiagonals of H are enforced to be non-negative -c real numbers. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cnapps - & ( n, kev, np, shift, v, ldv, h, ldh, resid, q, ldq, - & workl, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex - & h(ldh,kev+np), resid(n), shift(np), - & v(ldv,kev+np), q(ldq,kev+np), workd(2*n), workl(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - Real - & rzero - parameter (one = (1.0E+0, 0.0E+0), zero = (0.0E+0, 0.0E+0), - & rzero = 0.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, iend, istart, j, jj, kplusp, msglvl - logical first - Complex - & cdum, f, g, h11, h21, r, s, sigma, t - Real - & c, ovfl, smlnum, ulp, unfl, tst1 - save first, ovfl, smlnum, ulp, unfl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external caxpy, ccopy, cgemv, cscal, clacpy, clartg, - & cvout, claset, slabad, cmout, arscnd, ivout -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & clanhs, slamch, slapy2 - external clanhs, slamch, slapy2 -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs, aimag, conjg, cmplx, max, min, real -c -c %---------------------% -c | Statement Functions | -c %---------------------% -c - Real - & cabs1 - cabs1( cdum ) = abs( real( cdum ) ) + abs( aimag( cdum ) ) -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------------% -c | Set machine-dependent constants for the | -c | stopping criterion. If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine clahqr | -c %-----------------------------------------------% -c - unfl = slamch( 'safe minimum' ) - ovfl = real(one / unfl) - call slabad( unfl, ovfl ) - ulp = slamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcapps -c - kplusp = kev + np -c -c %--------------------------------------------% -c | Initialize Q to the identity to accumulate | -c | the rotations and reflections | -c %--------------------------------------------% -c - call claset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------% -c | Chase the bulge with the application of each | -c | implicit shift. Each shift is applied to the | -c | whole matrix including each block. | -c %----------------------------------------------% -c - do 110 jj = 1, np - sigma = shift(jj) -c - if (msglvl .gt. 2 ) then - call ivout (logfil, 1, jj, ndigit, - & '_napps: shift number.') - call cvout (logfil, 1, sigma, ndigit, - & '_napps: Value of the shift ') - end if -c - istart = 1 - 20 continue -c - do 30 i = istart, kplusp-1 -c -c %----------------------------------------% -c | Check for splitting and deflation. Use | -c | a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine clahqr | -c %----------------------------------------% -c - tst1 = cabs1( h( i, i ) ) + cabs1( h( i+1, i+1 ) ) - if( tst1.eq.rzero ) - & tst1 = clanhs( '1', kplusp-jj+1, h, ldh, workl ) - if ( abs(real(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_napps: matrix splitting with shift number.') - call cvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') - end if - iend = i - h(i+1,i) = zero - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, istart, ndigit, - & '_napps: Start of current block ') - call ivout (logfil, 1, iend, ndigit, - & '_napps: End of current block ') - end if -c -c %------------------------------------------------% -c | No reason to apply a shift to block of order 1 | -c | or if the current block starts after the point | -c | of compression since we'll discard this stuff | -c %------------------------------------------------% -c - if ( istart .eq. iend .or. istart .gt. kev) go to 100 -c - h11 = h(istart,istart) - h21 = h(istart+1,istart) - f = h11 - sigma - g = h21 -c - do 80 i = istart, iend-1 -c -c %------------------------------------------------------% -c | Construct the plane rotation G to zero out the bulge | -c %------------------------------------------------------% -c - call clartg (f, g, c, s, r) - if (i .gt. istart) then - h(i,i-1) = r - h(i+1,i-1) = zero - end if -c -c %---------------------------------------------% -c | Apply rotation to the left of H; H <- G'*H | -c %---------------------------------------------% -c - do 50 j = i, kplusp - t = c*h(i,j) + s*h(i+1,j) - h(i+1,j) = -conjg(s)*h(i,j) + c*h(i+1,j) - h(i,j) = t - 50 continue -c -c %---------------------------------------------% -c | Apply rotation to the right of H; H <- H*G | -c %---------------------------------------------% -c - do 60 j = 1, min(i+2,iend) - t = c*h(j,i) + conjg(s)*h(j,i+1) - h(j,i+1) = -s*h(j,i) + c*h(j,i+1) - h(j,i) = t - 60 continue -c -c %-----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G' | -c %-----------------------------------------------------% -c - do 70 j = 1, min(i+jj, kplusp) - t = c*q(j,i) + conjg(s)*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = t - 70 continue -c -c %---------------------------% -c | Prepare for next rotation | -c %---------------------------% -c - if (i .lt. iend-1) then - f = h(i+1,i) - g = h(i+2,i) - end if - 80 continue -c -c %-------------------------------% -c | Finished applying the shift. | -c %-------------------------------% -c - 100 continue -c -c %---------------------------------------------------------% -c | Apply the same shift to the next block if there is any. | -c %---------------------------------------------------------% -c - istart = iend + 1 - if (iend .lt. kplusp) go to 20 -c -c %---------------------------------------------% -c | Loop back to the top to get the next shift. | -c %---------------------------------------------% -c - 110 continue -c -c %---------------------------------------------------% -c | Perform a similarity transformation that makes | -c | sure that the compressed H will have non-negative | -c | real subdiagonal elements. | -c %---------------------------------------------------% -c - do 120 j=1,kev - if ( real( h(j+1,j) ) .lt. rzero .or. - & aimag( h(j+1,j) ) .ne. rzero ) then - t = h(j+1,j) / slapy2(real(h(j+1,j)),aimag(h(j+1,j))) - call cscal( kplusp-j+1, conjg(t), h(j+1,j), ldh ) - call cscal( min(j+2, kplusp), t, h(1,j+1), 1 ) - call cscal( min(j+np+1,kplusp), t, q(1,j+1), 1 ) - h(j+1,j) = cmplx( real( h(j+1,j) ), rzero ) - end if - 120 continue -c - do 130 i = 1, kev -c -c %--------------------------------------------% -c | Final check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine clahqr. | -c | Note: Since the subdiagonals of the | -c | compressed H are nonnegative real numbers, | -c | we take advantage of this. | -c %--------------------------------------------% -c - tst1 = cabs1( h( i, i ) ) + cabs1( h( i+1, i+1 ) ) - if( tst1 .eq. rzero ) - & tst1 = clanhs( '1', kev, h, ldh, workl ) - if( real( h( i+1,i ) ) .le. max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 130 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is needed in the residual update since we | -c | cannot GUARANTEE that the corresponding entry | -c | of H would be zero as in exact arithmetic. | -c %-------------------------------------------------% -c - if ( real( h(kev+1,kev) ) .gt. rzero ) - & call cgemv ('N', n, kplusp, one, v, ldv, q(1,kev+1), 1, zero, - & workd(n+1), 1) -c -c %----------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage of the upper Hessenberg structure of Q. | -c %----------------------------------------------------------% -c - do 140 i = 1, kev - call cgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call ccopy (n, workd, 1, v(1,kplusp-i+1), 1) - 140 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call clacpy ('A', n, kev, v(1,kplusp-kev+1), ldv, v, ldv) -c -c %--------------------------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the appropriate place | -c %--------------------------------------------------------------% -c - if ( real( h(kev+1,kev) ) .gt. rzero ) - & call ccopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kev+p}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call cscal (n, q(kplusp,kev), resid, 1) - if ( real( h(kev+1,kev) ) .gt. rzero ) - & call caxpy (n, h(kev+1,kev), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call cvout (logfil, 1, q(kplusp,kev), ndigit, - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call cvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') - call ivout (logfil, 1, kev, ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call cmout (logfil, kev, kev, h, ldh, ndigit, - & '_napps: updated Hessenberg matrix H for next iteration') - end if -c - end if -c - 9000 continue - call arscnd (t1) - tcapps = tcapps + (t1 - t0) -c - return -c -c %---------------% -c | End of cnapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/cnaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,801 +0,0 @@ -c\BeginDoc -c -c\Name: cnaup2 -c -c\Description: -c Intermediate level interface called by cnaupd. -c -c\Usage: -c call cnaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZ, BOUNDS, -c Q, LDQ, WORKL, IPNTR, WORKD, RWORK, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in cnaupd. -c MODE, ISHIFT, MXITER: see the definition of IPARAM in cnaupd. -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV since a leading block of the current -c upper Hessenberg matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Complex N by (NEV+NP) array. (INPUT/OUTPUT) -c The Arnoldi basis vectors are returned in the first NEV -c columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex (NEV+NP) by (NEV+NP) array. (OUTPUT) -c H is used to store the generated upper Hessenberg matrix -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Complex array of length NEV+NP. (OUTPUT) -c RITZ(1:NEV) contains the computed Ritz values of OP. -c -c BOUNDS Complex array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to -c the computed Ritz values. -c -c Q Complex (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex work array of length at least -c (NEV+NP)**2 + 3*(NEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in shifts calculation, shifts -c application and convergence checking. -c -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Complex work array of length 3*N. (WORKSPACE) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in CNAUPD. -c -c RWORK Real work array of length NEV+NP ( WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. -c NP returns the number of converged Ritz values. -c = 2: No shifts could be applied. -c = -8: Error return from LAPACK eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Arnoldi factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c cgetv0 ARPACK initial vector generation routine. -c cnaitr ARPACK Arnoldi factorization routine. -c cnapps ARPACK application of implicit shifts routine. -c cneigh ARPACK compute Ritz values and error bounds routine. -c cngets ARPACK reorder Ritz values and error bounds routine. -c csortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c cmout ARPACK utility routine that prints matrices -c cvout ARPACK utility routine that prints vectors. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c ccopy Level 1 BLAS that copies one vector to another . -c cdotc Level 1 BLAS that computes the scalar product of two vectors. -c cswap Level 1 BLAS that swaps two vectors. -c scnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice Universitya -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naup2.F SID: 2.6 DATE OF SID: 06/01/00 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cnaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritz, bounds, - & q, ldq, workl, ipntr, workd, rwork, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, mode, ldh, ldq, ldv, mxiter, - & n, nev, np - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(13) - Complex - & bounds(nev+np), h(ldh,nev+np), q(ldq,nev+np), - & resid(n), ritz(nev+np), v(ldv,nev+np), - & workd(3*n), workl( (nev+np)*(nev+np+3) ) - Real - & rwork(nev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - Real - & rzero - parameter (one = (1.0E+0, 0.0E+0) , zero = (0.0E+0, 0.0E+0) , - & rzero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical cnorm , getv0, initv , update, ushift - integer ierr , iter , kplusp, msglvl, nconv, - & nevbef, nev0 , np0 , nptemp, i , - & j - Complex - & cmpnorm - Real - & rnorm , eps23, rtemp - character wprime*2 -c - save cnorm, getv0, initv , update, ushift, - & rnorm, iter , kplusp, msglvl, nconv , - & nevbef, nev0 , np0 , eps23 -c -c -c %-----------------------% -c | Local array arguments | -c %-----------------------% -c - integer kp(3) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external ccopy, cgetv0, cnaitr, cneigh, cngets, cnapps, - & csortc, cswap, cmout, cvout, ivout, arscnd -c -c %--------------------% -c | External functions | -c %--------------------% -c - Complex - & cdotc - Real - & scnrm2, slamch, slapy2 - external cdotc, scnrm2, slamch, slapy2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic aimag, real , min, max -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c - call arscnd (t0) -c - msglvl = mcaup2 -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvalues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev + np - nconv = 0 - iter = 0 -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0 ) -c -c %---------------------------------------% -c | Set flags for computing the first NEV | -c | steps of the Arnoldi factorization. | -c %---------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call cgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. rzero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1100 - end if - getv0 = .false. - ido = 0 - end if -c -c %-----------------------------------% -c | Back from reverse communication : | -c | continue with update step | -c %-----------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Arnoldi factorization | -c %----------------------------------------------------------% -c - call cnaitr (ido, bmat, n, 0, nev, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N ARNOLDI I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Arnoldi | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_naup2: **** Start of major iteration number ****') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c | Adjust NP since NEV might have been updated by last call | -c | to the shift application routine cnapps. | -c %-----------------------------------------------------------% -c - np = kplusp - nev -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_naup2: The length of the current Arnoldi factorization') - call ivout (logfil, 1, np, ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c %-----------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call cnaitr(ido, bmat, n, nev, np, mode, resid, rnorm, - & v , ldv , h, ldh, ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call svout (logfil, 1, rnorm, ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current upper Hessenberg matrix. | -c %--------------------------------------------------------% -c - call cneigh (rnorm, kplusp, h, ldh, ritz, bounds, - & q, ldq, workl, rwork, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | error bounds are in the last NEV loc. of RITZ, | -c | and BOUNDS respectively. | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 -c -c %--------------------------------------------------% -c | Make a copy of Ritz values and the corresponding | -c | Ritz estimates obtained from cneigh. | -c %--------------------------------------------------% -c - call ccopy(kplusp,ritz,1,workl(kplusp**2+1),1) - call ccopy(kplusp,bounds,1,workl(kplusp**2+kplusp+1),1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | bounds are in the last NEV loc. of RITZ | -c | BOUNDS respectively. | -c %---------------------------------------------------% -c - call cngets (ishift, which, nev, np, ritz, bounds) -c -c %------------------------------------------------------------% -c | Convergence test: currently we use the following criteria. | -c | The relative accuracy of a Ritz value is considered | -c | acceptable if: | -c | | -c | error_bounds(i) .le. tol*max(eps23, magnitude_of_ritz(i)). | -c | | -c %------------------------------------------------------------% -c - nconv = 0 -c - do 25 i = 1, nev - rtemp = max( eps23, slapy2( real (ritz(np+i)), - & aimag(ritz(np+i)) ) ) - if ( slapy2(real (bounds(np+i)),aimag(bounds(np+i))) - & .le. tol*rtemp ) then - nconv = nconv + 1 - end if - 25 continue -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = nconv - call ivout (logfil, 3, kp, ndigit, - & '_naup2: NEV, NP, NCONV are') - call cvout (logfil, kplusp, ritz, ndigit, - & '_naup2: The eigenvalues of H') - call cvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. nev0) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c - if (msglvl .gt. 4) then - call cvout(logfil, kplusp, workl(kplusp**2+1), ndigit, - & '_naup2: Eigenvalues computed by _neigh:') - call cvout(logfil, kplusp, workl(kplusp**2+kplusp+1), - & ndigit, - & '_naup2: Ritz estimates computed by _neigh:') - end if -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP | -c %------------------------------------------------% -c -c %------------------------------------------% -c | Use h( 3,1 ) as storage to communicate | -c | rnorm to cneupd if needed | -c %------------------------------------------% - - h(3,1) = cmplx(rnorm,rzero) -c -c %----------------------------------------------% -c | Sort Ritz values so that converged Ritz | -c | values appear within the first NEV locations | -c | of ritz and bounds, and the most desired one | -c | appears at the front. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LR') wprime = 'SR' - if (which .eq. 'SR') wprime = 'LR' - if (which .eq. 'LI') wprime = 'SI' - if (which .eq. 'SI') wprime = 'LI' -c - call csortc(wprime, .true., kplusp, ritz, bounds) -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23, magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, nev0 - rtemp = max( eps23, slapy2( real (ritz(j)), - & aimag(ritz(j)) ) ) - bounds(j) = bounds(j)/rtemp - 35 continue -c -c %---------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | estimates. This will push all the converged ones | -c | towards the front of ritz, bounds (in the case | -c | when NCONV < NEV.) | -c %---------------------------------------------------% -c - wprime = 'LM' - call csortc(wprime, .true., nev0, bounds, ritz) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, nev0 - rtemp = max( eps23, slapy2( real (ritz(j)), - & aimag(ritz(j)) ) ) - bounds(j) = bounds(j)*rtemp - 40 continue -c -c %-----------------------------------------------% -c | Sort the converged Ritz values again so that | -c | the "threshold" value appears at the front of | -c | ritz and bound. | -c %-----------------------------------------------% -c - call csortc(which, .true., nconv, ritz, bounds) -c - if (msglvl .gt. 1) then - call cvout (logfil, kplusp, ritz, ndigit, - & '_naup2: Sorted eigenvalues') - call cvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. nev0) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. nev0) info = 2 -c - np = nconv - go to 1100 -c - else if ( (nconv .lt. nev0) .and. (ishift .eq. 1) ) then -c -c %-------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the size | -c | of NEV. | -c %-------------------------------------------------% -c - nevbef = nev - nev = nev + min(nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 3) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call cngets (ishift, which, nev, np, ritz, bounds) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_naup2: NEV and NP are') - call cvout (logfil, nev, ritz(np+1), ndigit, - & '_naup2: "wanted" Ritz values ') - call cvout (logfil, nev, bounds(np+1), ndigit, - & '_naup2: Ritz estimates of the "wanted" values ') - end if - end if -c - if (ishift .eq. 0) then -c -c %-------------------------------------------------------% -c | User specified shifts: pop back out to get the shifts | -c | and return them in the first 2*NP locations of WORKL. | -c %-------------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if - 50 continue - ushift = .false. -c - if ( ishift .ne. 1 ) then -c -c %----------------------------------% -c | Move the NP shifts from WORKL to | -c | RITZ, to free up WORKL | -c | for non-exact shift case. | -c %----------------------------------% -c - call ccopy (np, workl, 1, ritz, 1) - end if -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_naup2: The number of shifts to apply ') - call cvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') - if ( ishift .eq. 1 ) - & call cvout (logfil, np, bounds, ndigit, - & '_naup2: Ritz estimates of the shifts') - end if -c -c %---------------------------------------------------------% -c | Apply the NP implicit shifts by QR bulge chasing. | -c | Each shift is applied to the whole upper Hessenberg | -c | matrix H. | -c | The first 2*N locations of WORKD are used as workspace. | -c %---------------------------------------------------------% -c - call cnapps (n, nev, np, ritz, v, ldv, - & h, ldh, resid, q, ldq, workl, workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to cnaitr. | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call ccopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call ccopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - cmpnorm = cdotc (n, resid, 1, workd, 1) - rnorm = sqrt(slapy2(real (cmpnorm),aimag(cmpnorm))) - else if (bmat .eq. 'I') then - rnorm = scnrm2(n, resid, 1) - end if - cnorm = .false. -c - if (msglvl .gt. 2) then - call svout (logfil, 1, rnorm, ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call cmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = nconv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error Exit | -c %------------% -c - call arscnd (t1) - tcaup2 = t1 - t0 -c - 9000 continue -c -c %---------------% -c | End of cnaup2 | -c %---------------% -c - return - end
--- a/libcruft/arpack/src/cnaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,664 +0,0 @@ -c\BeginDoc -c -c\Name: cnaupd -c -c\Description: -c Reverse communication interface for the Implicitly Restarted Arnoldi -c iteration. This is intended to be used to find a few eigenpairs of a -c complex linear operator OP with respect to a semi-inner product defined -c by a hermitian positive semi-definite real matrix B. B may be the identity -c matrix. NOTE: if both OP and B are real, then ssaupd or snaupd should -c be used. -c -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c cnaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x. -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, M hermitian positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: A*x = lambda*M*x, M hermitian semi-definite -c ===> OP = inv[A - sigma*M]*M and B = M. -c ===> shift-and-invert mode -c If OP*x = amu*x, then lambda = sigma + 1/amu. -c -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call cnaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, RWORK, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to cnaupd. IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c cnaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = M * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute and return the shifts in the first -c NP locations of WORKL. -c IDO = 99: done -c ------------------------------------------------------------- -c After the initialization phase, when the routine is used in -c the "shift-and-invert" mode, the vector M * X is already -c available and does not need to be recomputed in forming OP*X. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c BMAT = 'I' -> standard eigenvalue problem A*x = lambda*x -c BMAT = 'G' -> generalized eigenvalue problem A*x = lambda*M*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c 'LM' -> want the NEV eigenvalues of largest magnitude. -c 'SM' -> want the NEV eigenvalues of smallest magnitude. -c 'LR' -> want the NEV eigenvalues of largest real part. -c 'SR' -> want the NEV eigenvalues of smallest real part. -c 'LI' -> want the NEV eigenvalues of largest imaginary part. -c 'SI' -> want the NEV eigenvalues of smallest imaginary part. -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N-1. -c -c TOL Real scalar. (INPUT) -c Stopping criteria: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)) -c where ABS(RITZ(I)) is the magnitude when RITZ(I) is complex. -c DEFAULT = slamch('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine slamch). -c -c RESID Complex array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V. NCV must satisfy the two -c inequalities 1 <= NCV-NEV and NCV <= N. -c This will indicate how many Arnoldi vectors are generated -c at each iteration. After the startup phase in which NEV -c Arnoldi vectors are generated, the algorithm generates -c approximately NCV-NEV Arnoldi vectors at each subsequent update -c iteration. Most of the cost in generating each Arnoldi vector is -c in the matrix-vector operation OP*x. (See remark 4 below.) -c -c V Complex array N by NCV. (OUTPUT) -c Contains the final set of Arnoldi basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to filter out -c the components of the unwanted eigenvector. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are to be provided by the user via -c reverse communication. The NCV eigenvalues of -c the Hessenberg matrix H are returned in the part -c of WORKL array corresponding to RITZ. -c ISHIFT = 1: exact shifts with respect to the current -c Hessenberg matrix H. This is equivalent to -c restarting the iteration from the beginning -c after updating the starting vector with a linear -c combination of Ritz vectors associated with the -c "wanted" eigenvalues. -c ISHIFT = 2: other choice of internal shift to be defined. -c ------------------------------------------------------------- -c -c IPARAM(2) = No longer referenced -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3; See under \Description of cnaupd for the -c four modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), _naupd returns NP, the number -c of shifts the user is to provide. 0 < NP < NCV-NEV. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 14. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by NCV upper Hessenberg -c matrix H in WORKL. -c IPNTR(6): pointer to the ritz value array RITZ -c IPNTR(7): pointer to the (projected) ritz vector array Q -c IPNTR(8): pointer to the error BOUNDS array in WORKL. -c IPNTR(14): pointer to the NP shifts in WORKL. See Remark 5 below. -c -c Note: IPNTR(9:13) is only referenced by cneupd. See Remark 2 below. -c -c IPNTR(9): pointer to the NCV RITZ values of the -c original system. -c IPNTR(10): Not Used -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c cneupd if RVEC = .TRUE. See Remark 2 below. -c -c ------------------------------------------------------------- -c -c WORKD Complex work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note below. -c -c WORKL Complex work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least 3*NCV**2 + 5*NCV. -c -c RWORK Real work array of length NCV (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -4: The maximum number of Arnoldi update iteration -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation; -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -9999: Could not build an Arnoldi factorization. -c User input error highly likely. Please -c check actual array dimensions and layout. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. -c -c\Remarks -c 1. The computed Ritz values are approximate eigenvalues of OP. The -c selection of WHICH should be made with this in mind when using -c Mode = 3. When operating in Mode = 3 setting WHICH = 'LM' will -c compute the NEV eigenvalues of the original problem that are -c closest to the shift SIGMA . After convergence, approximate eigenvalues -c of the original problem may be obtained with the ARPACK subroutine cneupd. -c -c 2. If a basis for the invariant subspace corresponding to the converged Ritz -c values is needed, the user must call cneupd immediately following -c completion of cnaupd. This is new starting with release 2 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requirement is that NCV > NEV + 1. -c However, it is recommended that NCV .ge. 2*NEV. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c See Chapter 8 of Reference 2 for further information. -c -c 5. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) complex shifts in locations -c WORKL(IPNTR(14)), WORKL(IPNTR(14)+1), ... , WORKL(IPNTR(14)+NP). -c Eigenvalues of the current upper Hessenberg matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1). They are ordered -c according to the order defined by WHICH. The associated Ritz estimates -c are located in WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , -c WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c Complex resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c decompose d1(n), d2(n,ncv) -c align resid(i) with d1(i) -c align v(i,j) with d2(i,j) -c align workd(i) with d1(i) range (1:n) -c align workd(i) with d1(i-n) range (n+1:2*n) -c align workd(i) with d1(i-2*n) range (2*n+1:3*n) -c distribute d1(block), d2(block,:) -c replicated workl(lworkl) -c -c Cray MPP syntax: -c =============== -c Complex resid(n), v(ldv,ncv), workd(n,3), workl(lworkl) -c shared resid(block), v(block,:), workd(block,:) -c replicated workl(lworkl) -c -c CM2/CM5 syntax: -c ============== -c -c----------------------------------------------------------------------- -c -c include 'ex-nonsym.doc' -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "_Complex_ Shift and Invert Strategies for -c _Real_ Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c cnaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c cstatn ARPACK routine that initializes the timing variables. -c ivout ARPACK utility routine that prints integers. -c cvout ARPACK utility routine that prints vectors. -c arscnd ARPACK utility routine for timing. -c slamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cnaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, rwork, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - Complex - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) - Real - & rwork(ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - parameter (one = (1.0E+0, 0.0E+0) , zero = (0.0E+0, 0.0E+0) ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritz, j - save bounds, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritz -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external cnaup2, cvout, ivout, arscnd, cstatn -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch - external slamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call cstatn - call arscnd (t0) - msglvl = mcaupd -c -c %----------------% -c | Error checking | -c %----------------% -c - ierr = 0 - ishift = iparam(1) -c levec = iparam(2) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev .or. ncv .gt. n) then - ierr = -3 - else if (mxiter .le. 0) then - ierr = -4 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 5*ncv) then - ierr = -7 - else if (mode .lt. 1 .or. mode .gt. 3) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. 0.0E+0 ) tol = slamch('EpsMach') - if (ishift .ne. 0 .and. - & ishift .ne. 1 .and. - & ishift .ne. 2) ishift = 1 -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, 3*ncv**2 + 5*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+ncv) := the ritz values | -c | workl(ncv*ncv+ncv+1:ncv*ncv+2*ncv) := error bounds | -c | workl(ncv*ncv+2*ncv+1:2*ncv*ncv+2*ncv) := rotation matrix Q | -c | workl(2*ncv*ncv+2*ncv+1:3*ncv*ncv+5*ncv) := workspace | -c | The final workspace is needed by subroutine cneigh called | -c | by cnaup2. Subroutine cneigh calls LAPACK routines for | -c | calculating eigenvalues and the last row of the eigenvector | -c | matrix. | -c %-------------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritz = ih + ldh*ncv - bounds = ritz + ncv - iq = bounds + ncv - iw = iq + ldq*ncv - next = iw + ncv**2 + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritz - ipntr(7) = iq - ipntr(8) = bounds - ipntr(14) = iw - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Arnoldi Iteration. | -c %-------------------------------------------------------% -c - call cnaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritz), - & workl(bounds), workl(iq), ldq, workl(iw), - & ipntr, workd, rwork, info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within cnaup2. | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_naupd: Number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call cvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') - call cvout (logfil, np, workl(bounds), ndigit, - & '_naupd: Associated Ritz estimates') - end if -c - call arscnd (t1) - tcaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tcaupd, tcaup2, tcaitr, titref, - & tgetv0, tceigh, tcgets, tcapps, tcconv, trvec - 1000 format (//, - & 5x, '=============================================',/ - & 5x, '= Complex implicit Arnoldi update code =',/ - & 5x, '= Version Number: ', ' 2.3' , 21x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 16x, ' =',/ - & 5x, '=============================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '=============================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in naup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in Hessenberg eig. subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6,/ - & 5x, 'Total time in computing final Ritz vectors = ', f12.6/) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of cnaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/cneigh.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,257 +0,0 @@ -c\BeginDoc -c -c\Name: cneigh -c -c\Description: -c Compute the eigenvalues of the current upper Hessenberg matrix -c and the corresponding Ritz estimates given the current residual norm. -c -c\Usage: -c call cneigh -c ( RNORM, N, H, LDH, RITZ, BOUNDS, Q, LDQ, WORKL, RWORK, IERR ) -c -c\Arguments -c RNORM Real scalar. (INPUT) -c Residual norm corresponding to the current upper Hessenberg -c matrix H. -c -c N Integer. (INPUT) -c Size of the matrix H. -c -c H Complex N by N array. (INPUT) -c H contains the current upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Complex array of length N. (OUTPUT) -c On output, RITZ(1:N) contains the eigenvalues of H. -c -c BOUNDS Complex array of length N. (OUTPUT) -c On output, BOUNDS contains the Ritz estimates associated with -c the eigenvalues held in RITZ. This is equal to RNORM -c times the last components of the eigenvectors corresponding -c to the eigenvalues in RITZ. -c -c Q Complex N by N array. (WORKSPACE) -c Workspace needed to store the eigenvectors of H. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex work array of length N**2 + 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. This is needed to keep the full Schur form -c of H and also in the calculation of the eigenvectors of H. -c -c RWORK Real work array of length N (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c IERR Integer. (OUTPUT) -c Error exit flag from clahqr or ctrevc. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c cmout ARPACK utility routine that prints matrices -c cvout ARPACK utility routine that prints vectors. -c svout ARPACK utility routine that prints vectors. -c clacpy LAPACK matrix copy routine. -c clahqr LAPACK routine to compute the Schur form of an -c upper Hessenberg matrix. -c claset LAPACK matrix initialization routine. -c ctrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper triangular form -c ccopy Level 1 BLAS that copies one vector to another. -c csscal Level 1 BLAS that scales a complex vector by a real number. -c scnrm2 Level 1 BLAS that computes the norm of a vector. -c -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neigh.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cneigh (rnorm, n, h, ldh, ritz, bounds, - & q, ldq, workl, rwork, ierr) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, n, ldh, ldq - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex - & bounds(n), h(ldh,n), q(ldq,n), ritz(n), - & workl(n*(n+3)) - Real - & rwork(n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - Real - & rone - parameter (one = (1.0E+0, 0.0E+0), zero = (0.0E+0, 0.0E+0), - & rone = 1.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical select(1) - integer j, msglvl - Complex - & vl(1) - Real - & temp -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external clacpy, clahqr, ctrevc, ccopy, - & csscal, cmout, cvout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & scnrm2 - external scnrm2 -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mceigh -c - if (msglvl .gt. 2) then - call cmout (logfil, n, n, h, ldh, ndigit, - & '_neigh: Entering upper Hessenberg matrix H ') - end if -c -c %----------------------------------------------------------% -c | 1. Compute the eigenvalues, the last components of the | -c | corresponding Schur vectors and the full Schur form T | -c | of the current upper Hessenberg matrix H. | -c | clahqr returns the full Schur form of H | -c | in WORKL(1:N**2), and the Schur vectors in q. | -c %----------------------------------------------------------% -c - call clacpy ('All', n, n, h, ldh, workl, n) - call claset ('All', n, n, zero, one, q, ldq) - call clahqr (.true., .true., n, 1, n, workl, ldh, ritz, - & 1, n, q, ldq, ierr) - if (ierr .ne. 0) go to 9000 -c - call ccopy (n, q(n-1,1), ldq, bounds, 1) - if (msglvl .gt. 1) then - call cvout (logfil, n, bounds, ndigit, - & '_neigh: last row of the Schur matrix for H') - end if -c -c %----------------------------------------------------------% -c | 2. Compute the eigenvectors of the full Schur form T and | -c | apply the Schur vectors to get the corresponding | -c | eigenvectors. | -c %----------------------------------------------------------% -c - call ctrevc ('Right', 'Back', select, n, workl, n, vl, n, q, - & ldq, n, n, workl(n*n+1), rwork, ierr) -c - if (ierr .ne. 0) go to 9000 -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | ctrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; here the magnitude of a complex | -c | number (x,y) is taken to be |x| + |y|. | -c %------------------------------------------------% -c - do 10 j=1, n - temp = scnrm2( n, q(1,j), 1 ) - call csscal ( n, rone / temp, q(1,j), 1 ) - 10 continue -c - if (msglvl .gt. 1) then - call ccopy(n, q(n,1), ldq, workl, 1) - call cvout (logfil, n, workl, ndigit, - & '_neigh: Last row of the eigenvector matrix for H') - end if -c -c %----------------------------% -c | Compute the Ritz estimates | -c %----------------------------% -c - call ccopy(n, q(n,1), n, bounds, 1) - call csscal(n, rnorm, bounds, 1) -c - if (msglvl .gt. 2) then - call cvout (logfil, n, ritz, ndigit, - & '_neigh: The eigenvalues of H') - call cvout (logfil, n, bounds, ndigit, - & '_neigh: Ritz estimates for the eigenvalues of H') - end if -c - call arscnd(t1) - tceigh = tceigh + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of cneigh | -c %---------------% -c - end
--- a/libcruft/arpack/src/cneupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,876 +0,0 @@ -c\BeginDoc -c -c\Name: cneupd -c -c\Description: -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) The corresponding approximate eigenvectors; -c -c (2) An orthonormal basis for the associated approximate -c invariant subspace; -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c basis is always computed. There is an additional storage cost of n*nev -c if both are requested (in this case a separate array Z must be supplied). -c -c The approximate eigenvalues and eigenvectors of A*z = lambda*B*z -c are derived from approximate eigenvalues and eigenvectors of -c of the linear operator OP prescribed by the MODE selection in the -c call to CNAUPD. CNAUPD must be called before this routine is called. -c These approximate eigenvalues and vectors are commonly called Ritz -c values and Ritz vectors respectively. They are referred to as such -c in the comments that follow. The computed orthonormal basis for the -c invariant subspace corresponding to these Ritz values is referred to as a -c Schur basis. -c -c The definition of OP as well as other terms and the relation of computed -c Ritz values and vectors of OP with respect to the given problem -c A*z = lambda*B*z may be found in the header of CNAUPD. For a brief -c description, see definitions of IPARAM(7), MODE and WHICH in the -c documentation of CNAUPD. -c -c\Usage: -c call cneupd -c ( RVEC, HOWMNY, SELECT, D, Z, LDZ, SIGMA, WORKEV, BMAT, -c N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, -c WORKL, LWORKL, RWORK, INFO ) -c -c\Arguments: -c RVEC LOGICAL (INPUT) -c Specifies whether a basis for the invariant subspace corresponding -c to the converged Ritz value approximations for the eigenproblem -c A*z = lambda*B*z is computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute Ritz vectors or Schur vectors. -c See Remarks below. -c -c HOWMNY Character*1 (INPUT) -c Specifies the form of the basis for the invariant subspace -c corresponding to the converged Ritz values that is to be computed. -c -c = 'A': Compute NEV Ritz vectors; -c = 'P': Compute NEV Schur vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value D(j), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' or 'P', SELECT need not be initialized -c but it is used as internal workspace. -c -c D Complex array of dimension NEV+1. (OUTPUT) -c On exit, D contains the Ritz approximations -c to the eigenvalues lambda for A*z = lambda*B*z. -c -c Z Complex N by NEV array (OUTPUT) -c On exit, if RVEC = .TRUE. and HOWMNY = 'A', then the columns of -c Z represents approximate eigenvectors (Ritz vectors) corresponding -c to the NCONV=IPARAM(5) Ritz values for eigensystem -c A*z = lambda*B*z. -c -c If RVEC = .FALSE. or HOWMNY = 'P', then Z is NOT REFERENCED. -c -c NOTE: If if RVEC = .TRUE. and a Schur basis is not required, -c the array Z may be set equal to first NEV+1 columns of the Arnoldi -c basis array V computed by CNAUPD. In this case the Arnoldi basis -c will be destroyed and overwritten with the eigenvector basis. -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ .ge. max( 1, N ) is required. -c In any case, LDZ .ge. 1 is required. -c -c SIGMA Complex (INPUT) -c If IPARAM(7) = 3 then SIGMA represents the shift. -c Not referenced if IPARAM(7) = 1 or 2. -c -c WORKEV Complex work array of dimension 2*NCV. (WORKSPACE) -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to CNAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, RWORK, INFO -c -c must be passed directly to CNEUPD following the last call -c to CNAUPD. These arguments MUST NOT BE MODIFIED between -c the the last call to CNAUPD and the call to CNEUPD. -c -c Three of these parameters (V, WORKL and INFO) are also output parameters: -c -c V Complex N by NCV array. (INPUT/OUTPUT) -c -c Upon INPUT: the NCV columns of V contain the Arnoldi basis -c vectors for OP as constructed by CNAUPD . -c -c Upon OUTPUT: If RVEC = .TRUE. the first NCONV=IPARAM(5) columns -c contain approximate Schur vectors that span the -c desired invariant subspace. -c -c NOTE: If the array Z has been set equal to first NEV+1 columns -c of the array V and RVEC=.TRUE. and HOWMNY= 'A', then the -c Arnoldi basis held by V has been overwritten by the desired -c Ritz vectors. If a separate array Z has been passed then -c the first NCONV=IPARAM(5) columns of V will contain approximate -c Schur vectors that span the desired invariant subspace. -c -c WORKL Real work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:ncv*ncv+2*ncv) contains information obtained in -c cnaupd. They are not changed by cneupd. -c WORKL(ncv*ncv+2*ncv+1:3*ncv*ncv+4*ncv) holds the -c untransformed Ritz values, the untransformed error estimates of -c the Ritz values, the upper triangular matrix for H, and the -c associated matrix representation of the invariant subspace for H. -c -c Note: IPNTR(9:13) contains the pointer into WORKL for addresses -c of the above information computed by cneupd. -c ------------------------------------------------------------- -c IPNTR(9): pointer to the NCV RITZ values of the -c original system. -c IPNTR(10): Not used -c IPNTR(11): pointer to the NCV corresponding error estimates. -c IPNTR(12): pointer to the NCV by NCV upper triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c cneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c = 0: Normal exit. -c -c = 1: The Schur form computed by LAPACK routine csheqr -c could not be reordered by LAPACK routine ctrsen. -c Re-enter subroutine cneupd with IPARAM(5)=NCV and -c increase the size of the array D to have -c dimension at least dimension NCV and allocate at least NCV -c columns for Z. NOTE: Not necessary if Z and V share -c the same space. Please notify the authors if this error -c occurs. -c -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation. -c This should never happened. -c = -9: Error return from calculation of eigenvectors. -c Informational error from LAPACK routine ctrevc. -c = -10: IPARAM(7) must be 1,2,3 -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: HOWMNY = 'S' not yet implemented -c = -13: HOWMNY must be one of 'A' or 'P' if RVEC = .true. -c = -14: CNAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: CNEUPD got a different count of the number of converged -c Ritz values than CNAUPD got. This indicates the user -c probably made an error in passing data from CNAUPD to -c CNEUPD or that the data was modified before entering -c CNEUPD -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B. Nour-Omid, B. N. Parlett, T. Ericsson and P. S. Jensen, -c "How to Implement the Spectral Transformation", Math Comp., -c Vol. 48, No. 178, April, 1987 pp. 664-673. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c cmout ARPACK utility routine that prints matrices -c cvout ARPACK utility routine that prints vectors. -c cgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c clacpy LAPACK matrix copy routine. -c clahqr LAPACK routine that computes the Schur form of a -c upper Hessenberg matrix. -c claset LAPACK matrix initialization routine. -c ctrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper triangular form. -c ctrsen LAPACK routine that re-orders the Schur form. -c cunm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c slamch LAPACK routine that determines machine constants. -c ctrmm Level 3 BLAS matrix times an upper triangular matrix. -c cgeru Level 2 BLAS rank one update to a matrix. -c ccopy Level 1 BLAS that copies one vector to another . -c cscal Level 1 BLAS that scales a vector. -c csscal Level 1 BLAS that scales a complex vector by a real number. -c scnrm2 Level 1 BLAS that computes the norm of a complex vector. -c -c\Remarks -c -c 1. Currently only HOWMNY = 'A' and 'P' are implemented. -c -c 2. Schur vectors are an orthogonal representation for the basis of -c Ritz vectors. Thus, their numerical properties are often superior. -c If RVEC = .true. then the relationship -c A * V(:,1:IPARAM(5)) = V(:,1:IPARAM(5)) * T, and -c transpose( V(:,1:IPARAM(5)) ) * V(:,1:IPARAM(5)) = I -c are approximately satisfied. -c Here T is the leading submatrix of order IPARAM(5) of the -c upper triangular matrix stored workl(ipntr(12)). -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neupd.F SID: 2.7 DATE OF SID: 09/20/00 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine cneupd(rvec , howmny, select, d , - & z , ldz , sigma , workev, - & bmat , n , which , nev , - & tol , resid , ncv , v , - & ldv , iparam, ipntr , workd , - & workl, lworkl, rwork , info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Complex - & sigma - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - logical select(ncv) - Real - & rwork(ncv) - Complex - & d(nev) , resid(n) , v(ldv,ncv), - & z(ldz, nev), - & workd(3*n) , workl(lworkl), workev(2*ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - parameter (one = (1.0E+0, 0.0E+0) , zero = (0.0E+0, 0.0E+0) ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds, ierr , ih , ihbds, iheig , nconv , - & invsub, iuptri, iwev , j , ldh , ldq , - & mode , msglvl, ritz , wr , k , irz , - & ibd , outncv, iq , np , numcnv, jj , - & ishift, nconv2 - Complex - & rnorm, temp, vl(1) - Real - & conds, sep, rtemp, eps23 - logical reord -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external ccopy , cgeru, cgeqr2, clacpy, cmout, - & cunm2r, ctrmm, cvout, ivout, - & clahqr -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & scnrm2, slamch, slapy2 - external scnrm2, slamch, slapy2 -c - Complex - & cdotc - external cdotc -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mceupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0 ) -c -c %-------------------------------% -c | Quick return | -c | Check for incompatible input | -c %-------------------------------% -c - ierr = 0 -c - if (nconv .le. 0) then - ierr = -14 - else if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 4*ncv) then - ierr = -7 - else if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) then - ierr = -13 - else if (howmny .eq. 'S' ) then - ierr = -12 - end if -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 ) then - type = 'SHIFTI' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, WORKEV, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+ncv) := ritz values | -c | workl(ncv*ncv+ncv+1:ncv*ncv+2*ncv) := error bounds | -c %--------------------------------------------------------% -c -c %-----------------------------------------------------------% -c | The following is used and set by CNEUPD. | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := The untransformed | -c | Ritz values. | -c | workl(ncv*ncv+3*ncv+1:ncv*ncv+4*ncv) := The untransformed | -c | error bounds of | -c | the Ritz values | -c | workl(ncv*ncv+4*ncv+1:2*ncv*ncv+4*ncv) := Holds the upper | -c | triangular matrix | -c | for H. | -c | workl(2*ncv*ncv+4*ncv+1: 3*ncv*ncv+4*ncv) := Holds the | -c | associated matrix | -c | representation of | -c | the invariant | -c | subspace for H. | -c | GRAND total of NCV * ( 3 * NCV + 4 ) locations. | -c %-----------------------------------------------------------% -c - ih = ipntr(5) - ritz = ipntr(6) - iq = ipntr(7) - bounds = ipntr(8) - ldh = ncv - ldq = ncv - iheig = bounds + ldh - ihbds = iheig + ldh - iuptri = ihbds + ldh - invsub = iuptri + ldh*ncv - ipntr(9) = iheig - ipntr(11) = ihbds - ipntr(12) = iuptri - ipntr(13) = invsub - wr = 1 - iwev = wr + ncv -c -c %-----------------------------------------% -c | irz points to the Ritz values computed | -c | by _neigh before exiting _naup2. | -c | ibd points to the Ritz estimates | -c | computed by _neigh before exiting | -c | _naup2. | -c %-----------------------------------------% -c - irz = ipntr(14) + ncv*ncv - ibd = irz + ncv -c -c %------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c %------------------------------------% -c - rnorm = workl(ih+2) - workl(ih+2) = zero -c - if (msglvl .gt. 2) then - call cvout(logfil, ncv, workl(irz), ndigit, - & '_neupd: Ritz values passed in from _NAUPD.') - call cvout(logfil, ncv, workl(ibd), ndigit, - & '_neupd: Ritz estimates passed in from _NAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(ibd) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call cngets(ishift, which , nev , - & np , workl(irz), workl(bounds)) -c - if (msglvl .gt. 2) then - call cvout (logfil, ncv, workl(irz), ndigit, - & '_neupd: Ritz values after calling _NGETS.') - call cvout (logfil, ncv, workl(bounds), ndigit, - & '_neupd: Ritz value indices after calling _NGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - rtemp = max(eps23, - & slapy2 ( real (workl(irz+ncv-j)), - & aimag(workl(irz+ncv-j)) )) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & slapy2( real (workl(ibd+jj-1)), - & aimag(workl(ibd+jj-1)) ) - & .le. tol*rtemp) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by dnaupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the dnaupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_neupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -15 - go to 9000 - end if -c -c %-------------------------------------------------------% -c | Call LAPACK routine clahqr to compute the Schur form | -c | of the upper Hessenberg matrix returned by CNAUPD. | -c | Make a copy of the upper Hessenberg matrix. | -c | Initialize the Schur vector matrix Q to the identity. | -c %-------------------------------------------------------% -c - call ccopy(ldh*ncv, workl(ih), 1, workl(iuptri), 1) - call claset('All', ncv, ncv , - & zero , one, workl(invsub), - & ldq) - call clahqr(.true., .true. , ncv , - & 1 , ncv , workl(iuptri), - & ldh , workl(iheig) , 1 , - & ncv , workl(invsub), ldq , - & ierr) - call ccopy(ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call cvout (logfil, ncv, workl(iheig), ndigit, - & '_neupd: Eigenvalues of H') - call cvout (logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the Schur vector matrix') - if (msglvl .gt. 3) then - call cmout (logfil , ncv, ncv , - & workl(iuptri), ldh, ndigit, - & '_neupd: The upper triangular matrix ') - end if - end if -c - if (reord) then -c -c %-----------------------------------------------% -c | Reorder the computed upper triangular matrix. | -c %-----------------------------------------------% -c - call ctrsen('None' , 'V' , select , - & ncv , workl(iuptri), ldh , - & workl(invsub), ldq , workl(iheig), - & nconv2 , conds , sep , - & workev , ncv , ierr) -c - if (nconv2 .lt. nconv) then - nconv = nconv2 - end if - - if (ierr .eq. 1) then - info = 1 - go to 9000 - end if -c - if (msglvl .gt. 2) then - call cvout (logfil, ncv, workl(iheig), ndigit, - & '_neupd: Eigenvalues of H--reordered') - if (msglvl .gt. 3) then - call cmout(logfil , ncv, ncv , - & workl(iuptri), ldq, ndigit, - & '_neupd: Triangular matrix after re-ordering') - end if - end if -c - end if -c -c %---------------------------------------------% -c | Copy the last row of the Schur basis matrix | -c | to workl(ihbds). This vector will be used | -c | to compute the Ritz estimates of converged | -c | Ritz values. | -c %---------------------------------------------% -c - call ccopy(ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c -c %--------------------------------------------% -c | Place the computed eigenvalues of H into D | -c | if a spectral transformation was not used. | -c %--------------------------------------------% -c - if (type .eq. 'REGULR') then - call ccopy(nconv, workl(iheig), 1, d, 1) - end if -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(invsub,ldq). | -c %----------------------------------------------------------% -c - call cgeqr2(ncv , nconv , workl(invsub), - & ldq , workev, workev(ncv+1), - & ierr) -c -c %--------------------------------------------------------% -c | * Postmultiply V by Q using cunm2r. | -c | * Copy the first NCONV columns of VQ into Z. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(iheig). The first NCONV | -c | columns of V are now approximate Schur vectors | -c | associated with the upper triangular matrix of order | -c | NCONV in workl(iuptri). | -c %--------------------------------------------------------% -c - call cunm2r('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , v , - & ldv , workd(n+1) , ierr) - call clacpy('All', n, nconv, v, ldv, z, ldz) -c - do 20 j=1, nconv -c -c %---------------------------------------------------% -c | Perform both a column and row scaling if the | -c | diagonal element of workl(invsub,ldq) is negative | -c | I'm lazy and don't take advantage of the upper | -c | triangular form of workl(iuptri,ldq). | -c | Note that since Q is orthogonal, R is a diagonal | -c | matrix consisting of plus or minus ones. | -c %---------------------------------------------------% -c - if ( real ( workl(invsub+(j-1)*ldq+j-1) ) .lt. - & real (zero) ) then - call cscal(nconv, -one, workl(iuptri+j-1), ldq) - call cscal(nconv, -one, workl(iuptri+(j-1)*ldq), 1) - end if -c - 20 continue -c - if (howmny .eq. 'A') then -c -c %--------------------------------------------% -c | Compute the NCONV wanted eigenvectors of T | -c | located in workl(iuptri,ldq). | -c %--------------------------------------------% -c - do 30 j=1, ncv - if (j .le. nconv) then - select(j) = .true. - else - select(j) = .false. - end if - 30 continue -c - call ctrevc('Right', 'Select' , select , - & ncv , workl(iuptri), ldq , - & vl , 1 , workl(invsub), - & ldq , ncv , outncv , - & workev , rwork , ierr) -c - if (ierr .ne. 0) then - info = -9 - go to 9000 - end if -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | ctrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1. | -c %------------------------------------------------% -c - do 40 j=1, nconv - rtemp = scnrm2(ncv, workl(invsub+(j-1)*ldq), 1) - rtemp = real (one) / rtemp - call csscal ( ncv, rtemp, - & workl(invsub+(j-1)*ldq), 1 ) -c -c %------------------------------------------% -c | Ritz estimates can be obtained by taking | -c | the inner product of the last row of the | -c | Schur basis of H with eigenvectors of T. | -c | Note that the eigenvector matrix of T is | -c | upper triangular, thus the length of the | -c | inner product can be set to j. | -c %------------------------------------------% -c - workev(j) = cdotc(j, workl(ihbds), 1, - & workl(invsub+(j-1)*ldq), 1) - 40 continue -c - if (msglvl .gt. 2) then - call ccopy(nconv, workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) - call cvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Last row of the eigenvector matrix for T') - if (msglvl .gt. 3) then - call cmout(logfil , ncv, ncv , - & workl(invsub), ldq, ndigit, - & '_neupd: The eigenvector matrix for T') - end if - end if -c -c %---------------------------------------% -c | Copy Ritz estimates into workl(ihbds) | -c %---------------------------------------% -c - call ccopy(nconv, workev, 1, workl(ihbds), 1) -c -c %----------------------------------------------% -c | The eigenvector matrix Q of T is triangular. | -c | Form Z*Q. | -c %----------------------------------------------% -c - call ctrmm('Right' , 'Upper' , 'No transpose', - & 'Non-unit', n , nconv , - & one , workl(invsub), ldq , - & z , ldz) - end if -c - else -c -c %--------------------------------------------------% -c | An approximate invariant subspace is not needed. | -c | Place the Ritz values computed CNAUPD into D. | -c %--------------------------------------------------% -c - call ccopy(nconv, workl(ritz), 1, d, 1) - call ccopy(nconv, workl(ritz), 1, workl(iheig), 1) - call ccopy(nconv, workl(bounds), 1, workl(ihbds), 1) -c - end if -c -c %------------------------------------------------% -c | Transform the Ritz values and possibly vectors | -c | and corresponding error bounds of OP to those | -c | of A*x = lambda*B*x. | -c %------------------------------------------------% -c - if (type .eq. 'REGULR') then -c - if (rvec) - & call cscal(ncv, rnorm, workl(ihbds), 1) -c - else -c -c %---------------------------------------% -c | A spectral transformation was used. | -c | * Determine the Ritz estimates of the | -c | Ritz values in the original system. | -c %---------------------------------------% -c - if (rvec) - & call cscal(ncv, rnorm, workl(ihbds), 1) -c - do 50 k=1, ncv - temp = workl(iheig+k-1) - workl(ihbds+k-1) = workl(ihbds+k-1) / temp / temp - 50 continue -c - end if -c -c %-----------------------------------------------------------% -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c %-----------------------------------------------------------% -c - if (type .eq. 'SHIFTI') then - do 60 k=1, nconv - d(k) = one / workl(iheig+k-1) + sigma - 60 continue - end if -c - if (type .ne. 'REGULR' .and. msglvl .gt. 1) then - call cvout (logfil, nconv, d, ndigit, - & '_neupd: Untransformed Ritz values.') - call cvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Ritz estimates of the untransformed Ritz values.') - else if ( msglvl .gt. 1) then - call cvout (logfil, nconv, d, ndigit, - & '_neupd: Converged Ritz values.') - call cvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Associated Ritz estimates.') - end if -c -c %-------------------------------------------------% -c | Eigenvector Purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 3. See reference 3. | -c %-------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A' .and. type .eq. 'SHIFTI') then -c -c %------------------------------------------------% -c | Purify the computed Ritz vectors by adding a | -c | little bit of the residual vector: | -c | T | -c | resid(:)*( e s ) / theta | -c | NCV | -c | where H s = s theta. | -c %------------------------------------------------% -c - do 100 j=1, nconv - if (workl(iheig+j-1) .ne. zero) then - workev(j) = workl(invsub+(j-1)*ldq+ncv-1) / - & workl(iheig+j-1) - endif - 100 continue - -c %---------------------------------------% -c | Perform a rank one update to Z and | -c | purify all the Ritz vectors together. | -c %---------------------------------------% -c - call cgeru (n, nconv, one, resid, 1, workev, 1, z, ldz) -c - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of cneupd| -c %---------------% -c - end
--- a/libcruft/arpack/src/cngets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -c\BeginDoc -c -c\Name: cngets -c -c\Description: -c Given the eigenvalues of the upper Hessenberg matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: call this even in the case of user specified shifts in order -c to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call cngets -c ( ISHIFT, WHICH, KEV, NP, RITZ, BOUNDS ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> want the KEV eigenvalues of largest magnitude. -c 'SM' -> want the KEV eigenvalues of smallest magnitude. -c 'LR' -> want the KEV eigenvalues of largest REAL part. -c 'SR' -> want the KEV eigenvalues of smallest REAL part. -c 'LI' -> want the KEV eigenvalues of largest imaginary part. -c 'SI' -> want the KEV eigenvalues of smallest imaginary part. -c -c KEV Integer. (INPUT) -c The number of desired eigenvalues. -c -c NP Integer. (INPUT) -c The number of shifts to compute. -c -c RITZ Complex array of length KEV+NP. (INPUT/OUTPUT) -c On INPUT, RITZ contains the the eigenvalues of H. -c On OUTPUT, RITZ are sorted so that the unwanted -c eigenvalues are in the first NP locations and the wanted -c portion is in the last KEV locations. When exact shifts are -c selected, the unwanted part corresponds to the shifts to -c be applied. Also, if ISHIFT .eq. 1, the unwanted eigenvalues -c are further sorted so that the ones with largest Ritz values -c are first. -c -c BOUNDS Complex array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex -c -c\Routines called: -c csortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c cvout ARPACK utility routine that prints vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: ngets.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. This routine does not keep complex conjugate pairs of -c eigenvalues together. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine cngets ( ishift, which, kev, np, ritz, bounds) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex - & bounds(kev+np), ritz(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex - & one, zero - parameter (one = (1.0E+0, 0.0E+0), zero = (0.0E+0, 0.0E+0)) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external cvout, csortc, arscnd -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcgets -c - call csortc (which, .true., kev+np, ritz, bounds) -c - if ( ishift .eq. 1 ) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when the shifts | -c | are applied in subroutine cnapps. | -c | Be careful and use 'SM' since we want to sort BOUNDS! | -c %-------------------------------------------------------% -c - call csortc ( 'SM', .true., np, bounds, ritz ) -c - end if -c - call arscnd (t1) - tcgets = tcgets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') - call cvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call cvout (logfil, kev+np, bounds, ndigit, - & '_ngets: Ritz estimates of the current KEV+NP Ritz values') - end if -c - return -c -c %---------------% -c | End of cngets | -c %---------------% -c - end
--- a/libcruft/arpack/src/csortc.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,322 +0,0 @@ -c\BeginDoc -c -c\Name: csortc -c -c\Description: -c Sorts the Complex array in X into the order -c specified by WHICH and optionally applies the permutation to the -c Real array Y. -c -c\Usage: -c call csortc -c ( WHICH, APPLY, N, X, Y ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> sort X into increasing order of magnitude. -c 'SM' -> sort X into decreasing order of magnitude. -c 'LR' -> sort X with real(X) in increasing algebraic order -c 'SR' -> sort X with real(X) in decreasing algebraic order -c 'LI' -> sort X with imag(X) in increasing algebraic order -c 'SI' -> sort X with imag(X) in decreasing algebraic order -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to array Y. -c APPLY = .FALSE. -> do not apply the sorted order to array Y. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c X Complex array of length N. (INPUT/OUTPUT) -c This is the array to be sorted. -c -c Y Complex array of length N. (INPUT/OUTPUT) -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines called: -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortc.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine csortc (which, apply, n, x, y) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex - & x(0:n-1), y(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Complex - & temp - Real - & temp1, temp2 -c -c %--------------------% -c | External functions | -c %--------------------% -c - Real - & slapy2 -c -c %--------------------% -c | Intrinsic Functions | -c %--------------------% - Intrinsic - & real, aimag -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'LM') then -c -c %--------------------------------------------% -c | Sort X into increasing order of magnitude. | -c %--------------------------------------------% -c - 10 continue - if (igap .eq. 0) go to 9000 -c - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - temp1 = slapy2(real(x(j)),aimag(x(j))) - temp2 = slapy2(real(x(j+igap)),aimag(x(j+igap))) -c - if (temp1.gt.temp2) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 30 - end if - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c %--------------------------------------------% -c | Sort X into decreasing order of magnitude. | -c %--------------------------------------------% -c - 40 continue - if (igap .eq. 0) go to 9000 -c - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j .lt. 0) go to 60 -c - temp1 = slapy2(real(x(j)),aimag(x(j))) - temp2 = slapy2(real(x(j+igap)),aimag(x(j+igap))) -c - if (temp1.lt.temp2) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LR') then -c -c %------------------------------------------------% -c | Sort XREAL into increasing order of algebraic. | -c %------------------------------------------------% -c - 70 continue - if (igap .eq. 0) go to 9000 -c - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (real(x(j)).gt.real(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'SR') then -c -c %------------------------------------------------% -c | Sort XREAL into decreasing order of algebraic. | -c %------------------------------------------------% -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (real(x(j)).lt.real(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 -c - else if (which .eq. 'LI') then -c -c %--------------------------------------------% -c | Sort XIMAG into increasing algebraic order | -c %--------------------------------------------% -c - 130 continue - if (igap .eq. 0) go to 9000 - do 150 i = igap, n-1 - j = i-igap - 140 continue -c - if (j.lt.0) go to 150 -c - if (aimag(x(j)).gt.aimag(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 150 - endif - j = j-igap - go to 140 - 150 continue - igap = igap / 2 - go to 130 -c - else if (which .eq. 'SI') then -c -c %---------------------------------------------% -c | Sort XIMAG into decreasing algebraic order | -c %---------------------------------------------% -c - 160 continue - if (igap .eq. 0) go to 9000 - do 180 i = igap, n-1 - j = i-igap - 170 continue -c - if (j.lt.0) go to 180 -c - if (aimag(x(j)).lt.aimag(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 180 - endif - j = j-igap - go to 170 - 180 continue - igap = igap / 2 - go to 160 - end if -c - 9000 continue - return -c -c %---------------% -c | End of csortc | -c %---------------% -c - end
--- a/libcruft/arpack/src/cstatn.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -c -c\SCCS Information: @(#) -c FILE: statn.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for complex nonsymmetric Arnoldi code. | -c %---------------------------------------------% - - subroutine cstatn -c -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% -c - include 'stat.h' - -c %-----------------------% -c | Executable Statements | -c %-----------------------% - - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 - - tcaupd = 0.0E+0 - tcaup2 = 0.0E+0 - tcaitr = 0.0E+0 - tceigh = 0.0E+0 - tcgets = 0.0E+0 - tcapps = 0.0E+0 - tcconv = 0.0E+0 - titref = 0.0E+0 - tgetv0 = 0.0E+0 - trvec = 0.0E+0 - -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% - tmvopx = 0.0E+0 - tmvbx = 0.0E+0 - - return -c -c %---------------% -c | End of cstatn | -c %---------------% -c - end
--- a/libcruft/arpack/src/debug.h Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -c -c\SCCS Information: @(#) -c FILE: debug.h SID: 2.3 DATE OF SID: 11/16/95 RELEASE: 2 -c -c %---------------------------------% -c | See debug.doc for documentation | -c %---------------------------------% - integer logfil, ndigit, mgetv0, - & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, - & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, - & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd - common /debug/ - & logfil, ndigit, mgetv0, - & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, - & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, - & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd
--- a/libcruft/arpack/src/dgetv0.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,419 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dgetv0 -c -c\Description: -c Generate a random initial residual vector for the Arnoldi process. -c Force the residual vector to be in the range of the operator OP. -c -c\Usage: -c call dgetv0 -c ( IDO, BMAT, ITRY, INITV, N, J, V, LDV, RESID, RNORM, -c IPNTR, WORKD, IERR ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to dgetv0. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B in the (generalized) -c eigenvalue problem A*x = lambda*B*x. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c ITRY Integer. (INPUT) -c ITRY counts the number of times that dgetv0 is called. -c It should be set to 1 on the initial call to dgetv0. -c -c INITV Logical variable. (INPUT) -c .TRUE. => the initial residual vector is given in RESID. -c .FALSE. => generate a random initial residual vector. -c -c N Integer. (INPUT) -c Dimension of the problem. -c -c J Integer. (INPUT) -c Index of the residual vector to be generated, with respect to -c the Arnoldi process. J > 1 in case of a "restart". -c -c V Double precision N by J array. (INPUT) -c The first J-1 columns of V contain the current Arnoldi basis -c if this is a "restart". -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c Initial residual vector to be generated. If RESID is -c provided, force RESID into the range of the operator OP. -c -c RNORM Double precision scalar. (OUTPUT) -c B-norm of the generated residual. -c -c IPNTR Integer array of length 3. (OUTPUT) -c -c WORKD Double precision work array of length 2*N. (REVERSE COMMUNICATION). -c On exit, WORK(1:N) = B*RESID to be used in SSAITR. -c -c IERR Integer. (OUTPUT) -c = 0: Normal exit. -c = -1: Cannot generate a nontrivial restarted residual vector -c in the range of the operator OP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine for vector output. -c dlarnv LAPACK routine for generating a random vector. -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c dcopy Level 1 BLAS that copies one vector to another. -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: getv0.F SID: 2.7 DATE OF SID: 04/07/99 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dgetv0 - & ( ido, bmat, itry, initv, n, j, v, ldv, resid, rnorm, - & ipntr, workd, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - logical initv - integer ido, ierr, itry, j, ldv, n - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Double precision - & resid(n), v(ldv,j), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical first, inits, orth - integer idist, iseed(4), iter, msglvl, jj - Double precision - & rnorm0 - save first, iseed, inits, iter, msglvl, orth, rnorm0 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dlarnv, dvout, dcopy, dgemv, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & ddot, dnrm2 - external ddot, dnrm2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, sqrt -c -c %-----------------% -c | Data Statements | -c %-----------------% -c - data inits /.true./ -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-----------------------------------% -c | Initialize the seed of the LAPACK | -c | random number generator | -c %-----------------------------------% -c - if (inits) then - iseed(1) = 1 - iseed(2) = 3 - iseed(3) = 5 - iseed(4) = 7 - inits = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mgetv0 -c - ierr = 0 - iter = 0 - first = .FALSE. - orth = .FALSE. -c -c %-----------------------------------------------------% -c | Possibly generate a random starting vector in RESID | -c | Use a LAPACK random number generator used by the | -c | matrix generation routines. | -c | idist = 1: uniform (0,1) distribution; | -c | idist = 2: uniform (-1,1) distribution; | -c | idist = 3: normal (0,1) distribution; | -c %-----------------------------------------------------% -c - if (.not.initv) then - idist = 2 - call dlarnv (idist, iseed, n, resid) - end if -c -c %----------------------------------------------------------% -c | Force the starting vector into the range of OP to handle | -c | the generalized problem when B is possibly (singular). | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nopx = nopx + 1 - ipntr(1) = 1 - ipntr(2) = n + 1 - call dcopy (n, resid, 1, workd, 1) - ido = -1 - go to 9000 - end if - end if -c -c %-----------------------------------------% -c | Back from computing OP*(initial-vector) | -c %-----------------------------------------% -c - if (first) go to 20 -c -c %-----------------------------------------------% -c | Back from computing B*(orthogonalized-vector) | -c %-----------------------------------------------% -c - if (orth) go to 40 -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - end if -c -c %------------------------------------------------------% -c | Starting vector is now in the range of OP; r = OP*r; | -c | Compute B-norm of starting vector. | -c %------------------------------------------------------% -c - call arscnd (t2) - first = .TRUE. - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, workd(n+1), 1, resid, 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd, 1) - end if -c - 20 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - first = .FALSE. - if (bmat .eq. 'G') then - rnorm0 = ddot (n, resid, 1, workd, 1) - rnorm0 = sqrt(abs(rnorm0)) - else if (bmat .eq. 'I') then - rnorm0 = dnrm2(n, resid, 1) - end if - rnorm = rnorm0 -c -c %---------------------------------------------% -c | Exit if this is the very first Arnoldi step | -c %---------------------------------------------% -c - if (j .eq. 1) go to 50 -c -c %---------------------------------------------------------------- -c | Otherwise need to B-orthogonalize the starting vector against | -c | the current Arnoldi basis using Gram-Schmidt with iter. ref. | -c | This is the case where an invariant subspace is encountered | -c | in the middle of the Arnoldi factorization. | -c | | -c | s = V^{T}*B*r; r = r - V*s; | -c | | -c | Stopping criteria used for iter. ref. is discussed in | -c | Parlett's book, page 107 and in Gragg & Reichel TOMS paper. | -c %---------------------------------------------------------------% -c - orth = .TRUE. - 30 continue -c - call dgemv ('T', n, j-1, one, v, ldv, workd, 1, - & zero, workd(n+1), 1) - call dgemv ('N', n, j-1, -one, v, ldv, workd(n+1), 1, - & one, resid, 1) -c -c %----------------------------------------------------------% -c | Compute the B-norm of the orthogonalized starting vector | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd, 1) - end if -c - 40 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = ddot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = dnrm2(n, resid, 1) - end if -c -c %--------------------------------------% -c | Check for further orthogonalization. | -c %--------------------------------------% -c - if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm0, ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') - call dvout (logfil, 1, rnorm, ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if -c - if (rnorm .gt. 0.717*rnorm0) go to 50 -c - iter = iter + 1 - if (iter .le. 5) then -c -c %-----------------------------------% -c | Perform iterative refinement step | -c %-----------------------------------% -c - rnorm0 = rnorm - go to 30 - else -c -c %------------------------------------% -c | Iterative refinement step "failed" | -c %------------------------------------% -c - do 45 jj = 1, n - resid(jj) = zero - 45 continue - rnorm = zero - ierr = -1 - end if -c - 50 continue -c - if (msglvl .gt. 0) then - call dvout (logfil, 1, rnorm, ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then - call dvout (logfil, n, resid, ndigit, - & '_getv0: initial / restarted starting vector') - end if - ido = 99 -c - call arscnd (t1) - tgetv0 = tgetv0 + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of dgetv0 | -c %---------------% -c - end
--- a/libcruft/arpack/src/dlaqrb.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,521 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dlaqrb -c -c\Description: -c Compute the eigenvalues and the Schur decomposition of an upper -c Hessenberg submatrix in rows and columns ILO to IHI. Only the -c last component of the Schur vectors are computed. -c -c This is mostly a modification of the LAPACK routine dlahqr. -c -c\Usage: -c call dlaqrb -c ( WANTT, N, ILO, IHI, H, LDH, WR, WI, Z, INFO ) -c -c\Arguments -c WANTT Logical variable. (INPUT) -c = .TRUE. : the full Schur form T is required; -c = .FALSE.: only eigenvalues are required. -c -c N Integer. (INPUT) -c The order of the matrix H. N >= 0. -c -c ILO Integer. (INPUT) -c IHI Integer. (INPUT) -c It is assumed that H is already upper quasi-triangular in -c rows and columns IHI+1:N, and that H(ILO,ILO-1) = 0 (unless -c ILO = 1). SLAQRB works primarily with the Hessenberg -c submatrix in rows and columns ILO to IHI, but applies -c transformations to all of H if WANTT is .TRUE.. -c 1 <= ILO <= max(1,IHI); IHI <= N. -c -c H Double precision array, dimension (LDH,N). (INPUT/OUTPUT) -c On entry, the upper Hessenberg matrix H. -c On exit, if WANTT is .TRUE., H is upper quasi-triangular in -c rows and columns ILO:IHI, with any 2-by-2 diagonal blocks in -c standard form. If WANTT is .FALSE., the contents of H are -c unspecified on exit. -c -c LDH Integer. (INPUT) -c The leading dimension of the array H. LDH >= max(1,N). -c -c WR Double precision array, dimension (N). (OUTPUT) -c WI Double precision array, dimension (N). (OUTPUT) -c The real and imaginary parts, respectively, of the computed -c eigenvalues ILO to IHI are stored in the corresponding -c elements of WR and WI. If two eigenvalues are computed as a -c complex conjugate pair, they are stored in consecutive -c elements of WR and WI, say the i-th and (i+1)th, with -c WI(i) > 0 and WI(i+1) < 0. If WANTT is .TRUE., the -c eigenvalues are stored in the same order as on the diagonal -c of the Schur form returned in H, with WR(i) = H(i,i), and, if -c H(i:i+1,i:i+1) is a 2-by-2 diagonal block, -c WI(i) = sqrt(H(i+1,i)*H(i,i+1)) and WI(i+1) = -WI(i). -c -c Z Double precision array, dimension (N). (OUTPUT) -c On exit Z contains the last components of the Schur vectors. -c -c INFO Integer. (OUPUT) -c = 0: successful exit -c > 0: SLAQRB failed to compute all the eigenvalues ILO to IHI -c in a total of 30*(IHI-ILO+1) iterations; if INFO = i, -c elements i+1:ihi of WR and WI contain those eigenvalues -c which have been successfully computed. -c -c\Remarks -c 1. None. -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dlabad LAPACK routine that computes machine constants. -c dlamch LAPACK routine that determines machine constants. -c dlanhs LAPACK routine that computes various norms of a matrix. -c dlanv2 LAPACK routine that computes the Schur factorization of -c 2 by 2 nonsymmetric matrix in standard form. -c dlarfg LAPACK Householder reflection construction routine. -c dcopy Level 1 BLAS that copies one vector to another. -c drot Level 1 BLAS that applies a rotation to a 2 by 2 matrix. - -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c Modified from the LAPACK routine dlahqr so that only the -c last component of the Schur vectors are computed. -c -c\SCCS Information: @(#) -c FILE: laqrb.F SID: 2.2 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dlaqrb ( wantt, n, ilo, ihi, h, ldh, wr, wi, - & z, info ) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - logical wantt - integer ihi, ilo, info, ldh, n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & h( ldh, * ), wi( * ), wr( * ), z( * ) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & zero, one, dat1, dat2 - parameter (zero = 0.0D+0, one = 1.0D+0, dat1 = 7.5D-1, - & dat2 = -4.375D-1) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, i1, i2, itn, its, j, k, l, m, nh, nr - Double precision - & cs, h00, h10, h11, h12, h21, h22, h33, h33s, - & h43h34, h44, h44s, ovfl, s, smlnum, sn, sum, - & t1, t2, t3, tst1, ulp, unfl, v1, v2, v3 - Double precision - & v( 3 ), work( 1 ) -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch, dlanhs - external dlamch, dlanhs -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy, dlabad, dlanv2, dlarfg, drot -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - info = 0 -c -c %--------------------------% -c | Quick return if possible | -c %--------------------------% -c - if( n.eq.0 ) - & return - if( ilo.eq.ihi ) then - wr( ilo ) = h( ilo, ilo ) - wi( ilo ) = zero - return - end if -c -c %---------------------------------------------% -c | Initialize the vector of last components of | -c | the Schur vectors for accumulation. | -c %---------------------------------------------% -c - do 5 j = 1, n-1 - z(j) = zero - 5 continue - z(n) = one -c - nh = ihi - ilo + 1 -c -c %-------------------------------------------------------------% -c | Set machine-dependent constants for the stopping criterion. | -c | If norm(H) <= sqrt(OVFL), overflow should not occur. | -c %-------------------------------------------------------------% -c - unfl = dlamch( 'safe minimum' ) - ovfl = one / unfl - call dlabad( unfl, ovfl ) - ulp = dlamch( 'precision' ) - smlnum = unfl*( nh / ulp ) -c -c %---------------------------------------------------------------% -c | I1 and I2 are the indices of the first row and last column | -c | of H to which transformations must be applied. If eigenvalues | -c | only are computed, I1 and I2 are set inside the main loop. | -c | Zero out H(J+2,J) = ZERO for J=1:N if WANTT = .TRUE. | -c | else H(J+2,J) for J=ILO:IHI-ILO-1 if WANTT = .FALSE. | -c %---------------------------------------------------------------% -c - if( wantt ) then - i1 = 1 - i2 = n - do 8 i=1,i2-2 - h(i1+i+1,i) = zero - 8 continue - else - do 9 i=1, ihi-ilo-1 - h(ilo+i+1,ilo+i-1) = zero - 9 continue - end if -c -c %---------------------------------------------------% -c | ITN is the total number of QR iterations allowed. | -c %---------------------------------------------------% -c - itn = 30*nh -c -c ------------------------------------------------------------------ -c The main loop begins here. I is the loop index and decreases from -c IHI to ILO in steps of 1 or 2. Each iteration of the loop works -c with the active submatrix in rows and columns L to I. -c Eigenvalues I+1 to IHI have already converged. Either L = ILO or -c H(L,L-1) is negligible so that the matrix splits. -c ------------------------------------------------------------------ -c - i = ihi - 10 continue - l = ilo - if( i.lt.ilo ) - & go to 150 - -c %--------------------------------------------------------------% -c | Perform QR iterations on rows and columns ILO to I until a | -c | submatrix of order 1 or 2 splits off at the bottom because a | -c | subdiagonal element has become negligible. | -c %--------------------------------------------------------------% - - do 130 its = 0, itn -c -c %----------------------------------------------% -c | Look for a single small subdiagonal element. | -c %----------------------------------------------% -c - do 20 k = i, l + 1, -1 - tst1 = abs( h( k-1, k-1 ) ) + abs( h( k, k ) ) - if( tst1.eq.zero ) - & tst1 = dlanhs( '1', i-l+1, h( l, l ), ldh, work ) - if( abs( h( k, k-1 ) ).le.max( ulp*tst1, smlnum ) ) - & go to 30 - 20 continue - 30 continue - l = k - if( l.gt.ilo ) then -c -c %------------------------% -c | H(L,L-1) is negligible | -c %------------------------% -c - h( l, l-1 ) = zero - end if -c -c %-------------------------------------------------------------% -c | Exit from loop if a submatrix of order 1 or 2 has split off | -c %-------------------------------------------------------------% -c - if( l.ge.i-1 ) - & go to 140 -c -c %---------------------------------------------------------% -c | Now the active submatrix is in rows and columns L to I. | -c | If eigenvalues only are being computed, only the active | -c | submatrix need be transformed. | -c %---------------------------------------------------------% -c - if( .not.wantt ) then - i1 = l - i2 = i - end if -c - if( its.eq.10 .or. its.eq.20 ) then -c -c %-------------------% -c | Exceptional shift | -c %-------------------% -c - s = abs( h( i, i-1 ) ) + abs( h( i-1, i-2 ) ) - h44 = dat1*s - h33 = h44 - h43h34 = dat2*s*s -c - else -c -c %-----------------------------------------% -c | Prepare to use Wilkinson's double shift | -c %-----------------------------------------% -c - h44 = h( i, i ) - h33 = h( i-1, i-1 ) - h43h34 = h( i, i-1 )*h( i-1, i ) - end if -c -c %-----------------------------------------------------% -c | Look for two consecutive small subdiagonal elements | -c %-----------------------------------------------------% -c - do 40 m = i - 2, l, -1 -c -c %---------------------------------------------------------% -c | Determine the effect of starting the double-shift QR | -c | iteration at row M, and see if this would make H(M,M-1) | -c | negligible. | -c %---------------------------------------------------------% -c - h11 = h( m, m ) - h22 = h( m+1, m+1 ) - h21 = h( m+1, m ) - h12 = h( m, m+1 ) - h44s = h44 - h11 - h33s = h33 - h11 - v1 = ( h33s*h44s-h43h34 ) / h21 + h12 - v2 = h22 - h11 - h33s - h44s - v3 = h( m+2, m+1 ) - s = abs( v1 ) + abs( v2 ) + abs( v3 ) - v1 = v1 / s - v2 = v2 / s - v3 = v3 / s - v( 1 ) = v1 - v( 2 ) = v2 - v( 3 ) = v3 - if( m.eq.l ) - & go to 50 - h00 = h( m-1, m-1 ) - h10 = h( m, m-1 ) - tst1 = abs( v1 )*( abs( h00 )+abs( h11 )+abs( h22 ) ) - if( abs( h10 )*( abs( v2 )+abs( v3 ) ).le.ulp*tst1 ) - & go to 50 - 40 continue - 50 continue -c -c %----------------------% -c | Double-shift QR step | -c %----------------------% -c - do 120 k = m, i - 1 -c -c ------------------------------------------------------------ -c The first iteration of this loop determines a reflection G -c from the vector V and applies it from left and right to H, -c thus creating a nonzero bulge below the subdiagonal. -c -c Each subsequent iteration determines a reflection G to -c restore the Hessenberg form in the (K-1)th column, and thus -c chases the bulge one step toward the bottom of the active -c submatrix. NR is the order of G. -c ------------------------------------------------------------ -c - nr = min( 3, i-k+1 ) - if( k.gt.m ) - & call dcopy( nr, h( k, k-1 ), 1, v, 1 ) - call dlarfg( nr, v( 1 ), v( 2 ), 1, t1 ) - if( k.gt.m ) then - h( k, k-1 ) = v( 1 ) - h( k+1, k-1 ) = zero - if( k.lt.i-1 ) - & h( k+2, k-1 ) = zero - else if( m.gt.l ) then - h( k, k-1 ) = -h( k, k-1 ) - end if - v2 = v( 2 ) - t2 = t1*v2 - if( nr.eq.3 ) then - v3 = v( 3 ) - t3 = t1*v3 -c -c %------------------------------------------------% -c | Apply G from the left to transform the rows of | -c | the matrix in columns K to I2. | -c %------------------------------------------------% -c - do 60 j = k, i2 - sum = h( k, j ) + v2*h( k+1, j ) + v3*h( k+2, j ) - h( k, j ) = h( k, j ) - sum*t1 - h( k+1, j ) = h( k+1, j ) - sum*t2 - h( k+2, j ) = h( k+2, j ) - sum*t3 - 60 continue -c -c %----------------------------------------------------% -c | Apply G from the right to transform the columns of | -c | the matrix in rows I1 to min(K+3,I). | -c %----------------------------------------------------% -c - do 70 j = i1, min( k+3, i ) - sum = h( j, k ) + v2*h( j, k+1 ) + v3*h( j, k+2 ) - h( j, k ) = h( j, k ) - sum*t1 - h( j, k+1 ) = h( j, k+1 ) - sum*t2 - h( j, k+2 ) = h( j, k+2 ) - sum*t3 - 70 continue -c -c %----------------------------------% -c | Accumulate transformations for Z | -c %----------------------------------% -c - sum = z( k ) + v2*z( k+1 ) + v3*z( k+2 ) - z( k ) = z( k ) - sum*t1 - z( k+1 ) = z( k+1 ) - sum*t2 - z( k+2 ) = z( k+2 ) - sum*t3 - - else if( nr.eq.2 ) then -c -c %------------------------------------------------% -c | Apply G from the left to transform the rows of | -c | the matrix in columns K to I2. | -c %------------------------------------------------% -c - do 90 j = k, i2 - sum = h( k, j ) + v2*h( k+1, j ) - h( k, j ) = h( k, j ) - sum*t1 - h( k+1, j ) = h( k+1, j ) - sum*t2 - 90 continue -c -c %----------------------------------------------------% -c | Apply G from the right to transform the columns of | -c | the matrix in rows I1 to min(K+3,I). | -c %----------------------------------------------------% -c - do 100 j = i1, i - sum = h( j, k ) + v2*h( j, k+1 ) - h( j, k ) = h( j, k ) - sum*t1 - h( j, k+1 ) = h( j, k+1 ) - sum*t2 - 100 continue -c -c %----------------------------------% -c | Accumulate transformations for Z | -c %----------------------------------% -c - sum = z( k ) + v2*z( k+1 ) - z( k ) = z( k ) - sum*t1 - z( k+1 ) = z( k+1 ) - sum*t2 - end if - 120 continue - - 130 continue -c -c %-------------------------------------------------------% -c | Failure to converge in remaining number of iterations | -c %-------------------------------------------------------% -c - info = i - return - - 140 continue - - if( l.eq.i ) then -c -c %------------------------------------------------------% -c | H(I,I-1) is negligible: one eigenvalue has converged | -c %------------------------------------------------------% -c - wr( i ) = h( i, i ) - wi( i ) = zero - - else if( l.eq.i-1 ) then -c -c %--------------------------------------------------------% -c | H(I-1,I-2) is negligible; | -c | a pair of eigenvalues have converged. | -c | | -c | Transform the 2-by-2 submatrix to standard Schur form, | -c | and compute and store the eigenvalues. | -c %--------------------------------------------------------% -c - call dlanv2( h( i-1, i-1 ), h( i-1, i ), h( i, i-1 ), - & h( i, i ), wr( i-1 ), wi( i-1 ), wr( i ), wi( i ), - & cs, sn ) - - if( wantt ) then -c -c %-----------------------------------------------------% -c | Apply the transformation to the rest of H and to Z, | -c | as required. | -c %-----------------------------------------------------% -c - if( i2.gt.i ) - & call drot( i2-i, h( i-1, i+1 ), ldh, h( i, i+1 ), ldh, - & cs, sn ) - call drot( i-i1-1, h( i1, i-1 ), 1, h( i1, i ), 1, cs, sn ) - sum = cs*z( i-1 ) + sn*z( i ) - z( i ) = cs*z( i ) - sn*z( i-1 ) - z( i-1 ) = sum - end if - end if -c -c %---------------------------------------------------------% -c | Decrement number of remaining iterations, and return to | -c | start of the main loop with new value of I. | -c %---------------------------------------------------------% -c - itn = itn - its - i = l - 1 - go to 10 - - 150 continue - return -c -c %---------------% -c | End of dlaqrb | -c %---------------% -c - end
--- a/libcruft/arpack/src/dnaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,840 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dnaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step nonsymmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in dnaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call dnaitr -c ( IDO, BMAT, N, K, NP, NB, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and do not need to be -c recompute in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. See dnaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M**x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current size of V and H. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c NB Integer. (INPUT) -c Blocksize to be used in the recurrence. -c Only work for NB = 1 right now. The goal is to have a -c program that implement both the block and non-block method. -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Double precision scalar. (INPUT/OUTPUT) -c B-norm of the starting residual on input. -c B-norm of the updated residual r_{k+p} on output. -c -c V Double precision N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (K+NP) by (K+NP) array. (INPUT/OUTPUT) -c H is used to store the generated upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On input, WORKD(1:N) = B*RESID and is used to save some -c computation at the first step. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of the spanning invariant subspace of OP found. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c dgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dmout ARPACK utility routine that prints matrices -c dvout ARPACK utility routine that prints vectors. -c dlabad LAPACK routine that computes machine constants. -c dlamch LAPACK routine that determines machine constants. -c dlascl LAPACK routine for careful scaling of a matrix. -c dlanhs LAPACK routine that computes various norms of a matrix. -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c daxpy Level 1 BLAS that computes a vector triad. -c dscal Level 1 BLAS that scales a vector. -c dcopy Level 1 BLAS that copies one vector to another . -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: naitr.F SID: 2.4 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c ( At present tol is zero ) -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in dnaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c H(:,j) = w_{j}; -c H(j,j-1) = rnorm -c rnorm = || r_(j) || -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dnaitr - & (ido, bmat, n, k, np, nb, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, nb, np - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Double precision - & h(ldh,k+np), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer ierr, i, infol, ipj, irj, ivj, iter, itry, j, msglvl, - & jj - Double precision - & betaj, ovfl, temp1, rnorm1, smlnum, tst1, ulp, unfl, - & wnorm - save first, orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, ovfl, - & betaj, rnorm1, smlnum, ulp, unfl, wnorm -c -c %-----------------------% -c | Local Array Arguments | -c %-----------------------% -c - Double precision - & xtemp(2) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external daxpy, dcopy, dscal, dgemv, dgetv0, dlabad, - & dvout, dmout, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & ddot, dnrm2, dlanhs, dlamch - external ddot, dnrm2, dlanhs, dlamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, sqrt -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------% -c | Set machine-dependent constants for the | -c | the splitting and deflation criterion. | -c | If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine dlahqr | -c %-----------------------------------------% -c - unfl = dlamch( 'safe minimum' ) - ovfl = one / unfl - call dlabad( unfl, ovfl ) - ulp = dlamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mnaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. - j = k + 1 - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. when .... | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | dgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %-----------------------------% -c | Else this is the first step | -c %-----------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% - - 1000 continue -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: generating Arnoldi vector number') - call dvout (logfil, 1, rnorm, ndigit, - & '_naitr: B-norm of the current residual is') - end if -c -c %---------------------------------------------------% -c | STEP 1: Check if the B norm of j-th residual | -c | vector is zero. Equivalent to determing whether | -c | an exact j-step Arnoldi factorization is present. | -c %---------------------------------------------------% -c - betaj = rnorm - if (rnorm .gt. zero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - betaj = zero - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call dgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tnaitr = tnaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call dcopy (n, resid, 1, v(1,j), 1) - if (rnorm .ge. unfl) then - temp1 = one / rnorm - call dscal (n, temp1, v(1,j), 1) - call dscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine SLASCL | -c %-----------------------------------------% -c - call dlascl ('General', i, i, rnorm, one, n, 1, - & v(1,j), n, infol) - call dlascl ('General', i, i, rnorm, one, n, 1, - & workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call dcopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | -c | if step3 = .true. | -c %----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call dcopy (n, workd(irj), 1, resid, 1) -c -c %---------------------------------------% -c | STEP 4: Finish extending the Arnoldi | -c | factorization to length j. | -c %---------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd(ipj), 1) - end if - 60 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j} | -c | if step4 = .true. | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - if (bmat .eq. 'G') then - wnorm = ddot (n, resid, 1, workd(ipj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'I') then - wnorm = dnrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - call dgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, h(1,j), 1) -c -c %--------------------------------------% -c | Orthogonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call dgemv ('N', n, j, -one, v, ldv, h(1,j), 1, - & one, resid, 1) -c - if (j .gt. 1) h(j,j-1) = betaj -c - call arscnd (t4) -c - orth1 = .true. -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - rnorm = ddot (n, resid, 1, workd(ipj), 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = dnrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c | The following test determines whether the sine of the | -c | angle between OP*x and the computed residual is less | -c | than or equal to 0.717. | -c %-----------------------------------------------------------% -c - if (rnorm .gt. 0.717*wnorm) go to 100 - iter = 0 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - xtemp(1) = wnorm - xtemp(2) = rnorm - call dvout (logfil, 2, xtemp, ndigit, - & '_naitr: re-orthonalization; wnorm and rnorm are') - call dvout (logfil, j, h(1,j), ndigit, - & '_naitr: j-th column of H') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call dgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %---------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) | -c | + v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j. | -c %---------------------------------------------% -c - call dgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) - call daxpy (j, one, workd(irj), 1, h(1,j), 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - rnorm1 = ddot (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt(abs(rnorm1)) - else if (bmat .eq. 'I') then - rnorm1 = dnrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm - xtemp(2) = rnorm1 - call dvout (logfil, 2, xtemp, ndigit, - & '_naitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if (rnorm1 .gt. 0.717*rnorm) then -c -c %---------------------------------------% -c | No need for further refinement. | -c | The cosine of the angle between the | -c | corrected residual vector and the old | -c | residual vector is greater than 0.717 | -c | In other words the corrected residual | -c | and the old residual vector share an | -c | angle of less than arcCOS(0.717) | -c %---------------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = zero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tnaitr = tnaitr + (t1 - t0) - ido = 99 - do 110 i = max(1,k), k+np-1 -c -c %--------------------------------------------% -c | Check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine dlahqr | -c %--------------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = dlanhs( '1', k+np, h, ldh, workd(n+1) ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 110 continue -c - if (msglvl .gt. 2) then - call dmout (logfil, k+np, k+np, h, ldh, ndigit, - & '_naitr: Final upper Hessenberg matrix H of order K+NP') - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of dnaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/dnapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,647 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dnapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP implicit shifts resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix which is the product of rotations -c and reflections resulting from the NP bulge chage sweeps. -c The updated Arnoldi factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call dnapps -c ( N, KEV, NP, SHIFTR, SHIFTI, V, LDV, H, LDH, RESID, Q, LDQ, -c WORKL, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. size of matrix A. -c -c KEV Integer. (INPUT/OUTPUT) -c KEV+NP is the size of the input matrix H. -c KEV is the size of the updated matrix HNEW. KEV is only -c updated on ouput when fewer than NP shifts are applied in -c order to keep the conjugate pair together. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFTR, Double precision array of length NP. (INPUT) -c SHIFTI Real and imaginary part of the shifts to be applied. -c Upon, entry to dnapps, the shifts must be sorted so that the -c conjugate pairs are in consecutive locations. -c -c V Double precision N by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, V contains the current KEV+NP Arnoldi vectors. -c On OUTPUT, V contains the updated KEV Arnoldi vectors -c in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (KEV+NP) by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, H contains the current KEV+NP by KEV+NP upper -c Hessenber matrix of the Arnoldi factorization. -c On OUTPUT, H contains the updated KEV by KEV upper Hessenberg -c matrix in the KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c On INPUT, RESID contains the the residual vector r_{k+p}. -c On OUTPUT, RESID is the update residual vector rnew_{k} -c in the first KEV locations. -c -c Q Double precision KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations and reflections -c during the bulge chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Double precision work array of length (KEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c WORKD Double precision work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dmout ARPACK utility routine that prints matrices. -c dvout ARPACK utility routine that prints vectors. -c dlabad LAPACK routine that computes machine constants. -c dlacpy LAPACK matrix copy routine. -c dlamch LAPACK routine that determines machine constants. -c dlanhs LAPACK routine that computes various norms of a matrix. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c dlarf LAPACK routine that applies Householder reflection to -c a matrix. -c dlarfg LAPACK Householder reflection construction routine. -c dlartg LAPACK Givens rotation construction routine. -c dlaset LAPACK matrix initialization routine. -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c daxpy Level 1 BLAS that computes a vector triad. -c dcopy Level 1 BLAS that copies one vector to another . -c dscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: napps.F SID: 2.4 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the sublocks of -c the Hessenberg matrix H and not just to the submatrix that it -c comes from. Deflation as in LAPACK routine dlahqr (QR algorithm -c for upper Hessenberg matrices ) is used. -c The subdiagonals of H are enforced to be non-negative. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dnapps - & ( n, kev, np, shiftr, shifti, v, ldv, h, ldh, resid, q, ldq, - & workl, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & h(ldh,kev+np), resid(n), shifti(np), shiftr(np), - & v(ldv,kev+np), q(ldq,kev+np), workd(2*n), workl(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, iend, ir, istart, j, jj, kplusp, msglvl, nr - logical cconj, first - Double precision - & c, f, g, h11, h12, h21, h22, h32, ovfl, r, s, sigmai, - & sigmar, smlnum, ulp, unfl, u(3), t, tau, tst1 - save first, ovfl, smlnum, ulp, unfl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external daxpy, dcopy, dscal, dlacpy, dlarfg, dlarf, - & dlaset, dlabad, arscnd, dlartg -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch, dlanhs, dlapy2 - external dlamch, dlanhs, dlapy2 -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs, max, min -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------------% -c | Set machine-dependent constants for the | -c | stopping criterion. If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine dlahqr | -c %-----------------------------------------------% -c - unfl = dlamch( 'safe minimum' ) - ovfl = one / unfl - call dlabad( unfl, ovfl ) - ulp = dlamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mnapps - kplusp = kev + np -c -c %--------------------------------------------% -c | Initialize Q to the identity to accumulate | -c | the rotations and reflections | -c %--------------------------------------------% -c - call dlaset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------% -c | Chase the bulge with the application of each | -c | implicit shift. Each shift is applied to the | -c | whole matrix including each block. | -c %----------------------------------------------% -c - cconj = .false. - do 110 jj = 1, np - sigmar = shiftr(jj) - sigmai = shifti(jj) -c - if (msglvl .gt. 2 ) then - call ivout (logfil, 1, jj, ndigit, - & '_napps: shift number.') - call dvout (logfil, 1, sigmar, ndigit, - & '_napps: The real part of the shift ') - call dvout (logfil, 1, sigmai, ndigit, - & '_napps: The imaginary part of the shift ') - end if -c -c %-------------------------------------------------% -c | The following set of conditionals is necessary | -c | in order that complex conjugate pairs of shifts | -c | are applied together or not at all. | -c %-------------------------------------------------% -c - if ( cconj ) then -c -c %-----------------------------------------% -c | cconj = .true. means the previous shift | -c | had non-zero imaginary part. | -c %-----------------------------------------% -c - cconj = .false. - go to 110 - else if ( jj .lt. np .and. abs( sigmai ) .gt. zero ) then -c -c %------------------------------------% -c | Start of a complex conjugate pair. | -c %------------------------------------% -c - cconj = .true. - else if ( jj .eq. np .and. abs( sigmai ) .gt. zero ) then -c -c %----------------------------------------------% -c | The last shift has a nonzero imaginary part. | -c | Don't apply it; thus the order of the | -c | compressed H is order KEV+1 since only np-1 | -c | were applied. | -c %----------------------------------------------% -c - kev = kev + 1 - go to 110 - end if - istart = 1 - 20 continue -c -c %--------------------------------------------------% -c | if sigmai = 0 then | -c | Apply the jj-th shift ... | -c | else | -c | Apply the jj-th and (jj+1)-th together ... | -c | (Note that jj < np at this point in the code) | -c | end | -c | to the current block of H. The next do loop | -c | determines the current block ; | -c %--------------------------------------------------% -c - do 30 i = istart, kplusp-1 -c -c %----------------------------------------% -c | Check for splitting and deflation. Use | -c | a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine dlahqr | -c %----------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_napps: matrix splitting with shift number.') - call dvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') - end if - iend = i - h(i+1,i) = zero - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, istart, ndigit, - & '_napps: Start of current block ') - call ivout (logfil, 1, iend, ndigit, - & '_napps: End of current block ') - end if -c -c %------------------------------------------------% -c | No reason to apply a shift to block of order 1 | -c %------------------------------------------------% -c - if ( istart .eq. iend ) go to 100 -c -c %------------------------------------------------------% -c | If istart + 1 = iend then no reason to apply a | -c | complex conjugate pair of shifts on a 2 by 2 matrix. | -c %------------------------------------------------------% -c - if ( istart + 1 .eq. iend .and. abs( sigmai ) .gt. zero ) - & go to 100 -c - h11 = h(istart,istart) - h21 = h(istart+1,istart) - if ( abs( sigmai ) .le. zero ) then -c -c %---------------------------------------------% -c | Real-valued shift ==> apply single shift QR | -c %---------------------------------------------% -c - f = h11 - sigmar - g = h21 -c - do 80 i = istart, iend-1 -c -c %-----------------------------------------------------% -c | Contruct the plane rotation G to zero out the bulge | -c %-----------------------------------------------------% -c - call dlartg (f, g, c, s, r) - if (i .gt. istart) then -c -c %-------------------------------------------% -c | The following ensures that h(1:iend-1,1), | -c | the first iend-2 off diagonal of elements | -c | H, remain non negative. | -c %-------------------------------------------% -c - if (r .lt. zero) then - r = -r - c = -c - s = -s - end if - h(i,i-1) = r - h(i+1,i-1) = zero - end if -c -c %---------------------------------------------% -c | Apply rotation to the left of H; H <- G'*H | -c %---------------------------------------------% -c - do 50 j = i, kplusp - t = c*h(i,j) + s*h(i+1,j) - h(i+1,j) = -s*h(i,j) + c*h(i+1,j) - h(i,j) = t - 50 continue -c -c %---------------------------------------------% -c | Apply rotation to the right of H; H <- H*G | -c %---------------------------------------------% -c - do 60 j = 1, min(i+2,iend) - t = c*h(j,i) + s*h(j,i+1) - h(j,i+1) = -s*h(j,i) + c*h(j,i+1) - h(j,i) = t - 60 continue -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 70 j = 1, min( i+jj, kplusp ) - t = c*q(j,i) + s*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = t - 70 continue -c -c %---------------------------% -c | Prepare for next rotation | -c %---------------------------% -c - if (i .lt. iend-1) then - f = h(i+1,i) - g = h(i+2,i) - end if - 80 continue -c -c %-----------------------------------% -c | Finished applying the real shift. | -c %-----------------------------------% -c - else -c -c %----------------------------------------------------% -c | Complex conjugate shifts ==> apply double shift QR | -c %----------------------------------------------------% -c - h12 = h(istart,istart+1) - h22 = h(istart+1,istart+1) - h32 = h(istart+2,istart+1) -c -c %---------------------------------------------------------% -c | Compute 1st column of (H - shift*I)*(H - conj(shift)*I) | -c %---------------------------------------------------------% -c - s = 2.0*sigmar - t = dlapy2 ( sigmar, sigmai ) - u(1) = ( h11 * (h11 - s) + t * t ) / h21 + h12 - u(2) = h11 + h22 - s - u(3) = h32 -c - do 90 i = istart, iend-1 -c - nr = min ( 3, iend-i+1 ) -c -c %-----------------------------------------------------% -c | Construct Householder reflector G to zero out u(1). | -c | G is of the form I - tau*( 1 u )' * ( 1 u' ). | -c %-----------------------------------------------------% -c - call dlarfg ( nr, u(1), u(2), 1, tau ) -c - if (i .gt. istart) then - h(i,i-1) = u(1) - h(i+1,i-1) = zero - if (i .lt. iend-1) h(i+2,i-1) = zero - end if - u(1) = one -c -c %--------------------------------------% -c | Apply the reflector to the left of H | -c %--------------------------------------% -c - call dlarf ('Left', nr, kplusp-i+1, u, 1, tau, - & h(i,i), ldh, workl) -c -c %---------------------------------------% -c | Apply the reflector to the right of H | -c %---------------------------------------% -c - ir = min ( i+3, iend ) - call dlarf ('Right', ir, nr, u, 1, tau, - & h(1,i), ldh, workl) -c -c %-----------------------------------------------------% -c | Accumulate the reflector in the matrix Q; Q <- Q*G | -c %-----------------------------------------------------% -c - call dlarf ('Right', kplusp, nr, u, 1, tau, - & q(1,i), ldq, workl) -c -c %----------------------------% -c | Prepare for next reflector | -c %----------------------------% -c - if (i .lt. iend-1) then - u(1) = h(i+1,i) - u(2) = h(i+2,i) - if (i .lt. iend-2) u(3) = h(i+3,i) - end if -c - 90 continue -c -c %--------------------------------------------% -c | Finished applying a complex pair of shifts | -c | to the current block | -c %--------------------------------------------% -c - end if -c - 100 continue -c -c %---------------------------------------------------------% -c | Apply the same shift to the next block if there is any. | -c %---------------------------------------------------------% -c - istart = iend + 1 - if (iend .lt. kplusp) go to 20 -c -c %---------------------------------------------% -c | Loop back to the top to get the next shift. | -c %---------------------------------------------% -c - 110 continue -c -c %--------------------------------------------------% -c | Perform a similarity transformation that makes | -c | sure that H will have non negative sub diagonals | -c %--------------------------------------------------% -c - do 120 j=1,kev - if ( h(j+1,j) .lt. zero ) then - call dscal( kplusp-j+1, -one, h(j+1,j), ldh ) - call dscal( min(j+2, kplusp), -one, h(1,j+1), 1 ) - call dscal( min(j+np+1,kplusp), -one, q(1,j+1), 1 ) - end if - 120 continue -c - do 130 i = 1, kev -c -c %--------------------------------------------% -c | Final check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine dlahqr | -c %--------------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = dlanhs( '1', kev, h, ldh, workl ) - if( h( i+1,i ) .le. max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 130 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is needed in the residual update since we | -c | cannot GUARANTEE that the corresponding entry | -c | of H would be zero as in exact arithmetic. | -c %-------------------------------------------------% -c - if (h(kev+1,kev) .gt. zero) - & call dgemv ('N', n, kplusp, one, v, ldv, q(1,kev+1), 1, zero, - & workd(n+1), 1) -c -c %----------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage of the upper Hessenberg structure of Q. | -c %----------------------------------------------------------% -c - do 140 i = 1, kev - call dgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call dcopy (n, workd, 1, v(1,kplusp-i+1), 1) - 140 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call dlacpy ('A', n, kev, v(1,kplusp-kev+1), ldv, v, ldv) -c -c %--------------------------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the appropriate place | -c %--------------------------------------------------------------% -c - if (h(kev+1,kev) .gt. zero) - & call dcopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kplusp}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call dscal (n, q(kplusp,kev), resid, 1) - if (h(kev+1,kev) .gt. zero) - & call daxpy (n, h(kev+1,kev), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call dvout (logfil, 1, q(kplusp,kev), ndigit, - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call dvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') - call ivout (logfil, 1, kev, ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call dmout (logfil, kev, kev, h, ldh, ndigit, - & '_napps: updated Hessenberg matrix H for next iteration') - end if -c - end if -c - 9000 continue - call arscnd (t1) - tnapps = tnapps + (t1 - t0) -c - return -c -c %---------------% -c | End of dnapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/dnaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,835 +0,0 @@ -c\BeginDoc -c -c\Name: dnaup2 -c -c\Description: -c Intermediate level interface called by dnaupd . -c -c\Usage: -c call dnaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZR, RITZI, BOUNDS, -c Q, LDQ, WORKL, IPNTR, WORKD, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in dnaupd . -c MODE, ISHIFT, MXITER: see the definition of IPARAM in dnaupd . -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV for two reasons. The first, is -c to keep complex conjugate pairs of "wanted" Ritz values -c together. The second, is that a leading block of the current -c upper Hessenberg matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Double precision N by (NEV+NP) array. (INPUT/OUTPUT) -c The Arnoldi basis vectors are returned in the first NEV -c columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (NEV+NP) by (NEV+NP) array. (OUTPUT) -c H is used to store the generated upper Hessenberg matrix -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZR, Double precision arrays of length NEV+NP. (OUTPUT) -c RITZI RITZR(1:NEV) (resp. RITZI(1:NEV)) contains the real (resp. -c imaginary) part of the computed Ritz values of OP. -c -c BOUNDS Double precision array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to -c the computed Ritz values. -c -c Q Double precision (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Double precision work array of length at least -c (NEV+NP)**2 + 3*(NEV+NP). (INPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in shifts calculation, shifts -c application and convergence checking. -c -c On exit, the last 3*(NEV+NP) locations of WORKL contain -c the Ritz values (real,imaginary) and associated Ritz -c estimates of the current Hessenberg matrix. They are -c listed in the same order as returned from dneigh . -c -c If ISHIFT .EQ. O and IDO .EQ. 3, the first 2*NP locations -c of WORKL are used in reverse communication to hold the user -c supplied shifts. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (WORKSPACE) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in DNAUPD. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. -c NP returns the number of converged Ritz values. -c = 2: No shifts could be applied. -c = -8: Error return from LAPACK eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Arnoldi factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c dgetv0 ARPACK initial vector generation routine. -c dnaitr ARPACK Arnoldi factorization routine. -c dnapps ARPACK application of implicit shifts routine. -c dnconv ARPACK convergence of Ritz values routine. -c dneigh ARPACK compute Ritz values and error bounds routine. -c dngets ARPACK reorder Ritz values and error bounds routine. -c dsortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dmout ARPACK utility routine that prints matrices -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c dcopy Level 1 BLAS that copies one vector to another . -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c dswap Level 1 BLAS that swaps two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naup2.F SID: 2.8 DATE OF SID: 10/17/00 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dnaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ipntr, workd, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, mode, ldh, ldq, ldv, mxiter, - & n, nev, np - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(13) - Double precision - & bounds(nev+np), h(ldh,nev+np), q(ldq,nev+np), resid(n), - & ritzi(nev+np), ritzr(nev+np), v(ldv,nev+np), - & workd(3*n), workl( (nev+np)*(nev+np+3) ) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0 , zero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character wprime*2 - logical cnorm , getv0, initv, update, ushift - integer ierr , iter , j , kplusp, msglvl, nconv, - & nevbef, nev0 , np0 , nptemp, numcnv - Double precision - & rnorm , temp , eps23 - save cnorm , getv0, initv, update, ushift, - & rnorm , iter , eps23, kplusp, msglvl, nconv , - & nevbef, nev0 , np0 , numcnv -c -c %-----------------------% -c | Local array arguments | -c %-----------------------% -c - integer kp(4) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy , dgetv0 , dnaitr , dnconv , dneigh , - & dngets , dnapps , dvout , ivout , arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & ddot , dnrm2 , dlapy2 , dlamch - external ddot , dnrm2 , dlapy2 , dlamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min, max, abs, sqrt -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c - call arscnd (t0) -c - msglvl = mnaup2 -c -c %-------------------------------------% -c | Get the machine dependent constant. | -c %-------------------------------------% -c - eps23 = dlamch ('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0 ) -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvlues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev + np - nconv = 0 - iter = 0 -c -c %---------------------------------------% -c | Set flags for computing the first NEV | -c | steps of the Arnoldi factorization. | -c %---------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call dgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. zero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1100 - end if - getv0 = .false. - ido = 0 - end if -c -c %-----------------------------------% -c | Back from reverse communication : | -c | continue with update step | -c %-----------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Arnoldi factorization | -c %----------------------------------------------------------% -c - call dnaitr (ido, bmat, n, 0, nev, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N ARNOLDI I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Arnoldi | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_naup2: **** Start of major iteration number ****') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c | Adjust NP since NEV might have been updated by last call | -c | to the shift application routine dnapps . | -c %-----------------------------------------------------------% -c - np = kplusp - nev -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_naup2: The length of the current Arnoldi factorization') - call ivout (logfil, 1, np, ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c %-----------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call dnaitr (ido , bmat, n , nev, np , mode , resid, - & rnorm, v , ldv, h , ldh, ipntr, workd, - & info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call dvout (logfil, 1, rnorm, ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current upper Hessenberg matrix. | -c %--------------------------------------------------------% -c - call dneigh (rnorm, kplusp, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %----------------------------------------------------% -c | Make a copy of eigenvalues and corresponding error | -c | bounds obtained from dneigh . | -c %----------------------------------------------------% -c - call dcopy (kplusp, ritzr, 1, workl(kplusp**2+1), 1) - call dcopy (kplusp, ritzi, 1, workl(kplusp**2+kplusp+1), 1) - call dcopy (kplusp, bounds, 1, workl(kplusp**2+2*kplusp+1), 1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | error bounds are in the last NEV loc. of RITZR, | -c | RITZI and BOUNDS respectively. The variables NEV | -c | and NP may be updated if the NEV-th wanted Ritz | -c | value has a non zero imaginary part. In this case | -c | NEV is increased by one and NP decreased by one. | -c | NOTE: The last two arguments of dngets are no | -c | longer used as of version 2.1. | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 - numcnv = nev - call dngets (ishift, which, nev, np, ritzr, ritzi, - & bounds, workl, workl(np+1)) - if (nev .eq. nev0+1) numcnv = nev0+1 -c -c %-------------------% -c | Convergence test. | -c %-------------------% -c - call dcopy (nev, bounds(np+1), 1, workl(2*np+1), 1) - call dnconv (nev, ritzr(np+1), ritzi(np+1), workl(2*np+1), - & tol, nconv) -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = numcnv - kp(4) = nconv - call ivout (logfil, 4, kp, ndigit, - & '_naup2: NEV, NP, NUMCNV, NCONV are') - call dvout (logfil, kplusp, ritzr, ndigit, - & '_naup2: Real part of the eigenvalues of H') - call dvout (logfil, kplusp, ritzi, ndigit, - & '_naup2: Imaginary part of the eigenvalues of H') - call dvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. numcnv) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c - if (msglvl .gt. 4) then - call dvout (logfil, kplusp, workl(kplusp**2+1), ndigit, - & '_naup2: Real part of the eig computed by _neigh:') - call dvout (logfil, kplusp, workl(kplusp**2+kplusp+1), - & ndigit, - & '_naup2: Imag part of the eig computed by _neigh:') - call dvout (logfil, kplusp, workl(kplusp**2+kplusp*2+1), - & ndigit, - & '_naup2: Ritz eistmates computed by _neigh:') - end if -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP | -c %------------------------------------------------% -c -c %------------------------------------------% -c | Use h( 3,1 ) as storage to communicate | -c | rnorm to _neupd if needed | -c %------------------------------------------% - - h(3,1) = rnorm -c -c %----------------------------------------------% -c | To be consistent with dngets , we first do a | -c | pre-processing sort in order to keep complex | -c | conjugate pairs together. This is similar | -c | to the pre-processing sort used in dngets | -c | except that the sort is done in the opposite | -c | order. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SR' - if (which .eq. 'SM') wprime = 'LR' - if (which .eq. 'LR') wprime = 'SM' - if (which .eq. 'SR') wprime = 'LM' - if (which .eq. 'LI') wprime = 'SM' - if (which .eq. 'SI') wprime = 'LM' -c - call dsortc (wprime, .true., kplusp, ritzr, ritzi, bounds) -c -c %----------------------------------------------% -c | Now sort Ritz values so that converged Ritz | -c | values appear within the first NEV locations | -c | of ritzr, ritzi and bounds, and the most | -c | desired one appears at the front. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LR') wprime = 'SR' - if (which .eq. 'SR') wprime = 'LR' - if (which .eq. 'LI') wprime = 'SI' - if (which .eq. 'SI') wprime = 'LI' -c - call dsortc (wprime, .true., kplusp, ritzr, ritzi, bounds) -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23,magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, numcnv - temp = max(eps23,dlapy2 (ritzr(j), - & ritzi(j))) - bounds(j) = bounds(j)/temp - 35 continue -c -c %----------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | esitmates. This will push all the converged ones | -c | towards the front of ritzr, ritzi, bounds | -c | (in the case when NCONV < NEV.) | -c %----------------------------------------------------% -c - wprime = 'LR' - call dsortc (wprime, .true., numcnv, bounds, ritzr, ritzi) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, numcnv - temp = max(eps23, dlapy2 (ritzr(j), - & ritzi(j))) - bounds(j) = bounds(j)*temp - 40 continue -c -c %------------------------------------------------% -c | Sort the converged Ritz values again so that | -c | the "threshold" value appears at the front of | -c | ritzr, ritzi and bound. | -c %------------------------------------------------% -c - call dsortc (which, .true., nconv, ritzr, ritzi, bounds) -c - if (msglvl .gt. 1) then - call dvout (logfil, kplusp, ritzr, ndigit, - & '_naup2: Sorted real part of the eigenvalues') - call dvout (logfil, kplusp, ritzi, ndigit, - & '_naup2: Sorted imaginary part of the eigenvalues') - call dvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. numcnv) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. numcnv) info = 2 -c - np = nconv - go to 1100 -c - else if ( (nconv .lt. numcnv) .and. (ishift .eq. 1) ) then -c -c %-------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the size | -c | of NEV. | -c %-------------------------------------------------% -c - nevbef = nev - nev = nev + min(nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 3) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call dngets (ishift, which, nev, np, ritzr, ritzi, - & bounds, workl, workl(np+1)) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_naup2: NEV and NP are') - call dvout (logfil, nev, ritzr(np+1), ndigit, - & '_naup2: "wanted" Ritz values -- real part') - call dvout (logfil, nev, ritzi(np+1), ndigit, - & '_naup2: "wanted" Ritz values -- imag part') - call dvout (logfil, nev, bounds(np+1), ndigit, - & '_naup2: Ritz estimates of the "wanted" values ') - end if - end if -c - if (ishift .eq. 0) then -c -c %-------------------------------------------------------% -c | User specified shifts: reverse comminucation to | -c | compute the shifts. They are returned in the first | -c | 2*NP locations of WORKL. | -c %-------------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if -c - 50 continue -c -c %------------------------------------% -c | Back from reverse communication; | -c | User specified shifts are returned | -c | in WORKL(1:2*NP) | -c %------------------------------------% -c - ushift = .false. -c - if ( ishift .eq. 0 ) then -c -c %----------------------------------% -c | Move the NP shifts from WORKL to | -c | RITZR, RITZI to free up WORKL | -c | for non-exact shift case. | -c %----------------------------------% -c - call dcopy (np, workl, 1, ritzr, 1) - call dcopy (np, workl(np+1), 1, ritzi, 1) - end if -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_naup2: The number of shifts to apply ') - call dvout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') - call dvout (logfil, np, ritzi, ndigit, - & '_naup2: Imaginary part of the shifts') - if ( ishift .eq. 1 ) - & call dvout (logfil, np, bounds, ndigit, - & '_naup2: Ritz estimates of the shifts') - end if -c -c %---------------------------------------------------------% -c | Apply the NP implicit shifts by QR bulge chasing. | -c | Each shift is applied to the whole upper Hessenberg | -c | matrix H. | -c | The first 2*N locations of WORKD are used as workspace. | -c %---------------------------------------------------------% -c - call dnapps (n, nev, np, ritzr, ritzi, v, ldv, - & h, ldh, resid, q, ldq, workl, workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to dnaitr . | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = ddot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = dnrm2 (n, resid, 1) - end if - cnorm = .false. -c - if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm, ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call dmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = numcnv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error Exit | -c %------------% -c - call arscnd (t1) - tnaup2 = t1 - t0 -c - 9000 continue -c -c %---------------% -c | End of dnaup2 | -c %---------------% -c - return - end
--- a/libcruft/arpack/src/dnaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,693 +0,0 @@ -c\BeginDoc -c -c\Name: dnaupd -c -c\Description: -c Reverse communication interface for the Implicitly Restarted Arnoldi -c iteration. This subroutine computes approximations to a few eigenpairs -c of a linear operator "OP" with respect to a semi-inner product defined by -c a symmetric positive semi-definite real matrix B. B may be the identity -c matrix. NOTE: If the linear operator "OP" is real and symmetric -c with respect to the real positive semi-definite symmetric matrix B, -c i.e. B*OP = (OP`)*B, then subroutine dsaupd should be used instead. -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c dnaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x. -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, M symmetric positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: A*x = lambda*M*x, M symmetric semi-definite -c ===> OP = Real_Part{ inv[A - sigma*M]*M } and B = M. -c ===> shift-and-invert mode (in real arithmetic) -c If OP*x = amu*x, then -c amu = 1/2 * [ 1/(lambda-sigma) + 1/(lambda-conjg(sigma)) ]. -c Note: If sigma is real, i.e. imaginary part of sigma is zero; -c Real_Part{ inv[A - sigma*M]*M } == inv[A - sigma*M]*M -c amu == 1/(lambda-sigma). -c -c Mode 4: A*x = lambda*M*x, M symmetric semi-definite -c ===> OP = Imaginary_Part{ inv[A - sigma*M]*M } and B = M. -c ===> shift-and-invert mode (in real arithmetic) -c If OP*x = amu*x, then -c amu = 1/2i * [ 1/(lambda-sigma) - 1/(lambda-conjg(sigma)) ]. -c -c Both mode 3 and 4 give the same enhancement to eigenvalues close to -c the (complex) shift sigma. However, as lambda goes to infinity, -c the operator OP in mode 4 dampens the eigenvalues more strongly than -c does OP defined in mode 3. -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call dnaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to dnaupd . IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c dnaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3 and 4, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute the IPARAM(8) real and imaginary parts -c of the shifts where INPTR(14) is the pointer -c into WORKL for placing the shifts. See Remark -c 5 below. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c BMAT = 'I' -> standard eigenvalue problem A*x = lambda*x -c BMAT = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c 'LM' -> want the NEV eigenvalues of largest magnitude. -c 'SM' -> want the NEV eigenvalues of smallest magnitude. -c 'LR' -> want the NEV eigenvalues of largest real part. -c 'SR' -> want the NEV eigenvalues of smallest real part. -c 'LI' -> want the NEV eigenvalues of largest imaginary part. -c 'SI' -> want the NEV eigenvalues of smallest imaginary part. -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N-1. -c -c TOL Double precision scalar. (INPUT) -c Stopping criterion: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)) -c where ABS(RITZ(I)) is the magnitude when RITZ(I) is complex. -c DEFAULT = DLAMCH ('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine DLAMCH ). -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V. NCV must satisfy the two -c inequalities 2 <= NCV-NEV and NCV <= N. -c This will indicate how many Arnoldi vectors are generated -c at each iteration. After the startup phase in which NEV -c Arnoldi vectors are generated, the algorithm generates -c approximately NCV-NEV Arnoldi vectors at each subsequent update -c iteration. Most of the cost in generating each Arnoldi vector is -c in the matrix-vector operation OP*x. -c NOTE: 2 <= NCV-NEV in order that complex conjugate pairs of Ritz -c values are kept together. (See remark 4 below) -c -c V Double precision array N by NCV. (OUTPUT) -c Contains the final set of Arnoldi basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to restart -c the Arnoldi iteration in an implicit fashion. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are provided by the user via -c reverse communication. The real and imaginary -c parts of the NCV eigenvalues of the Hessenberg -c matrix H are returned in the part of the WORKL -c array corresponding to RITZR and RITZI. See remark -c 5 below. -c ISHIFT = 1: exact shifts with respect to the current -c Hessenberg matrix H. This is equivalent to -c restarting the iteration with a starting vector -c that is a linear combination of approximate Schur -c vectors associated with the "wanted" Ritz values. -c ------------------------------------------------------------- -c -c IPARAM(2) = No longer referenced. -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3,4; See under \Description of dnaupd for the -c four modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), dnaupd returns NP, the number -c of shifts the user is to provide. 0 < NP <=NCV-NEV. See Remark -c 5 below. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 14. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by NCV upper Hessenberg matrix -c H in WORKL. -c IPNTR(6): pointer to the real part of the ritz value array -c RITZR in WORKL. -c IPNTR(7): pointer to the imaginary part of the ritz value array -c RITZI in WORKL. -c IPNTR(8): pointer to the Ritz estimates in array WORKL associated -c with the Ritz values located in RITZR and RITZI in WORKL. -c -c IPNTR(14): pointer to the NP shifts in WORKL. See Remark 5 below. -c -c Note: IPNTR(9:13) is only referenced by dneupd . See Remark 2 below. -c -c IPNTR(9): pointer to the real part of the NCV RITZ values of the -c original system. -c IPNTR(10): pointer to the imaginary part of the NCV RITZ values of -c the original system. -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper quasi-triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c dneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration. Upon termination -c WORKD(1:N) contains B*RESID(1:N). If an invariant subspace -c associated with the converged Ritz values is desired, see remark -c 2 below, subroutine dneupd uses this output. -c See Data Distribution Note below. -c -c WORKL Double precision work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least 3*NCV**2 + 6*NCV. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -4: The maximum number of Arnoldi update iteration -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation; -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatable. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -9999: Could not build an Arnoldi factorization. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. -c -c\Remarks -c 1. The computed Ritz values are approximate eigenvalues of OP. The -c selection of WHICH should be made with this in mind when -c Mode = 3 and 4. After convergence, approximate eigenvalues of the -c original problem may be obtained with the ARPACK subroutine dneupd . -c -c 2. If a basis for the invariant subspace corresponding to the converged Ritz -c values is needed, the user must call dneupd immediately following -c completion of dnaupd . This is new starting with release 2 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requrement is that NCV > NEV + 2. -c However, it is recommended that NCV .ge. 2*NEV+1. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c See Chapter 8 of Reference 2 for further information. -c -c 5. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) real and imaginary parts of the shifts in locations -c real part imaginary part -c ----------------------- -------------- -c 1 WORKL(IPNTR(14)) WORKL(IPNTR(14)+NP) -c 2 WORKL(IPNTR(14)+1) WORKL(IPNTR(14)+NP+1) -c . . -c . . -c . . -c NP WORKL(IPNTR(14)+NP-1) WORKL(IPNTR(14)+2*NP-1). -c -c Only complex conjugate pairs of shifts may be applied and the pairs -c must be placed in consecutive locations. The real part of the -c eigenvalues of the current upper Hessenberg matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1) and the imaginary part -c in WORKL(IPNTR(7)) through WORKL(IPNTR(7)+NCV-1). They are ordered -c according to the order defined by WHICH. The complex conjugate -c pairs are kept together and the associated Ritz estimates are located in -c WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c Double precision resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c decompose d1(n), d2(n,ncv) -c align resid(i) with d1(i) -c align v(i,j) with d2(i,j) -c align workd(i) with d1(i) range (1:n) -c align workd(i) with d1(i-n) range (n+1:2*n) -c align workd(i) with d1(i-2*n) range (2*n+1:3*n) -c distribute d1(block), d2(block,:) -c replicated workl(lworkl) -c -c Cray MPP syntax: -c =============== -c Double precision resid(n), v(ldv,ncv), workd(n,3), workl(lworkl) -c shared resid(block), v(block,:), workd(block,:) -c replicated workl(lworkl) -c -c CM2/CM5 syntax: -c ============== -c -c----------------------------------------------------------------------- -c -c include 'ex-nonsym.doc' -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "Complex Shift and Invert Strategies for -c Real Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c dnaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version '1.1' -c -c\SCCS Information: @(#) -c FILE: naupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dnaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - Double precision - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0 , zero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritzi, ritzr, j - save bounds, ih, iq, ishift, iupd, iw, ldh, ldq, - & levec, mode, msglvl, mxiter, nb, nev0, next, - & np, ritzi, ritzr -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dnaup2 , dvout , ivout, arscnd, dstatn -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch - external dlamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call dstatn - call arscnd (t0) - msglvl = mnaupd -c -c %----------------% -c | Error checking | -c %----------------% -c - ierr = 0 - ishift = iparam(1) -c levec = iparam(2) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (mxiter .le. 0) then - ierr = -4 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 6*ncv) then - ierr = -7 - else if (mode .lt. 1 .or. mode .gt. 4) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - else if (ishift .lt. 0 .or. ishift .gt. 1) then - ierr = -12 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. zero) tol = dlamch ('EpsMach') -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, 3*ncv**2 + 6*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+2*ncv) := real and imaginary | -c | parts of ritz values | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := error bounds | -c | workl(ncv*ncv+3*ncv+1:2*ncv*ncv+3*ncv) := rotation matrix Q | -c | workl(2*ncv*ncv+3*ncv+1:3*ncv*ncv+6*ncv) := workspace | -c | The final workspace is needed by subroutine dneigh called | -c | by dnaup2 . Subroutine dneigh calls LAPACK routines for | -c | calculating eigenvalues and the last row of the eigenvector | -c | matrix. | -c %-------------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritzr = ih + ldh*ncv - ritzi = ritzr + ncv - bounds = ritzi + ncv - iq = bounds + ncv - iw = iq + ldq*ncv - next = iw + ncv**2 + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritzr - ipntr(7) = ritzi - ipntr(8) = bounds - ipntr(14) = iw -c - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Arnoldi Iteration. | -c %-------------------------------------------------------% -c - call dnaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritzr), - & workl(ritzi), workl(bounds), workl(iq), ldq, workl(iw), - & ipntr, workd, info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP or shifts. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within dnaup2 . | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_naupd: Number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call dvout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') - call dvout (logfil, np, workl(ritzi), ndigit, - & '_naupd: Imaginary part of the final Ritz values') - call dvout (logfil, np, workl(bounds), ndigit, - & '_naupd: Associated Ritz estimates') - end if -c - call arscnd (t1) - tnaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tnaupd, tnaup2, tnaitr, titref, - & tgetv0, tneigh, tngets, tnapps, tnconv, trvec - 1000 format (//, - & 5x, '=============================================',/ - & 5x, '= Nonsymmetric implicit Arnoldi update code =',/ - & 5x, '= Version Number: ', ' 2.4' , 21x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 16x, ' =',/ - & 5x, '=============================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '=============================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in naup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in Hessenberg eig. subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6,/ - & 5x, 'Total time in computing final Ritz vectors = ', f12.6/) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of dnaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/dnconv.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dnconv -c -c\Description: -c Convergence testing for the nonsymmetric Arnoldi eigenvalue routine. -c -c\Usage: -c call dnconv -c ( N, RITZR, RITZI, BOUNDS, TOL, NCONV ) -c -c\Arguments -c N Integer. (INPUT) -c Number of Ritz values to check for convergence. -c -c RITZR, Double precision arrays of length N. (INPUT) -c RITZI Real and imaginary parts of the Ritz values to be checked -c for convergence. - -c BOUNDS Double precision array of length N. (INPUT) -c Ritz estimates for the Ritz values in RITZR and RITZI. -c -c TOL Double precision scalar. (INPUT) -c Desired backward error for a Ritz value to be considered -c "converged". -c -c NCONV Integer scalar. (OUTPUT) -c Number of "converged" Ritz values. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: nconv.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. xxxx -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dnconv (n, ritzr, ritzi, bounds, tol, nconv) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer n, nconv - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% - - Double precision - & ritzr(n), ritzi(n), bounds(n) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i - Double precision - & temp, eps23 -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlapy2, dlamch - external dlapy2, dlamch - -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------------------------------------% -c | Convergence test: unlike in the symmetric code, I am not | -c | using things like refined error bounds and gap condition | -c | because I don't know the exact equivalent concept. | -c | | -c | Instead the i-th Ritz value is considered "converged" when: | -c | | -c | bounds(i) .le. ( TOL * | ritz | ) | -c | | -c | for some appropriate choice of norm. | -c %-------------------------------------------------------------% -c - call arscnd (t0) -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0) -c - nconv = 0 - do 20 i = 1, n - temp = max( eps23, dlapy2( ritzr(i), ritzi(i) ) ) - if (bounds(i) .le. tol*temp) nconv = nconv + 1 - 20 continue -c - call arscnd (t1) - tnconv = tnconv + (t1 - t0) -c - return -c -c %---------------% -c | End of dnconv | -c %---------------% -c - end
--- a/libcruft/arpack/src/dneigh.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,314 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dneigh -c -c\Description: -c Compute the eigenvalues of the current upper Hessenberg matrix -c and the corresponding Ritz estimates given the current residual norm. -c -c\Usage: -c call dneigh -c ( RNORM, N, H, LDH, RITZR, RITZI, BOUNDS, Q, LDQ, WORKL, IERR ) -c -c\Arguments -c RNORM Double precision scalar. (INPUT) -c Residual norm corresponding to the current upper Hessenberg -c matrix H. -c -c N Integer. (INPUT) -c Size of the matrix H. -c -c H Double precision N by N array. (INPUT) -c H contains the current upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZR, Double precision arrays of length N. (OUTPUT) -c RITZI On output, RITZR(1:N) (resp. RITZI(1:N)) contains the real -c (respectively imaginary) parts of the eigenvalues of H. -c -c BOUNDS Double precision array of length N. (OUTPUT) -c On output, BOUNDS contains the Ritz estimates associated with -c the eigenvalues RITZR and RITZI. This is equal to RNORM -c times the last components of the eigenvectors corresponding -c to the eigenvalues in RITZR and RITZI. -c -c Q Double precision N by N array. (WORKSPACE) -c Workspace needed to store the eigenvectors of H. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Double precision work array of length N**2 + 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. This is needed to keep the full Schur form -c of H and also in the calculation of the eigenvectors of H. -c -c IERR Integer. (OUTPUT) -c Error exit flag from dlaqrb or dtrevc. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dlaqrb ARPACK routine to compute the real Schur form of an -c upper Hessenberg matrix and last row of the Schur vectors. -c arscnd ARPACK utility routine for timing. -c dmout ARPACK utility routine that prints matrices -c dvout ARPACK utility routine that prints vectors. -c dlacpy LAPACK matrix copy routine. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c dtrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper quasi-triangular form -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c dcopy Level 1 BLAS that copies one vector to another . -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c dscal Level 1 BLAS that scales a vector. -c -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: neigh.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dneigh (rnorm, n, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ierr) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, n, ldh, ldq - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & bounds(n), h(ldh,n), q(ldq,n), ritzi(n), ritzr(n), - & workl(n*(n+3)) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical select(1) - integer i, iconj, msglvl - Double precision - & temp, vl(1) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy, dlacpy, dlaqrb, dtrevc, dvout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlapy2, dnrm2 - external dlapy2, dnrm2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mneigh -c - if (msglvl .gt. 2) then - call dmout (logfil, n, n, h, ldh, ndigit, - & '_neigh: Entering upper Hessenberg matrix H ') - end if -c -c %-----------------------------------------------------------% -c | 1. Compute the eigenvalues, the last components of the | -c | corresponding Schur vectors and the full Schur form T | -c | of the current upper Hessenberg matrix H. | -c | dlaqrb returns the full Schur form of H in WORKL(1:N**2) | -c | and the last components of the Schur vectors in BOUNDS. | -c %-----------------------------------------------------------% -c - call dlacpy ('All', n, n, h, ldh, workl, n) - call dlaqrb (.true., n, 1, n, workl, n, ritzr, ritzi, bounds, - & ierr) - if (ierr .ne. 0) go to 9000 -c - if (msglvl .gt. 1) then - call dvout (logfil, n, bounds, ndigit, - & '_neigh: last row of the Schur matrix for H') - end if -c -c %-----------------------------------------------------------% -c | 2. Compute the eigenvectors of the full Schur form T and | -c | apply the last components of the Schur vectors to get | -c | the last components of the corresponding eigenvectors. | -c | Remember that if the i-th and (i+1)-st eigenvalues are | -c | complex conjugate pairs, then the real & imaginary part | -c | of the eigenvector components are split across adjacent | -c | columns of Q. | -c %-----------------------------------------------------------% -c - call dtrevc ('R', 'A', select, n, workl, n, vl, n, q, ldq, - & n, n, workl(n*n+1), ierr) -c - if (ierr .ne. 0) go to 9000 -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | euclidean norms are all one. LAPACK subroutine | -c | dtrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; here the magnitude of a complex | -c | number (x,y) is taken to be |x| + |y|. | -c %------------------------------------------------% -c - iconj = 0 - do 10 i=1, n - if ( abs( ritzi(i) ) .le. zero ) then -c -c %----------------------% -c | Real eigenvalue case | -c %----------------------% -c - temp = dnrm2( n, q(1,i), 1 ) - call dscal ( n, one / temp, q(1,i), 1 ) - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we further normalize by the | -c | square root of two. | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - temp = dlapy2( dnrm2( n, q(1,i), 1 ), - & dnrm2( n, q(1,i+1), 1 ) ) - call dscal ( n, one / temp, q(1,i), 1 ) - call dscal ( n, one / temp, q(1,i+1), 1 ) - iconj = 1 - else - iconj = 0 - end if - end if - 10 continue -c - call dgemv ('T', n, n, one, q, ldq, bounds, 1, zero, workl, 1) -c - if (msglvl .gt. 1) then - call dvout (logfil, n, workl, ndigit, - & '_neigh: Last row of the eigenvector matrix for H') - end if -c -c %----------------------------% -c | Compute the Ritz estimates | -c %----------------------------% -c - iconj = 0 - do 20 i = 1, n - if ( abs( ritzi(i) ) .le. zero ) then -c -c %----------------------% -c | Real eigenvalue case | -c %----------------------% -c - bounds(i) = rnorm * abs( workl(i) ) - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we need to take the magnitude | -c | of the last components of the two vectors | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - bounds(i) = rnorm * dlapy2( workl(i), workl(i+1) ) - bounds(i+1) = bounds(i) - iconj = 1 - else - iconj = 0 - end if - end if - 20 continue -c - if (msglvl .gt. 2) then - call dvout (logfil, n, ritzr, ndigit, - & '_neigh: Real part of the eigenvalues of H') - call dvout (logfil, n, ritzi, ndigit, - & '_neigh: Imaginary part of the eigenvalues of H') - call dvout (logfil, n, bounds, ndigit, - & '_neigh: Ritz estimates for the eigenvalues of H') - end if -c - call arscnd (t1) - tneigh = tneigh + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of dneigh | -c %---------------% -c - end
--- a/libcruft/arpack/src/dneupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1068 +0,0 @@ -c\BeginDoc -c -c\Name: dneupd -c -c\Description: -c -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) The corresponding approximate eigenvectors; -c -c (2) An orthonormal basis for the associated approximate -c invariant subspace; -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c basis is always computed. There is an additional storage cost of n*nev -c if both are requested (in this case a separate array Z must be supplied). -c -c The approximate eigenvalues and eigenvectors of A*z = lambda*B*z -c are derived from approximate eigenvalues and eigenvectors of -c of the linear operator OP prescribed by the MODE selection in the -c call to DNAUPD . DNAUPD must be called before this routine is called. -c These approximate eigenvalues and vectors are commonly called Ritz -c values and Ritz vectors respectively. They are referred to as such -c in the comments that follow. The computed orthonormal basis for the -c invariant subspace corresponding to these Ritz values is referred to as a -c Schur basis. -c -c See documentation in the header of the subroutine DNAUPD for -c definition of OP as well as other terms and the relation of computed -c Ritz values and Ritz vectors of OP with respect to the given problem -c A*z = lambda*B*z. For a brief description, see definitions of -c IPARAM(7), MODE and WHICH in the documentation of DNAUPD . -c -c\Usage: -c call dneupd -c ( RVEC, HOWMNY, SELECT, DR, DI, Z, LDZ, SIGMAR, SIGMAI, WORKEV, BMAT, -c N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, WORKL, -c LWORKL, INFO ) -c -c\Arguments: -c RVEC LOGICAL (INPUT) -c Specifies whether a basis for the invariant subspace corresponding -c to the converged Ritz value approximations for the eigenproblem -c A*z = lambda*B*z is computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute the Ritz vectors or Schur vectors. -c See Remarks below. -c -c HOWMNY Character*1 (INPUT) -c Specifies the form of the basis for the invariant subspace -c corresponding to the converged Ritz values that is to be computed. -c -c = 'A': Compute NEV Ritz vectors; -c = 'P': Compute NEV Schur vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value (DR(j), DI(j)), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' or 'P', SELECT is used as internal workspace. -c -c DR Double precision array of dimension NEV+1. (OUTPUT) -c If IPARAM(7) = 1,2 or 3 and SIGMAI=0.0 then on exit: DR contains -c the real part of the Ritz approximations to the eigenvalues of -c A*z = lambda*B*z. -c If IPARAM(7) = 3, 4 and SIGMAI is not equal to zero, then on exit: -c DR contains the real part of the Ritz values of OP computed by -c DNAUPD . A further computation must be performed by the user -c to transform the Ritz values computed for OP by DNAUPD to those -c of the original system A*z = lambda*B*z. See remark 3 below. -c -c DI Double precision array of dimension NEV+1. (OUTPUT) -c On exit, DI contains the imaginary part of the Ritz value -c approximations to the eigenvalues of A*z = lambda*B*z associated -c with DR. -c -c NOTE: When Ritz values are complex, they will come in complex -c conjugate pairs. If eigenvectors are requested, the -c corresponding Ritz vectors will also come in conjugate -c pairs and the real and imaginary parts of these are -c represented in two consecutive columns of the array Z -c (see below). -c -c Z Double precision N by NEV+1 array if RVEC = .TRUE. and HOWMNY = 'A'. (OUTPUT) -c On exit, if RVEC = .TRUE. and HOWMNY = 'A', then the columns of -c Z represent approximate eigenvectors (Ritz vectors) corresponding -c to the NCONV=IPARAM(5) Ritz values for eigensystem -c A*z = lambda*B*z. -c -c The complex Ritz vector associated with the Ritz value -c with positive imaginary part is stored in two consecutive -c columns. The first column holds the real part of the Ritz -c vector and the second column holds the imaginary part. The -c Ritz vector associated with the Ritz value with negative -c imaginary part is simply the complex conjugate of the Ritz vector -c associated with the positive imaginary part. -c -c If RVEC = .FALSE. or HOWMNY = 'P', then Z is not referenced. -c -c NOTE: If if RVEC = .TRUE. and a Schur basis is not required, -c the array Z may be set equal to first NEV+1 columns of the Arnoldi -c basis array V computed by DNAUPD . In this case the Arnoldi basis -c will be destroyed and overwritten with the eigenvector basis. -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ >= max( 1, N ). In any case, LDZ >= 1. -c -c SIGMAR Double precision (INPUT) -c If IPARAM(7) = 3 or 4, represents the real part of the shift. -c Not referenced if IPARAM(7) = 1 or 2. -c -c SIGMAI Double precision (INPUT) -c If IPARAM(7) = 3 or 4, represents the imaginary part of the shift. -c Not referenced if IPARAM(7) = 1 or 2. See remark 3 below. -c -c WORKEV Double precision work array of dimension 3*NCV. (WORKSPACE) -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to DNAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, INFO -c -c must be passed directly to DNEUPD following the last call -c to DNAUPD . These arguments MUST NOT BE MODIFIED between -c the the last call to DNAUPD and the call to DNEUPD . -c -c Three of these parameters (V, WORKL, INFO) are also output parameters: -c -c V Double precision N by NCV array. (INPUT/OUTPUT) -c -c Upon INPUT: the NCV columns of V contain the Arnoldi basis -c vectors for OP as constructed by DNAUPD . -c -c Upon OUTPUT: If RVEC = .TRUE. the first NCONV=IPARAM(5) columns -c contain approximate Schur vectors that span the -c desired invariant subspace. See Remark 2 below. -c -c NOTE: If the array Z has been set equal to first NEV+1 columns -c of the array V and RVEC=.TRUE. and HOWMNY= 'A', then the -c Arnoldi basis held by V has been overwritten by the desired -c Ritz vectors. If a separate array Z has been passed then -c the first NCONV=IPARAM(5) columns of V will contain approximate -c Schur vectors that span the desired invariant subspace. -c -c WORKL Double precision work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:ncv*ncv+3*ncv) contains information obtained in -c dnaupd . They are not changed by dneupd . -c WORKL(ncv*ncv+3*ncv+1:3*ncv*ncv+6*ncv) holds the -c real and imaginary part of the untransformed Ritz values, -c the upper quasi-triangular matrix for H, and the -c associated matrix representation of the invariant subspace for H. -c -c Note: IPNTR(9:13) contains the pointer into WORKL for addresses -c of the above information computed by dneupd . -c ------------------------------------------------------------- -c IPNTR(9): pointer to the real part of the NCV RITZ values of the -c original system. -c IPNTR(10): pointer to the imaginary part of the NCV RITZ values of -c the original system. -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper quasi-triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c dneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c -c = 0: Normal exit. -c -c = 1: The Schur form computed by LAPACK routine dlahqr -c could not be reordered by LAPACK routine dtrsen . -c Re-enter subroutine dneupd with IPARAM(5)=NCV and -c increase the size of the arrays DR and DI to have -c dimension at least dimension NCV and allocate at least NCV -c columns for Z. NOTE: Not necessary if Z and V share -c the same space. Please notify the authors if this error -c occurs. -c -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from calculation of a real Schur form. -c Informational error from LAPACK routine dlahqr . -c = -9: Error return from calculation of eigenvectors. -c Informational error from LAPACK routine dtrevc . -c = -10: IPARAM(7) must be 1,2,3,4. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: HOWMNY = 'S' not yet implemented -c = -13: HOWMNY must be one of 'A' or 'P' if RVEC = .true. -c = -14: DNAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: DNEUPD got a different count of the number of converged -c Ritz values than DNAUPD got. This indicates the user -c probably made an error in passing data from DNAUPD to -c DNEUPD or that the data was modified before entering -c DNEUPD -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "Complex Shift and Invert Strategies for -c Real Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c dmout ARPACK utility routine that prints matrices -c dvout ARPACK utility routine that prints vectors. -c dgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c dlacpy LAPACK matrix copy routine. -c dlahqr LAPACK routine to compute the real Schur form of an -c upper Hessenberg matrix. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c dlaset LAPACK matrix initialization routine. -c dorm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c dtrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper quasi-triangular form. -c dtrsen LAPACK routine that re-orders the Schur form. -c dtrmm Level 3 BLAS matrix times an upper triangular matrix. -c dger Level 2 BLAS rank one update to a matrix. -c dcopy Level 1 BLAS that copies one vector to another . -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c dscal Level 1 BLAS that scales a vector. -c -c\Remarks -c -c 1. Currently only HOWMNY = 'A' and 'P' are implemented. -c -c Let trans(X) denote the transpose of X. -c -c 2. Schur vectors are an orthogonal representation for the basis of -c Ritz vectors. Thus, their numerical properties are often superior. -c If RVEC = .TRUE. then the relationship -c A * V(:,1:IPARAM(5)) = V(:,1:IPARAM(5)) * T, and -c trans(V(:,1:IPARAM(5))) * V(:,1:IPARAM(5)) = I are approximately -c satisfied. Here T is the leading submatrix of order IPARAM(5) of the -c real upper quasi-triangular matrix stored workl(ipntr(12)). That is, -c T is block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; -c each 2-by-2 diagonal block has its diagonal elements equal and its -c off-diagonal elements of opposite sign. Corresponding to each 2-by-2 -c diagonal block is a complex conjugate pair of Ritz values. The real -c Ritz values are stored on the diagonal of T. -c -c 3. If IPARAM(7) = 3 or 4 and SIGMAI is not equal zero, then the user must -c form the IPARAM(5) Rayleigh quotients in order to transform the Ritz -c values computed by DNAUPD for OP to those of A*z = lambda*B*z. -c Set RVEC = .true. and HOWMNY = 'A', and -c compute -c trans(Z(:,I)) * A * Z(:,I) if DI(I) = 0. -c If DI(I) is not equal to zero and DI(I+1) = - D(I), -c then the desired real and imaginary parts of the Ritz value are -c trans(Z(:,I)) * A * Z(:,I) + trans(Z(:,I+1)) * A * Z(:,I+1), -c trans(Z(:,I)) * A * Z(:,I+1) - trans(Z(:,I+1)) * A * Z(:,I), -c respectively. -c Another possibility is to set RVEC = .true. and HOWMNY = 'P' and -c compute trans(V(:,1:IPARAM(5))) * A * V(:,1:IPARAM(5)) and then an upper -c quasi-triangular matrix of order IPARAM(5) is computed. See remark -c 2 above. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neupd.F SID: 2.7 DATE OF SID: 09/20/00 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine dneupd (rvec , howmny, select, dr , di, - & z , ldz , sigmar, sigmai, workev, - & bmat , n , which , nev , tol, - & resid, ncv , v , ldv , iparam, - & ipntr, workd , workl , lworkl, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Double precision - & sigmar, sigmai, tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - logical select(ncv) - Double precision - & dr(nev+1) , di(nev+1), resid(n) , - & v(ldv,ncv) , z(ldz,*) , workd(3*n), - & workl(lworkl), workev(3*ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0 , zero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds, ierr , ih , ihbds , - & iheigr, iheigi, iconj , nconv , - & invsub, iuptri, iwev , iwork(1), - & j , k , ldh , ldq , - & mode , msglvl, outncv, ritzr , - & ritzi , wri , wrr , irr , - & iri , ibd , ishift, numcnv , - & np , jj , nconv2 - logical reord - Double precision - & conds , rnorm, sep , temp, - & vl(1,1), temp1, eps23 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy , dger , dgeqr2 , dlacpy , - & dlahqr , dlaset , dmout , dorm2r , - & dtrevc , dtrmm , dtrsen , dscal , - & dvout , ivout -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlapy2 , dnrm2 , dlamch , ddot - external dlapy2 , dnrm2 , dlamch , ddot -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, min, sqrt -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mneupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch ('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0 ) -c -c %--------------% -c | Quick return | -c %--------------% -c - ierr = 0 -c - if (nconv .le. 0) then - ierr = -14 - else if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 6*ncv) then - ierr = -7 - else if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) then - ierr = -13 - else if (howmny .eq. 'S' ) then - ierr = -12 - end if -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 .and. sigmai .eq. zero) then - type = 'SHIFTI' - else if (mode .eq. 3 ) then - type = 'REALPT' - else if (mode .eq. 4 ) then - type = 'IMAGPT' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+2*ncv) := real and imaginary | -c | parts of ritz values | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := error bounds | -c %--------------------------------------------------------% -c -c %-----------------------------------------------------------% -c | The following is used and set by DNEUPD . | -c | workl(ncv*ncv+3*ncv+1:ncv*ncv+4*ncv) := The untransformed | -c | real part of the Ritz values. | -c | workl(ncv*ncv+4*ncv+1:ncv*ncv+5*ncv) := The untransformed | -c | imaginary part of the Ritz values. | -c | workl(ncv*ncv+5*ncv+1:ncv*ncv+6*ncv) := The untransformed | -c | error bounds of the Ritz values | -c | workl(ncv*ncv+6*ncv+1:2*ncv*ncv+6*ncv) := Holds the upper | -c | quasi-triangular matrix for H | -c | workl(2*ncv*ncv+6*ncv+1: 3*ncv*ncv+6*ncv) := Holds the | -c | associated matrix representation of the invariant | -c | subspace for H. | -c | GRAND total of NCV * ( 3 * NCV + 6 ) locations. | -c %-----------------------------------------------------------% -c - ih = ipntr(5) - ritzr = ipntr(6) - ritzi = ipntr(7) - bounds = ipntr(8) - ldh = ncv - ldq = ncv - iheigr = bounds + ldh - iheigi = iheigr + ldh - ihbds = iheigi + ldh - iuptri = ihbds + ldh - invsub = iuptri + ldh*ncv - ipntr(9) = iheigr - ipntr(10) = iheigi - ipntr(11) = ihbds - ipntr(12) = iuptri - ipntr(13) = invsub - wrr = 1 - wri = ncv + 1 - iwev = wri + ncv -c -c %-----------------------------------------% -c | irr points to the REAL part of the Ritz | -c | values computed by _neigh before | -c | exiting _naup2. | -c | iri points to the IMAGINARY part of the | -c | Ritz values computed by _neigh | -c | before exiting _naup2. | -c | ibd points to the Ritz estimates | -c | computed by _neigh before exiting | -c | _naup2. | -c %-----------------------------------------% -c - irr = ipntr(14)+ncv*ncv - iri = irr+ncv - ibd = iri+ncv -c -c %------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c %------------------------------------% -c - rnorm = workl(ih+2) - workl(ih+2) = zero -c - if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(irr), ndigit, - & '_neupd: Real part of Ritz values passed in from _NAUPD.') - call dvout (logfil, ncv, workl(iri), ndigit, - & '_neupd: Imag part of Ritz values passed in from _NAUPD.') - call dvout (logfil, ncv, workl(ibd), ndigit, - & '_neupd: Ritz estimates passed in from _NAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(bound) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call dngets (ishift , which , nev , - & np , workl(irr), workl(iri), - & workl(bounds), workl , workl(np+1)) -c - if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(irr), ndigit, - & '_neupd: Real part of Ritz values after calling _NGETS.') - call dvout (logfil, ncv, workl(iri), ndigit, - & '_neupd: Imag part of Ritz values after calling _NGETS.') - call dvout (logfil, ncv, workl(bounds), ndigit, - & '_neupd: Ritz value indices after calling _NGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - temp1 = max(eps23, - & dlapy2 ( workl(irr+ncv-j), workl(iri+ncv-j) )) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & workl(ibd+jj-1) .le. tol*temp1) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by dnaupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the dnaupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_neupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -15 - go to 9000 - end if -c -c %-----------------------------------------------------------% -c | Call LAPACK routine dlahqr to compute the real Schur form | -c | of the upper Hessenberg matrix returned by DNAUPD . | -c | Make a copy of the upper Hessenberg matrix. | -c | Initialize the Schur vector matrix Q to the identity. | -c %-----------------------------------------------------------% -c - call dcopy (ldh*ncv, workl(ih), 1, workl(iuptri), 1) - call dlaset ('All', ncv, ncv, - & zero , one, workl(invsub), - & ldq) - call dlahqr (.true., .true. , ncv, - & 1 , ncv , workl(iuptri), - & ldh , workl(iheigr), workl(iheigi), - & 1 , ncv , workl(invsub), - & ldq , ierr) - call dcopy (ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call dvout (logfil, ncv, workl(iheigr), ndigit, - & '_neupd: Real part of the eigenvalues of H') - call dvout (logfil, ncv, workl(iheigi), ndigit, - & '_neupd: Imaginary part of the Eigenvalues of H') - call dvout (logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the Schur vector matrix') - if (msglvl .gt. 3) then - call dmout (logfil , ncv, ncv , - & workl(iuptri), ldh, ndigit, - & '_neupd: The upper quasi-triangular matrix ') - end if - end if -c - if (reord) then -c -c %-----------------------------------------------------% -c | Reorder the computed upper quasi-triangular matrix. | -c %-----------------------------------------------------% -c - call dtrsen ('None' , 'V' , - & select , ncv , - & workl(iuptri), ldh , - & workl(invsub), ldq , - & workl(iheigr), workl(iheigi), - & nconv2 , conds , - & sep , workl(ihbds) , - & ncv , iwork , - & 1 , ierr) -c - if (nconv2 .lt. nconv) then - nconv = nconv2 - end if - - if (ierr .eq. 1) then - info = 1 - go to 9000 - end if -c - - if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(iheigr), ndigit, - & '_neupd: Real part of the eigenvalues of H--reordered') - call dvout (logfil, ncv, workl(iheigi), ndigit, - & '_neupd: Imag part of the eigenvalues of H--reordered') - if (msglvl .gt. 3) then - call dmout (logfil , ncv, ncv , - & workl(iuptri), ldq, ndigit, - & '_neupd: Quasi-triangular matrix after re-ordering') - end if - end if -c - end if -c -c %---------------------------------------% -c | Copy the last row of the Schur vector | -c | into workl(ihbds). This will be used | -c | to compute the Ritz estimates of | -c | converged Ritz values. | -c %---------------------------------------% -c - call dcopy (ncv, workl(invsub+ncv-1), ldq, workl(ihbds), 1) -c -c %----------------------------------------------------% -c | Place the computed eigenvalues of H into DR and DI | -c | if a spectral transformation was not used. | -c %----------------------------------------------------% -c - if (type .eq. 'REGULR') then - call dcopy (nconv, workl(iheigr), 1, dr, 1) - call dcopy (nconv, workl(iheigi), 1, di, 1) - end if -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(invsub,ldq). | -c %----------------------------------------------------------% -c - call dgeqr2 (ncv, nconv , workl(invsub), - & ldq, workev, workev(ncv+1), - & ierr) -c -c %---------------------------------------------------------% -c | * Postmultiply V by Q using dorm2r . | -c | * Copy the first NCONV columns of VQ into Z. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(iheigr) and workl(iheigi) | -c | The first NCONV columns of V are now approximate Schur | -c | vectors associated with the real upper quasi-triangular | -c | matrix of order NCONV in workl(iuptri) | -c %---------------------------------------------------------% -c - call dorm2r ('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , v , - & ldv , workd(n+1) , ierr) - call dlacpy ('All', n, nconv, v, ldv, z, ldz) -c - do 20 j=1, nconv -c -c %---------------------------------------------------% -c | Perform both a column and row scaling if the | -c | diagonal element of workl(invsub,ldq) is negative | -c | I'm lazy and don't take advantage of the upper | -c | quasi-triangular form of workl(iuptri,ldq) | -c | Note that since Q is orthogonal, R is a diagonal | -c | matrix consisting of plus or minus ones | -c %---------------------------------------------------% -c - if (workl(invsub+(j-1)*ldq+j-1) .lt. zero) then - call dscal (nconv, -one, workl(iuptri+j-1), ldq) - call dscal (nconv, -one, workl(iuptri+(j-1)*ldq), 1) - end if -c - 20 continue -c - if (howmny .eq. 'A') then -c -c %--------------------------------------------% -c | Compute the NCONV wanted eigenvectors of T | -c | located in workl(iuptri,ldq). | -c %--------------------------------------------% -c - do 30 j=1, ncv - if (j .le. nconv) then - select(j) = .true. - else - select(j) = .false. - end if - 30 continue -c - call dtrevc ('Right', 'Select' , select , - & ncv , workl(iuptri), ldq , - & vl , 1 , workl(invsub), - & ldq , ncv , outncv , - & workev , ierr) -c - if (ierr .ne. 0) then - info = -9 - go to 9000 - end if -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | dtrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; | -c %------------------------------------------------% -c - iconj = 0 - do 40 j=1, nconv -c - if ( workl(iheigi+j-1) .eq. zero ) then -c -c %----------------------% -c | real eigenvalue case | -c %----------------------% -c - temp = dnrm2 ( ncv, workl(invsub+(j-1)*ldq), 1 ) - call dscal ( ncv, one / temp, - & workl(invsub+(j-1)*ldq), 1 ) -c - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we further normalize by the | -c | square root of two. | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - temp = dlapy2 (dnrm2 (ncv, - & workl(invsub+(j-1)*ldq), - & 1), - & dnrm2 (ncv, - & workl(invsub+j*ldq), - & 1)) - call dscal (ncv, one/temp, - & workl(invsub+(j-1)*ldq), 1 ) - call dscal (ncv, one/temp, - & workl(invsub+j*ldq), 1 ) - iconj = 1 - else - iconj = 0 - end if -c - end if -c - 40 continue -c - call dgemv ('T', ncv, nconv, one, workl(invsub), - & ldq, workl(ihbds), 1, zero, workev, 1) -c - iconj = 0 - do 45 j=1, nconv - if (workl(iheigi+j-1) .ne. zero) then -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - workev(j) = dlapy2 (workev(j), workev(j+1)) - workev(j+1) = workev(j) - iconj = 1 - else - iconj = 0 - end if - end if - 45 continue -c - if (msglvl .gt. 2) then - call dcopy (ncv, workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) - call dvout (logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the eigenvector matrix for T') - if (msglvl .gt. 3) then - call dmout (logfil, ncv, ncv, workl(invsub), ldq, - & ndigit, '_neupd: The eigenvector matrix for T') - end if - end if -c -c %---------------------------------------% -c | Copy Ritz estimates into workl(ihbds) | -c %---------------------------------------% -c - call dcopy (nconv, workev, 1, workl(ihbds), 1) -c -c %---------------------------------------------------------% -c | Compute the QR factorization of the eigenvector matrix | -c | associated with leading portion of T in the first NCONV | -c | columns of workl(invsub,ldq). | -c %---------------------------------------------------------% -c - call dgeqr2 (ncv, nconv , workl(invsub), - & ldq, workev, workev(ncv+1), - & ierr) -c -c %----------------------------------------------% -c | * Postmultiply Z by Q. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now contains the | -c | Ritz vectors associated with the Ritz values | -c | in workl(iheigr) and workl(iheigi). | -c %----------------------------------------------% -c - call dorm2r ('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , z , - & ldz , workd(n+1) , ierr) -c - call dtrmm ('Right' , 'Upper' , 'No transpose', - & 'Non-unit', n , nconv , - & one , workl(invsub), ldq , - & z , ldz) -c - end if -c - else -c -c %------------------------------------------------------% -c | An approximate invariant subspace is not needed. | -c | Place the Ritz values computed DNAUPD into DR and DI | -c %------------------------------------------------------% -c - call dcopy (nconv, workl(ritzr), 1, dr, 1) - call dcopy (nconv, workl(ritzi), 1, di, 1) - call dcopy (nconv, workl(ritzr), 1, workl(iheigr), 1) - call dcopy (nconv, workl(ritzi), 1, workl(iheigi), 1) - call dcopy (nconv, workl(bounds), 1, workl(ihbds), 1) - end if -c -c %------------------------------------------------% -c | Transform the Ritz values and possibly vectors | -c | and corresponding error bounds of OP to those | -c | of A*x = lambda*B*x. | -c %------------------------------------------------% -c - if (type .eq. 'REGULR') then -c - if (rvec) - & call dscal (ncv, rnorm, workl(ihbds), 1) -c - else -c -c %---------------------------------------% -c | A spectral transformation was used. | -c | * Determine the Ritz estimates of the | -c | Ritz values in the original system. | -c %---------------------------------------% -c - if (type .eq. 'SHIFTI') then -c - if (rvec) - & call dscal (ncv, rnorm, workl(ihbds), 1) -c - do 50 k=1, ncv - temp = dlapy2 ( workl(iheigr+k-1), - & workl(iheigi+k-1) ) - workl(ihbds+k-1) = abs( workl(ihbds+k-1) ) - & / temp / temp - 50 continue -c - else if (type .eq. 'REALPT') then -c - do 60 k=1, ncv - 60 continue -c - else if (type .eq. 'IMAGPT') then -c - do 70 k=1, ncv - 70 continue -c - end if -c -c %-----------------------------------------------------------% -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | For TYPE = 'REALPT' or 'IMAGPT' the user must from | -c | Rayleigh quotients or a projection. See remark 3 above.| -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c %-----------------------------------------------------------% -c - if (type .eq. 'SHIFTI') then -c - do 80 k=1, ncv - temp = dlapy2 ( workl(iheigr+k-1), - & workl(iheigi+k-1) ) - workl(iheigr+k-1) = workl(iheigr+k-1)/temp/temp - & + sigmar - workl(iheigi+k-1) = -workl(iheigi+k-1)/temp/temp - & + sigmai - 80 continue -c - call dcopy (nconv, workl(iheigr), 1, dr, 1) - call dcopy (nconv, workl(iheigi), 1, di, 1) -c - else if (type .eq. 'REALPT' .or. type .eq. 'IMAGPT') then -c - call dcopy (nconv, workl(iheigr), 1, dr, 1) - call dcopy (nconv, workl(iheigi), 1, di, 1) -c - end if -c - end if -c - if (type .eq. 'SHIFTI' .and. msglvl .gt. 1) then - call dvout (logfil, nconv, dr, ndigit, - & '_neupd: Untransformed real part of the Ritz valuess.') - call dvout (logfil, nconv, di, ndigit, - & '_neupd: Untransformed imag part of the Ritz valuess.') - call dvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Ritz estimates of untransformed Ritz values.') - else if (type .eq. 'REGULR' .and. msglvl .gt. 1) then - call dvout (logfil, nconv, dr, ndigit, - & '_neupd: Real parts of converged Ritz values.') - call dvout (logfil, nconv, di, ndigit, - & '_neupd: Imag parts of converged Ritz values.') - call dvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Associated Ritz estimates.') - end if -c -c %-------------------------------------------------% -c | Eigenvector Purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 2. | -c %-------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A' .and. type .eq. 'SHIFTI') then -c -c %------------------------------------------------% -c | Purify the computed Ritz vectors by adding a | -c | little bit of the residual vector: | -c | T | -c | resid(:)*( e s ) / theta | -c | NCV | -c | where H s = s theta. Remember that when theta | -c | has nonzero imaginary part, the corresponding | -c | Ritz vector is stored across two columns of Z. | -c %------------------------------------------------% -c - iconj = 0 - do 110 j=1, nconv - if (workl(iheigi+j-1) .eq. zero) then - workev(j) = workl(invsub+(j-1)*ldq+ncv-1) / - & workl(iheigr+j-1) - else if (iconj .eq. 0) then - temp = dlapy2 ( workl(iheigr+j-1), workl(iheigi+j-1) ) - workev(j) = ( workl(invsub+(j-1)*ldq+ncv-1) * - & workl(iheigr+j-1) + - & workl(invsub+j*ldq+ncv-1) * - & workl(iheigi+j-1) ) / temp / temp - workev(j+1) = ( workl(invsub+j*ldq+ncv-1) * - & workl(iheigr+j-1) - - & workl(invsub+(j-1)*ldq+ncv-1) * - & workl(iheigi+j-1) ) / temp / temp - iconj = 1 - else - iconj = 0 - end if - 110 continue -c -c %---------------------------------------% -c | Perform a rank one update to Z and | -c | purify all the Ritz vectors together. | -c %---------------------------------------% -c - call dger (n, nconv, one, resid, 1, workev, 1, z, ldz) -c - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of DNEUPD | -c %---------------% -c - end
--- a/libcruft/arpack/src/dngets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,231 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dngets -c -c\Description: -c Given the eigenvalues of the upper Hessenberg matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: call this even in the case of user specified shifts in order -c to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call dngets -c ( ISHIFT, WHICH, KEV, NP, RITZR, RITZI, BOUNDS, SHIFTR, SHIFTI ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> want the KEV eigenvalues of largest magnitude. -c 'SM' -> want the KEV eigenvalues of smallest magnitude. -c 'LR' -> want the KEV eigenvalues of largest real part. -c 'SR' -> want the KEV eigenvalues of smallest real part. -c 'LI' -> want the KEV eigenvalues of largest imaginary part. -c 'SI' -> want the KEV eigenvalues of smallest imaginary part. -c -c KEV Integer. (INPUT/OUTPUT) -c INPUT: KEV+NP is the size of the matrix H. -c OUTPUT: Possibly increases KEV by one to keep complex conjugate -c pairs together. -c -c NP Integer. (INPUT/OUTPUT) -c Number of implicit shifts to be computed. -c OUTPUT: Possibly decreases NP by one to keep complex conjugate -c pairs together. -c -c RITZR, Double precision array of length KEV+NP. (INPUT/OUTPUT) -c RITZI On INPUT, RITZR and RITZI contain the real and imaginary -c parts of the eigenvalues of H. -c On OUTPUT, RITZR and RITZI are sorted so that the unwanted -c eigenvalues are in the first NP locations and the wanted -c portion is in the last KEV locations. When exact shifts are -c selected, the unwanted part corresponds to the shifts to -c be applied. Also, if ISHIFT .eq. 1, the unwanted eigenvalues -c are further sorted so that the ones with largest Ritz values -c are first. -c -c BOUNDS Double precision array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c SHIFTR, SHIFTI *** USE deprecated as of version 2.1. *** -c -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dsortc ARPACK sorting routine. -c dcopy Level 1 BLAS that copies one vector to another . -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: ngets.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. xxxx -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dngets ( ishift, which, kev, np, ritzr, ritzi, bounds, - & shiftr, shifti ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & bounds(kev+np), ritzr(kev+np), ritzi(kev+np), - & shiftr(1), shifti(1) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0, zero = 0.0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy, dsortc, arscnd -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mngets -c -c %----------------------------------------------------% -c | LM, SM, LR, SR, LI, SI case. | -c | Sort the eigenvalues of H into the desired order | -c | and apply the resulting order to BOUNDS. | -c | The eigenvalues are sorted so that the wanted part | -c | are always in the last KEV locations. | -c | We first do a pre-processing sort in order to keep | -c | complex conjugate pairs together | -c %----------------------------------------------------% -c - if (which .eq. 'LM') then - call dsortc ('LR', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SM') then - call dsortc ('SR', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'LR') then - call dsortc ('LM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SR') then - call dsortc ('SM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'LI') then - call dsortc ('LM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SI') then - call dsortc ('SM', .true., kev+np, ritzr, ritzi, bounds) - end if -c - call dsortc (which, .true., kev+np, ritzr, ritzi, bounds) -c -c %-------------------------------------------------------% -c | Increase KEV by one if the ( ritzr(np),ritzi(np) ) | -c | = ( ritzr(np+1),-ritzi(np+1) ) and ritz(np) .ne. zero | -c | Accordingly decrease NP by one. In other words keep | -c | complex conjugate pairs together. | -c %-------------------------------------------------------% -c - if ( ( ritzr(np+1) - ritzr(np) ) .eq. zero - & .and. ( ritzi(np+1) + ritzi(np) ) .eq. zero ) then - np = np - 1 - kev = kev + 1 - end if -c - if ( ishift .eq. 1 ) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when they shifts | -c | are applied in subroutine dnapps. | -c | Be careful and use 'SR' since we want to sort BOUNDS! | -c %-------------------------------------------------------% -c - call dsortc ( 'SR', .true., np, bounds, ritzr, ritzi ) - end if -c - call arscnd (t1) - tngets = tngets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') - call dvout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call dvout (logfil, kev+np, ritzi, ndigit, - & '_ngets: Eigenvalues of current H matrix -- imag part') - call dvout (logfil, kev+np, bounds, ndigit, - & '_ngets: Ritz estimates of the current KEV+NP Ritz values') - end if -c - return -c -c %---------------% -c | End of dngets | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,853 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step symmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in dsaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call dsaitr -c ( IDO, BMAT, N, K, NP, MODE, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and does not need to be -c recomputed in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of matrix B that defines the -c semi-inner product for the operator OP. See dsaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current order of H and the number of columns of V. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c MODE Integer. (INPUT) -c Signifies which form for "OP". If MODE=2 then -c a reduction in the number of B matrix vector multiplies -c is possible since the B-norm of OP*x is equivalent to -c the inv(B)-norm of A*x. -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Double precision scalar. (INPUT/OUTPUT) -c On INPUT the B-norm of r_{k}. -c On OUTPUT the B-norm of the updated residual r_{k+p}. -c -c V Double precision N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (K+NP) by 2 array. (INPUT/OUTPUT) -c H is used to store the generated symmetric tridiagonal matrix -c with the subdiagonal in the first column starting at H(2,1) -c and the main diagonal in the second column. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On INPUT, WORKD(1:N) = B*RESID where RESID is associated -c with the K step Arnoldi factorization. Used to save some -c computation at the first step. -c On OUTPUT, WORKD(1:N) = B*RESID where RESID is associated -c with the K+NP step Arnoldi factorization. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of an invariant subspace of OP is found that is -c less than K + NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c dmout ARPACK utility routine that prints matrices. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c dlascl LAPACK routine for careful scaling of a matrix. -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c daxpy Level 1 BLAS that computes a vector triad. -c dscal Level 1 BLAS that scales a vector. -c dcopy Level 1 BLAS that copies one vector to another . -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: saitr.F SID: 2.6 DATE OF SID: 8/28/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in dsaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c alphaj <- j-th component of w_{j} -c rnorm = || r_{j} || -c betaj+1 = rnorm -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsaitr - & (ido, bmat, n, k, np, mode, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, mode, np - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Double precision - & h(ldh,2), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer i, ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & infol, jj - Double precision - & rnorm1, wnorm, safmin, temp1 - save orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & rnorm1, safmin, wnorm -c -c %-----------------------% -c | Local Array Arguments | -c %-----------------------% -c - Double precision - & xtemp(2) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external daxpy, dcopy, dscal, dgemv, dgetv0, dvout, dmout, - & dlascl, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & ddot, dnrm2, dlamch - external ddot, dnrm2, dlamch -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then - first = .false. -c -c %--------------------------------% -c | safmin = safe minimum is such | -c | that 1/sfmin does not overflow | -c %--------------------------------% -c - safmin = dlamch('safmin') - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. -c -c %--------------------------------% -c | Pointer to the current step of | -c | the factorization to build | -c %--------------------------------% -c - j = k + 1 -c -c %------------------------------------------% -c | Pointers used for reverse communication | -c | when using WORKD. | -c %------------------------------------------% -c - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | dgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %------------------------------% -c | Else this is the first step. | -c %------------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% -c - 1000 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: generating Arnoldi vector no.') - call dvout (logfil, 1, rnorm, ndigit, - & '_saitr: B-norm of the current residual =') - end if -c -c %---------------------------------------------------------% -c | Check for exact zero. Equivalent to determing whether a | -c | j-step Arnoldi factorization is present. | -c %---------------------------------------------------------% -c - if (rnorm .gt. zero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: ****** restart at step ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call dgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tsaitr = tsaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call dcopy (n, resid, 1, v(1,j), 1) - if (rnorm .ge. safmin) then - temp1 = one / rnorm - call dscal (n, temp1, v(1,j), 1) - call dscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine SLASCL | -c %-----------------------------------------% -c - call dlascl ('General', i, i, rnorm, one, n, 1, - & v(1,j), n, infol) - call dlascl ('General', i, i, rnorm, one, n, 1, - & workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call dcopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %-----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | -c %-----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) -c - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call dcopy (n, workd(irj), 1, resid, 1) -c -c %-------------------------------------------% -c | STEP 4: Finish extending the symmetric | -c | Arnoldi to length j. If MODE = 2 | -c | then B*OP = B*inv(B)*A = A and | -c | we don't need to compute B*OP. | -c | NOTE: If MODE = 2 WORKD(IVJ:IVJ+N-1) is | -c | assumed to have A*v_{j}. | -c %-------------------------------------------% -c - if (mode .eq. 2) go to 65 - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy(n, resid, 1 , workd(ipj), 1) - end if - 60 continue -c -c %-----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | -c %-----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - 65 continue - if (mode .eq. 2) then -c -c %----------------------------------% -c | Note that the B-norm of OP*v_{j} | -c | is the inv(B)-norm of A*v_{j}. | -c %----------------------------------% -c - wnorm = ddot (n, resid, 1, workd(ivj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'G') then - wnorm = ddot (n, resid, 1, workd(ipj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'I') then - wnorm = dnrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - if (mode .ne. 2 ) then - call dgemv('T', n, j, one, v, ldv, workd(ipj), 1, zero, - & workd(irj), 1) - else if (mode .eq. 2) then - call dgemv('T', n, j, one, v, ldv, workd(ivj), 1, zero, - & workd(irj), 1) - end if -c -c %--------------------------------------% -c | Orthgonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call dgemv('N', n, j, -one, v, ldv, workd(irj), 1, one, - & resid, 1) -c -c %--------------------------------------% -c | Extend H to have j rows and columns. | -c %--------------------------------------% -c - h(j,2) = workd(irj + j - 1) - if (j .eq. 1 .or. rstart) then - h(j,1) = zero - else - h(j,1) = rnorm - end if - call arscnd (t4) -c - orth1 = .true. - iter = 0 -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - rnorm = ddot (n, resid, 1, workd(ipj), 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = dnrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c %-----------------------------------------------------------% -c - if (rnorm .gt. 0.717*wnorm) go to 100 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - xtemp(1) = wnorm - xtemp(2) = rnorm - call dvout (logfil, 2, xtemp, ndigit, - & '_saitr: re-orthonalization ; wnorm and rnorm are') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call dgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %----------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) + | -c | v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j, but only | -c | H(j,j) is updated. | -c %----------------------------------------------% -c - call dgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) -c - if (j .eq. 1 .or. rstart) h(j,1) = zero - h(j,2) = h(j,2) + workd(irj + j - 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - rnorm1 = ddot (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt(abs(rnorm1)) - else if (bmat .eq. 'I') then - rnorm1 = dnrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm - xtemp(2) = rnorm1 - call dvout (logfil, 2, xtemp, ndigit, - & '_saitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if (rnorm1 .gt. 0.717*rnorm) then -c -c %--------------------------------% -c | No need for further refinement | -c %--------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = zero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %----------------------------------------------------------% -c | Make sure the last off-diagonal element is non negative | -c | If not perform a similarity transformation on H(1:j,1:j) | -c | and scale v(:,j) by -1. | -c %----------------------------------------------------------% -c - if (h(j,1) .lt. zero) then - h(j,1) = -h(j,1) - if ( j .lt. k+np) then - call dscal(n, -one, v(1,j+1), 1) - else - call dscal(n, -one, resid, 1) - end if - end if -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tsaitr = tsaitr + (t1 - t0) - ido = 99 -c - if (msglvl .gt. 1) then - call dvout (logfil, k+np, h(1,2), ndigit, - & '_saitr: main diagonal of matrix H of step K+NP.') - if (k+np .gt. 1) then - call dvout (logfil, k+np-1, h(2,1), ndigit, - & '_saitr: sub diagonal of matrix H of step K+NP.') - end if - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of dsaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,516 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP shifts implicitly resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix of order KEV+NP. Q is the product of -c rotations resulting from the NP bulge chasing sweeps. The updated Arnoldi -c factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call dsapps -c ( N, KEV, NP, SHIFT, V, LDV, H, LDH, RESID, Q, LDQ, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. dimension of matrix A. -c -c KEV Integer. (INPUT) -c INPUT: KEV+NP is the size of the input matrix H. -c OUTPUT: KEV is the size of the updated matrix HNEW. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFT Double precision array of length NP. (INPUT) -c The shifts to be applied. -c -c V Double precision N by (KEV+NP) array. (INPUT/OUTPUT) -c INPUT: V contains the current KEV+NP Arnoldi vectors. -c OUTPUT: VNEW = V(1:n,1:KEV); the updated Arnoldi vectors -c are in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (KEV+NP) by 2 array. (INPUT/OUTPUT) -c INPUT: H contains the symmetric tridiagonal matrix of the -c Arnoldi factorization with the subdiagonal in the 1st column -c starting at H(2,1) and the main diagonal in the 2nd column. -c OUTPUT: H contains the updated tridiagonal matrix in the -c KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Double precision array of length (N). (INPUT/OUTPUT) -c INPUT: RESID contains the the residual vector r_{k+p}. -c OUTPUT: RESID is the updated residual vector rnew_{k}. -c -c Q Double precision KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations during the bulge -c chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKD Double precision work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c dlartg LAPACK Givens rotation construction routine. -c dlacpy LAPACK matrix copy routine. -c dlaset LAPACK matrix initialization routine. -c dgemv Level 2 BLAS routine for matrix vector multiplication. -c daxpy Level 1 BLAS that computes a vector triad. -c dcopy Level 1 BLAS that copies one vector to another. -c dscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: sapps.F SID: 2.6 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the subblocks of -c the tridiagonal matrix H and not just to the submatrix that it -c comes from. This routine assumes that the subdiagonal elements -c of H that are stored in h(1:kev+np,1) are nonegative upon input -c and enforce this condition upon output. This version incorporates -c deflation. See code for documentation. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsapps - & ( n, kev, np, shift, v, ldv, h, ldh, resid, q, ldq, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & h(ldh,2), q(ldq,kev+np), resid(n), shift(np), - & v(ldv,kev+np), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, iend, istart, itop, j, jj, kplusp, msglvl - logical first - Double precision - & a1, a2, a3, a4, big, c, epsmch, f, g, r, s - save epsmch, first -c -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external daxpy, dcopy, dscal, dlacpy, dlartg, dlaset, dvout, - & ivout, arscnd, dgemv -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch - external dlamch -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then - epsmch = dlamch('Epsilon-Machine') - first = .false. - end if - itop = 1 -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msapps -c - kplusp = kev + np -c -c %----------------------------------------------% -c | Initialize Q to the identity matrix of order | -c | kplusp used to accumulate the rotations. | -c %----------------------------------------------% -c - call dlaset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------------------% -c | Apply the np shifts implicitly. Apply each shift to the | -c | whole matrix and not just to the submatrix from which it | -c | comes. | -c %----------------------------------------------------------% -c - do 90 jj = 1, np -c - istart = itop -c -c %----------------------------------------------------------% -c | Check for splitting and deflation. Currently we consider | -c | an off-diagonal element h(i+1,1) negligible if | -c | h(i+1,1) .le. epsmch*( |h(i,2)| + |h(i+1,2)| ) | -c | for i=1:KEV+NP-1. | -c | If above condition tests true then we set h(i+1,1) = 0. | -c | Note that h(1:KEV+NP,1) are assumed to be non negative. | -c %----------------------------------------------------------% -c - 20 continue -c -c %------------------------------------------------% -c | The following loop exits early if we encounter | -c | a negligible off diagonal element. | -c %------------------------------------------------% -c - do 30 i = istart, kplusp-1 - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_sapps: deflation at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_sapps: occured before shift number.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') - end if - h(i+1,1) = zero - iend = i - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (istart .lt. iend) then -c -c %--------------------------------------------------------% -c | Construct the plane rotation G'(istart,istart+1,theta) | -c | that attempts to drive h(istart+1,1) to zero. | -c %--------------------------------------------------------% -c - f = h(istart,2) - shift(jj) - g = h(istart+1,1) - call dlartg (f, g, c, s, r) -c -c %-------------------------------------------------------% -c | Apply rotation to the left and right of H; | -c | H <- G' * H * G, where G = G(istart,istart+1,theta). | -c | This will create a "bulge". | -c %-------------------------------------------------------% -c - a1 = c*h(istart,2) + s*h(istart+1,1) - a2 = c*h(istart+1,1) + s*h(istart+1,2) - a4 = c*h(istart+1,2) - s*h(istart+1,1) - a3 = c*h(istart+1,1) - s*h(istart,2) - h(istart,2) = c*a1 + s*a2 - h(istart+1,2) = c*a4 - s*a3 - h(istart+1,1) = c*a3 + s*a4 -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 60 j = 1, min(istart+jj,kplusp) - a1 = c*q(j,istart) + s*q(j,istart+1) - q(j,istart+1) = - s*q(j,istart) + c*q(j,istart+1) - q(j,istart) = a1 - 60 continue -c -c -c %----------------------------------------------% -c | The following loop chases the bulge created. | -c | Note that the previous rotation may also be | -c | done within the following loop. But it is | -c | kept separate to make the distinction among | -c | the bulge chasing sweeps and the first plane | -c | rotation designed to drive h(istart+1,1) to | -c | zero. | -c %----------------------------------------------% -c - do 70 i = istart+1, iend-1 -c -c %----------------------------------------------% -c | Construct the plane rotation G'(i,i+1,theta) | -c | that zeros the i-th bulge that was created | -c | by G(i-1,i,theta). g represents the bulge. | -c %----------------------------------------------% -c - f = h(i,1) - g = s*h(i+1,1) -c -c %----------------------------------% -c | Final update with G(i-1,i,theta) | -c %----------------------------------% -c - h(i+1,1) = c*h(i+1,1) - call dlartg (f, g, c, s, r) -c -c %-------------------------------------------% -c | The following ensures that h(1:iend-1,1), | -c | the first iend-2 off diagonal of elements | -c | H, remain non negative. | -c %-------------------------------------------% -c - if (r .lt. zero) then - r = -r - c = -c - s = -s - end if -c -c %--------------------------------------------% -c | Apply rotation to the left and right of H; | -c | H <- G * H * G', where G = G(i,i+1,theta) | -c %--------------------------------------------% -c - h(i,1) = r -c - a1 = c*h(i,2) + s*h(i+1,1) - a2 = c*h(i+1,1) + s*h(i+1,2) - a3 = c*h(i+1,1) - s*h(i,2) - a4 = c*h(i+1,2) - s*h(i+1,1) -c - h(i,2) = c*a1 + s*a2 - h(i+1,2) = c*a4 - s*a3 - h(i+1,1) = c*a3 + s*a4 -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 50 j = 1, min( i+jj, kplusp ) - a1 = c*q(j,i) + s*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = a1 - 50 continue -c - 70 continue -c - end if -c -c %--------------------------% -c | Update the block pointer | -c %--------------------------% -c - istart = iend + 1 -c -c %------------------------------------------% -c | Make sure that h(iend,1) is non-negative | -c | If not then set h(iend,1) <-- -h(iend,1) | -c | and negate the last column of Q. | -c | We have effectively carried out a | -c | similarity on transformation H | -c %------------------------------------------% -c - if (h(iend,1) .lt. zero) then - h(iend,1) = -h(iend,1) - call dscal(kplusp, -one, q(1,iend), 1) - end if -c -c %--------------------------------------------------------% -c | Apply the same shift to the next block if there is any | -c %--------------------------------------------------------% -c - if (iend .lt. kplusp) go to 20 -c -c %-----------------------------------------------------% -c | Check if we can increase the the start of the block | -c %-----------------------------------------------------% -c - do 80 i = itop, kplusp-1 - if (h(i+1,1) .gt. zero) go to 90 - itop = itop + 1 - 80 continue -c -c %-----------------------------------% -c | Finished applying the jj-th shift | -c %-----------------------------------% -c - 90 continue -c -c %------------------------------------------% -c | All shifts have been applied. Check for | -c | more possible deflation that might occur | -c | after the last shift is applied. | -c %------------------------------------------% -c - do 100 i = itop, kplusp-1 - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_sapps: deflation at row/column no.') - call dvout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') - end if - h(i+1,1) = zero - end if - 100 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is not necessary if h(kev+1,1) = 0. | -c %-------------------------------------------------% -c - if ( h(kev+1,1) .gt. zero ) - & call dgemv ('N', n, kplusp, one, v, ldv, - & q(1,kev+1), 1, zero, workd(n+1), 1) -c -c %-------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage that Q is an upper triangular matrix | -c | with lower bandwidth np. | -c | Place results in v(:,kplusp-kev:kplusp) temporarily. | -c %-------------------------------------------------------% -c - do 130 i = 1, kev - call dgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call dcopy (n, workd, 1, v(1,kplusp-i+1), 1) - 130 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call dlacpy ('All', n, kev, v(1,np+1), ldv, v, ldv) -c -c %--------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the | -c | appropriate place if h(kev+1,1) .ne. zero. | -c %--------------------------------------------% -c - if ( h(kev+1,1) .gt. zero ) - & call dcopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kev+p}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call dscal (n, q(kplusp,kev), resid, 1) - if (h(kev+1,1) .gt. zero) - & call daxpy (n, h(kev+1,1), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call dvout (logfil, 1, q(kplusp,kev), ndigit, - & '_sapps: sigmak of the updated residual vector') - call dvout (logfil, 1, h(kev+1,1), ndigit, - & '_sapps: betak of the updated residual vector') - call dvout (logfil, kev, h(1,2), ndigit, - & '_sapps: updated main diagonal of H for next iteration') - if (kev .gt. 1) then - call dvout (logfil, kev-1, h(2,1), ndigit, - & '_sapps: updated sub diagonal of H for next iteration') - end if - end if -c - call arscnd (t1) - tsapps = tsapps + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of dsapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,850 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsaup2 -c -c\Description: -c Intermediate level interface called by dsaupd. -c -c\Usage: -c call dsaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZ, BOUNDS, Q, LDQ, WORKL, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in dsaupd. -c MODE, ISHIFT, MXITER: see the definition of IPARAM in dsaupd. -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi/Lanczos iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV since a leading block of the current -c upper Tridiagonal matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Double precision N by (NEV+NP) array. (INPUT/OUTPUT) -c The Lanczos basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Double precision (NEV+NP) by 2 array. (OUTPUT) -c H is used to store the generated symmetric tridiagonal matrix -c The subdiagonal is stored in the first column of H starting -c at H(2,1). The main diagonal is stored in the arscnd column -c of H starting at H(1,2). If dsaup2 converges store the -c B-norm of the final residual vector in H(1,1). -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Double precision array of length NEV+NP. (OUTPUT) -c RITZ(1:NEV) contains the computed Ritz values of OP. -c -c BOUNDS Double precision array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to RITZ. -c -c Q Double precision (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Double precision array of length at least 3*(NEV+NP). (INPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in the computation of the -c tridiagonal eigenvalue problem, the calculation and -c application of the shifts and convergence checking. -c If ISHIFT .EQ. O and IDO .EQ. 3, the first NP locations -c of WORKL are used in reverse communication to hold the user -c supplied shifts. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Lanczos iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in one of -c the spectral transformation modes. X is the current -c operand. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Lanczos iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in dsaupd. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: All possible eigenvalues of OP has been found. -c NP returns the size of the invariant subspace -c spanning the operator OP. -c = 2: No shifts could be applied. -c = -8: Error return from trid. eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Lanczos factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c -c\Routines called: -c dgetv0 ARPACK initial vector generation routine. -c dsaitr ARPACK Lanczos factorization routine. -c dsapps ARPACK application of implicit shifts routine. -c dsconv ARPACK convergence of Ritz values routine. -c dseigt ARPACK compute Ritz values and error bounds routine. -c dsgets ARPACK reorder Ritz values and error bounds routine. -c dsortr ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c dcopy Level 1 BLAS that copies one vector to another. -c ddot Level 1 BLAS that computes the scalar product of two vectors. -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c dscal Level 1 BLAS that scales a vector. -c dswap Level 1 BLAS that swaps two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.4' -c xx/xx/95: Version ' 2.4'. (R.B. Lehoucq) -c -c\SCCS Information: @(#) -c FILE: saup2.F SID: 2.7 DATE OF SID: 5/19/98 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritz, bounds, - & q, ldq, workl, ipntr, workd, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, ldh, ldq, ldv, mxiter, - & n, mode, nev, np - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Double precision - & bounds(nev+np), h(ldh,2), q(ldq,nev+np), resid(n), - & ritz(nev+np), v(ldv,nev+np), workd(3*n), - & workl(3*(nev+np)) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character wprime*2 - logical cnorm, getv0, initv, update, ushift - integer ierr, iter, j, kplusp, msglvl, nconv, nevbef, nev0, - & np0, nptemp, nevd2, nevm2, kp(3) - Double precision - & rnorm, temp, eps23 - save cnorm, getv0, initv, update, ushift, - & iter, kplusp, msglvl, nconv, nev0, np0, - & rnorm, eps23 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy, dgetv0, dsaitr, dscal, dsconv, dseigt, dsgets, - & dsapps, dsortr, dvout, ivout, arscnd, dswap -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & ddot, dnrm2, dlamch - external ddot, dnrm2, dlamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msaup2 -c -c %---------------------------------% -c | Set machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch('Epsilon-Machine') - eps23 = eps23**(2.0D+0/3.0D+0) -c -c %-------------------------------------% -c | nev0 and np0 are integer variables | -c | hold the initial values of NEV & NP | -c %-------------------------------------% -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvlues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev0 + np0 - nconv = 0 - iter = 0 -c -c %--------------------------------------------% -c | Set flags for computing the first NEV steps | -c | of the Lanczos factorization. | -c %--------------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call dgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. zero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1200 - end if - getv0 = .false. - ido = 0 - end if -c -c %------------------------------------------------------------% -c | Back from reverse communication: continue with update step | -c %------------------------------------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Lanczos factorization | -c %----------------------------------------------------------% -c - call dsaitr (ido, bmat, n, 0, nev0, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then -c -c %-----------------------------------------------------% -c | dsaitr was unable to build an Lanczos factorization | -c | of length NEV0. INFO is returned with the size of | -c | the factorization built. Exit main loop. | -c %-----------------------------------------------------% -c - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N LANCZOS I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Lanczos | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_saup2: The length of the current Lanczos factorization') - call ivout (logfil, 1, np, ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if -c -c %------------------------------------------------------------% -c | Compute NP additional steps of the Lanczos factorization. | -c %------------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call dsaitr (ido, bmat, n, nev, np, mode, resid, rnorm, v, - & ldv, h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then -c -c %-----------------------------------------------------% -c | dsaitr was unable to build an Lanczos factorization | -c | of length NEV0+NP0. INFO is returned with the size | -c | of the factorization built. Exit main loop. | -c %-----------------------------------------------------% -c - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call dvout (logfil, 1, rnorm, ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current symmetric tridiagonal matrix. | -c %--------------------------------------------------------% -c - call dseigt (rnorm, kplusp, h, ldh, ritz, bounds, workl, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %----------------------------------------------------% -c | Make a copy of eigenvalues and corresponding error | -c | bounds obtained from _seigt. | -c %----------------------------------------------------% -c - call dcopy(kplusp, ritz, 1, workl(kplusp+1), 1) - call dcopy(kplusp, bounds, 1, workl(2*kplusp+1), 1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The selection is based on the requested number of | -c | eigenvalues instead of the current NEV and NP to | -c | prevent possible misconvergence. | -c | * Wanted Ritz values := RITZ(NP+1:NEV+NP) | -c | * Shifts := RITZ(1:NP) := WORKL(1:NP) | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 - call dsgets (ishift, which, nev, np, ritz, bounds, workl) -c -c %-------------------% -c | Convergence test. | -c %-------------------% -c - call dcopy (nev, bounds(np+1), 1, workl(np+1), 1) - call dsconv (nev, ritz(np+1), workl(np+1), tol, nconv) -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = nconv - call ivout (logfil, 3, kp, ndigit, - & '_saup2: NEV, NP, NCONV are') - call dvout (logfil, kplusp, ritz, ndigit, - & '_saup2: The eigenvalues of H') - call dvout (logfil, kplusp, bounds, ndigit, - & '_saup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. nev0) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP since we don't want to | -c | swap overlapping locations. | -c %------------------------------------------------% -c - if (which .eq. 'BE') then -c -c %-----------------------------------------------------% -c | Both ends of the spectrum are requested. | -c | Sort the eigenvalues into algebraically decreasing | -c | order first then swap low end of the spectrum next | -c | to high end in appropriate locations. | -c | NOTE: when np < floor(nev/2) be careful not to swap | -c | overlapping locations. | -c %-----------------------------------------------------% -c - wprime = 'SA' - call dsortr (wprime, .true., kplusp, ritz, bounds) - nevd2 = nev0 / 2 - nevm2 = nev0 - nevd2 - if ( nev .gt. 1 ) then - call dswap ( min(nevd2,np), ritz(nevm2+1), 1, - & ritz( max(kplusp-nevd2+1,kplusp-np+1) ), 1) - call dswap ( min(nevd2,np), bounds(nevm2+1), 1, - & bounds( max(kplusp-nevd2+1,kplusp-np+1)), 1) - end if -c - else -c -c %--------------------------------------------------% -c | LM, SM, LA, SA case. | -c | Sort the eigenvalues of H into the an order that | -c | is opposite to WHICH, and apply the resulting | -c | order to BOUNDS. The eigenvalues are sorted so | -c | that the wanted part are always within the first | -c | NEV locations. | -c %--------------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LA') wprime = 'SA' - if (which .eq. 'SA') wprime = 'LA' -c - call dsortr (wprime, .true., kplusp, ritz, bounds) -c - end if -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23,magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, nev0 - temp = max( eps23, abs(ritz(j)) ) - bounds(j) = bounds(j)/temp - 35 continue -c -c %----------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | esitmates. This will push all the converged ones | -c | towards the front of ritzr, ritzi, bounds | -c | (in the case when NCONV < NEV.) | -c %----------------------------------------------------% -c - wprime = 'LA' - call dsortr(wprime, .true., nev0, bounds, ritz) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, nev0 - temp = max( eps23, abs(ritz(j)) ) - bounds(j) = bounds(j)*temp - 40 continue -c -c %--------------------------------------------------% -c | Sort the "converged" Ritz values again so that | -c | the "threshold" values and their associated Ritz | -c | estimates appear at the appropriate position in | -c | ritz and bound. | -c %--------------------------------------------------% -c - if (which .eq. 'BE') then -c -c %------------------------------------------------% -c | Sort the "converged" Ritz values in increasing | -c | order. The "threshold" values are in the | -c | middle. | -c %------------------------------------------------% -c - wprime = 'LA' - call dsortr(wprime, .true., nconv, ritz, bounds) -c - else -c -c %----------------------------------------------% -c | In LM, SM, LA, SA case, sort the "converged" | -c | Ritz values according to WHICH so that the | -c | "threshold" value appears at the front of | -c | ritz. | -c %----------------------------------------------% - - call dsortr(which, .true., nconv, ritz, bounds) -c - end if -c -c %------------------------------------------% -c | Use h( 1,1 ) as storage to communicate | -c | rnorm to _seupd if needed | -c %------------------------------------------% -c - h(1,1) = rnorm -c - if (msglvl .gt. 1) then - call dvout (logfil, kplusp, ritz, ndigit, - & '_saup2: Sorted Ritz values.') - call dvout (logfil, kplusp, bounds, ndigit, - & '_saup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. nev) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. nev0) info = 2 -c - np = nconv - go to 1100 -c - else if (nconv .lt. nev .and. ishift .eq. 1) then -c -c %---------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the number | -c | of Ritz values and the shifts. | -c %---------------------------------------------------% -c - nevbef = nev - nev = nev + min (nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 2) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call dsgets (ishift, which, nev, np, ritz, bounds, - & workl) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_saup2: NEV and NP are') - call dvout (logfil, nev, ritz(np+1), ndigit, - & '_saup2: "wanted" Ritz values.') - call dvout (logfil, nev, bounds(np+1), ndigit, - & '_saup2: Ritz estimates of the "wanted" values ') - end if - end if - -c - if (ishift .eq. 0) then -c -c %-----------------------------------------------------% -c | User specified shifts: reverse communication to | -c | compute the shifts. They are returned in the first | -c | NP locations of WORKL. | -c %-----------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if -c - 50 continue -c -c %------------------------------------% -c | Back from reverse communication; | -c | User specified shifts are returned | -c | in WORKL(1:*NP) | -c %------------------------------------% -c - ushift = .false. -c -c -c %---------------------------------------------------------% -c | Move the NP shifts to the first NP locations of RITZ to | -c | free up WORKL. This is for the non-exact shift case; | -c | in the exact shift case, dsgets already handles this. | -c %---------------------------------------------------------% -c - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_saup2: The number of shifts to apply ') - call dvout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') - if (ishift .eq. 1) then - call dvout (logfil, np, bounds, ndigit, - & '_saup2: corresponding Ritz estimates') - end if - end if -c -c %---------------------------------------------------------% -c | Apply the NP0 implicit shifts by QR bulge chasing. | -c | Each shift is applied to the entire tridiagonal matrix. | -c | The first 2*N locations of WORKD are used as workspace. | -c | After dsapps is done, we have a Lanczos | -c | factorization of length NEV. | -c %---------------------------------------------------------% -c - call dsapps (n, nev, np, ritz, v, ldv, h, ldh, resid, q, ldq, - & workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to dsaitr. | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call dcopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call dcopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = ddot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = dnrm2(n, resid, 1) - end if - cnorm = .false. - 130 continue -c - if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm, ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call dvout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') - call dvout (logfil, nev-1, h(2,1), ndigit, - & '_saup2: subdiagonal of compressed H matrix') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = nconv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error exit | -c %------------% -c - call arscnd (t1) - tsaup2 = t1 - t0 -c - 9000 continue - return -c -c %---------------% -c | End of dsaup2 | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,690 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsaupd -c -c\Description: -c -c Reverse communication interface for the Implicitly Restarted Arnoldi -c Iteration. For symmetric problems this reduces to a variant of the Lanczos -c method. This method has been designed to compute approximations to a -c few eigenpairs of a linear operator OP that is real and symmetric -c with respect to a real positive semi-definite symmetric matrix B, -c i.e. -c -c B*OP = (OP`)*B. -c -c Another way to express this condition is -c -c < x,OPy > = < OPx,y > where < z,w > = z`Bw . -c -c In the standard eigenproblem B is the identity matrix. -c ( A` denotes transpose of A) -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c dsaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x, A symmetric -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, A symmetric, M symmetric positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: K*x = lambda*M*x, K symmetric, M symmetric positive semi-definite -c ===> OP = (inv[K - sigma*M])*M and B = M. -c ===> Shift-and-Invert mode -c -c Mode 4: K*x = lambda*KG*x, K symmetric positive semi-definite, -c KG symmetric indefinite -c ===> OP = (inv[K - sigma*KG])*K and B = K. -c ===> Buckling mode -c -c Mode 5: A*x = lambda*M*x, A symmetric, M symmetric positive semi-definite -c ===> OP = inv[A - sigma*M]*[A + sigma*M] and B = M. -c ===> Cayley transformed mode -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call dsaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to dsaupd . IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c dsaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c (If Mode = 2 see remark 5 below) -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3,4 and 5, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute the IPARAM(8) shifts where -c IPNTR(11) is the pointer into WORKL for -c placing the shifts. See remark 6 below. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c Specify which of the Ritz values of OP to compute. -c -c 'LA' - compute the NEV largest (algebraic) eigenvalues. -c 'SA' - compute the NEV smallest (algebraic) eigenvalues. -c 'LM' - compute the NEV largest (in magnitude) eigenvalues. -c 'SM' - compute the NEV smallest (in magnitude) eigenvalues. -c 'BE' - compute NEV eigenvalues, half from each end of the -c spectrum. When NEV is odd, compute one more from the -c high end than from the low end. -c (see remark 1 below) -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N. -c -c TOL Double precision scalar. (INPUT) -c Stopping criterion: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)). -c If TOL .LE. 0. is passed a default is set: -c DEFAULT = DLAMCH ('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine DLAMCH ). -c -c RESID Double precision array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V (less than or equal to N). -c This will indicate how many Lanczos vectors are generated -c at each iteration. After the startup phase in which NEV -c Lanczos vectors are generated, the algorithm generates -c NCV-NEV Lanczos vectors at each subsequent update iteration. -c Most of the cost in generating each Lanczos vector is in the -c matrix-vector product OP*x. (See remark 4 below). -c -c V Double precision N by NCV array. (OUTPUT) -c The NCV columns of V contain the Lanczos basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to restart -c the Arnoldi iteration in an implicit fashion. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are provided by the user via -c reverse communication. The NCV eigenvalues of -c the current tridiagonal matrix T are returned in -c the part of WORKL array corresponding to RITZ. -c See remark 6 below. -c ISHIFT = 1: exact shifts with respect to the reduced -c tridiagonal matrix T. This is equivalent to -c restarting the iteration with a starting vector -c that is a linear combination of Ritz vectors -c associated with the "wanted" Ritz values. -c ------------------------------------------------------------- -c -c IPARAM(2) = LEVEC -c No longer referenced. See remark 2 below. -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3,4,5; See under \Description of dsaupd for the -c five modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), dsaupd returns NP, the number -c of shifts the user is to provide. 0 < NP <=NCV-NEV. See Remark -c 6 below. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 11. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Lanczos iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by 2 tridiagonal matrix T in WORKL. -c IPNTR(6): pointer to the NCV RITZ values array in WORKL. -c IPNTR(7): pointer to the Ritz estimates in array WORKL associated -c with the Ritz values located in RITZ in WORKL. -c IPNTR(11): pointer to the NP shifts in WORKL. See Remark 6 below. -c -c Note: IPNTR(8:10) is only referenced by dseupd . See Remark 2. -c IPNTR(8): pointer to the NCV RITZ values of the original system. -c IPNTR(9): pointer to the NCV corresponding error bounds. -c IPNTR(10): pointer to the NCV by NCV matrix of eigenvectors -c of the tridiagonal matrix T. Only referenced by -c dseupd if RVEC = .TRUE. See Remarks. -c ------------------------------------------------------------- -c -c WORKD Double precision work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration. Upon termination -c WORKD(1:N) contains B*RESID(1:N). If the Ritz vectors are desired -c subroutine dseupd uses this output. -c See Data Distribution Note below. -c -c WORKL Double precision work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least NCV**2 + 8*NCV . -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV must be greater than NEV and less than or equal to N. -c = -4: The maximum number of Arnoldi update iterations allowed -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LA', 'SA' or 'BE'. -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array WORKL is not sufficient. -c = -8: Error return from trid. eigenvalue calculation; -c Informatinal error from LAPACK routine dsteqr . -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4,5. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatable. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -13: NEV and WHICH = 'BE' are incompatable. -c = -9999: Could not build an Arnoldi factorization. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. The user is advised to check that -c enough workspace and array storage has been allocated. -c -c -c\Remarks -c 1. The converged Ritz values are always returned in ascending -c algebraic order. The computed Ritz values are approximate -c eigenvalues of OP. The selection of WHICH should be made -c with this in mind when Mode = 3,4,5. After convergence, -c approximate eigenvalues of the original problem may be obtained -c with the ARPACK subroutine dseupd . -c -c 2. If the Ritz vectors corresponding to the converged Ritz values -c are needed, the user must call dseupd immediately following completion -c of dsaupd . This is new starting with version 2.1 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requrement is that NCV > NEV. -c However, it is recommended that NCV .ge. 2*NEV. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c -c 5. If IPARAM(7) = 2 then in the Reverse commuication interface the user -c must do the following. When IDO = 1, Y = OP * X is to be computed. -c When IPARAM(7) = 2 OP = inv(B)*A. After computing A*X the user -c must overwrite X with A*X. Y is then the solution to the linear set -c of equations B*Y = A*X. -c -c 6. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) shifts in locations: -c 1 WORKL(IPNTR(11)) -c 2 WORKL(IPNTR(11)+1) -c . -c . -c . -c NP WORKL(IPNTR(11)+NP-1). -c -c The eigenvalues of the current tridiagonal matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1). They are in the -c order defined by WHICH. The associated Ritz estimates are located in -c WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c REAL RESID(N), V(LDV,NCV), WORKD(3*N), WORKL(LWORKL) -c DECOMPOSE D1(N), D2(N,NCV) -c ALIGN RESID(I) with D1(I) -c ALIGN V(I,J) with D2(I,J) -c ALIGN WORKD(I) with D1(I) range (1:N) -c ALIGN WORKD(I) with D1(I-N) range (N+1:2*N) -c ALIGN WORKD(I) with D1(I-2*N) range (2*N+1:3*N) -c DISTRIBUTE D1(BLOCK), D2(BLOCK,:) -c REPLICATED WORKL(LWORKL) -c -c Cray MPP syntax: -c =============== -c REAL RESID(N), V(LDV,NCV), WORKD(N,3), WORKL(LWORKL) -c SHARED RESID(BLOCK), V(BLOCK,:), WORKD(BLOCK,:) -c REPLICATED WORKL(LWORKL) -c -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c 8. R.B. Lehoucq, D.C. Sorensen, "Implementation of Some Spectral -c Transformations in a k-Step Arnoldi Method". In Preparation. -c -c\Routines called: -c dsaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c dstats ARPACK routine that initialize timing and other statistics -c variables. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: saupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(11) - Double precision - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0 , zero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, msglvl, mxiter, mode, nb, - & nev0, next, np, ritz, j - save bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, msglvl, mxiter, mode, nb, - & nev0, next, np, ritz -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dsaup2 , dvout , ivout, arscnd, dstats -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch - external dlamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call dstats - call arscnd (t0) - msglvl = msaupd -c - ierr = 0 - ishift = iparam(1) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c -c %----------------% -c | Error checking | -c %----------------% -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev .or. ncv .gt. n) then - ierr = -3 - end if -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c %----------------------------------------------% -c - np = ncv - nev -c - if (mxiter .le. 0) ierr = -4 - if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LA' .and. - & which .ne. 'SA' .and. - & which .ne. 'BE') ierr = -5 - if (bmat .ne. 'I' .and. bmat .ne. 'G') ierr = -6 -c - if (lworkl .lt. ncv**2 + 8*ncv) ierr = -7 - if (mode .lt. 1 .or. mode .gt. 5) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - else if (ishift .lt. 0 .or. ishift .gt. 1) then - ierr = -12 - else if (nev .eq. 1 .and. which .eq. 'BE') then - ierr = -13 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. zero) tol = dlamch ('EpsMach') -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, ncv**2 + 8*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:2*ncv) := generated tridiagonal matrix | -c | workl(2*ncv+1:2*ncv+ncv) := ritz values | -c | workl(3*ncv+1:3*ncv+ncv) := computed error bounds | -c | workl(4*ncv+1:4*ncv+ncv*ncv) := rotation matrix Q | -c | workl(4*ncv+ncv*ncv+1:7*ncv+ncv*ncv) := workspace | -c %-------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritz = ih + 2*ldh - bounds = ritz + ncv - iq = bounds + ncv - iw = iq + ncv**2 - next = iw + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritz - ipntr(7) = bounds - ipntr(11) = iw - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Lanczos Iteration. | -c %-------------------------------------------------------% -c - call dsaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritz), - & workl(bounds), workl(iq), ldq, workl(iw), ipntr, workd, - & info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP or shifts. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within dsaup2 . | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_saupd: number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_saupd: number of "converged" Ritz values') - call dvout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') - call dvout (logfil, np, workl(Bounds), ndigit, - & '_saupd: corresponding error bounds') - end if -c - call arscnd (t1) - tsaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tsaupd, tsaup2, tsaitr, titref, - & tgetv0, tseigt, tsgets, tsapps, tsconv - 1000 format (//, - & 5x, '==========================================',/ - & 5x, '= Symmetric implicit Arnoldi update code =',/ - & 5x, '= Version Number:', ' 2.4' , 19x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 14x, ' =',/ - & 5x, '==========================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '==========================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in saup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in trid eigenvalue subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of dsaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsconv.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsconv -c -c\Description: -c Convergence testing for the symmetric Arnoldi eigenvalue routine. -c -c\Usage: -c call dsconv -c ( N, RITZ, BOUNDS, TOL, NCONV ) -c -c\Arguments -c N Integer. (INPUT) -c Number of Ritz values to check for convergence. -c -c RITZ Double precision array of length N. (INPUT) -c The Ritz values to be checked for convergence. -c -c BOUNDS Double precision array of length N. (INPUT) -c Ritz estimates associated with the Ritz values in RITZ. -c -c TOL Double precision scalar. (INPUT) -c Desired relative accuracy for a Ritz value to be considered -c "converged". -c -c NCONV Integer scalar. (OUTPUT) -c Number of "converged" Ritz values. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c dlamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: sconv.F SID: 2.4 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\Remarks -c 1. Starting with version 2.4, this routine no longer uses the -c Parlett strategy using the gap conditions. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsconv (n, ritz, bounds, tol, nconv) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer n, nconv - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & ritz(n), bounds(n) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i - Double precision - & temp, eps23 -c -c %-------------------% -c | External routines | -c %-------------------% -c - Double precision - & dlamch - external dlamch - -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - call arscnd (t0) -c - eps23 = dlamch('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0) -c - nconv = 0 - do 10 i = 1, n -c -c %-----------------------------------------------------% -c | The i-th Ritz value is considered "converged" | -c | when: bounds(i) .le. TOL*max(eps23, abs(ritz(i))) | -c %-----------------------------------------------------% -c - temp = max( eps23, abs(ritz(i)) ) - if ( bounds(i) .le. tol*temp ) then - nconv = nconv + 1 - end if -c - 10 continue -c - call arscnd (t1) - tsconv = tsconv + (t1 - t0) -c - return -c -c %---------------% -c | End of dsconv | -c %---------------% -c - end
--- a/libcruft/arpack/src/dseigt.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dseigt -c -c\Description: -c Compute the eigenvalues of the current symmetric tridiagonal matrix -c and the corresponding error bounds given the current residual norm. -c -c\Usage: -c call dseigt -c ( RNORM, N, H, LDH, EIG, BOUNDS, WORKL, IERR ) -c -c\Arguments -c RNORM Double precision scalar. (INPUT) -c RNORM contains the residual norm corresponding to the current -c symmetric tridiagonal matrix H. -c -c N Integer. (INPUT) -c Size of the symmetric tridiagonal matrix H. -c -c H Double precision N by 2 array. (INPUT) -c H contains the symmetric tridiagonal matrix with the -c subdiagonal in the first column starting at H(2,1) and the -c main diagonal in second column. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c EIG Double precision array of length N. (OUTPUT) -c On output, EIG contains the N eigenvalues of H possibly -c unsorted. The BOUNDS arrays are returned in the -c same sorted order as EIG. -c -c BOUNDS Double precision array of length N. (OUTPUT) -c On output, BOUNDS contains the error estimates corresponding -c to the eigenvalues EIG. This is equal to RNORM times the -c last components of the eigenvectors corresponding to the -c eigenvalues in EIG. -c -c WORKL Double precision work array of length 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c IERR Integer. (OUTPUT) -c Error exit flag from dstqrb. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dstqrb ARPACK routine that computes the eigenvalues and the -c last components of the eigenvectors of a symmetric -c and tridiagonal matrix. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dcopy Level 1 BLAS that copies one vector to another. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: seigt.F SID: 2.4 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dseigt - & ( rnorm, n, h, ldh, eig, bounds, workl, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, ldh, n - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & eig(n), bounds(n), h(ldh,2), workl(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & zero - parameter (zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, k, msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy, dstqrb, dvout, arscnd -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mseigt -c - if (msglvl .gt. 0) then - call dvout (logfil, n, h(1,2), ndigit, - & '_seigt: main diagonal of matrix H') - if (n .gt. 1) then - call dvout (logfil, n-1, h(2,1), ndigit, - & '_seigt: sub diagonal of matrix H') - end if - end if -c - call dcopy (n, h(1,2), 1, eig, 1) - call dcopy (n-1, h(2,1), 1, workl, 1) - call dstqrb (n, eig, workl, bounds, workl(n+1), ierr) - if (ierr .ne. 0) go to 9000 - if (msglvl .gt. 1) then - call dvout (logfil, n, bounds, ndigit, - & '_seigt: last row of the eigenvector matrix for H') - end if -c -c %-----------------------------------------------% -c | Finally determine the error bounds associated | -c | with the n Ritz values of H. | -c %-----------------------------------------------% -c - do 30 k = 1, n - bounds(k) = rnorm*abs(bounds(k)) - 30 continue -c - call arscnd (t1) - tseigt = tseigt + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of dseigt | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsesrt.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,217 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsesrt -c -c\Description: -c Sort the array X in the order specified by WHICH and optionally -c apply the permutation to the columns of the matrix A. -c -c\Usage: -c call dsesrt -c ( WHICH, APPLY, N, X, NA, A, LDA) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> X is sorted into increasing order of magnitude. -c 'SM' -> X is sorted into decreasing order of magnitude. -c 'LA' -> X is sorted into increasing order of algebraic. -c 'SA' -> X is sorted into decreasing order of algebraic. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to A. -c APPLY = .FALSE. -> do not apply the sorted order to A. -c -c N Integer. (INPUT) -c Dimension of the array X. -c -c X Double precision array of length N. (INPUT/OUTPUT) -c The array to be sorted. -c -c NA Integer. (INPUT) -c Number of rows of the matrix A. -c -c A Double precision array of length NA by N. (INPUT/OUTPUT) -c -c LDA Integer. (INPUT) -c Leading dimension of A. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines -c dswap Level 1 BLAS that swaps the contents of two vectors. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.1'. -c Adapted from the sort routine in LANSO and -c the ARPACK code dsortr -c -c\SCCS Information: @(#) -c FILE: sesrt.F SID: 2.3 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsesrt (which, apply, n, x, na, a, lda) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer lda, n, na -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & x(0:n-1), a(lda, 0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Double precision - & temp -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dswap -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'SA') then -c -c X is sorted into decreasing order of algebraic. -c - 10 continue - if (igap .eq. 0) go to 9000 - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - if (x(j).lt.x(j+igap)) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call dswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 30 - endif - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c X is sorted into decreasing order of magnitude. -c - 40 continue - if (igap .eq. 0) go to 9000 - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j.lt.0) go to 60 -c - if (abs(x(j)).lt.abs(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call dswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LA') then -c -c X is sorted into increasing order of algebraic. -c - 70 continue - if (igap .eq. 0) go to 9000 - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (x(j).gt.x(j+igap)) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call dswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'LM') then -c -c X is sorted into increasing order of magnitude. -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (abs(x(j)).gt.abs(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call dswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 - end if -c - 9000 continue - return -c -c %---------------% -c | End of dsesrt | -c %---------------% -c - end
--- a/libcruft/arpack/src/dseupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,857 +0,0 @@ -c\BeginDoc -c -c\Name: dseupd -c -c\Description: -c -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) the corresponding approximate eigenvectors, -c -c (2) an orthonormal (Lanczos) basis for the associated approximate -c invariant subspace, -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c (Lanczos) basis is always computed. There is an additional storage cost -c of n*nev if both are requested (in this case a separate array Z must be -c supplied). -c -c These quantities are obtained from the Lanczos factorization computed -c by DSAUPD for the linear operator OP prescribed by the MODE selection -c (see IPARAM(7) in DSAUPD documentation.) DSAUPD must be called before -c this routine is called. These approximate eigenvalues and vectors are -c commonly called Ritz values and Ritz vectors respectively. They are -c referred to as such in the comments that follow. The computed orthonormal -c basis for the invariant subspace corresponding to these Ritz values is -c referred to as a Lanczos basis. -c -c See documentation in the header of the subroutine DSAUPD for a definition -c of OP as well as other terms and the relation of computed Ritz values -c and vectors of OP with respect to the given problem A*z = lambda*B*z. -c -c The approximate eigenvalues of the original problem are returned in -c ascending algebraic order. The user may elect to call this routine -c once for each desired Ritz vector and store it peripherally if desired. -c There is also the option of computing a selected set of these vectors -c with a single call. -c -c\Usage: -c call dseupd -c ( RVEC, HOWMNY, SELECT, D, Z, LDZ, SIGMA, BMAT, N, WHICH, NEV, TOL, -c RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c RVEC LOGICAL (INPUT) -c Specifies whether Ritz vectors corresponding to the Ritz value -c approximations to the eigenproblem A*z = lambda*B*z are computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute Ritz vectors. -c -c HOWMNY Character*1 (INPUT) -c Specifies how many Ritz vectors are wanted and the form of Z -c the matrix of Ritz vectors. See remark 1 below. -c = 'A': compute NEV Ritz vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT/WORKSPACE) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value D(j), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' , SELECT is used as a workspace for -c reordering the Ritz values. -c -c D Double precision array of dimension NEV. (OUTPUT) -c On exit, D contains the Ritz value approximations to the -c eigenvalues of A*z = lambda*B*z. The values are returned -c in ascending order. If IPARAM(7) = 3,4,5 then D represents -c the Ritz values of OP computed by dsaupd transformed to -c those of the original eigensystem A*z = lambda*B*z. If -c IPARAM(7) = 1,2 then the Ritz values of OP are the same -c as the those of A*z = lambda*B*z. -c -c Z Double precision N by NEV array if HOWMNY = 'A'. (OUTPUT) -c On exit, Z contains the B-orthonormal Ritz vectors of the -c eigensystem A*z = lambda*B*z corresponding to the Ritz -c value approximations. -c If RVEC = .FALSE. then Z is not referenced. -c NOTE: The array Z may be set equal to first NEV columns of the -c Arnoldi/Lanczos basis array V computed by DSAUPD . -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ .ge. max( 1, N ). In any case, LDZ .ge. 1. -c -c SIGMA Double precision (INPUT) -c If IPARAM(7) = 3,4,5 represents the shift. Not referenced if -c IPARAM(7) = 1 or 2. -c -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to DSAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, INFO -c -c must be passed directly to DSEUPD following the last call -c to DSAUPD . These arguments MUST NOT BE MODIFIED between -c the the last call to DSAUPD and the call to DSEUPD . -c -c Two of these parameters (WORKL, INFO) are also output parameters: -c -c WORKL Double precision work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:4*ncv) contains information obtained in -c dsaupd . They are not changed by dseupd . -c WORKL(4*ncv+1:ncv*ncv+8*ncv) holds the -c untransformed Ritz values, the computed error estimates, -c and the associated eigenvector matrix of H. -c -c Note: IPNTR(8:10) contains the pointer into WORKL for addresses -c of the above information computed by dseupd . -c ------------------------------------------------------------- -c IPNTR(8): pointer to the NCV RITZ values of the original system. -c IPNTR(9): pointer to the NCV corresponding error bounds. -c IPNTR(10): pointer to the NCV by NCV matrix of eigenvectors -c of the tridiagonal matrix T. Only referenced by -c dseupd if RVEC = .TRUE. See Remarks. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c = 0: Normal exit. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV must be greater than NEV and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LA', 'SA' or 'BE'. -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from trid. eigenvalue calculation; -c Information error from LAPACK routine dsteqr . -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4,5. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: NEV and WHICH = 'BE' are incompatible. -c = -14: DSAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: HOWMNY must be one of 'A' or 'S' if RVEC = .true. -c = -16: HOWMNY = 'S' not yet implemented -c = -17: DSEUPD got a different count of the number of converged -c Ritz values than DSAUPD got. This indicates the user -c probably made an error in passing data from DSAUPD to -c DSEUPD or that the data was modified before entering -c DSEUPD . -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c -c\Remarks -c 1. The converged Ritz values are always returned in increasing -c (algebraic) order. -c -c 2. Currently only HOWMNY = 'A' is implemented. It is included at this -c stage for the user who wants to incorporate it. -c -c\Routines called: -c dsesrt ARPACK routine that sorts an array X, and applies the -c corresponding permutation to a matrix A. -c dsortr dsortr ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c dvout ARPACK utility routine that prints vectors. -c dgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c dlacpy LAPACK matrix copy routine. -c dlamch LAPACK routine that determines machine constants. -c dorm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c dsteqr LAPACK routine that computes eigenvalues and eigenvectors -c of a tridiagonal matrix. -c dger Level 2 BLAS rank one update to a matrix. -c dcopy Level 1 BLAS that copies one vector to another . -c dnrm2 Level 1 BLAS that computes the norm of a vector. -c dscal Level 1 BLAS that scales a vector. -c dswap Level 1 BLAS that swaps the contents of two vectors. - -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: seupd.F SID: 2.11 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine dseupd (rvec , howmny, select, d , - & z , ldz , sigma , bmat , - & n , which , nev , tol , - & resid , ncv , v , ldv , - & iparam, ipntr , workd , workl, - & lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Double precision - & sigma, tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(7), ipntr(11) - logical select(ncv) - Double precision - & d(nev) , resid(n) , v(ldv,ncv), - & z(ldz, nev), workd(2*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0 , zero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds , ierr , ih , ihb , ihd , - & iq , iw , j , k , ldh , - & ldq , mode , msglvl, nconv , next , - & ritz , irz , ibd , np , ishift, - & leftptr, rghtptr, numcnv, jj - Double precision - & bnorm2 , rnorm, temp, temp1, eps23 - logical reord -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dcopy , dger , dgeqr2 , dlacpy , dorm2r , dscal , - & dsesrt , dsteqr , dswap , dvout , ivout , dsortr -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dnrm2 , dlamch - external dnrm2 , dlamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mseupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c %--------------% -c | Quick return | -c %--------------% -c - if (nconv .eq. 0) go to 9000 - ierr = 0 -c - if (nconv .le. 0) ierr = -14 - if (n .le. 0) ierr = -1 - if (nev .le. 0) ierr = -2 - if (ncv .le. nev .or. ncv .gt. n) ierr = -3 - if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LA' .and. - & which .ne. 'SA' .and. - & which .ne. 'BE') ierr = -5 - if (bmat .ne. 'I' .and. bmat .ne. 'G') ierr = -6 - if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) - & ierr = -15 - if (rvec .and. howmny .eq. 'S') ierr = -16 -c - if (rvec .and. lworkl .lt. ncv**2+8*ncv) ierr = -7 -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 ) then - type = 'SHIFTI' - else if (mode .eq. 4 ) then - type = 'BUCKLE' - else if (mode .eq. 5 ) then - type = 'CAYLEY' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 - if (nev .eq. 1 .and. which .eq. 'BE') ierr = -12 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %-------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:2*ncv) := generated tridiagonal matrix H | -c | The subdiagonal is stored in workl(2:ncv). | -c | The dead spot is workl(1) but upon exiting | -c | dsaupd stores the B-norm of the last residual | -c | vector in workl(1). We use this !!! | -c | workl(2*ncv+1:2*ncv+ncv) := ritz values | -c | The wanted values are in the first NCONV spots. | -c | workl(3*ncv+1:3*ncv+ncv) := computed Ritz estimates | -c | The wanted values are in the first NCONV spots. | -c | NOTE: workl(1:4*ncv) is set by dsaupd and is not | -c | modified by dseupd . | -c %-------------------------------------------------------% -c -c %-------------------------------------------------------% -c | The following is used and set by dseupd . | -c | workl(4*ncv+1:4*ncv+ncv) := used as workspace during | -c | computation of the eigenvectors of H. Stores | -c | the diagonal of H. Upon EXIT contains the NCV | -c | Ritz values of the original system. The first | -c | NCONV spots have the wanted values. If MODE = | -c | 1 or 2 then will equal workl(2*ncv+1:3*ncv). | -c | workl(5*ncv+1:5*ncv+ncv) := used as workspace during | -c | computation of the eigenvectors of H. Stores | -c | the subdiagonal of H. Upon EXIT contains the | -c | NCV corresponding Ritz estimates of the | -c | original system. The first NCONV spots have the | -c | wanted values. If MODE = 1,2 then will equal | -c | workl(3*ncv+1:4*ncv). | -c | workl(6*ncv+1:6*ncv+ncv*ncv) := orthogonal Q that is | -c | the eigenvector matrix for H as returned by | -c | dsteqr . Not referenced if RVEC = .False. | -c | Ordering follows that of workl(4*ncv+1:5*ncv) | -c | workl(6*ncv+ncv*ncv+1:6*ncv+ncv*ncv+2*ncv) := | -c | Workspace. Needed by dsteqr and by dseupd . | -c | GRAND total of NCV*(NCV+8) locations. | -c %-------------------------------------------------------% -c -c - ih = ipntr(5) - ritz = ipntr(6) - bounds = ipntr(7) - ldh = ncv - ldq = ncv - ihd = bounds + ldh - ihb = ihd + ldh - iq = ihb + ldh - iw = iq + ldh*ncv - next = iw + 2*ncv - ipntr(4) = next - ipntr(8) = ihd - ipntr(9) = ihb - ipntr(10) = iq -c -c %----------------------------------------% -c | irz points to the Ritz values computed | -c | by _seigt before exiting _saup2. | -c | ibd points to the Ritz estimates | -c | computed by _seigt before exiting | -c | _saup2. | -c %----------------------------------------% -c - irz = ipntr(11)+ncv - ibd = irz+ncv -c -c -c %---------------------------------% -c | Set machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch ('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0 ) -c -c %---------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c | BNORM2 is the 2 norm of B*RESID(1:N). | -c | Upon exit of dsaupd WORKD(1:N) has | -c | B*RESID(1:N). | -c %---------------------------------------% -c - rnorm = workl(ih) - if (bmat .eq. 'I') then - bnorm2 = rnorm - else if (bmat .eq. 'G') then - bnorm2 = dnrm2 (n, workd, 1) - end if -c - if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(irz), ndigit, - & '_seupd: Ritz values passed in from _SAUPD.') - call dvout (logfil, ncv, workl(ibd), ndigit, - & '_seupd: Ritz estimates passed in from _SAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(bound) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call dsgets (ishift, which , nev , - & np , workl(irz) , workl(bounds), - & workl) -c - if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(irz), ndigit, - & '_seupd: Ritz values after calling _SGETS.') - call dvout (logfil, ncv, workl(bounds), ndigit, - & '_seupd: Ritz value indices after calling _SGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - temp1 = max(eps23, abs(workl(irz+ncv-j)) ) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & workl(ibd+jj-1) .le. tol*temp1) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by _saupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the _saupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_seupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -17 - go to 9000 - end if -c -c %-----------------------------------------------------------% -c | Call LAPACK routine _steqr to compute the eigenvalues and | -c | eigenvectors of the final symmetric tridiagonal matrix H. | -c | Initialize the eigenvector matrix Q to the identity. | -c %-----------------------------------------------------------% -c - call dcopy (ncv-1, workl(ih+1), 1, workl(ihb), 1) - call dcopy (ncv, workl(ih+ldh), 1, workl(ihd), 1) -c - call dsteqr ('Identity', ncv, workl(ihd), workl(ihb), - & workl(iq) , ldq, workl(iw), ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call dcopy (ncv, workl(iq+ncv-1), ldq, workl(iw), 1) - call dvout (logfil, ncv, workl(ihd), ndigit, - & '_seupd: NCV Ritz values of the final H matrix') - call dvout (logfil, ncv, workl(iw), ndigit, - & '_seupd: last row of the eigenvector matrix for H') - end if -c - if (reord) then -c -c %---------------------------------------------% -c | Reordered the eigenvalues and eigenvectors | -c | computed by _steqr so that the "converged" | -c | eigenvalues appear in the first NCONV | -c | positions of workl(ihd), and the associated | -c | eigenvectors appear in the first NCONV | -c | columns. | -c %---------------------------------------------% -c - leftptr = 1 - rghtptr = ncv -c - if (ncv .eq. 1) go to 30 -c - 20 if (select(leftptr)) then -c -c %-------------------------------------------% -c | Search, from the left, for the first Ritz | -c | value that has not converged. | -c %-------------------------------------------% -c - leftptr = leftptr + 1 -c - else if ( .not. select(rghtptr)) then -c -c %----------------------------------------------% -c | Search, from the right, the first Ritz value | -c | that has converged. | -c %----------------------------------------------% -c - rghtptr = rghtptr - 1 -c - else -c -c %----------------------------------------------% -c | Swap the Ritz value on the left that has not | -c | converged with the Ritz value on the right | -c | that has converged. Swap the associated | -c | eigenvector of the tridiagonal matrix H as | -c | well. | -c %----------------------------------------------% -c - temp = workl(ihd+leftptr-1) - workl(ihd+leftptr-1) = workl(ihd+rghtptr-1) - workl(ihd+rghtptr-1) = temp - call dcopy (ncv, workl(iq+ncv*(leftptr-1)), 1, - & workl(iw), 1) - call dcopy (ncv, workl(iq+ncv*(rghtptr-1)), 1, - & workl(iq+ncv*(leftptr-1)), 1) - call dcopy (ncv, workl(iw), 1, - & workl(iq+ncv*(rghtptr-1)), 1) - leftptr = leftptr + 1 - rghtptr = rghtptr - 1 -c - end if -c - if (leftptr .lt. rghtptr) go to 20 -c - end if -c - 30 if (msglvl .gt. 2) then - call dvout (logfil, ncv, workl(ihd), ndigit, - & '_seupd: The eigenvalues of H--reordered') - end if -c -c %----------------------------------------% -c | Load the converged Ritz values into D. | -c %----------------------------------------% -c - call dcopy (nconv, workl(ihd), 1, d, 1) -c - else -c -c %-----------------------------------------------------% -c | Ritz vectors not required. Load Ritz values into D. | -c %-----------------------------------------------------% -c - call dcopy (nconv, workl(ritz), 1, d, 1) - call dcopy (ncv, workl(ritz), 1, workl(ihd), 1) -c - end if -c -c %------------------------------------------------------------------% -c | Transform the Ritz values and possibly vectors and corresponding | -c | Ritz estimates of OP to those of A*x=lambda*B*x. The Ritz values | -c | (and corresponding data) are returned in ascending order. | -c %------------------------------------------------------------------% -c - if (type .eq. 'REGULR') then -c -c %---------------------------------------------------------% -c | Ascending sort of wanted Ritz values, vectors and error | -c | bounds. Not necessary if only Ritz values are desired. | -c %---------------------------------------------------------% -c - if (rvec) then - call dsesrt ('LA', rvec , nconv, d, ncv, workl(iq), ldq) - else - call dcopy (ncv, workl(bounds), 1, workl(ihb), 1) - end if -c - else -c -c %-------------------------------------------------------------% -c | * Make a copy of all the Ritz values. | -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | For TYPE = 'BUCKLE' the transformation is | -c | lambda = sigma * theta / ( theta - 1 ) | -c | For TYPE = 'CAYLEY' the transformation is | -c | lambda = sigma * (theta + 1) / (theta - 1 ) | -c | where the theta are the Ritz values returned by dsaupd . | -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c | They are only reordered. | -c %-------------------------------------------------------------% -c - call dcopy (ncv, workl(ihd), 1, workl(iw), 1) - if (type .eq. 'SHIFTI') then - do 40 k=1, ncv - workl(ihd+k-1) = one / workl(ihd+k-1) + sigma - 40 continue - else if (type .eq. 'BUCKLE') then - do 50 k=1, ncv - workl(ihd+k-1) = sigma * workl(ihd+k-1) / - & (workl(ihd+k-1) - one) - 50 continue - else if (type .eq. 'CAYLEY') then - do 60 k=1, ncv - workl(ihd+k-1) = sigma * (workl(ihd+k-1) + one) / - & (workl(ihd+k-1) - one) - 60 continue - end if -c -c %-------------------------------------------------------------% -c | * Store the wanted NCONV lambda values into D. | -c | * Sort the NCONV wanted lambda in WORKL(IHD:IHD+NCONV-1) | -c | into ascending order and apply sort to the NCONV theta | -c | values in the transformed system. We will need this to | -c | compute Ritz estimates in the original system. | -c | * Finally sort the lambda`s into ascending order and apply | -c | to Ritz vectors if wanted. Else just sort lambda`s into | -c | ascending order. | -c | NOTES: | -c | *workl(iw:iw+ncv-1) contain the theta ordered so that they | -c | match the ordering of the lambda. We`ll use them again for | -c | Ritz vector purification. | -c %-------------------------------------------------------------% -c - call dcopy (nconv, workl(ihd), 1, d, 1) - call dsortr ('LA', .true., nconv, workl(ihd), workl(iw)) - if (rvec) then - call dsesrt ('LA', rvec , nconv, d, ncv, workl(iq), ldq) - else - call dcopy (ncv, workl(bounds), 1, workl(ihb), 1) - call dscal (ncv, bnorm2/rnorm, workl(ihb), 1) - call dsortr ('LA', .true., nconv, d, workl(ihb)) - end if -c - end if -c -c %------------------------------------------------% -c | Compute the Ritz vectors. Transform the wanted | -c | eigenvectors of the symmetric tridiagonal H by | -c | the Lanczos basis matrix V. | -c %------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A') then -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(iq,ldq). | -c %----------------------------------------------------------% -c - call dgeqr2 (ncv, nconv , workl(iq) , - & ldq, workl(iw+ncv), workl(ihb), - & ierr) -c -c %--------------------------------------------------------% -c | * Postmultiply V by Q. | -c | * Copy the first NCONV columns of VQ into Z. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(ihd). | -c %--------------------------------------------------------% -c - call dorm2r ('Right', 'Notranspose', n , - & ncv , nconv , workl(iq), - & ldq , workl(iw+ncv), v , - & ldv , workd(n+1) , ierr) - call dlacpy ('All', n, nconv, v, ldv, z, ldz) -c -c %-----------------------------------------------------% -c | In order to compute the Ritz estimates for the Ritz | -c | values in both systems, need the last row of the | -c | eigenvector matrix. Remember, it`s in factored form | -c %-----------------------------------------------------% -c - do 65 j = 1, ncv-1 - workl(ihb+j-1) = zero - 65 continue - workl(ihb+ncv-1) = one - call dorm2r ('Left', 'Transpose' , ncv , - & 1 , nconv , workl(iq) , - & ldq , workl(iw+ncv), workl(ihb), - & ncv , temp , ierr) -c - else if (rvec .and. howmny .eq. 'S') then -c -c Not yet implemented. See remark 2 above. -c - end if -c - if (type .eq. 'REGULR' .and. rvec) then -c - do 70 j=1, ncv - workl(ihb+j-1) = rnorm * abs( workl(ihb+j-1) ) - 70 continue -c - else if (type .ne. 'REGULR' .and. rvec) then -c -c %-------------------------------------------------% -c | * Determine Ritz estimates of the theta. | -c | If RVEC = .true. then compute Ritz estimates | -c | of the theta. | -c | If RVEC = .false. then copy Ritz estimates | -c | as computed by dsaupd . | -c | * Determine Ritz estimates of the lambda. | -c %-------------------------------------------------% -c - call dscal (ncv, bnorm2, workl(ihb), 1) - if (type .eq. 'SHIFTI') then -c - do 80 k=1, ncv - workl(ihb+k-1) = abs( workl(ihb+k-1) ) - & / workl(iw+k-1)**2 - 80 continue -c - else if (type .eq. 'BUCKLE') then -c - do 90 k=1, ncv - workl(ihb+k-1) = sigma * abs( workl(ihb+k-1) ) - & / (workl(iw+k-1)-one )**2 - 90 continue -c - else if (type .eq. 'CAYLEY') then -c - do 100 k=1, ncv - workl(ihb+k-1) = abs( workl(ihb+k-1) - & / workl(iw+k-1)*(workl(iw+k-1)-one) ) - 100 continue -c - end if -c - end if -c - if (type .ne. 'REGULR' .and. msglvl .gt. 1) then - call dvout (logfil, nconv, d, ndigit, - & '_seupd: Untransformed converged Ritz values') - call dvout (logfil, nconv, workl(ihb), ndigit, - & '_seupd: Ritz estimates of the untransformed Ritz values') - else if (msglvl .gt. 1) then - call dvout (logfil, nconv, d, ndigit, - & '_seupd: Converged Ritz values') - call dvout (logfil, nconv, workl(ihb), ndigit, - & '_seupd: Associated Ritz estimates') - end if -c -c %-------------------------------------------------% -c | Ritz vector purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 3,4,5. See reference 7 | -c %-------------------------------------------------% -c - if (rvec .and. (type .eq. 'SHIFTI' .or. type .eq. 'CAYLEY')) then -c - do 110 k=0, nconv-1 - workl(iw+k) = workl(iq+k*ldq+ncv-1) - & / workl(iw+k) - 110 continue -c - else if (rvec .and. type .eq. 'BUCKLE') then -c - do 120 k=0, nconv-1 - workl(iw+k) = workl(iq+k*ldq+ncv-1) - & / (workl(iw+k)-one) - 120 continue -c - end if -c - if (type .ne. 'REGULR') - & call dger (n, nconv, one, resid, 1, workl(iw), 1, z, ldz) -c - 9000 continue -c - return -c -c %---------------% -c | End of dseupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsgets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsgets -c -c\Description: -c Given the eigenvalues of the symmetric tridiagonal matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: This is called even in the case of user specified shifts in -c order to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call dsgets -c ( ISHIFT, WHICH, KEV, NP, RITZ, BOUNDS, SHIFTS ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> KEV eigenvalues of largest magnitude are retained. -c 'SM' -> KEV eigenvalues of smallest magnitude are retained. -c 'LA' -> KEV eigenvalues of largest value are retained. -c 'SA' -> KEV eigenvalues of smallest value are retained. -c 'BE' -> KEV eigenvalues, half from each end of the spectrum. -c If KEV is odd, compute one more from the high end. -c -c KEV Integer. (INPUT) -c KEV+NP is the size of the matrix H. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be computed. -c -c RITZ Double precision array of length KEV+NP. (INPUT/OUTPUT) -c On INPUT, RITZ contains the eigenvalues of H. -c On OUTPUT, RITZ are sorted so that the unwanted eigenvalues -c are in the first NP locations and the wanted part is in -c the last KEV locations. When exact shifts are selected, the -c unwanted part corresponds to the shifts to be applied. -c -c BOUNDS Double precision array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c SHIFTS Double precision array of length NP. (INPUT/OUTPUT) -c On INPUT: contains the user specified shifts if ISHIFT = 0. -c On OUTPUT: contains the shifts sorted into decreasing order -c of magnitude with respect to the Ritz estimates contained in -c BOUNDS. If ISHIFT = 0, SHIFTS is not modified on exit. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c dsortr ARPACK utility sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c dvout ARPACK utility routine that prints vectors. -c dcopy Level 1 BLAS that copies one vector to another. -c dswap Level 1 BLAS that swaps the contents of two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/93: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: sgets.F SID: 2.4 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsgets ( ishift, which, kev, np, ritz, bounds, shifts ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & bounds(kev+np), ritz(kev+np), shifts(np) -c -c %------------% -c | Parameters | -c %------------% -c - Double precision - & one, zero - parameter (one = 1.0D+0, zero = 0.0D+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer kevd2, msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external dswap, dcopy, dsortr, arscnd -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic max, min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msgets -c - if (which .eq. 'BE') then -c -c %-----------------------------------------------------% -c | Both ends of the spectrum are requested. | -c | Sort the eigenvalues into algebraically increasing | -c | order first then swap high end of the spectrum next | -c | to low end in appropriate locations. | -c | NOTE: when np < floor(kev/2) be careful not to swap | -c | overlapping locations. | -c %-----------------------------------------------------% -c - call dsortr ('LA', .true., kev+np, ritz, bounds) - kevd2 = kev / 2 - if ( kev .gt. 1 ) then - call dswap ( min(kevd2,np), ritz, 1, - & ritz( max(kevd2,np)+1 ), 1) - call dswap ( min(kevd2,np), bounds, 1, - & bounds( max(kevd2,np)+1 ), 1) - end if -c - else -c -c %----------------------------------------------------% -c | LM, SM, LA, SA case. | -c | Sort the eigenvalues of H into the desired order | -c | and apply the resulting order to BOUNDS. | -c | The eigenvalues are sorted so that the wanted part | -c | are always in the last KEV locations. | -c %----------------------------------------------------% -c - call dsortr (which, .true., kev+np, ritz, bounds) - end if -c - if (ishift .eq. 1 .and. np .gt. 0) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first. | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when the shifts | -c | are applied in subroutine dsapps. | -c %-------------------------------------------------------% -c - call dsortr ('SM', .true., np, bounds, ritz) - call dcopy (np, ritz, 1, shifts, 1) - end if -c - call arscnd (t1) - tsgets = tsgets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') - call ivout (logfil, 1, np, ndigit, '_sgets: NP is') - call dvout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call dvout (logfil, kev+np, bounds, ndigit, - & '_sgets: Associated Ritz estimates') - end if -c - return -c -c %---------------% -c | End of dsgets | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsortc.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,344 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsortc -c -c\Description: -c Sorts the complex array in XREAL and XIMAG into the order -c specified by WHICH and optionally applies the permutation to the -c real array Y. It is assumed that if an element of XIMAG is -c nonzero, then its negative is also an element. In other words, -c both members of a complex conjugate pair are to be sorted and the -c pairs are kept adjacent to each other. -c -c\Usage: -c call dsortc -c ( WHICH, APPLY, N, XREAL, XIMAG, Y ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> sort XREAL,XIMAG into increasing order of magnitude. -c 'SM' -> sort XREAL,XIMAG into decreasing order of magnitude. -c 'LR' -> sort XREAL into increasing order of algebraic. -c 'SR' -> sort XREAL into decreasing order of algebraic. -c 'LI' -> sort XIMAG into increasing order of magnitude. -c 'SI' -> sort XIMAG into decreasing order of magnitude. -c NOTE: If an element of XIMAG is non-zero, then its negative -c is also an element. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to array Y. -c APPLY = .FALSE. -> do not apply the sorted order to array Y. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c XREAL, Double precision array of length N. (INPUT/OUTPUT) -c XIMAG Real and imaginary part of the array to be sorted. -c -c Y Double precision array of length N. (INPUT/OUTPUT) -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortc.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsortc (which, apply, n, xreal, ximag, y) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & xreal(0:n-1), ximag(0:n-1), y(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Double precision - & temp, temp1, temp2 -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlapy2 - external dlapy2 -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'LM') then -c -c %------------------------------------------------------% -c | Sort XREAL,XIMAG into increasing order of magnitude. | -c %------------------------------------------------------% -c - 10 continue - if (igap .eq. 0) go to 9000 -c - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - temp1 = dlapy2(xreal(j),ximag(j)) - temp2 = dlapy2(xreal(j+igap),ximag(j+igap)) -c - if (temp1.gt.temp2) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 30 - end if - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c %------------------------------------------------------% -c | Sort XREAL,XIMAG into decreasing order of magnitude. | -c %------------------------------------------------------% -c - 40 continue - if (igap .eq. 0) go to 9000 -c - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j .lt. 0) go to 60 -c - temp1 = dlapy2(xreal(j),ximag(j)) - temp2 = dlapy2(xreal(j+igap),ximag(j+igap)) -c - if (temp1.lt.temp2) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LR') then -c -c %------------------------------------------------% -c | Sort XREAL into increasing order of algebraic. | -c %------------------------------------------------% -c - 70 continue - if (igap .eq. 0) go to 9000 -c - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (xreal(j).gt.xreal(j+igap)) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'SR') then -c -c %------------------------------------------------% -c | Sort XREAL into decreasing order of algebraic. | -c %------------------------------------------------% -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (xreal(j).lt.xreal(j+igap)) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 -c - else if (which .eq. 'LI') then -c -c %------------------------------------------------% -c | Sort XIMAG into increasing order of magnitude. | -c %------------------------------------------------% -c - 130 continue - if (igap .eq. 0) go to 9000 - do 150 i = igap, n-1 - j = i-igap - 140 continue -c - if (j.lt.0) go to 150 -c - if (abs(ximag(j)).gt.abs(ximag(j+igap))) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 150 - endif - j = j-igap - go to 140 - 150 continue - igap = igap / 2 - go to 130 -c - else if (which .eq. 'SI') then -c -c %------------------------------------------------% -c | Sort XIMAG into decreasing order of magnitude. | -c %------------------------------------------------% -c - 160 continue - if (igap .eq. 0) go to 9000 - do 180 i = igap, n-1 - j = i-igap - 170 continue -c - if (j.lt.0) go to 180 -c - if (abs(ximag(j)).lt.abs(ximag(j+igap))) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 180 - endif - j = j-igap - go to 170 - 180 continue - igap = igap / 2 - go to 160 - end if -c - 9000 continue - return -c -c %---------------% -c | End of dsortc | -c %---------------% -c - end
--- a/libcruft/arpack/src/dsortr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,218 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dsortr -c -c\Description: -c Sort the array X1 in the order specified by WHICH and optionally -c applies the permutation to the array X2. -c -c\Usage: -c call dsortr -c ( WHICH, APPLY, N, X1, X2 ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> X1 is sorted into increasing order of magnitude. -c 'SM' -> X1 is sorted into decreasing order of magnitude. -c 'LA' -> X1 is sorted into increasing order of algebraic. -c 'SA' -> X1 is sorted into decreasing order of algebraic. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to X2. -c APPLY = .FALSE. -> do not apply the sorted order to X2. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c X1 Double precision array of length N. (INPUT/OUTPUT) -c The array to be sorted. -c -c X2 Double precision array of length N. (INPUT/OUTPUT) -c Only referenced if APPLY = .TRUE. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version ' 2.1'. -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortr.F SID: 2.3 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dsortr (which, apply, n, x1, x2) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & x1(0:n-1), x2(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Double precision - & temp -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'SA') then -c -c X1 is sorted into decreasing order of algebraic. -c - 10 continue - if (igap .eq. 0) go to 9000 - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - if (x1(j).lt.x1(j+igap)) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 30 - endif - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c X1 is sorted into decreasing order of magnitude. -c - 40 continue - if (igap .eq. 0) go to 9000 - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j.lt.0) go to 60 -c - if (abs(x1(j)).lt.abs(x1(j+igap))) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LA') then -c -c X1 is sorted into increasing order of algebraic. -c - 70 continue - if (igap .eq. 0) go to 9000 - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (x1(j).gt.x1(j+igap)) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'LM') then -c -c X1 is sorted into increasing order of magnitude. -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (abs(x1(j)).gt.abs(x1(j+igap))) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 - end if -c - 9000 continue - return -c -c %---------------% -c | End of dsortr | -c %---------------% -c - end
--- a/libcruft/arpack/src/dstatn.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -c -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for nonsymmetric Arnoldi code. | -c %---------------------------------------------% -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: statn.F SID: 2.4 DATE OF SID: 4/20/96 RELEASE: 2 -c - subroutine dstatn -c -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% -c - include 'stat.h' -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 -c - tnaupd = 0.0D+0 - tnaup2 = 0.0D+0 - tnaitr = 0.0D+0 - tneigh = 0.0D+0 - tngets = 0.0D+0 - tnapps = 0.0D+0 - tnconv = 0.0D+0 - titref = 0.0D+0 - tgetv0 = 0.0D+0 - trvec = 0.0D+0 -c -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% -c - tmvopx = 0.0D+0 - tmvbx = 0.0D+0 -c - return -c -c -c %---------------% -c | End of dstatn | -c %---------------% -c - end
--- a/libcruft/arpack/src/dstats.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -c -c\SCCS Information: @(#) -c FILE: stats.F SID: 2.1 DATE OF SID: 4/19/96 RELEASE: 2 -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for symmetric Arnoldi code. | -c %---------------------------------------------% - - subroutine dstats - -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% - include 'stat.h' - -c %-----------------------% -c | Executable Statements | -c %-----------------------% - - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 - - tsaupd = 0.0D+0 - tsaup2 = 0.0D+0 - tsaitr = 0.0D+0 - tseigt = 0.0D+0 - tsgets = 0.0D+0 - tsapps = 0.0D+0 - tsconv = 0.0D+0 - titref = 0.0D+0 - tgetv0 = 0.0D+0 - trvec = 0.0D+0 - -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% - tmvopx = 0.0D+0 - tmvbx = 0.0D+0 - - return -c -c End of dstats -c - end
--- a/libcruft/arpack/src/dstqrb.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,594 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: dstqrb -c -c\Description: -c Computes all eigenvalues and the last component of the eigenvectors -c of a symmetric tridiagonal matrix using the implicit QL or QR method. -c -c This is mostly a modification of the LAPACK routine dsteqr. -c See Remarks. -c -c\Usage: -c call dstqrb -c ( N, D, E, Z, WORK, INFO ) -c -c\Arguments -c N Integer. (INPUT) -c The number of rows and columns in the matrix. N >= 0. -c -c D Double precision array, dimension (N). (INPUT/OUTPUT) -c On entry, D contains the diagonal elements of the -c tridiagonal matrix. -c On exit, D contains the eigenvalues, in ascending order. -c If an error exit is made, the eigenvalues are correct -c for indices 1,2,...,INFO-1, but they are unordered and -c may not be the smallest eigenvalues of the matrix. -c -c E Double precision array, dimension (N-1). (INPUT/OUTPUT) -c On entry, E contains the subdiagonal elements of the -c tridiagonal matrix in positions 1 through N-1. -c On exit, E has been destroyed. -c -c Z Double precision array, dimension (N). (OUTPUT) -c On exit, Z contains the last row of the orthonormal -c eigenvector matrix of the symmetric tridiagonal matrix. -c If an error exit is made, Z contains the last row of the -c eigenvector matrix associated with the stored eigenvalues. -c -c WORK Double precision array, dimension (max(1,2*N-2)). (WORKSPACE) -c Workspace used in accumulating the transformation for -c computing the last components of the eigenvectors. -c -c INFO Integer. (OUTPUT) -c = 0: normal return. -c < 0: if INFO = -i, the i-th argument had an illegal value. -c > 0: if INFO = +i, the i-th eigenvalue has not converged -c after a total of 30*N iterations. -c -c\Remarks -c 1. None. -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c daxpy Level 1 BLAS that computes a vector triad. -c dcopy Level 1 BLAS that copies one vector to another. -c dswap Level 1 BLAS that swaps the contents of two vectors. -c lsame LAPACK character comparison routine. -c dlae2 LAPACK routine that computes the eigenvalues of a 2-by-2 -c symmetric matrix. -c dlaev2 LAPACK routine that eigendecomposition of a 2-by-2 symmetric -c matrix. -c dlamch LAPACK routine that determines machine constants. -c dlanst LAPACK routine that computes the norm of a matrix. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c dlartg LAPACK Givens rotation construction routine. -c dlascl LAPACK routine for careful scaling of a matrix. -c dlaset LAPACK matrix initialization routine. -c dlasr LAPACK routine that applies an orthogonal transformation to -c a matrix. -c dlasrt LAPACK sorting routine. -c dsteqr LAPACK routine that computes eigenvalues and eigenvectors -c of a symmetric tridiagonal matrix. -c xerbla LAPACK error handler routine. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: stqrb.F SID: 2.5 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c 1. Starting with version 2.5, this routine is a modified version -c of LAPACK version 2.0 subroutine SSTEQR. No lines are deleted, -c only commeted out and new lines inserted. -c All lines commented out have "c$$$" at the beginning. -c Note that the LAPACK version 1.0 subroutine SSTEQR contained -c bugs. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine dstqrb ( n, d, e, z, work, info ) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer info, n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Double precision - & d( n ), e( n-1 ), z( n ), work( 2*n-2 ) -c -c .. parameters .. - Double precision - & zero, one, two, three - parameter ( zero = 0.0D+0, one = 1.0D+0, - & two = 2.0D+0, three = 3.0D+0 ) - integer maxit - parameter ( maxit = 30 ) -c .. -c .. local scalars .. - integer i, icompz, ii, iscale, j, jtot, k, l, l1, lend, - & lendm1, lendp1, lendsv, lm1, lsv, m, mm, mm1, - & nm1, nmaxit - Double precision - & anorm, b, c, eps, eps2, f, g, p, r, rt1, rt2, - & s, safmax, safmin, ssfmax, ssfmin, tst -c .. -c .. external functions .. - logical lsame - Double precision - & dlamch, dlanst, dlapy2 - external lsame, dlamch, dlanst, dlapy2 -c .. -c .. external subroutines .. - external dlae2, dlaev2, dlartg, dlascl, dlaset, dlasr, - & dlasrt, dswap, xerbla -c .. -c .. intrinsic functions .. - intrinsic abs, max, sign, sqrt -c .. -c .. executable statements .. -c -c test the input parameters. -c - info = 0 -c -c$$$ IF( LSAME( COMPZ, 'N' ) ) THEN -c$$$ ICOMPZ = 0 -c$$$ ELSE IF( LSAME( COMPZ, 'V' ) ) THEN -c$$$ ICOMPZ = 1 -c$$$ ELSE IF( LSAME( COMPZ, 'I' ) ) THEN -c$$$ ICOMPZ = 2 -c$$$ ELSE -c$$$ ICOMPZ = -1 -c$$$ END IF -c$$$ IF( ICOMPZ.LT.0 ) THEN -c$$$ INFO = -1 -c$$$ ELSE IF( N.LT.0 ) THEN -c$$$ INFO = -2 -c$$$ ELSE IF( ( LDZ.LT.1 ) .OR. ( ICOMPZ.GT.0 .AND. LDZ.LT.MAX( 1, -c$$$ $ N ) ) ) THEN -c$$$ INFO = -6 -c$$$ END IF -c$$$ IF( INFO.NE.0 ) THEN -c$$$ CALL XERBLA( 'SSTEQR', -INFO ) -c$$$ RETURN -c$$$ END IF -c -c *** New starting with version 2.5 *** -c - icompz = 2 -c ************************************* -c -c quick return if possible -c - if( n.eq.0 ) - $ return -c - if( n.eq.1 ) then - if( icompz.eq.2 ) z( 1 ) = one - return - end if -c -c determine the unit roundoff and over/underflow thresholds. -c - eps = dlamch( 'e' ) - eps2 = eps**2 - safmin = dlamch( 's' ) - safmax = one / safmin - ssfmax = sqrt( safmax ) / three - ssfmin = sqrt( safmin ) / eps2 -c -c compute the eigenvalues and eigenvectors of the tridiagonal -c matrix. -c -c$$ if( icompz.eq.2 ) -c$$$ $ call dlaset( 'full', n, n, zero, one, z, ldz ) -c -c *** New starting with version 2.5 *** -c - if ( icompz .eq. 2 ) then - do 5 j = 1, n-1 - z(j) = zero - 5 continue - z( n ) = one - end if -c ************************************* -c - nmaxit = n*maxit - jtot = 0 -c -c determine where the matrix splits and choose ql or qr iteration -c for each block, according to whether top or bottom diagonal -c element is smaller. -c - l1 = 1 - nm1 = n - 1 -c - 10 continue - if( l1.gt.n ) - $ go to 160 - if( l1.gt.1 ) - $ e( l1-1 ) = zero - if( l1.le.nm1 ) then - do 20 m = l1, nm1 - tst = abs( e( m ) ) - if( tst.eq.zero ) - $ go to 30 - if( tst.le.( sqrt( abs( d( m ) ) )*sqrt( abs( d( m+ - $ 1 ) ) ) )*eps ) then - e( m ) = zero - go to 30 - end if - 20 continue - end if - m = n -c - 30 continue - l = l1 - lsv = l - lend = m - lendsv = lend - l1 = m + 1 - if( lend.eq.l ) - $ go to 10 -c -c scale submatrix in rows and columns l to lend -c - anorm = dlanst( 'i', lend-l+1, d( l ), e( l ) ) - iscale = 0 - if( anorm.eq.zero ) - $ go to 10 - if( anorm.gt.ssfmax ) then - iscale = 1 - call dlascl( 'g', 0, 0, anorm, ssfmax, lend-l+1, 1, d( l ), n, - $ info ) - call dlascl( 'g', 0, 0, anorm, ssfmax, lend-l, 1, e( l ), n, - $ info ) - else if( anorm.lt.ssfmin ) then - iscale = 2 - call dlascl( 'g', 0, 0, anorm, ssfmin, lend-l+1, 1, d( l ), n, - $ info ) - call dlascl( 'g', 0, 0, anorm, ssfmin, lend-l, 1, e( l ), n, - $ info ) - end if -c -c choose between ql and qr iteration -c - if( abs( d( lend ) ).lt.abs( d( l ) ) ) then - lend = lsv - l = lendsv - end if -c - if( lend.gt.l ) then -c -c ql iteration -c -c look for small subdiagonal element. -c - 40 continue - if( l.ne.lend ) then - lendm1 = lend - 1 - do 50 m = l, lendm1 - tst = abs( e( m ) )**2 - if( tst.le.( eps2*abs( d( m ) ) )*abs( d( m+1 ) )+ - $ safmin )go to 60 - 50 continue - end if -c - m = lend -c - 60 continue - if( m.lt.lend ) - $ e( m ) = zero - p = d( l ) - if( m.eq.l ) - $ go to 80 -c -c if remaining matrix is 2-by-2, use dlae2 or dlaev2 -c to compute its eigensystem. -c - if( m.eq.l+1 ) then - if( icompz.gt.0 ) then - call dlaev2( d( l ), e( l ), d( l+1 ), rt1, rt2, c, s ) - work( l ) = c - work( n-1+l ) = s -c$$$ call dlasr( 'r', 'v', 'b', n, 2, work( l ), -c$$$ $ work( n-1+l ), z( 1, l ), ldz ) -c -c *** New starting with version 2.5 *** -c - tst = z(l+1) - z(l+1) = c*tst - s*z(l) - z(l) = s*tst + c*z(l) -c ************************************* - else - call dlae2( d( l ), e( l ), d( l+1 ), rt1, rt2 ) - end if - d( l ) = rt1 - d( l+1 ) = rt2 - e( l ) = zero - l = l + 2 - if( l.le.lend ) - $ go to 40 - go to 140 - end if -c - if( jtot.eq.nmaxit ) - $ go to 140 - jtot = jtot + 1 -c -c form shift. -c - g = ( d( l+1 )-p ) / ( two*e( l ) ) - r = dlapy2( g, one ) - g = d( m ) - p + ( e( l ) / ( g+sign( r, g ) ) ) -c - s = one - c = one - p = zero -c -c inner loop -c - mm1 = m - 1 - do 70 i = mm1, l, -1 - f = s*e( i ) - b = c*e( i ) - call dlartg( g, f, c, s, r ) - if( i.ne.m-1 ) - $ e( i+1 ) = r - g = d( i+1 ) - p - r = ( d( i )-g )*s + two*c*b - p = s*r - d( i+1 ) = g + p - g = c*r - b -c -c if eigenvectors are desired, then save rotations. -c - if( icompz.gt.0 ) then - work( i ) = c - work( n-1+i ) = -s - end if -c - 70 continue -c -c if eigenvectors are desired, then apply saved rotations. -c - if( icompz.gt.0 ) then - mm = m - l + 1 -c$$$ call dlasr( 'r', 'v', 'b', n, mm, work( l ), work( n-1+l ), -c$$$ $ z( 1, l ), ldz ) -c -c *** New starting with version 2.5 *** -c - call dlasr( 'r', 'v', 'b', 1, mm, work( l ), - & work( n-1+l ), z( l ), 1 ) -c ************************************* - end if -c - d( l ) = d( l ) - p - e( l ) = g - go to 40 -c -c eigenvalue found. -c - 80 continue - d( l ) = p -c - l = l + 1 - if( l.le.lend ) - $ go to 40 - go to 140 -c - else -c -c qr iteration -c -c look for small superdiagonal element. -c - 90 continue - if( l.ne.lend ) then - lendp1 = lend + 1 - do 100 m = l, lendp1, -1 - tst = abs( e( m-1 ) )**2 - if( tst.le.( eps2*abs( d( m ) ) )*abs( d( m-1 ) )+ - $ safmin )go to 110 - 100 continue - end if -c - m = lend -c - 110 continue - if( m.gt.lend ) - $ e( m-1 ) = zero - p = d( l ) - if( m.eq.l ) - $ go to 130 -c -c if remaining matrix is 2-by-2, use dlae2 or dlaev2 -c to compute its eigensystem. -c - if( m.eq.l-1 ) then - if( icompz.gt.0 ) then - call dlaev2( d( l-1 ), e( l-1 ), d( l ), rt1, rt2, c, s ) -c$$$ work( m ) = c -c$$$ work( n-1+m ) = s -c$$$ call dlasr( 'r', 'v', 'f', n, 2, work( m ), -c$$$ $ work( n-1+m ), z( 1, l-1 ), ldz ) -c -c *** New starting with version 2.5 *** -c - tst = z(l) - z(l) = c*tst - s*z(l-1) - z(l-1) = s*tst + c*z(l-1) -c ************************************* - else - call dlae2( d( l-1 ), e( l-1 ), d( l ), rt1, rt2 ) - end if - d( l-1 ) = rt1 - d( l ) = rt2 - e( l-1 ) = zero - l = l - 2 - if( l.ge.lend ) - $ go to 90 - go to 140 - end if -c - if( jtot.eq.nmaxit ) - $ go to 140 - jtot = jtot + 1 -c -c form shift. -c - g = ( d( l-1 )-p ) / ( two*e( l-1 ) ) - r = dlapy2( g, one ) - g = d( m ) - p + ( e( l-1 ) / ( g+sign( r, g ) ) ) -c - s = one - c = one - p = zero -c -c inner loop -c - lm1 = l - 1 - do 120 i = m, lm1 - f = s*e( i ) - b = c*e( i ) - call dlartg( g, f, c, s, r ) - if( i.ne.m ) - $ e( i-1 ) = r - g = d( i ) - p - r = ( d( i+1 )-g )*s + two*c*b - p = s*r - d( i ) = g + p - g = c*r - b -c -c if eigenvectors are desired, then save rotations. -c - if( icompz.gt.0 ) then - work( i ) = c - work( n-1+i ) = s - end if -c - 120 continue -c -c if eigenvectors are desired, then apply saved rotations. -c - if( icompz.gt.0 ) then - mm = l - m + 1 -c$$$ call dlasr( 'r', 'v', 'f', n, mm, work( m ), work( n-1+m ), -c$$$ $ z( 1, m ), ldz ) -c -c *** New starting with version 2.5 *** -c - call dlasr( 'r', 'v', 'f', 1, mm, work( m ), work( n-1+m ), - & z( m ), 1 ) -c ************************************* - end if -c - d( l ) = d( l ) - p - e( lm1 ) = g - go to 90 -c -c eigenvalue found. -c - 130 continue - d( l ) = p -c - l = l - 1 - if( l.ge.lend ) - $ go to 90 - go to 140 -c - end if -c -c undo scaling if necessary -c - 140 continue - if( iscale.eq.1 ) then - call dlascl( 'g', 0, 0, ssfmax, anorm, lendsv-lsv+1, 1, - $ d( lsv ), n, info ) - call dlascl( 'g', 0, 0, ssfmax, anorm, lendsv-lsv, 1, e( lsv ), - $ n, info ) - else if( iscale.eq.2 ) then - call dlascl( 'g', 0, 0, ssfmin, anorm, lendsv-lsv+1, 1, - $ d( lsv ), n, info ) - call dlascl( 'g', 0, 0, ssfmin, anorm, lendsv-lsv, 1, e( lsv ), - $ n, info ) - end if -c -c check for no convergence to an eigenvalue after a total -c of n*maxit iterations. -c - if( jtot.lt.nmaxit ) - $ go to 10 - do 150 i = 1, n - 1 - if( e( i ).ne.zero ) - $ info = info + 1 - 150 continue - go to 190 -c -c order eigenvalues and eigenvectors. -c - 160 continue - if( icompz.eq.0 ) then -c -c use quick sort -c - call dlasrt( 'i', n, d, info ) -c - else -c -c use selection sort to minimize swaps of eigenvectors -c - do 180 ii = 2, n - i = ii - 1 - k = i - p = d( i ) - do 170 j = ii, n - if( d( j ).lt.p ) then - k = j - p = d( j ) - end if - 170 continue - if( k.ne.i ) then - d( k ) = d( i ) - d( i ) = p -c$$$ call dswap( n, z( 1, i ), 1, z( 1, k ), 1 ) -c *** New starting with version 2.5 *** -c - p = z(k) - z(k) = z(i) - z(i) = p -c ************************************* - end if - 180 continue - end if -c - 190 continue - return -c -c %---------------% -c | End of dstqrb | -c %---------------% -c - end
--- a/libcruft/arpack/src/sgetv0.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,419 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: sgetv0 -c -c\Description: -c Generate a random initial residual vector for the Arnoldi process. -c Force the residual vector to be in the range of the operator OP. -c -c\Usage: -c call sgetv0 -c ( IDO, BMAT, ITRY, INITV, N, J, V, LDV, RESID, RNORM, -c IPNTR, WORKD, IERR ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to sgetv0. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B in the (generalized) -c eigenvalue problem A*x = lambda*B*x. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c ITRY Integer. (INPUT) -c ITRY counts the number of times that sgetv0 is called. -c It should be set to 1 on the initial call to sgetv0. -c -c INITV Logical variable. (INPUT) -c .TRUE. => the initial residual vector is given in RESID. -c .FALSE. => generate a random initial residual vector. -c -c N Integer. (INPUT) -c Dimension of the problem. -c -c J Integer. (INPUT) -c Index of the residual vector to be generated, with respect to -c the Arnoldi process. J > 1 in case of a "restart". -c -c V Real N by J array. (INPUT) -c The first J-1 columns of V contain the current Arnoldi basis -c if this is a "restart". -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c RESID Real array of length N. (INPUT/OUTPUT) -c Initial residual vector to be generated. If RESID is -c provided, force RESID into the range of the operator OP. -c -c RNORM Real scalar. (OUTPUT) -c B-norm of the generated residual. -c -c IPNTR Integer array of length 3. (OUTPUT) -c -c WORKD Real work array of length 2*N. (REVERSE COMMUNICATION). -c On exit, WORK(1:N) = B*RESID to be used in SSAITR. -c -c IERR Integer. (OUTPUT) -c = 0: Normal exit. -c = -1: Cannot generate a nontrivial restarted residual vector -c in the range of the operator OP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine for vector output. -c slarnv LAPACK routine for generating a random vector. -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c scopy Level 1 BLAS that copies one vector to another. -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: getv0.F SID: 2.7 DATE OF SID: 04/07/99 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine sgetv0 - & ( ido, bmat, itry, initv, n, j, v, ldv, resid, rnorm, - & ipntr, workd, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - logical initv - integer ido, ierr, itry, j, ldv, n - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Real - & resid(n), v(ldv,j), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical first, inits, orth - integer idist, iseed(4), iter, msglvl, jj - Real - & rnorm0 - save first, iseed, inits, iter, msglvl, orth, rnorm0 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external slarnv, svout, scopy, sgemv, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & sdot, snrm2 - external sdot, snrm2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, sqrt -c -c %-----------------% -c | Data Statements | -c %-----------------% -c - data inits /.true./ -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-----------------------------------% -c | Initialize the seed of the LAPACK | -c | random number generator | -c %-----------------------------------% -c - if (inits) then - iseed(1) = 1 - iseed(2) = 3 - iseed(3) = 5 - iseed(4) = 7 - inits = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mgetv0 -c - ierr = 0 - iter = 0 - first = .FALSE. - orth = .FALSE. -c -c %-----------------------------------------------------% -c | Possibly generate a random starting vector in RESID | -c | Use a LAPACK random number generator used by the | -c | matrix generation routines. | -c | idist = 1: uniform (0,1) distribution; | -c | idist = 2: uniform (-1,1) distribution; | -c | idist = 3: normal (0,1) distribution; | -c %-----------------------------------------------------% -c - if (.not.initv) then - idist = 2 - call slarnv (idist, iseed, n, resid) - end if -c -c %----------------------------------------------------------% -c | Force the starting vector into the range of OP to handle | -c | the generalized problem when B is possibly (singular). | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nopx = nopx + 1 - ipntr(1) = 1 - ipntr(2) = n + 1 - call scopy (n, resid, 1, workd, 1) - ido = -1 - go to 9000 - end if - end if -c -c %-----------------------------------------% -c | Back from computing OP*(initial-vector) | -c %-----------------------------------------% -c - if (first) go to 20 -c -c %-----------------------------------------------% -c | Back from computing B*(orthogonalized-vector) | -c %-----------------------------------------------% -c - if (orth) go to 40 -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - end if -c -c %------------------------------------------------------% -c | Starting vector is now in the range of OP; r = OP*r; | -c | Compute B-norm of starting vector. | -c %------------------------------------------------------% -c - call arscnd (t2) - first = .TRUE. - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, workd(n+1), 1, resid, 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd, 1) - end if -c - 20 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - first = .FALSE. - if (bmat .eq. 'G') then - rnorm0 = sdot (n, resid, 1, workd, 1) - rnorm0 = sqrt(abs(rnorm0)) - else if (bmat .eq. 'I') then - rnorm0 = snrm2(n, resid, 1) - end if - rnorm = rnorm0 -c -c %---------------------------------------------% -c | Exit if this is the very first Arnoldi step | -c %---------------------------------------------% -c - if (j .eq. 1) go to 50 -c -c %---------------------------------------------------------------- -c | Otherwise need to B-orthogonalize the starting vector against | -c | the current Arnoldi basis using Gram-Schmidt with iter. ref. | -c | This is the case where an invariant subspace is encountered | -c | in the middle of the Arnoldi factorization. | -c | | -c | s = V^{T}*B*r; r = r - V*s; | -c | | -c | Stopping criteria used for iter. ref. is discussed in | -c | Parlett's book, page 107 and in Gragg & Reichel TOMS paper. | -c %---------------------------------------------------------------% -c - orth = .TRUE. - 30 continue -c - call sgemv ('T', n, j-1, one, v, ldv, workd, 1, - & zero, workd(n+1), 1) - call sgemv ('N', n, j-1, -one, v, ldv, workd(n+1), 1, - & one, resid, 1) -c -c %----------------------------------------------------------% -c | Compute the B-norm of the orthogonalized starting vector | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd, 1) - end if -c - 40 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = sdot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = snrm2(n, resid, 1) - end if -c -c %--------------------------------------% -c | Check for further orthogonalization. | -c %--------------------------------------% -c - if (msglvl .gt. 2) then - call svout (logfil, 1, rnorm0, ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') - call svout (logfil, 1, rnorm, ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if -c - if (rnorm .gt. 0.717*rnorm0) go to 50 -c - iter = iter + 1 - if (iter .le. 5) then -c -c %-----------------------------------% -c | Perform iterative refinement step | -c %-----------------------------------% -c - rnorm0 = rnorm - go to 30 - else -c -c %------------------------------------% -c | Iterative refinement step "failed" | -c %------------------------------------% -c - do 45 jj = 1, n - resid(jj) = zero - 45 continue - rnorm = zero - ierr = -1 - end if -c - 50 continue -c - if (msglvl .gt. 0) then - call svout (logfil, 1, rnorm, ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 3) then - call svout (logfil, n, resid, ndigit, - & '_getv0: initial / restarted starting vector') - end if - ido = 99 -c - call arscnd (t1) - tgetv0 = tgetv0 + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of sgetv0 | -c %---------------% -c - end
--- a/libcruft/arpack/src/slaqrb.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,521 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: slaqrb -c -c\Description: -c Compute the eigenvalues and the Schur decomposition of an upper -c Hessenberg submatrix in rows and columns ILO to IHI. Only the -c last component of the Schur vectors are computed. -c -c This is mostly a modification of the LAPACK routine slahqr. -c -c\Usage: -c call slaqrb -c ( WANTT, N, ILO, IHI, H, LDH, WR, WI, Z, INFO ) -c -c\Arguments -c WANTT Logical variable. (INPUT) -c = .TRUE. : the full Schur form T is required; -c = .FALSE.: only eigenvalues are required. -c -c N Integer. (INPUT) -c The order of the matrix H. N >= 0. -c -c ILO Integer. (INPUT) -c IHI Integer. (INPUT) -c It is assumed that H is already upper quasi-triangular in -c rows and columns IHI+1:N, and that H(ILO,ILO-1) = 0 (unless -c ILO = 1). SLAQRB works primarily with the Hessenberg -c submatrix in rows and columns ILO to IHI, but applies -c transformations to all of H if WANTT is .TRUE.. -c 1 <= ILO <= max(1,IHI); IHI <= N. -c -c H Real array, dimension (LDH,N). (INPUT/OUTPUT) -c On entry, the upper Hessenberg matrix H. -c On exit, if WANTT is .TRUE., H is upper quasi-triangular in -c rows and columns ILO:IHI, with any 2-by-2 diagonal blocks in -c standard form. If WANTT is .FALSE., the contents of H are -c unspecified on exit. -c -c LDH Integer. (INPUT) -c The leading dimension of the array H. LDH >= max(1,N). -c -c WR Real array, dimension (N). (OUTPUT) -c WI Real array, dimension (N). (OUTPUT) -c The real and imaginary parts, respectively, of the computed -c eigenvalues ILO to IHI are stored in the corresponding -c elements of WR and WI. If two eigenvalues are computed as a -c complex conjugate pair, they are stored in consecutive -c elements of WR and WI, say the i-th and (i+1)th, with -c WI(i) > 0 and WI(i+1) < 0. If WANTT is .TRUE., the -c eigenvalues are stored in the same order as on the diagonal -c of the Schur form returned in H, with WR(i) = H(i,i), and, if -c H(i:i+1,i:i+1) is a 2-by-2 diagonal block, -c WI(i) = sqrt(H(i+1,i)*H(i,i+1)) and WI(i+1) = -WI(i). -c -c Z Real array, dimension (N). (OUTPUT) -c On exit Z contains the last components of the Schur vectors. -c -c INFO Integer. (OUPUT) -c = 0: successful exit -c > 0: SLAQRB failed to compute all the eigenvalues ILO to IHI -c in a total of 30*(IHI-ILO+1) iterations; if INFO = i, -c elements i+1:ihi of WR and WI contain those eigenvalues -c which have been successfully computed. -c -c\Remarks -c 1. None. -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c slabad LAPACK routine that computes machine constants. -c slamch LAPACK routine that determines machine constants. -c slanhs LAPACK routine that computes various norms of a matrix. -c slanv2 LAPACK routine that computes the Schur factorization of -c 2 by 2 nonsymmetric matrix in standard form. -c slarfg LAPACK Householder reflection construction routine. -c scopy Level 1 BLAS that copies one vector to another. -c srot Level 1 BLAS that applies a rotation to a 2 by 2 matrix. - -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c Modified from the LAPACK routine slahqr so that only the -c last component of the Schur vectors are computed. -c -c\SCCS Information: @(#) -c FILE: laqrb.F SID: 2.2 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine slaqrb ( wantt, n, ilo, ihi, h, ldh, wr, wi, - & z, info ) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - logical wantt - integer ihi, ilo, info, ldh, n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & h( ldh, * ), wi( * ), wr( * ), z( * ) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & zero, one, dat1, dat2 - parameter (zero = 0.0E+0, one = 1.0E+0, dat1 = 7.5E-1, - & dat2 = -4.375E-1) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, i1, i2, itn, its, j, k, l, m, nh, nr - Real - & cs, h00, h10, h11, h12, h21, h22, h33, h33s, - & h43h34, h44, h44s, ovfl, s, smlnum, sn, sum, - & t1, t2, t3, tst1, ulp, unfl, v1, v2, v3 - Real - & v( 3 ), work( 1 ) -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch, slanhs - external slamch, slanhs -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy, slabad, slanv2, slarfg, srot -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - info = 0 -c -c %--------------------------% -c | Quick return if possible | -c %--------------------------% -c - if( n.eq.0 ) - & return - if( ilo.eq.ihi ) then - wr( ilo ) = h( ilo, ilo ) - wi( ilo ) = zero - return - end if -c -c %---------------------------------------------% -c | Initialize the vector of last components of | -c | the Schur vectors for accumulation. | -c %---------------------------------------------% -c - do 5 j = 1, n-1 - z(j) = zero - 5 continue - z(n) = one -c - nh = ihi - ilo + 1 -c -c %-------------------------------------------------------------% -c | Set machine-dependent constants for the stopping criterion. | -c | If norm(H) <= sqrt(OVFL), overflow should not occur. | -c %-------------------------------------------------------------% -c - unfl = slamch( 'safe minimum' ) - ovfl = one / unfl - call slabad( unfl, ovfl ) - ulp = slamch( 'precision' ) - smlnum = unfl*( nh / ulp ) -c -c %---------------------------------------------------------------% -c | I1 and I2 are the indices of the first row and last column | -c | of H to which transformations must be applied. If eigenvalues | -c | only are computed, I1 and I2 are set inside the main loop. | -c | Zero out H(J+2,J) = ZERO for J=1:N if WANTT = .TRUE. | -c | else H(J+2,J) for J=ILO:IHI-ILO-1 if WANTT = .FALSE. | -c %---------------------------------------------------------------% -c - if( wantt ) then - i1 = 1 - i2 = n - do 8 i=1,i2-2 - h(i1+i+1,i) = zero - 8 continue - else - do 9 i=1, ihi-ilo-1 - h(ilo+i+1,ilo+i-1) = zero - 9 continue - end if -c -c %---------------------------------------------------% -c | ITN is the total number of QR iterations allowed. | -c %---------------------------------------------------% -c - itn = 30*nh -c -c ------------------------------------------------------------------ -c The main loop begins here. I is the loop index and decreases from -c IHI to ILO in steps of 1 or 2. Each iteration of the loop works -c with the active submatrix in rows and columns L to I. -c Eigenvalues I+1 to IHI have already converged. Either L = ILO or -c H(L,L-1) is negligible so that the matrix splits. -c ------------------------------------------------------------------ -c - i = ihi - 10 continue - l = ilo - if( i.lt.ilo ) - & go to 150 - -c %--------------------------------------------------------------% -c | Perform QR iterations on rows and columns ILO to I until a | -c | submatrix of order 1 or 2 splits off at the bottom because a | -c | subdiagonal element has become negligible. | -c %--------------------------------------------------------------% - - do 130 its = 0, itn -c -c %----------------------------------------------% -c | Look for a single small subdiagonal element. | -c %----------------------------------------------% -c - do 20 k = i, l + 1, -1 - tst1 = abs( h( k-1, k-1 ) ) + abs( h( k, k ) ) - if( tst1.eq.zero ) - & tst1 = slanhs( '1', i-l+1, h( l, l ), ldh, work ) - if( abs( h( k, k-1 ) ).le.max( ulp*tst1, smlnum ) ) - & go to 30 - 20 continue - 30 continue - l = k - if( l.gt.ilo ) then -c -c %------------------------% -c | H(L,L-1) is negligible | -c %------------------------% -c - h( l, l-1 ) = zero - end if -c -c %-------------------------------------------------------------% -c | Exit from loop if a submatrix of order 1 or 2 has split off | -c %-------------------------------------------------------------% -c - if( l.ge.i-1 ) - & go to 140 -c -c %---------------------------------------------------------% -c | Now the active submatrix is in rows and columns L to I. | -c | If eigenvalues only are being computed, only the active | -c | submatrix need be transformed. | -c %---------------------------------------------------------% -c - if( .not.wantt ) then - i1 = l - i2 = i - end if -c - if( its.eq.10 .or. its.eq.20 ) then -c -c %-------------------% -c | Exceptional shift | -c %-------------------% -c - s = abs( h( i, i-1 ) ) + abs( h( i-1, i-2 ) ) - h44 = dat1*s - h33 = h44 - h43h34 = dat2*s*s -c - else -c -c %-----------------------------------------% -c | Prepare to use Wilkinson's double shift | -c %-----------------------------------------% -c - h44 = h( i, i ) - h33 = h( i-1, i-1 ) - h43h34 = h( i, i-1 )*h( i-1, i ) - end if -c -c %-----------------------------------------------------% -c | Look for two consecutive small subdiagonal elements | -c %-----------------------------------------------------% -c - do 40 m = i - 2, l, -1 -c -c %---------------------------------------------------------% -c | Determine the effect of starting the double-shift QR | -c | iteration at row M, and see if this would make H(M,M-1) | -c | negligible. | -c %---------------------------------------------------------% -c - h11 = h( m, m ) - h22 = h( m+1, m+1 ) - h21 = h( m+1, m ) - h12 = h( m, m+1 ) - h44s = h44 - h11 - h33s = h33 - h11 - v1 = ( h33s*h44s-h43h34 ) / h21 + h12 - v2 = h22 - h11 - h33s - h44s - v3 = h( m+2, m+1 ) - s = abs( v1 ) + abs( v2 ) + abs( v3 ) - v1 = v1 / s - v2 = v2 / s - v3 = v3 / s - v( 1 ) = v1 - v( 2 ) = v2 - v( 3 ) = v3 - if( m.eq.l ) - & go to 50 - h00 = h( m-1, m-1 ) - h10 = h( m, m-1 ) - tst1 = abs( v1 )*( abs( h00 )+abs( h11 )+abs( h22 ) ) - if( abs( h10 )*( abs( v2 )+abs( v3 ) ).le.ulp*tst1 ) - & go to 50 - 40 continue - 50 continue -c -c %----------------------% -c | Double-shift QR step | -c %----------------------% -c - do 120 k = m, i - 1 -c -c ------------------------------------------------------------ -c The first iteration of this loop determines a reflection G -c from the vector V and applies it from left and right to H, -c thus creating a nonzero bulge below the subdiagonal. -c -c Each subsequent iteration determines a reflection G to -c restore the Hessenberg form in the (K-1)th column, and thus -c chases the bulge one step toward the bottom of the active -c submatrix. NR is the order of G. -c ------------------------------------------------------------ -c - nr = min( 3, i-k+1 ) - if( k.gt.m ) - & call scopy( nr, h( k, k-1 ), 1, v, 1 ) - call slarfg( nr, v( 1 ), v( 2 ), 1, t1 ) - if( k.gt.m ) then - h( k, k-1 ) = v( 1 ) - h( k+1, k-1 ) = zero - if( k.lt.i-1 ) - & h( k+2, k-1 ) = zero - else if( m.gt.l ) then - h( k, k-1 ) = -h( k, k-1 ) - end if - v2 = v( 2 ) - t2 = t1*v2 - if( nr.eq.3 ) then - v3 = v( 3 ) - t3 = t1*v3 -c -c %------------------------------------------------% -c | Apply G from the left to transform the rows of | -c | the matrix in columns K to I2. | -c %------------------------------------------------% -c - do 60 j = k, i2 - sum = h( k, j ) + v2*h( k+1, j ) + v3*h( k+2, j ) - h( k, j ) = h( k, j ) - sum*t1 - h( k+1, j ) = h( k+1, j ) - sum*t2 - h( k+2, j ) = h( k+2, j ) - sum*t3 - 60 continue -c -c %----------------------------------------------------% -c | Apply G from the right to transform the columns of | -c | the matrix in rows I1 to min(K+3,I). | -c %----------------------------------------------------% -c - do 70 j = i1, min( k+3, i ) - sum = h( j, k ) + v2*h( j, k+1 ) + v3*h( j, k+2 ) - h( j, k ) = h( j, k ) - sum*t1 - h( j, k+1 ) = h( j, k+1 ) - sum*t2 - h( j, k+2 ) = h( j, k+2 ) - sum*t3 - 70 continue -c -c %----------------------------------% -c | Accumulate transformations for Z | -c %----------------------------------% -c - sum = z( k ) + v2*z( k+1 ) + v3*z( k+2 ) - z( k ) = z( k ) - sum*t1 - z( k+1 ) = z( k+1 ) - sum*t2 - z( k+2 ) = z( k+2 ) - sum*t3 - - else if( nr.eq.2 ) then -c -c %------------------------------------------------% -c | Apply G from the left to transform the rows of | -c | the matrix in columns K to I2. | -c %------------------------------------------------% -c - do 90 j = k, i2 - sum = h( k, j ) + v2*h( k+1, j ) - h( k, j ) = h( k, j ) - sum*t1 - h( k+1, j ) = h( k+1, j ) - sum*t2 - 90 continue -c -c %----------------------------------------------------% -c | Apply G from the right to transform the columns of | -c | the matrix in rows I1 to min(K+3,I). | -c %----------------------------------------------------% -c - do 100 j = i1, i - sum = h( j, k ) + v2*h( j, k+1 ) - h( j, k ) = h( j, k ) - sum*t1 - h( j, k+1 ) = h( j, k+1 ) - sum*t2 - 100 continue -c -c %----------------------------------% -c | Accumulate transformations for Z | -c %----------------------------------% -c - sum = z( k ) + v2*z( k+1 ) - z( k ) = z( k ) - sum*t1 - z( k+1 ) = z( k+1 ) - sum*t2 - end if - 120 continue - - 130 continue -c -c %-------------------------------------------------------% -c | Failure to converge in remaining number of iterations | -c %-------------------------------------------------------% -c - info = i - return - - 140 continue - - if( l.eq.i ) then -c -c %------------------------------------------------------% -c | H(I,I-1) is negligible: one eigenvalue has converged | -c %------------------------------------------------------% -c - wr( i ) = h( i, i ) - wi( i ) = zero - - else if( l.eq.i-1 ) then -c -c %--------------------------------------------------------% -c | H(I-1,I-2) is negligible; | -c | a pair of eigenvalues have converged. | -c | | -c | Transform the 2-by-2 submatrix to standard Schur form, | -c | and compute and store the eigenvalues. | -c %--------------------------------------------------------% -c - call slanv2( h( i-1, i-1 ), h( i-1, i ), h( i, i-1 ), - & h( i, i ), wr( i-1 ), wi( i-1 ), wr( i ), wi( i ), - & cs, sn ) - - if( wantt ) then -c -c %-----------------------------------------------------% -c | Apply the transformation to the rest of H and to Z, | -c | as required. | -c %-----------------------------------------------------% -c - if( i2.gt.i ) - & call srot( i2-i, h( i-1, i+1 ), ldh, h( i, i+1 ), ldh, - & cs, sn ) - call srot( i-i1-1, h( i1, i-1 ), 1, h( i1, i ), 1, cs, sn ) - sum = cs*z( i-1 ) + sn*z( i ) - z( i ) = cs*z( i ) - sn*z( i-1 ) - z( i-1 ) = sum - end if - end if -c -c %---------------------------------------------------------% -c | Decrement number of remaining iterations, and return to | -c | start of the main loop with new value of I. | -c %---------------------------------------------------------% -c - itn = itn - its - i = l - 1 - go to 10 - - 150 continue - return -c -c %---------------% -c | End of slaqrb | -c %---------------% -c - end
--- a/libcruft/arpack/src/snaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,840 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: snaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step nonsymmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in snaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call snaitr -c ( IDO, BMAT, N, K, NP, NB, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and do not need to be -c recompute in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. See snaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M**x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current size of V and H. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c NB Integer. (INPUT) -c Blocksize to be used in the recurrence. -c Only work for NB = 1 right now. The goal is to have a -c program that implement both the block and non-block method. -c -c RESID Real array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Real scalar. (INPUT/OUTPUT) -c B-norm of the starting residual on input. -c B-norm of the updated residual r_{k+p} on output. -c -c V Real N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (K+NP) by (K+NP) array. (INPUT/OUTPUT) -c H is used to store the generated upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On input, WORKD(1:N) = B*RESID and is used to save some -c computation at the first step. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of the spanning invariant subspace of OP found. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c sgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c smout ARPACK utility routine that prints matrices -c svout ARPACK utility routine that prints vectors. -c slabad LAPACK routine that computes machine constants. -c slamch LAPACK routine that determines machine constants. -c slascl LAPACK routine for careful scaling of a matrix. -c slanhs LAPACK routine that computes various norms of a matrix. -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c saxpy Level 1 BLAS that computes a vector triad. -c sscal Level 1 BLAS that scales a vector. -c scopy Level 1 BLAS that copies one vector to another . -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: naitr.F SID: 2.4 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c ( At present tol is zero ) -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in snaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c H(:,j) = w_{j}; -c H(j,j-1) = rnorm -c rnorm = || r_(j) || -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine snaitr - & (ido, bmat, n, k, np, nb, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, nb, np - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Real - & h(ldh,k+np), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer ierr, i, infol, ipj, irj, ivj, iter, itry, j, msglvl, - & jj - Real - & betaj, ovfl, temp1, rnorm1, smlnum, tst1, ulp, unfl, - & wnorm - save first, orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, ovfl, - & betaj, rnorm1, smlnum, ulp, unfl, wnorm -c -c %-----------------------% -c | Local Array Arguments | -c %-----------------------% -c - Real - & xtemp(2) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external saxpy, scopy, sscal, sgemv, sgetv0, slabad, - & svout, smout, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & sdot, snrm2, slanhs, slamch - external sdot, snrm2, slanhs, slamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, sqrt -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------% -c | Set machine-dependent constants for the | -c | the splitting and deflation criterion. | -c | If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine slahqr | -c %-----------------------------------------% -c - unfl = slamch( 'safe minimum' ) - ovfl = one / unfl - call slabad( unfl, ovfl ) - ulp = slamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mnaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. - j = k + 1 - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. when .... | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | sgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %-----------------------------% -c | Else this is the first step | -c %-----------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% - - 1000 continue -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: generating Arnoldi vector number') - call svout (logfil, 1, rnorm, ndigit, - & '_naitr: B-norm of the current residual is') - end if -c -c %---------------------------------------------------% -c | STEP 1: Check if the B norm of j-th residual | -c | vector is zero. Equivalent to determing whether | -c | an exact j-step Arnoldi factorization is present. | -c %---------------------------------------------------% -c - betaj = rnorm - if (rnorm .gt. zero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - betaj = zero - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call sgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tnaitr = tnaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call scopy (n, resid, 1, v(1,j), 1) - if (rnorm .ge. unfl) then - temp1 = one / rnorm - call sscal (n, temp1, v(1,j), 1) - call sscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine SLASCL | -c %-----------------------------------------% -c - call slascl ('General', i, i, rnorm, one, n, 1, - & v(1,j), n, infol) - call slascl ('General', i, i, rnorm, one, n, 1, - & workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call scopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | -c | if step3 = .true. | -c %----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call scopy (n, workd(irj), 1, resid, 1) -c -c %---------------------------------------% -c | STEP 4: Finish extending the Arnoldi | -c | factorization to length j. | -c %---------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd(ipj), 1) - end if - 60 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j} | -c | if step4 = .true. | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - if (bmat .eq. 'G') then - wnorm = sdot (n, resid, 1, workd(ipj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'I') then - wnorm = snrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - call sgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, h(1,j), 1) -c -c %--------------------------------------% -c | Orthogonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call sgemv ('N', n, j, -one, v, ldv, h(1,j), 1, - & one, resid, 1) -c - if (j .gt. 1) h(j,j-1) = betaj -c - call arscnd (t4) -c - orth1 = .true. -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - rnorm = sdot (n, resid, 1, workd(ipj), 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = snrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c | The following test determines whether the sine of the | -c | angle between OP*x and the computed residual is less | -c | than or equal to 0.717. | -c %-----------------------------------------------------------% -c - if (rnorm .gt. 0.717*wnorm) go to 100 - iter = 0 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - xtemp(1) = wnorm - xtemp(2) = rnorm - call svout (logfil, 2, xtemp, ndigit, - & '_naitr: re-orthonalization; wnorm and rnorm are') - call svout (logfil, j, h(1,j), ndigit, - & '_naitr: j-th column of H') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call sgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %---------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) | -c | + v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j. | -c %---------------------------------------------% -c - call sgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) - call saxpy (j, one, workd(irj), 1, h(1,j), 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - rnorm1 = sdot (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt(abs(rnorm1)) - else if (bmat .eq. 'I') then - rnorm1 = snrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm - xtemp(2) = rnorm1 - call svout (logfil, 2, xtemp, ndigit, - & '_naitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if (rnorm1 .gt. 0.717*rnorm) then -c -c %---------------------------------------% -c | No need for further refinement. | -c | The cosine of the angle between the | -c | corrected residual vector and the old | -c | residual vector is greater than 0.717 | -c | In other words the corrected residual | -c | and the old residual vector share an | -c | angle of less than arcCOS(0.717) | -c %---------------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = zero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tnaitr = tnaitr + (t1 - t0) - ido = 99 - do 110 i = max(1,k), k+np-1 -c -c %--------------------------------------------% -c | Check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine slahqr | -c %--------------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = slanhs( '1', k+np, h, ldh, workd(n+1) ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 110 continue -c - if (msglvl .gt. 2) then - call smout (logfil, k+np, k+np, h, ldh, ndigit, - & '_naitr: Final upper Hessenberg matrix H of order K+NP') - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of snaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/snapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,647 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: snapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP implicit shifts resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix which is the product of rotations -c and reflections resulting from the NP bulge chage sweeps. -c The updated Arnoldi factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call snapps -c ( N, KEV, NP, SHIFTR, SHIFTI, V, LDV, H, LDH, RESID, Q, LDQ, -c WORKL, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. size of matrix A. -c -c KEV Integer. (INPUT/OUTPUT) -c KEV+NP is the size of the input matrix H. -c KEV is the size of the updated matrix HNEW. KEV is only -c updated on ouput when fewer than NP shifts are applied in -c order to keep the conjugate pair together. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFTR, Real array of length NP. (INPUT) -c SHIFTI Real and imaginary part of the shifts to be applied. -c Upon, entry to snapps, the shifts must be sorted so that the -c conjugate pairs are in consecutive locations. -c -c V Real N by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, V contains the current KEV+NP Arnoldi vectors. -c On OUTPUT, V contains the updated KEV Arnoldi vectors -c in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (KEV+NP) by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, H contains the current KEV+NP by KEV+NP upper -c Hessenber matrix of the Arnoldi factorization. -c On OUTPUT, H contains the updated KEV by KEV upper Hessenberg -c matrix in the KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Real array of length N. (INPUT/OUTPUT) -c On INPUT, RESID contains the the residual vector r_{k+p}. -c On OUTPUT, RESID is the update residual vector rnew_{k} -c in the first KEV locations. -c -c Q Real KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations and reflections -c during the bulge chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Real work array of length (KEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c WORKD Real work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c smout ARPACK utility routine that prints matrices. -c svout ARPACK utility routine that prints vectors. -c slabad LAPACK routine that computes machine constants. -c slacpy LAPACK matrix copy routine. -c slamch LAPACK routine that determines machine constants. -c slanhs LAPACK routine that computes various norms of a matrix. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c slarf LAPACK routine that applies Householder reflection to -c a matrix. -c slarfg LAPACK Householder reflection construction routine. -c slartg LAPACK Givens rotation construction routine. -c slaset LAPACK matrix initialization routine. -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c saxpy Level 1 BLAS that computes a vector triad. -c scopy Level 1 BLAS that copies one vector to another . -c sscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: napps.F SID: 2.4 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the sublocks of -c the Hessenberg matrix H and not just to the submatrix that it -c comes from. Deflation as in LAPACK routine slahqr (QR algorithm -c for upper Hessenberg matrices ) is used. -c The subdiagonals of H are enforced to be non-negative. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine snapps - & ( n, kev, np, shiftr, shifti, v, ldv, h, ldh, resid, q, ldq, - & workl, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & h(ldh,kev+np), resid(n), shifti(np), shiftr(np), - & v(ldv,kev+np), q(ldq,kev+np), workd(2*n), workl(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, iend, ir, istart, j, jj, kplusp, msglvl, nr - logical cconj, first - Real - & c, f, g, h11, h12, h21, h22, h32, ovfl, r, s, sigmai, - & sigmar, smlnum, ulp, unfl, u(3), t, tau, tst1 - save first, ovfl, smlnum, ulp, unfl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external saxpy, scopy, sscal, slacpy, slarfg, slarf, - & slaset, slabad, arscnd, slartg -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch, slanhs, slapy2 - external slamch, slanhs, slapy2 -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs, max, min -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------------% -c | Set machine-dependent constants for the | -c | stopping criterion. If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine slahqr | -c %-----------------------------------------------% -c - unfl = slamch( 'safe minimum' ) - ovfl = one / unfl - call slabad( unfl, ovfl ) - ulp = slamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mnapps - kplusp = kev + np -c -c %--------------------------------------------% -c | Initialize Q to the identity to accumulate | -c | the rotations and reflections | -c %--------------------------------------------% -c - call slaset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------% -c | Chase the bulge with the application of each | -c | implicit shift. Each shift is applied to the | -c | whole matrix including each block. | -c %----------------------------------------------% -c - cconj = .false. - do 110 jj = 1, np - sigmar = shiftr(jj) - sigmai = shifti(jj) -c - if (msglvl .gt. 2 ) then - call ivout (logfil, 1, jj, ndigit, - & '_napps: shift number.') - call svout (logfil, 1, sigmar, ndigit, - & '_napps: The real part of the shift ') - call svout (logfil, 1, sigmai, ndigit, - & '_napps: The imaginary part of the shift ') - end if -c -c %-------------------------------------------------% -c | The following set of conditionals is necessary | -c | in order that complex conjugate pairs of shifts | -c | are applied together or not at all. | -c %-------------------------------------------------% -c - if ( cconj ) then -c -c %-----------------------------------------% -c | cconj = .true. means the previous shift | -c | had non-zero imaginary part. | -c %-----------------------------------------% -c - cconj = .false. - go to 110 - else if ( jj .lt. np .and. abs( sigmai ) .gt. zero ) then -c -c %------------------------------------% -c | Start of a complex conjugate pair. | -c %------------------------------------% -c - cconj = .true. - else if ( jj .eq. np .and. abs( sigmai ) .gt. zero ) then -c -c %----------------------------------------------% -c | The last shift has a nonzero imaginary part. | -c | Don't apply it; thus the order of the | -c | compressed H is order KEV+1 since only np-1 | -c | were applied. | -c %----------------------------------------------% -c - kev = kev + 1 - go to 110 - end if - istart = 1 - 20 continue -c -c %--------------------------------------------------% -c | if sigmai = 0 then | -c | Apply the jj-th shift ... | -c | else | -c | Apply the jj-th and (jj+1)-th together ... | -c | (Note that jj < np at this point in the code) | -c | end | -c | to the current block of H. The next do loop | -c | determines the current block ; | -c %--------------------------------------------------% -c - do 30 i = istart, kplusp-1 -c -c %----------------------------------------% -c | Check for splitting and deflation. Use | -c | a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine slahqr | -c %----------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_napps: matrix splitting with shift number.') - call svout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') - end if - iend = i - h(i+1,i) = zero - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, istart, ndigit, - & '_napps: Start of current block ') - call ivout (logfil, 1, iend, ndigit, - & '_napps: End of current block ') - end if -c -c %------------------------------------------------% -c | No reason to apply a shift to block of order 1 | -c %------------------------------------------------% -c - if ( istart .eq. iend ) go to 100 -c -c %------------------------------------------------------% -c | If istart + 1 = iend then no reason to apply a | -c | complex conjugate pair of shifts on a 2 by 2 matrix. | -c %------------------------------------------------------% -c - if ( istart + 1 .eq. iend .and. abs( sigmai ) .gt. zero ) - & go to 100 -c - h11 = h(istart,istart) - h21 = h(istart+1,istart) - if ( abs( sigmai ) .le. zero ) then -c -c %---------------------------------------------% -c | Real-valued shift ==> apply single shift QR | -c %---------------------------------------------% -c - f = h11 - sigmar - g = h21 -c - do 80 i = istart, iend-1 -c -c %-----------------------------------------------------% -c | Contruct the plane rotation G to zero out the bulge | -c %-----------------------------------------------------% -c - call slartg (f, g, c, s, r) - if (i .gt. istart) then -c -c %-------------------------------------------% -c | The following ensures that h(1:iend-1,1), | -c | the first iend-2 off diagonal of elements | -c | H, remain non negative. | -c %-------------------------------------------% -c - if (r .lt. zero) then - r = -r - c = -c - s = -s - end if - h(i,i-1) = r - h(i+1,i-1) = zero - end if -c -c %---------------------------------------------% -c | Apply rotation to the left of H; H <- G'*H | -c %---------------------------------------------% -c - do 50 j = i, kplusp - t = c*h(i,j) + s*h(i+1,j) - h(i+1,j) = -s*h(i,j) + c*h(i+1,j) - h(i,j) = t - 50 continue -c -c %---------------------------------------------% -c | Apply rotation to the right of H; H <- H*G | -c %---------------------------------------------% -c - do 60 j = 1, min(i+2,iend) - t = c*h(j,i) + s*h(j,i+1) - h(j,i+1) = -s*h(j,i) + c*h(j,i+1) - h(j,i) = t - 60 continue -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 70 j = 1, min( i+jj, kplusp ) - t = c*q(j,i) + s*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = t - 70 continue -c -c %---------------------------% -c | Prepare for next rotation | -c %---------------------------% -c - if (i .lt. iend-1) then - f = h(i+1,i) - g = h(i+2,i) - end if - 80 continue -c -c %-----------------------------------% -c | Finished applying the real shift. | -c %-----------------------------------% -c - else -c -c %----------------------------------------------------% -c | Complex conjugate shifts ==> apply double shift QR | -c %----------------------------------------------------% -c - h12 = h(istart,istart+1) - h22 = h(istart+1,istart+1) - h32 = h(istart+2,istart+1) -c -c %---------------------------------------------------------% -c | Compute 1st column of (H - shift*I)*(H - conj(shift)*I) | -c %---------------------------------------------------------% -c - s = 2.0*sigmar - t = slapy2 ( sigmar, sigmai ) - u(1) = ( h11 * (h11 - s) + t * t ) / h21 + h12 - u(2) = h11 + h22 - s - u(3) = h32 -c - do 90 i = istart, iend-1 -c - nr = min ( 3, iend-i+1 ) -c -c %-----------------------------------------------------% -c | Construct Householder reflector G to zero out u(1). | -c | G is of the form I - tau*( 1 u )' * ( 1 u' ). | -c %-----------------------------------------------------% -c - call slarfg ( nr, u(1), u(2), 1, tau ) -c - if (i .gt. istart) then - h(i,i-1) = u(1) - h(i+1,i-1) = zero - if (i .lt. iend-1) h(i+2,i-1) = zero - end if - u(1) = one -c -c %--------------------------------------% -c | Apply the reflector to the left of H | -c %--------------------------------------% -c - call slarf ('Left', nr, kplusp-i+1, u, 1, tau, - & h(i,i), ldh, workl) -c -c %---------------------------------------% -c | Apply the reflector to the right of H | -c %---------------------------------------% -c - ir = min ( i+3, iend ) - call slarf ('Right', ir, nr, u, 1, tau, - & h(1,i), ldh, workl) -c -c %-----------------------------------------------------% -c | Accumulate the reflector in the matrix Q; Q <- Q*G | -c %-----------------------------------------------------% -c - call slarf ('Right', kplusp, nr, u, 1, tau, - & q(1,i), ldq, workl) -c -c %----------------------------% -c | Prepare for next reflector | -c %----------------------------% -c - if (i .lt. iend-1) then - u(1) = h(i+1,i) - u(2) = h(i+2,i) - if (i .lt. iend-2) u(3) = h(i+3,i) - end if -c - 90 continue -c -c %--------------------------------------------% -c | Finished applying a complex pair of shifts | -c | to the current block | -c %--------------------------------------------% -c - end if -c - 100 continue -c -c %---------------------------------------------------------% -c | Apply the same shift to the next block if there is any. | -c %---------------------------------------------------------% -c - istart = iend + 1 - if (iend .lt. kplusp) go to 20 -c -c %---------------------------------------------% -c | Loop back to the top to get the next shift. | -c %---------------------------------------------% -c - 110 continue -c -c %--------------------------------------------------% -c | Perform a similarity transformation that makes | -c | sure that H will have non negative sub diagonals | -c %--------------------------------------------------% -c - do 120 j=1,kev - if ( h(j+1,j) .lt. zero ) then - call sscal( kplusp-j+1, -one, h(j+1,j), ldh ) - call sscal( min(j+2, kplusp), -one, h(1,j+1), 1 ) - call sscal( min(j+np+1,kplusp), -one, q(1,j+1), 1 ) - end if - 120 continue -c - do 130 i = 1, kev -c -c %--------------------------------------------% -c | Final check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine slahqr | -c %--------------------------------------------% -c - tst1 = abs( h( i, i ) ) + abs( h( i+1, i+1 ) ) - if( tst1.eq.zero ) - & tst1 = slanhs( '1', kev, h, ldh, workl ) - if( h( i+1,i ) .le. max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 130 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is needed in the residual update since we | -c | cannot GUARANTEE that the corresponding entry | -c | of H would be zero as in exact arithmetic. | -c %-------------------------------------------------% -c - if (h(kev+1,kev) .gt. zero) - & call sgemv ('N', n, kplusp, one, v, ldv, q(1,kev+1), 1, zero, - & workd(n+1), 1) -c -c %----------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage of the upper Hessenberg structure of Q. | -c %----------------------------------------------------------% -c - do 140 i = 1, kev - call sgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call scopy (n, workd, 1, v(1,kplusp-i+1), 1) - 140 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call slacpy ('A', n, kev, v(1,kplusp-kev+1), ldv, v, ldv) -c -c %--------------------------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the appropriate place | -c %--------------------------------------------------------------% -c - if (h(kev+1,kev) .gt. zero) - & call scopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kplusp}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call sscal (n, q(kplusp,kev), resid, 1) - if (h(kev+1,kev) .gt. zero) - & call saxpy (n, h(kev+1,kev), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call svout (logfil, 1, q(kplusp,kev), ndigit, - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call svout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') - call ivout (logfil, 1, kev, ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call smout (logfil, kev, kev, h, ldh, ndigit, - & '_napps: updated Hessenberg matrix H for next iteration') - end if -c - end if -c - 9000 continue - call arscnd (t1) - tnapps = tnapps + (t1 - t0) -c - return -c -c %---------------% -c | End of snapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/snaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,835 +0,0 @@ -c\BeginDoc -c -c\Name: snaup2 -c -c\Description: -c Intermediate level interface called by snaupd. -c -c\Usage: -c call snaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZR, RITZI, BOUNDS, -c Q, LDQ, WORKL, IPNTR, WORKD, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in snaupd. -c MODE, ISHIFT, MXITER: see the definition of IPARAM in snaupd. -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV for two reasons. The first, is -c to keep complex conjugate pairs of "wanted" Ritz values -c together. The second, is that a leading block of the current -c upper Hessenberg matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Real N by (NEV+NP) array. (INPUT/OUTPUT) -c The Arnoldi basis vectors are returned in the first NEV -c columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (NEV+NP) by (NEV+NP) array. (OUTPUT) -c H is used to store the generated upper Hessenberg matrix -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZR, Real arrays of length NEV+NP. (OUTPUT) -c RITZI RITZR(1:NEV) (resp. RITZI(1:NEV)) contains the real (resp. -c imaginary) part of the computed Ritz values of OP. -c -c BOUNDS Real array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to -c the computed Ritz values. -c -c Q Real (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Real work array of length at least -c (NEV+NP)**2 + 3*(NEV+NP). (INPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in shifts calculation, shifts -c application and convergence checking. -c -c On exit, the last 3*(NEV+NP) locations of WORKL contain -c the Ritz values (real,imaginary) and associated Ritz -c estimates of the current Hessenberg matrix. They are -c listed in the same order as returned from sneigh. -c -c If ISHIFT .EQ. O and IDO .EQ. 3, the first 2*NP locations -c of WORKL are used in reverse communication to hold the user -c supplied shifts. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (WORKSPACE) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in DNAUPD. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. -c NP returns the number of converged Ritz values. -c = 2: No shifts could be applied. -c = -8: Error return from LAPACK eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Arnoldi factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c sgetv0 ARPACK initial vector generation routine. -c snaitr ARPACK Arnoldi factorization routine. -c snapps ARPACK application of implicit shifts routine. -c snconv ARPACK convergence of Ritz values routine. -c sneigh ARPACK compute Ritz values and error bounds routine. -c sngets ARPACK reorder Ritz values and error bounds routine. -c ssortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c smout ARPACK utility routine that prints matrices -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c scopy Level 1 BLAS that copies one vector to another . -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c sswap Level 1 BLAS that swaps two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naup2.F SID: 2.8 DATE OF SID: 10/17/00 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine snaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ipntr, workd, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, mode, ldh, ldq, ldv, mxiter, - & n, nev, np - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(13) - Real - & bounds(nev+np), h(ldh,nev+np), q(ldq,nev+np), resid(n), - & ritzi(nev+np), ritzr(nev+np), v(ldv,nev+np), - & workd(3*n), workl( (nev+np)*(nev+np+3) ) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0 , zero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character wprime*2 - logical cnorm , getv0, initv, update, ushift - integer ierr , iter , j , kplusp, msglvl, nconv, - & nevbef, nev0 , np0 , nptemp, numcnv - Real - & rnorm , temp , eps23 - save cnorm , getv0, initv, update, ushift, - & rnorm , iter , eps23, kplusp, msglvl, nconv , - & nevbef, nev0 , np0 , numcnv -c -c %-----------------------% -c | Local array arguments | -c %-----------------------% -c - integer kp(4) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy , sgetv0, snaitr, snconv, sneigh, - & sngets, snapps, svout , ivout , arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & sdot, snrm2, slapy2, slamch - external sdot, snrm2, slapy2, slamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min, max, abs, sqrt -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c - call arscnd (t0) -c - msglvl = mnaup2 -c -c %-------------------------------------% -c | Get the machine dependent constant. | -c %-------------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0 ) -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvlues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev + np - nconv = 0 - iter = 0 -c -c %---------------------------------------% -c | Set flags for computing the first NEV | -c | steps of the Arnoldi factorization. | -c %---------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call sgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. zero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1100 - end if - getv0 = .false. - ido = 0 - end if -c -c %-----------------------------------% -c | Back from reverse communication : | -c | continue with update step | -c %-----------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Arnoldi factorization | -c %----------------------------------------------------------% -c - call snaitr (ido, bmat, n, 0, nev, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N ARNOLDI I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Arnoldi | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_naup2: **** Start of major iteration number ****') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c | Adjust NP since NEV might have been updated by last call | -c | to the shift application routine snapps. | -c %-----------------------------------------------------------% -c - np = kplusp - nev -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_naup2: The length of the current Arnoldi factorization') - call ivout (logfil, 1, np, ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c %-----------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call snaitr (ido , bmat, n , nev, np , mode , resid, - & rnorm, v , ldv, h , ldh, ipntr, workd, - & info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call svout (logfil, 1, rnorm, ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current upper Hessenberg matrix. | -c %--------------------------------------------------------% -c - call sneigh (rnorm, kplusp, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %----------------------------------------------------% -c | Make a copy of eigenvalues and corresponding error | -c | bounds obtained from sneigh. | -c %----------------------------------------------------% -c - call scopy(kplusp, ritzr, 1, workl(kplusp**2+1), 1) - call scopy(kplusp, ritzi, 1, workl(kplusp**2+kplusp+1), 1) - call scopy(kplusp, bounds, 1, workl(kplusp**2+2*kplusp+1), 1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | error bounds are in the last NEV loc. of RITZR, | -c | RITZI and BOUNDS respectively. The variables NEV | -c | and NP may be updated if the NEV-th wanted Ritz | -c | value has a non zero imaginary part. In this case | -c | NEV is increased by one and NP decreased by one. | -c | NOTE: The last two arguments of sngets are no | -c | longer used as of version 2.1. | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 - numcnv = nev - call sngets (ishift, which, nev, np, ritzr, ritzi, - & bounds, workl, workl(np+1)) - if (nev .eq. nev0+1) numcnv = nev0+1 -c -c %-------------------% -c | Convergence test. | -c %-------------------% -c - call scopy (nev, bounds(np+1), 1, workl(2*np+1), 1) - call snconv (nev, ritzr(np+1), ritzi(np+1), workl(2*np+1), - & tol, nconv) -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = numcnv - kp(4) = nconv - call ivout (logfil, 4, kp, ndigit, - & '_naup2: NEV, NP, NUMCNV, NCONV are') - call svout (logfil, kplusp, ritzr, ndigit, - & '_naup2: Real part of the eigenvalues of H') - call svout (logfil, kplusp, ritzi, ndigit, - & '_naup2: Imaginary part of the eigenvalues of H') - call svout (logfil, kplusp, bounds, ndigit, - & '_naup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. numcnv) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c - if (msglvl .gt. 4) then - call svout(logfil, kplusp, workl(kplusp**2+1), ndigit, - & '_naup2: Real part of the eig computed by _neigh:') - call svout(logfil, kplusp, workl(kplusp**2+kplusp+1), - & ndigit, - & '_naup2: Imag part of the eig computed by _neigh:') - call svout(logfil, kplusp, workl(kplusp**2+kplusp*2+1), - & ndigit, - & '_naup2: Ritz eistmates computed by _neigh:') - end if -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP | -c %------------------------------------------------% -c -c %------------------------------------------% -c | Use h( 3,1 ) as storage to communicate | -c | rnorm to _neupd if needed | -c %------------------------------------------% - - h(3,1) = rnorm -c -c %----------------------------------------------% -c | To be consistent with sngets, we first do a | -c | pre-processing sort in order to keep complex | -c | conjugate pairs together. This is similar | -c | to the pre-processing sort used in sngets | -c | except that the sort is done in the opposite | -c | order. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SR' - if (which .eq. 'SM') wprime = 'LR' - if (which .eq. 'LR') wprime = 'SM' - if (which .eq. 'SR') wprime = 'LM' - if (which .eq. 'LI') wprime = 'SM' - if (which .eq. 'SI') wprime = 'LM' -c - call ssortc (wprime, .true., kplusp, ritzr, ritzi, bounds) -c -c %----------------------------------------------% -c | Now sort Ritz values so that converged Ritz | -c | values appear within the first NEV locations | -c | of ritzr, ritzi and bounds, and the most | -c | desired one appears at the front. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LR') wprime = 'SR' - if (which .eq. 'SR') wprime = 'LR' - if (which .eq. 'LI') wprime = 'SI' - if (which .eq. 'SI') wprime = 'LI' -c - call ssortc(wprime, .true., kplusp, ritzr, ritzi, bounds) -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23,magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, numcnv - temp = max(eps23,slapy2(ritzr(j), - & ritzi(j))) - bounds(j) = bounds(j)/temp - 35 continue -c -c %----------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | esitmates. This will push all the converged ones | -c | towards the front of ritzr, ritzi, bounds | -c | (in the case when NCONV < NEV.) | -c %----------------------------------------------------% -c - wprime = 'LR' - call ssortc(wprime, .true., numcnv, bounds, ritzr, ritzi) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, numcnv - temp = max(eps23, slapy2(ritzr(j), - & ritzi(j))) - bounds(j) = bounds(j)*temp - 40 continue -c -c %------------------------------------------------% -c | Sort the converged Ritz values again so that | -c | the "threshold" value appears at the front of | -c | ritzr, ritzi and bound. | -c %------------------------------------------------% -c - call ssortc(which, .true., nconv, ritzr, ritzi, bounds) -c - if (msglvl .gt. 1) then - call svout (logfil, kplusp, ritzr, ndigit, - & '_naup2: Sorted real part of the eigenvalues') - call svout (logfil, kplusp, ritzi, ndigit, - & '_naup2: Sorted imaginary part of the eigenvalues') - call svout (logfil, kplusp, bounds, ndigit, - & '_naup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. numcnv) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. numcnv) info = 2 -c - np = nconv - go to 1100 -c - else if ( (nconv .lt. numcnv) .and. (ishift .eq. 1) ) then -c -c %-------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the size | -c | of NEV. | -c %-------------------------------------------------% -c - nevbef = nev - nev = nev + min(nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 3) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call sngets (ishift, which, nev, np, ritzr, ritzi, - & bounds, workl, workl(np+1)) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_naup2: NEV and NP are') - call svout (logfil, nev, ritzr(np+1), ndigit, - & '_naup2: "wanted" Ritz values -- real part') - call svout (logfil, nev, ritzi(np+1), ndigit, - & '_naup2: "wanted" Ritz values -- imag part') - call svout (logfil, nev, bounds(np+1), ndigit, - & '_naup2: Ritz estimates of the "wanted" values ') - end if - end if -c - if (ishift .eq. 0) then -c -c %-------------------------------------------------------% -c | User specified shifts: reverse comminucation to | -c | compute the shifts. They are returned in the first | -c | 2*NP locations of WORKL. | -c %-------------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if -c - 50 continue -c -c %------------------------------------% -c | Back from reverse communication; | -c | User specified shifts are returned | -c | in WORKL(1:2*NP) | -c %------------------------------------% -c - ushift = .false. -c - if ( ishift .eq. 0 ) then -c -c %----------------------------------% -c | Move the NP shifts from WORKL to | -c | RITZR, RITZI to free up WORKL | -c | for non-exact shift case. | -c %----------------------------------% -c - call scopy (np, workl, 1, ritzr, 1) - call scopy (np, workl(np+1), 1, ritzi, 1) - end if -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_naup2: The number of shifts to apply ') - call svout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') - call svout (logfil, np, ritzi, ndigit, - & '_naup2: Imaginary part of the shifts') - if ( ishift .eq. 1 ) - & call svout (logfil, np, bounds, ndigit, - & '_naup2: Ritz estimates of the shifts') - end if -c -c %---------------------------------------------------------% -c | Apply the NP implicit shifts by QR bulge chasing. | -c | Each shift is applied to the whole upper Hessenberg | -c | matrix H. | -c | The first 2*N locations of WORKD are used as workspace. | -c %---------------------------------------------------------% -c - call snapps (n, nev, np, ritzr, ritzi, v, ldv, - & h, ldh, resid, q, ldq, workl, workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to snaitr. | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = sdot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = snrm2(n, resid, 1) - end if - cnorm = .false. -c - if (msglvl .gt. 2) then - call svout (logfil, 1, rnorm, ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call smout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = numcnv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error Exit | -c %------------% -c - call arscnd (t1) - tnaup2 = t1 - t0 -c - 9000 continue -c -c %---------------% -c | End of snaup2 | -c %---------------% -c - return - end
--- a/libcruft/arpack/src/snaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,693 +0,0 @@ -c\BeginDoc -c -c\Name: snaupd -c -c\Description: -c Reverse communication interface for the Implicitly Restarted Arnoldi -c iteration. This subroutine computes approximations to a few eigenpairs -c of a linear operator "OP" with respect to a semi-inner product defined by -c a symmetric positive semi-definite real matrix B. B may be the identity -c matrix. NOTE: If the linear operator "OP" is real and symmetric -c with respect to the real positive semi-definite symmetric matrix B, -c i.e. B*OP = (OP`)*B, then subroutine ssaupd should be used instead. -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c snaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x. -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, M symmetric positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: A*x = lambda*M*x, M symmetric semi-definite -c ===> OP = Real_Part{ inv[A - sigma*M]*M } and B = M. -c ===> shift-and-invert mode (in real arithmetic) -c If OP*x = amu*x, then -c amu = 1/2 * [ 1/(lambda-sigma) + 1/(lambda-conjg(sigma)) ]. -c Note: If sigma is real, i.e. imaginary part of sigma is zero; -c Real_Part{ inv[A - sigma*M]*M } == inv[A - sigma*M]*M -c amu == 1/(lambda-sigma). -c -c Mode 4: A*x = lambda*M*x, M symmetric semi-definite -c ===> OP = Imaginary_Part{ inv[A - sigma*M]*M } and B = M. -c ===> shift-and-invert mode (in real arithmetic) -c If OP*x = amu*x, then -c amu = 1/2i * [ 1/(lambda-sigma) - 1/(lambda-conjg(sigma)) ]. -c -c Both mode 3 and 4 give the same enhancement to eigenvalues close to -c the (complex) shift sigma. However, as lambda goes to infinity, -c the operator OP in mode 4 dampens the eigenvalues more strongly than -c does OP defined in mode 3. -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call snaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to snaupd. IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c snaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3 and 4, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute the IPARAM(8) real and imaginary parts -c of the shifts where INPTR(14) is the pointer -c into WORKL for placing the shifts. See Remark -c 5 below. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c BMAT = 'I' -> standard eigenvalue problem A*x = lambda*x -c BMAT = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c 'LM' -> want the NEV eigenvalues of largest magnitude. -c 'SM' -> want the NEV eigenvalues of smallest magnitude. -c 'LR' -> want the NEV eigenvalues of largest real part. -c 'SR' -> want the NEV eigenvalues of smallest real part. -c 'LI' -> want the NEV eigenvalues of largest imaginary part. -c 'SI' -> want the NEV eigenvalues of smallest imaginary part. -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N-1. -c -c TOL Real scalar. (INPUT) -c Stopping criterion: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)) -c where ABS(RITZ(I)) is the magnitude when RITZ(I) is complex. -c DEFAULT = SLAMCH('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine SLAMCH). -c -c RESID Real array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V. NCV must satisfy the two -c inequalities 2 <= NCV-NEV and NCV <= N. -c This will indicate how many Arnoldi vectors are generated -c at each iteration. After the startup phase in which NEV -c Arnoldi vectors are generated, the algorithm generates -c approximately NCV-NEV Arnoldi vectors at each subsequent update -c iteration. Most of the cost in generating each Arnoldi vector is -c in the matrix-vector operation OP*x. -c NOTE: 2 <= NCV-NEV in order that complex conjugate pairs of Ritz -c values are kept together. (See remark 4 below) -c -c V Real array N by NCV. (OUTPUT) -c Contains the final set of Arnoldi basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to restart -c the Arnoldi iteration in an implicit fashion. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are provided by the user via -c reverse communication. The real and imaginary -c parts of the NCV eigenvalues of the Hessenberg -c matrix H are returned in the part of the WORKL -c array corresponding to RITZR and RITZI. See remark -c 5 below. -c ISHIFT = 1: exact shifts with respect to the current -c Hessenberg matrix H. This is equivalent to -c restarting the iteration with a starting vector -c that is a linear combination of approximate Schur -c vectors associated with the "wanted" Ritz values. -c ------------------------------------------------------------- -c -c IPARAM(2) = No longer referenced. -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3,4; See under \Description of snaupd for the -c four modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), snaupd returns NP, the number -c of shifts the user is to provide. 0 < NP <=NCV-NEV. See Remark -c 5 below. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 14. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by NCV upper Hessenberg matrix -c H in WORKL. -c IPNTR(6): pointer to the real part of the ritz value array -c RITZR in WORKL. -c IPNTR(7): pointer to the imaginary part of the ritz value array -c RITZI in WORKL. -c IPNTR(8): pointer to the Ritz estimates in array WORKL associated -c with the Ritz values located in RITZR and RITZI in WORKL. -c -c IPNTR(14): pointer to the NP shifts in WORKL. See Remark 5 below. -c -c Note: IPNTR(9:13) is only referenced by sneupd. See Remark 2 below. -c -c IPNTR(9): pointer to the real part of the NCV RITZ values of the -c original system. -c IPNTR(10): pointer to the imaginary part of the NCV RITZ values of -c the original system. -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper quasi-triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c sneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration. Upon termination -c WORKD(1:N) contains B*RESID(1:N). If an invariant subspace -c associated with the converged Ritz values is desired, see remark -c 2 below, subroutine sneupd uses this output. -c See Data Distribution Note below. -c -c WORKL Real work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least 3*NCV**2 + 6*NCV. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -4: The maximum number of Arnoldi update iteration -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation; -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatable. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -9999: Could not build an Arnoldi factorization. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. -c -c\Remarks -c 1. The computed Ritz values are approximate eigenvalues of OP. The -c selection of WHICH should be made with this in mind when -c Mode = 3 and 4. After convergence, approximate eigenvalues of the -c original problem may be obtained with the ARPACK subroutine sneupd. -c -c 2. If a basis for the invariant subspace corresponding to the converged Ritz -c values is needed, the user must call sneupd immediately following -c completion of snaupd. This is new starting with release 2 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requrement is that NCV > NEV + 2. -c However, it is recommended that NCV .ge. 2*NEV+1. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c See Chapter 8 of Reference 2 for further information. -c -c 5. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) real and imaginary parts of the shifts in locations -c real part imaginary part -c ----------------------- -------------- -c 1 WORKL(IPNTR(14)) WORKL(IPNTR(14)+NP) -c 2 WORKL(IPNTR(14)+1) WORKL(IPNTR(14)+NP+1) -c . . -c . . -c . . -c NP WORKL(IPNTR(14)+NP-1) WORKL(IPNTR(14)+2*NP-1). -c -c Only complex conjugate pairs of shifts may be applied and the pairs -c must be placed in consecutive locations. The real part of the -c eigenvalues of the current upper Hessenberg matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1) and the imaginary part -c in WORKL(IPNTR(7)) through WORKL(IPNTR(7)+NCV-1). They are ordered -c according to the order defined by WHICH. The complex conjugate -c pairs are kept together and the associated Ritz estimates are located in -c WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c Real resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c decompose d1(n), d2(n,ncv) -c align resid(i) with d1(i) -c align v(i,j) with d2(i,j) -c align workd(i) with d1(i) range (1:n) -c align workd(i) with d1(i-n) range (n+1:2*n) -c align workd(i) with d1(i-2*n) range (2*n+1:3*n) -c distribute d1(block), d2(block,:) -c replicated workl(lworkl) -c -c Cray MPP syntax: -c =============== -c Real resid(n), v(ldv,ncv), workd(n,3), workl(lworkl) -c shared resid(block), v(block,:), workd(block,:) -c replicated workl(lworkl) -c -c CM2/CM5 syntax: -c ============== -c -c----------------------------------------------------------------------- -c -c include 'ex-nonsym.doc' -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "Complex Shift and Invert Strategies for -c Real Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c snaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version '1.1' -c -c\SCCS Information: @(#) -c FILE: naupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine snaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - Real - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0 , zero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritzi, ritzr, j - save bounds, ih, iq, ishift, iupd, iw, ldh, ldq, - & levec, mode, msglvl, mxiter, nb, nev0, next, - & np, ritzi, ritzr -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external snaup2, svout, ivout, arscnd, sstatn -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch - external slamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call sstatn - call arscnd (t0) - msglvl = mnaupd -c -c %----------------% -c | Error checking | -c %----------------% -c - ierr = 0 - ishift = iparam(1) -c levec = iparam(2) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (mxiter .le. 0) then - ierr = -4 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 6*ncv) then - ierr = -7 - else if (mode .lt. 1 .or. mode .gt. 4) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - else if (ishift .lt. 0 .or. ishift .gt. 1) then - ierr = -12 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. zero) tol = slamch('EpsMach') -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, 3*ncv**2 + 6*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+2*ncv) := real and imaginary | -c | parts of ritz values | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := error bounds | -c | workl(ncv*ncv+3*ncv+1:2*ncv*ncv+3*ncv) := rotation matrix Q | -c | workl(2*ncv*ncv+3*ncv+1:3*ncv*ncv+6*ncv) := workspace | -c | The final workspace is needed by subroutine sneigh called | -c | by snaup2. Subroutine sneigh calls LAPACK routines for | -c | calculating eigenvalues and the last row of the eigenvector | -c | matrix. | -c %-------------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritzr = ih + ldh*ncv - ritzi = ritzr + ncv - bounds = ritzi + ncv - iq = bounds + ncv - iw = iq + ldq*ncv - next = iw + ncv**2 + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritzr - ipntr(7) = ritzi - ipntr(8) = bounds - ipntr(14) = iw -c - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Arnoldi Iteration. | -c %-------------------------------------------------------% -c - call snaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritzr), - & workl(ritzi), workl(bounds), workl(iq), ldq, workl(iw), - & ipntr, workd, info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP or shifts. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within snaup2. | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_naupd: Number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call svout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') - call svout (logfil, np, workl(ritzi), ndigit, - & '_naupd: Imaginary part of the final Ritz values') - call svout (logfil, np, workl(bounds), ndigit, - & '_naupd: Associated Ritz estimates') - end if -c - call arscnd (t1) - tnaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tnaupd, tnaup2, tnaitr, titref, - & tgetv0, tneigh, tngets, tnapps, tnconv, trvec - 1000 format (//, - & 5x, '=============================================',/ - & 5x, '= Nonsymmetric implicit Arnoldi update code =',/ - & 5x, '= Version Number: ', ' 2.4' , 21x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 16x, ' =',/ - & 5x, '=============================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '=============================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in naup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in Hessenberg eig. subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6,/ - & 5x, 'Total time in computing final Ritz vectors = ', f12.6/) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of snaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/snconv.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: snconv -c -c\Description: -c Convergence testing for the nonsymmetric Arnoldi eigenvalue routine. -c -c\Usage: -c call snconv -c ( N, RITZR, RITZI, BOUNDS, TOL, NCONV ) -c -c\Arguments -c N Integer. (INPUT) -c Number of Ritz values to check for convergence. -c -c RITZR, Real arrays of length N. (INPUT) -c RITZI Real and imaginary parts of the Ritz values to be checked -c for convergence. - -c BOUNDS Real array of length N. (INPUT) -c Ritz estimates for the Ritz values in RITZR and RITZI. -c -c TOL Real scalar. (INPUT) -c Desired backward error for a Ritz value to be considered -c "converged". -c -c NCONV Integer scalar. (OUTPUT) -c Number of "converged" Ritz values. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: nconv.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. xxxx -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine snconv (n, ritzr, ritzi, bounds, tol, nconv) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer n, nconv - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% - - Real - & ritzr(n), ritzi(n), bounds(n) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i - Real - & temp, eps23 -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slapy2, slamch - external slapy2, slamch - -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------------------------------------% -c | Convergence test: unlike in the symmetric code, I am not | -c | using things like refined error bounds and gap condition | -c | because I don't know the exact equivalent concept. | -c | | -c | Instead the i-th Ritz value is considered "converged" when: | -c | | -c | bounds(i) .le. ( TOL * | ritz | ) | -c | | -c | for some appropriate choice of norm. | -c %-------------------------------------------------------------% -c - call arscnd (t0) -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0) -c - nconv = 0 - do 20 i = 1, n - temp = max( eps23, slapy2( ritzr(i), ritzi(i) ) ) - if (bounds(i) .le. tol*temp) nconv = nconv + 1 - 20 continue -c - call arscnd (t1) - tnconv = tnconv + (t1 - t0) -c - return -c -c %---------------% -c | End of snconv | -c %---------------% -c - end
--- a/libcruft/arpack/src/sneigh.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,314 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: sneigh -c -c\Description: -c Compute the eigenvalues of the current upper Hessenberg matrix -c and the corresponding Ritz estimates given the current residual norm. -c -c\Usage: -c call sneigh -c ( RNORM, N, H, LDH, RITZR, RITZI, BOUNDS, Q, LDQ, WORKL, IERR ) -c -c\Arguments -c RNORM Real scalar. (INPUT) -c Residual norm corresponding to the current upper Hessenberg -c matrix H. -c -c N Integer. (INPUT) -c Size of the matrix H. -c -c H Real N by N array. (INPUT) -c H contains the current upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZR, Real arrays of length N. (OUTPUT) -c RITZI On output, RITZR(1:N) (resp. RITZI(1:N)) contains the real -c (respectively imaginary) parts of the eigenvalues of H. -c -c BOUNDS Real array of length N. (OUTPUT) -c On output, BOUNDS contains the Ritz estimates associated with -c the eigenvalues RITZR and RITZI. This is equal to RNORM -c times the last components of the eigenvectors corresponding -c to the eigenvalues in RITZR and RITZI. -c -c Q Real N by N array. (WORKSPACE) -c Workspace needed to store the eigenvectors of H. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Real work array of length N**2 + 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. This is needed to keep the full Schur form -c of H and also in the calculation of the eigenvectors of H. -c -c IERR Integer. (OUTPUT) -c Error exit flag from slaqrb or strevc. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c slaqrb ARPACK routine to compute the real Schur form of an -c upper Hessenberg matrix and last row of the Schur vectors. -c arscnd ARPACK utility routine for timing. -c smout ARPACK utility routine that prints matrices -c svout ARPACK utility routine that prints vectors. -c slacpy LAPACK matrix copy routine. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c strevc LAPACK routine to compute the eigenvectors of a matrix -c in upper quasi-triangular form -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c scopy Level 1 BLAS that copies one vector to another . -c snrm2 Level 1 BLAS that computes the norm of a vector. -c sscal Level 1 BLAS that scales a vector. -c -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: neigh.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine sneigh (rnorm, n, h, ldh, ritzr, ritzi, bounds, - & q, ldq, workl, ierr) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, n, ldh, ldq - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & bounds(n), h(ldh,n), q(ldq,n), ritzi(n), ritzr(n), - & workl(n*(n+3)) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical select(1) - integer i, iconj, msglvl - Real - & temp, vl(1) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy, slacpy, slaqrb, strevc, svout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slapy2, snrm2 - external slapy2, snrm2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mneigh -c - if (msglvl .gt. 2) then - call smout (logfil, n, n, h, ldh, ndigit, - & '_neigh: Entering upper Hessenberg matrix H ') - end if -c -c %-----------------------------------------------------------% -c | 1. Compute the eigenvalues, the last components of the | -c | corresponding Schur vectors and the full Schur form T | -c | of the current upper Hessenberg matrix H. | -c | slaqrb returns the full Schur form of H in WORKL(1:N**2) | -c | and the last components of the Schur vectors in BOUNDS. | -c %-----------------------------------------------------------% -c - call slacpy ('All', n, n, h, ldh, workl, n) - call slaqrb (.true., n, 1, n, workl, n, ritzr, ritzi, bounds, - & ierr) - if (ierr .ne. 0) go to 9000 -c - if (msglvl .gt. 1) then - call svout (logfil, n, bounds, ndigit, - & '_neigh: last row of the Schur matrix for H') - end if -c -c %-----------------------------------------------------------% -c | 2. Compute the eigenvectors of the full Schur form T and | -c | apply the last components of the Schur vectors to get | -c | the last components of the corresponding eigenvectors. | -c | Remember that if the i-th and (i+1)-st eigenvalues are | -c | complex conjugate pairs, then the real & imaginary part | -c | of the eigenvector components are split across adjacent | -c | columns of Q. | -c %-----------------------------------------------------------% -c - call strevc ('R', 'A', select, n, workl, n, vl, n, q, ldq, - & n, n, workl(n*n+1), ierr) -c - if (ierr .ne. 0) go to 9000 -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | euclidean norms are all one. LAPACK subroutine | -c | strevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; here the magnitude of a complex | -c | number (x,y) is taken to be |x| + |y|. | -c %------------------------------------------------% -c - iconj = 0 - do 10 i=1, n - if ( abs( ritzi(i) ) .le. zero ) then -c -c %----------------------% -c | Real eigenvalue case | -c %----------------------% -c - temp = snrm2( n, q(1,i), 1 ) - call sscal ( n, one / temp, q(1,i), 1 ) - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we further normalize by the | -c | square root of two. | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - temp = slapy2( snrm2( n, q(1,i), 1 ), - & snrm2( n, q(1,i+1), 1 ) ) - call sscal ( n, one / temp, q(1,i), 1 ) - call sscal ( n, one / temp, q(1,i+1), 1 ) - iconj = 1 - else - iconj = 0 - end if - end if - 10 continue -c - call sgemv ('T', n, n, one, q, ldq, bounds, 1, zero, workl, 1) -c - if (msglvl .gt. 1) then - call svout (logfil, n, workl, ndigit, - & '_neigh: Last row of the eigenvector matrix for H') - end if -c -c %----------------------------% -c | Compute the Ritz estimates | -c %----------------------------% -c - iconj = 0 - do 20 i = 1, n - if ( abs( ritzi(i) ) .le. zero ) then -c -c %----------------------% -c | Real eigenvalue case | -c %----------------------% -c - bounds(i) = rnorm * abs( workl(i) ) - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we need to take the magnitude | -c | of the last components of the two vectors | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - bounds(i) = rnorm * slapy2( workl(i), workl(i+1) ) - bounds(i+1) = bounds(i) - iconj = 1 - else - iconj = 0 - end if - end if - 20 continue -c - if (msglvl .gt. 2) then - call svout (logfil, n, ritzr, ndigit, - & '_neigh: Real part of the eigenvalues of H') - call svout (logfil, n, ritzi, ndigit, - & '_neigh: Imaginary part of the eigenvalues of H') - call svout (logfil, n, bounds, ndigit, - & '_neigh: Ritz estimates for the eigenvalues of H') - end if -c - call arscnd (t1) - tneigh = tneigh + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of sneigh | -c %---------------% -c - end
--- a/libcruft/arpack/src/sneupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1067 +0,0 @@ -c\BeginDoc -c -c\Name: sneupd -c -c\Description: -c -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) The corresponding approximate eigenvectors; -c -c (2) An orthonormal basis for the associated approximate -c invariant subspace; -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c basis is always computed. There is an additional storage cost of n*nev -c if both are requested (in this case a separate array Z must be supplied). -c -c The approximate eigenvalues and eigenvectors of A*z = lambda*B*z -c are derived from approximate eigenvalues and eigenvectors of -c of the linear operator OP prescribed by the MODE selection in the -c call to SNAUPD. SNAUPD must be called before this routine is called. -c These approximate eigenvalues and vectors are commonly called Ritz -c values and Ritz vectors respectively. They are referred to as such -c in the comments that follow. The computed orthonormal basis for the -c invariant subspace corresponding to these Ritz values is referred to as a -c Schur basis. -c -c See documentation in the header of the subroutine SNAUPD for -c definition of OP as well as other terms and the relation of computed -c Ritz values and Ritz vectors of OP with respect to the given problem -c A*z = lambda*B*z. For a brief description, see definitions of -c IPARAM(7), MODE and WHICH in the documentation of SNAUPD. -c -c\Usage: -c call sneupd -c ( RVEC, HOWMNY, SELECT, DR, DI, Z, LDZ, SIGMAR, SIGMAI, WORKEV, BMAT, -c N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, WORKL, -c LWORKL, INFO ) -c -c\Arguments: -c RVEC LOGICAL (INPUT) -c Specifies whether a basis for the invariant subspace corresponding -c to the converged Ritz value approximations for the eigenproblem -c A*z = lambda*B*z is computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute the Ritz vectors or Schur vectors. -c See Remarks below. -c -c HOWMNY Character*1 (INPUT) -c Specifies the form of the basis for the invariant subspace -c corresponding to the converged Ritz values that is to be computed. -c -c = 'A': Compute NEV Ritz vectors; -c = 'P': Compute NEV Schur vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value (DR(j), DI(j)), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' or 'P', SELECT is used as internal workspace. -c -c DR Real array of dimension NEV+1. (OUTPUT) -c If IPARAM(7) = 1,2 or 3 and SIGMAI=0.0 then on exit: DR contains -c the real part of the Ritz approximations to the eigenvalues of -c A*z = lambda*B*z. -c If IPARAM(7) = 3, 4 and SIGMAI is not equal to zero, then on exit: -c DR contains the real part of the Ritz values of OP computed by -c SNAUPD. A further computation must be performed by the user -c to transform the Ritz values computed for OP by SNAUPD to those -c of the original system A*z = lambda*B*z. See remark 3 below. -c -c DI Real array of dimension NEV+1. (OUTPUT) -c On exit, DI contains the imaginary part of the Ritz value -c approximations to the eigenvalues of A*z = lambda*B*z associated -c with DR. -c -c NOTE: When Ritz values are complex, they will come in complex -c conjugate pairs. If eigenvectors are requested, the -c corresponding Ritz vectors will also come in conjugate -c pairs and the real and imaginary parts of these are -c represented in two consecutive columns of the array Z -c (see below). -c -c Z Real N by NEV+1 array if RVEC = .TRUE. and HOWMNY = 'A'. (OUTPUT) -c On exit, if RVEC = .TRUE. and HOWMNY = 'A', then the columns of -c Z represent approximate eigenvectors (Ritz vectors) corresponding -c to the NCONV=IPARAM(5) Ritz values for eigensystem -c A*z = lambda*B*z. -c -c The complex Ritz vector associated with the Ritz value -c with positive imaginary part is stored in two consecutive -c columns. The first column holds the real part of the Ritz -c vector and the second column holds the imaginary part. The -c Ritz vector associated with the Ritz value with negative -c imaginary part is simply the complex conjugate of the Ritz vector -c associated with the positive imaginary part. -c -c If RVEC = .FALSE. or HOWMNY = 'P', then Z is not referenced. -c -c NOTE: If if RVEC = .TRUE. and a Schur basis is not required, -c the array Z may be set equal to first NEV+1 columns of the Arnoldi -c basis array V computed by SNAUPD. In this case the Arnoldi basis -c will be destroyed and overwritten with the eigenvector basis. -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ >= max( 1, N ). In any case, LDZ >= 1. -c -c SIGMAR Real (INPUT) -c If IPARAM(7) = 3 or 4, represents the real part of the shift. -c Not referenced if IPARAM(7) = 1 or 2. -c -c SIGMAI Real (INPUT) -c If IPARAM(7) = 3 or 4, represents the imaginary part of the shift. -c Not referenced if IPARAM(7) = 1 or 2. See remark 3 below. -c -c WORKEV Real work array of dimension 3*NCV. (WORKSPACE) -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to SNAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, INFO -c -c must be passed directly to SNEUPD following the last call -c to SNAUPD. These arguments MUST NOT BE MODIFIED between -c the the last call to SNAUPD and the call to SNEUPD. -c -c Three of these parameters (V, WORKL, INFO) are also output parameters: -c -c V Real N by NCV array. (INPUT/OUTPUT) -c -c Upon INPUT: the NCV columns of V contain the Arnoldi basis -c vectors for OP as constructed by SNAUPD . -c -c Upon OUTPUT: If RVEC = .TRUE. the first NCONV=IPARAM(5) columns -c contain approximate Schur vectors that span the -c desired invariant subspace. See Remark 2 below. -c -c NOTE: If the array Z has been set equal to first NEV+1 columns -c of the array V and RVEC=.TRUE. and HOWMNY= 'A', then the -c Arnoldi basis held by V has been overwritten by the desired -c Ritz vectors. If a separate array Z has been passed then -c the first NCONV=IPARAM(5) columns of V will contain approximate -c Schur vectors that span the desired invariant subspace. -c -c WORKL Real work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:ncv*ncv+3*ncv) contains information obtained in -c snaupd. They are not changed by sneupd. -c WORKL(ncv*ncv+3*ncv+1:3*ncv*ncv+6*ncv) holds the -c real and imaginary part of the untransformed Ritz values, -c the upper quasi-triangular matrix for H, and the -c associated matrix representation of the invariant subspace for H. -c -c Note: IPNTR(9:13) contains the pointer into WORKL for addresses -c of the above information computed by sneupd. -c ------------------------------------------------------------- -c IPNTR(9): pointer to the real part of the NCV RITZ values of the -c original system. -c IPNTR(10): pointer to the imaginary part of the NCV RITZ values of -c the original system. -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper quasi-triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c sneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c -c = 0: Normal exit. -c -c = 1: The Schur form computed by LAPACK routine slahqr -c could not be reordered by LAPACK routine strsen. -c Re-enter subroutine sneupd with IPARAM(5)=NCV and -c increase the size of the arrays DR and DI to have -c dimension at least dimension NCV and allocate at least NCV -c columns for Z. NOTE: Not necessary if Z and V share -c the same space. Please notify the authors if this error -c occurs. -c -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from calculation of a real Schur form. -c Informational error from LAPACK routine slahqr. -c = -9: Error return from calculation of eigenvectors. -c Informational error from LAPACK routine strevc. -c = -10: IPARAM(7) must be 1,2,3,4. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: HOWMNY = 'S' not yet implemented -c = -13: HOWMNY must be one of 'A' or 'P' if RVEC = .true. -c = -14: SNAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: DNEUPD got a different count of the number of converged -c Ritz values than DNAUPD got. This indicates the user -c probably made an error in passing data from DNAUPD to -c DNEUPD or that the data was modified before entering -c DNEUPD -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "Complex Shift and Invert Strategies for -c Real Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c smout ARPACK utility routine that prints matrices -c svout ARPACK utility routine that prints vectors. -c sgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c slacpy LAPACK matrix copy routine. -c slahqr LAPACK routine to compute the real Schur form of an -c upper Hessenberg matrix. -c slamch LAPACK routine that determines machine constants. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c slaset LAPACK matrix initialization routine. -c sorm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c strevc LAPACK routine to compute the eigenvectors of a matrix -c in upper quasi-triangular form. -c strsen LAPACK routine that re-orders the Schur form. -c strmm Level 3 BLAS matrix times an upper triangular matrix. -c sger Level 2 BLAS rank one update to a matrix. -c scopy Level 1 BLAS that copies one vector to another . -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c sscal Level 1 BLAS that scales a vector. -c -c\Remarks -c -c 1. Currently only HOWMNY = 'A' and 'P' are implemented. -c -c Let trans(X) denote the transpose of X. -c -c 2. Schur vectors are an orthogonal representation for the basis of -c Ritz vectors. Thus, their numerical properties are often superior. -c If RVEC = .TRUE. then the relationship -c A * V(:,1:IPARAM(5)) = V(:,1:IPARAM(5)) * T, and -c trans(V(:,1:IPARAM(5))) * V(:,1:IPARAM(5)) = I are approximately -c satisfied. Here T is the leading submatrix of order IPARAM(5) of the -c real upper quasi-triangular matrix stored workl(ipntr(12)). That is, -c T is block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; -c each 2-by-2 diagonal block has its diagonal elements equal and its -c off-diagonal elements of opposite sign. Corresponding to each 2-by-2 -c diagonal block is a complex conjugate pair of Ritz values. The real -c Ritz values are stored on the diagonal of T. -c -c 3. If IPARAM(7) = 3 or 4 and SIGMAI is not equal zero, then the user must -c form the IPARAM(5) Rayleigh quotients in order to transform the Ritz -c values computed by SNAUPD for OP to those of A*z = lambda*B*z. -c Set RVEC = .true. and HOWMNY = 'A', and -c compute -c trans(Z(:,I)) * A * Z(:,I) if DI(I) = 0. -c If DI(I) is not equal to zero and DI(I+1) = - D(I), -c then the desired real and imaginary parts of the Ritz value are -c trans(Z(:,I)) * A * Z(:,I) + trans(Z(:,I+1)) * A * Z(:,I+1), -c trans(Z(:,I)) * A * Z(:,I+1) - trans(Z(:,I+1)) * A * Z(:,I), -c respectively. -c Another possibility is to set RVEC = .true. and HOWMNY = 'P' and -c compute trans(V(:,1:IPARAM(5))) * A * V(:,1:IPARAM(5)) and then an upper -c quasi-triangular matrix of order IPARAM(5) is computed. See remark -c 2 above. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neupd.F SID: 2.7 DATE OF SID: 09/20/00 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine sneupd(rvec , howmny, select, dr , di, - & z , ldz , sigmar, sigmai, workev, - & bmat , n , which , nev , tol, - & resid, ncv , v , ldv , iparam, - & ipntr, workd , workl , lworkl, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Real - & sigmar, sigmai, tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - logical select(ncv) - Real - & dr(nev+1) , di(nev+1), resid(n) , - & v(ldv,ncv) , z(ldz,*) , workd(3*n), - & workl(lworkl), workev(3*ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0 , zero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds, ierr , ih , ihbds , - & iheigr, iheigi, iconj , nconv , - & invsub, iuptri, iwev , iwork(1), - & j , k , ldh , ldq , - & mode , msglvl, outncv, ritzr , - & ritzi , wri , wrr , irr , - & iri , ibd , ishift, numcnv , - & np , jj , nconv2 - logical reord - Real - & conds , rnorm, sep , temp, - & vl(1,1), temp1, eps23 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy , sger , sgeqr2, slacpy, - & slahqr, slaset, smout , sorm2r, - & strevc, strmm , strsen, sscal , - & svout , ivout -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slapy2, snrm2, slamch, sdot - external slapy2, snrm2, slamch, sdot -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs, min, sqrt -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mneupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0 ) -c -c %--------------% -c | Quick return | -c %--------------% -c - ierr = 0 -c - if (nconv .le. 0) then - ierr = -14 - else if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 6*ncv) then - ierr = -7 - else if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) then - ierr = -13 - else if (howmny .eq. 'S' ) then - ierr = -12 - end if -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 .and. sigmai .eq. zero) then - type = 'SHIFTI' - else if (mode .eq. 3 ) then - type = 'REALPT' - else if (mode .eq. 4 ) then - type = 'IMAGPT' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+2*ncv) := real and imaginary | -c | parts of ritz values | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := error bounds | -c %--------------------------------------------------------% -c -c %-----------------------------------------------------------% -c | The following is used and set by SNEUPD. | -c | workl(ncv*ncv+3*ncv+1:ncv*ncv+4*ncv) := The untransformed | -c | real part of the Ritz values. | -c | workl(ncv*ncv+4*ncv+1:ncv*ncv+5*ncv) := The untransformed | -c | imaginary part of the Ritz values. | -c | workl(ncv*ncv+5*ncv+1:ncv*ncv+6*ncv) := The untransformed | -c | error bounds of the Ritz values | -c | workl(ncv*ncv+6*ncv+1:2*ncv*ncv+6*ncv) := Holds the upper | -c | quasi-triangular matrix for H | -c | workl(2*ncv*ncv+6*ncv+1: 3*ncv*ncv+6*ncv) := Holds the | -c | associated matrix representation of the invariant | -c | subspace for H. | -c | GRAND total of NCV * ( 3 * NCV + 6 ) locations. | -c %-----------------------------------------------------------% -c - ih = ipntr(5) - ritzr = ipntr(6) - ritzi = ipntr(7) - bounds = ipntr(8) - ldh = ncv - ldq = ncv - iheigr = bounds + ldh - iheigi = iheigr + ldh - ihbds = iheigi + ldh - iuptri = ihbds + ldh - invsub = iuptri + ldh*ncv - ipntr(9) = iheigr - ipntr(10) = iheigi - ipntr(11) = ihbds - ipntr(12) = iuptri - ipntr(13) = invsub - wrr = 1 - wri = ncv + 1 - iwev = wri + ncv -c -c %-----------------------------------------% -c | irr points to the REAL part of the Ritz | -c | values computed by _neigh before | -c | exiting _naup2. | -c | iri points to the IMAGINARY part of the | -c | Ritz values computed by _neigh | -c | before exiting _naup2. | -c | ibd points to the Ritz estimates | -c | computed by _neigh before exiting | -c | _naup2. | -c %-----------------------------------------% -c - irr = ipntr(14)+ncv*ncv - iri = irr+ncv - ibd = iri+ncv -c -c %------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c %------------------------------------% -c - rnorm = workl(ih+2) - workl(ih+2) = zero -c - if (msglvl .gt. 2) then - call svout(logfil, ncv, workl(irr), ndigit, - & '_neupd: Real part of Ritz values passed in from _NAUPD.') - call svout(logfil, ncv, workl(iri), ndigit, - & '_neupd: Imag part of Ritz values passed in from _NAUPD.') - call svout(logfil, ncv, workl(ibd), ndigit, - & '_neupd: Ritz estimates passed in from _NAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(bound) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call sngets(ishift , which , nev , - & np , workl(irr), workl(iri), - & workl(bounds), workl , workl(np+1)) -c - if (msglvl .gt. 2) then - call svout(logfil, ncv, workl(irr), ndigit, - & '_neupd: Real part of Ritz values after calling _NGETS.') - call svout(logfil, ncv, workl(iri), ndigit, - & '_neupd: Imag part of Ritz values after calling _NGETS.') - call svout(logfil, ncv, workl(bounds), ndigit, - & '_neupd: Ritz value indices after calling _NGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - temp1 = max(eps23, - & slapy2( workl(irr+ncv-j), workl(iri+ncv-j) )) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & workl(ibd+jj-1) .le. tol*temp1) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by dnaupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the dnaupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_neupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -15 - go to 9000 - end if -c -c %-----------------------------------------------------------% -c | Call LAPACK routine slahqr to compute the real Schur form | -c | of the upper Hessenberg matrix returned by SNAUPD. | -c | Make a copy of the upper Hessenberg matrix. | -c | Initialize the Schur vector matrix Q to the identity. | -c %-----------------------------------------------------------% -c - call scopy(ldh*ncv, workl(ih), 1, workl(iuptri), 1) - call slaset('All', ncv, ncv, - & zero , one, workl(invsub), - & ldq) - call slahqr(.true., .true. , ncv, - & 1 , ncv , workl(iuptri), - & ldh , workl(iheigr), workl(iheigi), - & 1 , ncv , workl(invsub), - & ldq , ierr) - call scopy(ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call svout(logfil, ncv, workl(iheigr), ndigit, - & '_neupd: Real part of the eigenvalues of H') - call svout(logfil, ncv, workl(iheigi), ndigit, - & '_neupd: Imaginary part of the Eigenvalues of H') - call svout(logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the Schur vector matrix') - if (msglvl .gt. 3) then - call smout(logfil , ncv, ncv , - & workl(iuptri), ldh, ndigit, - & '_neupd: The upper quasi-triangular matrix ') - end if - end if -c - if (reord) then -c -c %-----------------------------------------------------% -c | Reorder the computed upper quasi-triangular matrix. | -c %-----------------------------------------------------% -c - call strsen('None' , 'V' , - & select , ncv , - & workl(iuptri), ldh , - & workl(invsub), ldq , - & workl(iheigr), workl(iheigi), - & nconv2 , conds , - & sep , workl(ihbds) , - & ncv , iwork , - & 1 , ierr) -c - if (nconv2 .lt. nconv) then - nconv = nconv2 - end if - - if (ierr .eq. 1) then - info = 1 - go to 9000 - end if -c - if (msglvl .gt. 2) then - call svout(logfil, ncv, workl(iheigr), ndigit, - & '_neupd: Real part of the eigenvalues of H--reordered') - call svout(logfil, ncv, workl(iheigi), ndigit, - & '_neupd: Imag part of the eigenvalues of H--reordered') - if (msglvl .gt. 3) then - call smout(logfil , ncv, ncv , - & workl(iuptri), ldq, ndigit, - & '_neupd: Quasi-triangular matrix after re-ordering') - end if - end if -c - end if -c -c %---------------------------------------% -c | Copy the last row of the Schur vector | -c | into workl(ihbds). This will be used | -c | to compute the Ritz estimates of | -c | converged Ritz values. | -c %---------------------------------------% -c - call scopy(ncv, workl(invsub+ncv-1), ldq, workl(ihbds), 1) -c -c %----------------------------------------------------% -c | Place the computed eigenvalues of H into DR and DI | -c | if a spectral transformation was not used. | -c %----------------------------------------------------% -c - if (type .eq. 'REGULR') then - call scopy(nconv, workl(iheigr), 1, dr, 1) - call scopy(nconv, workl(iheigi), 1, di, 1) - end if -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(invsub,ldq). | -c %----------------------------------------------------------% -c - call sgeqr2(ncv, nconv , workl(invsub), - & ldq, workev, workev(ncv+1), - & ierr) -c -c %---------------------------------------------------------% -c | * Postmultiply V by Q using sorm2r. | -c | * Copy the first NCONV columns of VQ into Z. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(iheigr) and workl(iheigi) | -c | The first NCONV columns of V are now approximate Schur | -c | vectors associated with the real upper quasi-triangular | -c | matrix of order NCONV in workl(iuptri) | -c %---------------------------------------------------------% -c - call sorm2r('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , v , - & ldv , workd(n+1) , ierr) - call slacpy('All', n, nconv, v, ldv, z, ldz) -c - do 20 j=1, nconv -c -c %---------------------------------------------------% -c | Perform both a column and row scaling if the | -c | diagonal element of workl(invsub,ldq) is negative | -c | I'm lazy and don't take advantage of the upper | -c | quasi-triangular form of workl(iuptri,ldq) | -c | Note that since Q is orthogonal, R is a diagonal | -c | matrix consisting of plus or minus ones | -c %---------------------------------------------------% -c - if (workl(invsub+(j-1)*ldq+j-1) .lt. zero) then - call sscal(nconv, -one, workl(iuptri+j-1), ldq) - call sscal(nconv, -one, workl(iuptri+(j-1)*ldq), 1) - end if -c - 20 continue -c - if (howmny .eq. 'A') then -c -c %--------------------------------------------% -c | Compute the NCONV wanted eigenvectors of T | -c | located in workl(iuptri,ldq). | -c %--------------------------------------------% -c - do 30 j=1, ncv - if (j .le. nconv) then - select(j) = .true. - else - select(j) = .false. - end if - 30 continue -c - call strevc('Right', 'Select' , select , - & ncv , workl(iuptri), ldq , - & vl , 1 , workl(invsub), - & ldq , ncv , outncv , - & workev , ierr) -c - if (ierr .ne. 0) then - info = -9 - go to 9000 - end if -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | strevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; | -c %------------------------------------------------% -c - iconj = 0 - do 40 j=1, nconv -c - if ( workl(iheigi+j-1) .eq. zero ) then -c -c %----------------------% -c | real eigenvalue case | -c %----------------------% -c - temp = snrm2( ncv, workl(invsub+(j-1)*ldq), 1 ) - call sscal( ncv, one / temp, - & workl(invsub+(j-1)*ldq), 1 ) -c - else -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c | columns, we further normalize by the | -c | square root of two. | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - temp = slapy2(snrm2(ncv, - & workl(invsub+(j-1)*ldq), - & 1), - & snrm2(ncv, - & workl(invsub+j*ldq), - & 1)) - call sscal(ncv, one/temp, - & workl(invsub+(j-1)*ldq), 1 ) - call sscal(ncv, one/temp, - & workl(invsub+j*ldq), 1 ) - iconj = 1 - else - iconj = 0 - end if -c - end if -c - 40 continue -c - call sgemv('T', ncv, nconv, one, workl(invsub), - & ldq, workl(ihbds), 1, zero, workev, 1) -c - iconj = 0 - do 45 j=1, nconv - if (workl(iheigi+j-1) .ne. zero) then -c -c %-------------------------------------------% -c | Complex conjugate pair case. Note that | -c | since the real and imaginary part of | -c | the eigenvector are stored in consecutive | -c %-------------------------------------------% -c - if (iconj .eq. 0) then - workev(j) = slapy2(workev(j), workev(j+1)) - workev(j+1) = workev(j) - iconj = 1 - else - iconj = 0 - end if - end if - 45 continue -c - if (msglvl .gt. 2) then - call scopy(ncv, workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) - call svout(logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the eigenvector matrix for T') - if (msglvl .gt. 3) then - call smout(logfil, ncv, ncv, workl(invsub), ldq, - & ndigit, '_neupd: The eigenvector matrix for T') - end if - end if -c -c %---------------------------------------% -c | Copy Ritz estimates into workl(ihbds) | -c %---------------------------------------% -c - call scopy(nconv, workev, 1, workl(ihbds), 1) -c -c %---------------------------------------------------------% -c | Compute the QR factorization of the eigenvector matrix | -c | associated with leading portion of T in the first NCONV | -c | columns of workl(invsub,ldq). | -c %---------------------------------------------------------% -c - call sgeqr2(ncv, nconv , workl(invsub), - & ldq, workev, workev(ncv+1), - & ierr) -c -c %----------------------------------------------% -c | * Postmultiply Z by Q. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now contains the | -c | Ritz vectors associated with the Ritz values | -c | in workl(iheigr) and workl(iheigi). | -c %----------------------------------------------% -c - call sorm2r('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , z , - & ldz , workd(n+1) , ierr) -c - call strmm('Right' , 'Upper' , 'No transpose', - & 'Non-unit', n , nconv , - & one , workl(invsub), ldq , - & z , ldz) -c - end if -c - else -c -c %------------------------------------------------------% -c | An approximate invariant subspace is not needed. | -c | Place the Ritz values computed SNAUPD into DR and DI | -c %------------------------------------------------------% -c - call scopy(nconv, workl(ritzr), 1, dr, 1) - call scopy(nconv, workl(ritzi), 1, di, 1) - call scopy(nconv, workl(ritzr), 1, workl(iheigr), 1) - call scopy(nconv, workl(ritzi), 1, workl(iheigi), 1) - call scopy(nconv, workl(bounds), 1, workl(ihbds), 1) - end if -c -c %------------------------------------------------% -c | Transform the Ritz values and possibly vectors | -c | and corresponding error bounds of OP to those | -c | of A*x = lambda*B*x. | -c %------------------------------------------------% -c - if (type .eq. 'REGULR') then -c - if (rvec) - & call sscal(ncv, rnorm, workl(ihbds), 1) -c - else -c -c %---------------------------------------% -c | A spectral transformation was used. | -c | * Determine the Ritz estimates of the | -c | Ritz values in the original system. | -c %---------------------------------------% -c - if (type .eq. 'SHIFTI') then -c - if (rvec) - & call sscal(ncv, rnorm, workl(ihbds), 1) -c - do 50 k=1, ncv - temp = slapy2( workl(iheigr+k-1), - & workl(iheigi+k-1) ) - workl(ihbds+k-1) = abs( workl(ihbds+k-1) ) - & / temp / temp - 50 continue -c - else if (type .eq. 'REALPT') then -c - do 60 k=1, ncv - 60 continue -c - else if (type .eq. 'IMAGPT') then -c - do 70 k=1, ncv - 70 continue -c - end if -c -c %-----------------------------------------------------------% -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | For TYPE = 'REALPT' or 'IMAGPT' the user must from | -c | Rayleigh quotients or a projection. See remark 3 above.| -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c %-----------------------------------------------------------% -c - if (type .eq. 'SHIFTI') then -c - do 80 k=1, ncv - temp = slapy2( workl(iheigr+k-1), - & workl(iheigi+k-1) ) - workl(iheigr+k-1) = workl(iheigr+k-1)/temp/temp - & + sigmar - workl(iheigi+k-1) = -workl(iheigi+k-1)/temp/temp - & + sigmai - 80 continue -c - call scopy(nconv, workl(iheigr), 1, dr, 1) - call scopy(nconv, workl(iheigi), 1, di, 1) -c - else if (type .eq. 'REALPT' .or. type .eq. 'IMAGPT') then -c - call scopy(nconv, workl(iheigr), 1, dr, 1) - call scopy(nconv, workl(iheigi), 1, di, 1) -c - end if -c - end if -c - if (type .eq. 'SHIFTI' .and. msglvl .gt. 1) then - call svout(logfil, nconv, dr, ndigit, - & '_neupd: Untransformed real part of the Ritz valuess.') - call svout (logfil, nconv, di, ndigit, - & '_neupd: Untransformed imag part of the Ritz valuess.') - call svout(logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Ritz estimates of untransformed Ritz values.') - else if (type .eq. 'REGULR' .and. msglvl .gt. 1) then - call svout(logfil, nconv, dr, ndigit, - & '_neupd: Real parts of converged Ritz values.') - call svout (logfil, nconv, di, ndigit, - & '_neupd: Imag parts of converged Ritz values.') - call svout(logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Associated Ritz estimates.') - end if -c -c %-------------------------------------------------% -c | Eigenvector Purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 2. | -c %-------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A' .and. type .eq. 'SHIFTI') then -c -c %------------------------------------------------% -c | Purify the computed Ritz vectors by adding a | -c | little bit of the residual vector: | -c | T | -c | resid(:)*( e s ) / theta | -c | NCV | -c | where H s = s theta. Remember that when theta | -c | has nonzero imaginary part, the corresponding | -c | Ritz vector is stored across two columns of Z. | -c %------------------------------------------------% -c - iconj = 0 - do 110 j=1, nconv - if (workl(iheigi+j-1) .eq. zero) then - workev(j) = workl(invsub+(j-1)*ldq+ncv-1) / - & workl(iheigr+j-1) - else if (iconj .eq. 0) then - temp = slapy2( workl(iheigr+j-1), workl(iheigi+j-1) ) - workev(j) = ( workl(invsub+(j-1)*ldq+ncv-1) * - & workl(iheigr+j-1) + - & workl(invsub+j*ldq+ncv-1) * - & workl(iheigi+j-1) ) / temp / temp - workev(j+1) = ( workl(invsub+j*ldq+ncv-1) * - & workl(iheigr+j-1) - - & workl(invsub+(j-1)*ldq+ncv-1) * - & workl(iheigi+j-1) ) / temp / temp - iconj = 1 - else - iconj = 0 - end if - 110 continue -c -c %---------------------------------------% -c | Perform a rank one update to Z and | -c | purify all the Ritz vectors together. | -c %---------------------------------------% -c - call sger(n, nconv, one, resid, 1, workev, 1, z, ldz) -c - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of SNEUPD | -c %---------------% -c - end
--- a/libcruft/arpack/src/sngets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,231 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: sngets -c -c\Description: -c Given the eigenvalues of the upper Hessenberg matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: call this even in the case of user specified shifts in order -c to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call sngets -c ( ISHIFT, WHICH, KEV, NP, RITZR, RITZI, BOUNDS, SHIFTR, SHIFTI ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> want the KEV eigenvalues of largest magnitude. -c 'SM' -> want the KEV eigenvalues of smallest magnitude. -c 'LR' -> want the KEV eigenvalues of largest real part. -c 'SR' -> want the KEV eigenvalues of smallest real part. -c 'LI' -> want the KEV eigenvalues of largest imaginary part. -c 'SI' -> want the KEV eigenvalues of smallest imaginary part. -c -c KEV Integer. (INPUT/OUTPUT) -c INPUT: KEV+NP is the size of the matrix H. -c OUTPUT: Possibly increases KEV by one to keep complex conjugate -c pairs together. -c -c NP Integer. (INPUT/OUTPUT) -c Number of implicit shifts to be computed. -c OUTPUT: Possibly decreases NP by one to keep complex conjugate -c pairs together. -c -c RITZR, Real array of length KEV+NP. (INPUT/OUTPUT) -c RITZI On INPUT, RITZR and RITZI contain the real and imaginary -c parts of the eigenvalues of H. -c On OUTPUT, RITZR and RITZI are sorted so that the unwanted -c eigenvalues are in the first NP locations and the wanted -c portion is in the last KEV locations. When exact shifts are -c selected, the unwanted part corresponds to the shifts to -c be applied. Also, if ISHIFT .eq. 1, the unwanted eigenvalues -c are further sorted so that the ones with largest Ritz values -c are first. -c -c BOUNDS Real array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c SHIFTR, SHIFTI *** USE deprecated as of version 2.1. *** -c -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c ssortc ARPACK sorting routine. -c scopy Level 1 BLAS that copies one vector to another . -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: ngets.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. xxxx -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine sngets ( ishift, which, kev, np, ritzr, ritzi, bounds, - & shiftr, shifti ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & bounds(kev+np), ritzr(kev+np), ritzi(kev+np), - & shiftr(1), shifti(1) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0, zero = 0.0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy, ssortc, arscnd -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mngets -c -c %----------------------------------------------------% -c | LM, SM, LR, SR, LI, SI case. | -c | Sort the eigenvalues of H into the desired order | -c | and apply the resulting order to BOUNDS. | -c | The eigenvalues are sorted so that the wanted part | -c | are always in the last KEV locations. | -c | We first do a pre-processing sort in order to keep | -c | complex conjugate pairs together | -c %----------------------------------------------------% -c - if (which .eq. 'LM') then - call ssortc ('LR', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SM') then - call ssortc ('SR', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'LR') then - call ssortc ('LM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SR') then - call ssortc ('SM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'LI') then - call ssortc ('LM', .true., kev+np, ritzr, ritzi, bounds) - else if (which .eq. 'SI') then - call ssortc ('SM', .true., kev+np, ritzr, ritzi, bounds) - end if -c - call ssortc (which, .true., kev+np, ritzr, ritzi, bounds) -c -c %-------------------------------------------------------% -c | Increase KEV by one if the ( ritzr(np),ritzi(np) ) | -c | = ( ritzr(np+1),-ritzi(np+1) ) and ritz(np) .ne. zero | -c | Accordingly decrease NP by one. In other words keep | -c | complex conjugate pairs together. | -c %-------------------------------------------------------% -c - if ( ( ritzr(np+1) - ritzr(np) ) .eq. zero - & .and. ( ritzi(np+1) + ritzi(np) ) .eq. zero ) then - np = np - 1 - kev = kev + 1 - end if -c - if ( ishift .eq. 1 ) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when they shifts | -c | are applied in subroutine snapps. | -c | Be careful and use 'SR' since we want to sort BOUNDS! | -c %-------------------------------------------------------% -c - call ssortc ( 'SR', .true., np, bounds, ritzr, ritzi ) - end if -c - call arscnd (t1) - tngets = tngets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') - call svout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call svout (logfil, kev+np, ritzi, ndigit, - & '_ngets: Eigenvalues of current H matrix -- imag part') - call svout (logfil, kev+np, bounds, ndigit, - & '_ngets: Ritz estimates of the current KEV+NP Ritz values') - end if -c - return -c -c %---------------% -c | End of sngets | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,853 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step symmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in ssaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call ssaitr -c ( IDO, BMAT, N, K, NP, MODE, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and does not need to be -c recomputed in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of matrix B that defines the -c semi-inner product for the operator OP. See ssaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current order of H and the number of columns of V. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c MODE Integer. (INPUT) -c Signifies which form for "OP". If MODE=2 then -c a reduction in the number of B matrix vector multiplies -c is possible since the B-norm of OP*x is equivalent to -c the inv(B)-norm of A*x. -c -c RESID Real array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Real scalar. (INPUT/OUTPUT) -c On INPUT the B-norm of r_{k}. -c On OUTPUT the B-norm of the updated residual r_{k+p}. -c -c V Real N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (K+NP) by 2 array. (INPUT/OUTPUT) -c H is used to store the generated symmetric tridiagonal matrix -c with the subdiagonal in the first column starting at H(2,1) -c and the main diagonal in the second column. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On INPUT, WORKD(1:N) = B*RESID where RESID is associated -c with the K step Arnoldi factorization. Used to save some -c computation at the first step. -c On OUTPUT, WORKD(1:N) = B*RESID where RESID is associated -c with the K+NP step Arnoldi factorization. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of an invariant subspace of OP is found that is -c less than K + NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c sgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c smout ARPACK utility routine that prints matrices. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c slascl LAPACK routine for careful scaling of a matrix. -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c saxpy Level 1 BLAS that computes a vector triad. -c sscal Level 1 BLAS that scales a vector. -c scopy Level 1 BLAS that copies one vector to another . -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: saitr.F SID: 2.6 DATE OF SID: 8/28/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in ssaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c alphaj <- j-th component of w_{j} -c rnorm = || r_{j} || -c betaj+1 = rnorm -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssaitr - & (ido, bmat, n, k, np, mode, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, mode, np - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Real - & h(ldh,2), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer i, ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & infol, jj - Real - & rnorm1, wnorm, safmin, temp1 - save orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, - & rnorm1, safmin, wnorm -c -c %-----------------------% -c | Local Array Arguments | -c %-----------------------% -c - Real - & xtemp(2) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external saxpy, scopy, sscal, sgemv, sgetv0, svout, smout, - & slascl, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & sdot, snrm2, slamch - external sdot, snrm2, slamch -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then - first = .false. -c -c %--------------------------------% -c | safmin = safe minimum is such | -c | that 1/sfmin does not overflow | -c %--------------------------------% -c - safmin = slamch('safmin') - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. -c -c %--------------------------------% -c | Pointer to the current step of | -c | the factorization to build | -c %--------------------------------% -c - j = k + 1 -c -c %------------------------------------------% -c | Pointers used for reverse communication | -c | when using WORKD. | -c %------------------------------------------% -c - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | sgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %------------------------------% -c | Else this is the first step. | -c %------------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% -c - 1000 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: generating Arnoldi vector no.') - call svout (logfil, 1, rnorm, ndigit, - & '_saitr: B-norm of the current residual =') - end if -c -c %---------------------------------------------------------% -c | Check for exact zero. Equivalent to determing whether a | -c | j-step Arnoldi factorization is present. | -c %---------------------------------------------------------% -c - if (rnorm .gt. zero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: ****** restart at step ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call sgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tsaitr = tsaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call scopy (n, resid, 1, v(1,j), 1) - if (rnorm .ge. safmin) then - temp1 = one / rnorm - call sscal (n, temp1, v(1,j), 1) - call sscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine SLASCL | -c %-----------------------------------------% -c - call slascl ('General', i, i, rnorm, one, n, 1, - & v(1,j), n, infol) - call slascl ('General', i, i, rnorm, one, n, 1, - & workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call scopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %-----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j}. | -c %-----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) -c - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call scopy (n, workd(irj), 1, resid, 1) -c -c %-------------------------------------------% -c | STEP 4: Finish extending the symmetric | -c | Arnoldi to length j. If MODE = 2 | -c | then B*OP = B*inv(B)*A = A and | -c | we don't need to compute B*OP. | -c | NOTE: If MODE = 2 WORKD(IVJ:IVJ+N-1) is | -c | assumed to have A*v_{j}. | -c %-------------------------------------------% -c - if (mode .eq. 2) go to 65 - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy(n, resid, 1 , workd(ipj), 1) - end if - 60 continue -c -c %-----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j}. | -c %-----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - 65 continue - if (mode .eq. 2) then -c -c %----------------------------------% -c | Note that the B-norm of OP*v_{j} | -c | is the inv(B)-norm of A*v_{j}. | -c %----------------------------------% -c - wnorm = sdot (n, resid, 1, workd(ivj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'G') then - wnorm = sdot (n, resid, 1, workd(ipj), 1) - wnorm = sqrt(abs(wnorm)) - else if (bmat .eq. 'I') then - wnorm = snrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - if (mode .ne. 2 ) then - call sgemv('T', n, j, one, v, ldv, workd(ipj), 1, zero, - & workd(irj), 1) - else if (mode .eq. 2) then - call sgemv('T', n, j, one, v, ldv, workd(ivj), 1, zero, - & workd(irj), 1) - end if -c -c %--------------------------------------% -c | Orthgonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call sgemv('N', n, j, -one, v, ldv, workd(irj), 1, one, - & resid, 1) -c -c %--------------------------------------% -c | Extend H to have j rows and columns. | -c %--------------------------------------% -c - h(j,2) = workd(irj + j - 1) - if (j .eq. 1 .or. rstart) then - h(j,1) = zero - else - h(j,1) = rnorm - end if - call arscnd (t4) -c - orth1 = .true. - iter = 0 -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - rnorm = sdot (n, resid, 1, workd(ipj), 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = snrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c %-----------------------------------------------------------% -c - if (rnorm .gt. 0.717*wnorm) go to 100 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - xtemp(1) = wnorm - xtemp(2) = rnorm - call svout (logfil, 2, xtemp, ndigit, - & '_saitr: re-orthonalization ; wnorm and rnorm are') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call sgemv ('T', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %----------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) + | -c | v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j, but only | -c | H(j,j) is updated. | -c %----------------------------------------------% -c - call sgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) -c - if (j .eq. 1 .or. rstart) h(j,1) = zero - h(j,2) = h(j,2) + workd(irj + j - 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - rnorm1 = sdot (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt(abs(rnorm1)) - else if (bmat .eq. 'I') then - rnorm1 = snrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm - xtemp(2) = rnorm1 - call svout (logfil, 2, xtemp, ndigit, - & '_saitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if (rnorm1 .gt. 0.717*rnorm) then -c -c %--------------------------------% -c | No need for further refinement | -c %--------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = zero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %----------------------------------------------------------% -c | Make sure the last off-diagonal element is non negative | -c | If not perform a similarity transformation on H(1:j,1:j) | -c | and scale v(:,j) by -1. | -c %----------------------------------------------------------% -c - if (h(j,1) .lt. zero) then - h(j,1) = -h(j,1) - if ( j .lt. k+np) then - call sscal(n, -one, v(1,j+1), 1) - else - call sscal(n, -one, resid, 1) - end if - end if -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tsaitr = tsaitr + (t1 - t0) - ido = 99 -c - if (msglvl .gt. 1) then - call svout (logfil, k+np, h(1,2), ndigit, - & '_saitr: main diagonal of matrix H of step K+NP.') - if (k+np .gt. 1) then - call svout (logfil, k+np-1, h(2,1), ndigit, - & '_saitr: sub diagonal of matrix H of step K+NP.') - end if - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of ssaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,516 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP shifts implicitly resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix of order KEV+NP. Q is the product of -c rotations resulting from the NP bulge chasing sweeps. The updated Arnoldi -c factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call ssapps -c ( N, KEV, NP, SHIFT, V, LDV, H, LDH, RESID, Q, LDQ, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. dimension of matrix A. -c -c KEV Integer. (INPUT) -c INPUT: KEV+NP is the size of the input matrix H. -c OUTPUT: KEV is the size of the updated matrix HNEW. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFT Real array of length NP. (INPUT) -c The shifts to be applied. -c -c V Real N by (KEV+NP) array. (INPUT/OUTPUT) -c INPUT: V contains the current KEV+NP Arnoldi vectors. -c OUTPUT: VNEW = V(1:n,1:KEV); the updated Arnoldi vectors -c are in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (KEV+NP) by 2 array. (INPUT/OUTPUT) -c INPUT: H contains the symmetric tridiagonal matrix of the -c Arnoldi factorization with the subdiagonal in the 1st column -c starting at H(2,1) and the main diagonal in the 2nd column. -c OUTPUT: H contains the updated tridiagonal matrix in the -c KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Real array of length (N). (INPUT/OUTPUT) -c INPUT: RESID contains the the residual vector r_{k+p}. -c OUTPUT: RESID is the updated residual vector rnew_{k}. -c -c Q Real KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations during the bulge -c chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKD Real work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c slartg LAPACK Givens rotation construction routine. -c slacpy LAPACK matrix copy routine. -c slaset LAPACK matrix initialization routine. -c sgemv Level 2 BLAS routine for matrix vector multiplication. -c saxpy Level 1 BLAS that computes a vector triad. -c scopy Level 1 BLAS that copies one vector to another. -c sscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: sapps.F SID: 2.6 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the subblocks of -c the tridiagonal matrix H and not just to the submatrix that it -c comes from. This routine assumes that the subdiagonal elements -c of H that are stored in h(1:kev+np,1) are nonegative upon input -c and enforce this condition upon output. This version incorporates -c deflation. See code for documentation. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssapps - & ( n, kev, np, shift, v, ldv, h, ldh, resid, q, ldq, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & h(ldh,2), q(ldq,kev+np), resid(n), shift(np), - & v(ldv,kev+np), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, iend, istart, itop, j, jj, kplusp, msglvl - logical first - Real - & a1, a2, a3, a4, big, c, epsmch, f, g, r, s - save epsmch, first -c -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external saxpy, scopy, sscal, slacpy, slartg, slaset, svout, - & ivout, arscnd, sgemv -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch - external slamch -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then - epsmch = slamch('Epsilon-Machine') - first = .false. - end if - itop = 1 -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msapps -c - kplusp = kev + np -c -c %----------------------------------------------% -c | Initialize Q to the identity matrix of order | -c | kplusp used to accumulate the rotations. | -c %----------------------------------------------% -c - call slaset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------------------% -c | Apply the np shifts implicitly. Apply each shift to the | -c | whole matrix and not just to the submatrix from which it | -c | comes. | -c %----------------------------------------------------------% -c - do 90 jj = 1, np -c - istart = itop -c -c %----------------------------------------------------------% -c | Check for splitting and deflation. Currently we consider | -c | an off-diagonal element h(i+1,1) negligible if | -c | h(i+1,1) .le. epsmch*( |h(i,2)| + |h(i+1,2)| ) | -c | for i=1:KEV+NP-1. | -c | If above condition tests true then we set h(i+1,1) = 0. | -c | Note that h(1:KEV+NP,1) are assumed to be non negative. | -c %----------------------------------------------------------% -c - 20 continue -c -c %------------------------------------------------% -c | The following loop exits early if we encounter | -c | a negligible off diagonal element. | -c %------------------------------------------------% -c - do 30 i = istart, kplusp-1 - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_sapps: deflation at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_sapps: occured before shift number.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') - end if - h(i+1,1) = zero - iend = i - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (istart .lt. iend) then -c -c %--------------------------------------------------------% -c | Construct the plane rotation G'(istart,istart+1,theta) | -c | that attempts to drive h(istart+1,1) to zero. | -c %--------------------------------------------------------% -c - f = h(istart,2) - shift(jj) - g = h(istart+1,1) - call slartg (f, g, c, s, r) -c -c %-------------------------------------------------------% -c | Apply rotation to the left and right of H; | -c | H <- G' * H * G, where G = G(istart,istart+1,theta). | -c | This will create a "bulge". | -c %-------------------------------------------------------% -c - a1 = c*h(istart,2) + s*h(istart+1,1) - a2 = c*h(istart+1,1) + s*h(istart+1,2) - a4 = c*h(istart+1,2) - s*h(istart+1,1) - a3 = c*h(istart+1,1) - s*h(istart,2) - h(istart,2) = c*a1 + s*a2 - h(istart+1,2) = c*a4 - s*a3 - h(istart+1,1) = c*a3 + s*a4 -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 60 j = 1, min(istart+jj,kplusp) - a1 = c*q(j,istart) + s*q(j,istart+1) - q(j,istart+1) = - s*q(j,istart) + c*q(j,istart+1) - q(j,istart) = a1 - 60 continue -c -c -c %----------------------------------------------% -c | The following loop chases the bulge created. | -c | Note that the previous rotation may also be | -c | done within the following loop. But it is | -c | kept separate to make the distinction among | -c | the bulge chasing sweeps and the first plane | -c | rotation designed to drive h(istart+1,1) to | -c | zero. | -c %----------------------------------------------% -c - do 70 i = istart+1, iend-1 -c -c %----------------------------------------------% -c | Construct the plane rotation G'(i,i+1,theta) | -c | that zeros the i-th bulge that was created | -c | by G(i-1,i,theta). g represents the bulge. | -c %----------------------------------------------% -c - f = h(i,1) - g = s*h(i+1,1) -c -c %----------------------------------% -c | Final update with G(i-1,i,theta) | -c %----------------------------------% -c - h(i+1,1) = c*h(i+1,1) - call slartg (f, g, c, s, r) -c -c %-------------------------------------------% -c | The following ensures that h(1:iend-1,1), | -c | the first iend-2 off diagonal of elements | -c | H, remain non negative. | -c %-------------------------------------------% -c - if (r .lt. zero) then - r = -r - c = -c - s = -s - end if -c -c %--------------------------------------------% -c | Apply rotation to the left and right of H; | -c | H <- G * H * G', where G = G(i,i+1,theta) | -c %--------------------------------------------% -c - h(i,1) = r -c - a1 = c*h(i,2) + s*h(i+1,1) - a2 = c*h(i+1,1) + s*h(i+1,2) - a3 = c*h(i+1,1) - s*h(i,2) - a4 = c*h(i+1,2) - s*h(i+1,1) -c - h(i,2) = c*a1 + s*a2 - h(i+1,2) = c*a4 - s*a3 - h(i+1,1) = c*a3 + s*a4 -c -c %----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G | -c %----------------------------------------------------% -c - do 50 j = 1, min( i+jj, kplusp ) - a1 = c*q(j,i) + s*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = a1 - 50 continue -c - 70 continue -c - end if -c -c %--------------------------% -c | Update the block pointer | -c %--------------------------% -c - istart = iend + 1 -c -c %------------------------------------------% -c | Make sure that h(iend,1) is non-negative | -c | If not then set h(iend,1) <-- -h(iend,1) | -c | and negate the last column of Q. | -c | We have effectively carried out a | -c | similarity on transformation H | -c %------------------------------------------% -c - if (h(iend,1) .lt. zero) then - h(iend,1) = -h(iend,1) - call sscal(kplusp, -one, q(1,iend), 1) - end if -c -c %--------------------------------------------------------% -c | Apply the same shift to the next block if there is any | -c %--------------------------------------------------------% -c - if (iend .lt. kplusp) go to 20 -c -c %-----------------------------------------------------% -c | Check if we can increase the the start of the block | -c %-----------------------------------------------------% -c - do 80 i = itop, kplusp-1 - if (h(i+1,1) .gt. zero) go to 90 - itop = itop + 1 - 80 continue -c -c %-----------------------------------% -c | Finished applying the jj-th shift | -c %-----------------------------------% -c - 90 continue -c -c %------------------------------------------% -c | All shifts have been applied. Check for | -c | more possible deflation that might occur | -c | after the last shift is applied. | -c %------------------------------------------% -c - do 100 i = itop, kplusp-1 - big = abs(h(i,2)) + abs(h(i+1,2)) - if (h(i+1,1) .le. epsmch*big) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_sapps: deflation at row/column no.') - call svout (logfil, 1, h(i+1,1), ndigit, - & '_sapps: the corresponding off diagonal element') - end if - h(i+1,1) = zero - end if - 100 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is not necessary if h(kev+1,1) = 0. | -c %-------------------------------------------------% -c - if ( h(kev+1,1) .gt. zero ) - & call sgemv ('N', n, kplusp, one, v, ldv, - & q(1,kev+1), 1, zero, workd(n+1), 1) -c -c %-------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage that Q is an upper triangular matrix | -c | with lower bandwidth np. | -c | Place results in v(:,kplusp-kev:kplusp) temporarily. | -c %-------------------------------------------------------% -c - do 130 i = 1, kev - call sgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call scopy (n, workd, 1, v(1,kplusp-i+1), 1) - 130 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call slacpy ('All', n, kev, v(1,np+1), ldv, v, ldv) -c -c %--------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the | -c | appropriate place if h(kev+1,1) .ne. zero. | -c %--------------------------------------------% -c - if ( h(kev+1,1) .gt. zero ) - & call scopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kev+p}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call sscal (n, q(kplusp,kev), resid, 1) - if (h(kev+1,1) .gt. zero) - & call saxpy (n, h(kev+1,1), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call svout (logfil, 1, q(kplusp,kev), ndigit, - & '_sapps: sigmak of the updated residual vector') - call svout (logfil, 1, h(kev+1,1), ndigit, - & '_sapps: betak of the updated residual vector') - call svout (logfil, kev, h(1,2), ndigit, - & '_sapps: updated main diagonal of H for next iteration') - if (kev .gt. 1) then - call svout (logfil, kev-1, h(2,1), ndigit, - & '_sapps: updated sub diagonal of H for next iteration') - end if - end if -c - call arscnd (t1) - tsapps = tsapps + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of ssapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,850 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssaup2 -c -c\Description: -c Intermediate level interface called by ssaupd. -c -c\Usage: -c call ssaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZ, BOUNDS, Q, LDQ, WORKL, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in ssaupd. -c MODE, ISHIFT, MXITER: see the definition of IPARAM in ssaupd. -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi/Lanczos iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV since a leading block of the current -c upper Tridiagonal matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Real N by (NEV+NP) array. (INPUT/OUTPUT) -c The Lanczos basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Real (NEV+NP) by 2 array. (OUTPUT) -c H is used to store the generated symmetric tridiagonal matrix -c The subdiagonal is stored in the first column of H starting -c at H(2,1). The main diagonal is stored in the second column -c of H starting at H(1,2). If ssaup2 converges store the -c B-norm of the final residual vector in H(1,1). -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Real array of length NEV+NP. (OUTPUT) -c RITZ(1:NEV) contains the computed Ritz values of OP. -c -c BOUNDS Real array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to RITZ. -c -c Q Real (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Real array of length at least 3*(NEV+NP). (INPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in the computation of the -c tridiagonal eigenvalue problem, the calculation and -c application of the shifts and convergence checking. -c If ISHIFT .EQ. O and IDO .EQ. 3, the first NP locations -c of WORKL are used in reverse communication to hold the user -c supplied shifts. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Lanczos iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in one of -c the spectral transformation modes. X is the current -c operand. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Lanczos iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in ssaupd. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: All possible eigenvalues of OP has been found. -c NP returns the size of the invariant subspace -c spanning the operator OP. -c = 2: No shifts could be applied. -c = -8: Error return from trid. eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Lanczos factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c -c\Routines called: -c sgetv0 ARPACK initial vector generation routine. -c ssaitr ARPACK Lanczos factorization routine. -c ssapps ARPACK application of implicit shifts routine. -c ssconv ARPACK convergence of Ritz values routine. -c sseigt ARPACK compute Ritz values and error bounds routine. -c ssgets ARPACK reorder Ritz values and error bounds routine. -c ssortr ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c scopy Level 1 BLAS that copies one vector to another. -c sdot Level 1 BLAS that computes the scalar product of two vectors. -c snrm2 Level 1 BLAS that computes the norm of a vector. -c sscal Level 1 BLAS that scales a vector. -c sswap Level 1 BLAS that swaps two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.4' -c xx/xx/95: Version ' 2.4'. (R.B. Lehoucq) -c -c\SCCS Information: @(#) -c FILE: saup2.F SID: 2.7 DATE OF SID: 5/19/98 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritz, bounds, - & q, ldq, workl, ipntr, workd, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, ldh, ldq, ldv, mxiter, - & n, mode, nev, np - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Real - & bounds(nev+np), h(ldh,2), q(ldq,nev+np), resid(n), - & ritz(nev+np), v(ldv,nev+np), workd(3*n), - & workl(3*(nev+np)) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character wprime*2 - logical cnorm, getv0, initv, update, ushift - integer ierr, iter, j, kplusp, msglvl, nconv, nevbef, nev0, - & np0, nptemp, nevd2, nevm2, kp(3) - Real - & rnorm, temp, eps23 - save cnorm, getv0, initv, update, ushift, - & iter, kplusp, msglvl, nconv, nev0, np0, - & rnorm, eps23 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy, sgetv0, ssaitr, sscal, ssconv, sseigt, ssgets, - & ssapps, ssortr, svout, ivout, arscnd, sswap -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & sdot, snrm2, slamch - external sdot, snrm2, slamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msaup2 -c -c %---------------------------------% -c | Set machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0/3.0E+0) -c -c %-------------------------------------% -c | nev0 and np0 are integer variables | -c | hold the initial values of NEV & NP | -c %-------------------------------------% -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvlues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev0 + np0 - nconv = 0 - iter = 0 -c -c %--------------------------------------------% -c | Set flags for computing the first NEV steps | -c | of the Lanczos factorization. | -c %--------------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call sgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. zero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1200 - end if - getv0 = .false. - ido = 0 - end if -c -c %------------------------------------------------------------% -c | Back from reverse communication: continue with update step | -c %------------------------------------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Lanczos factorization | -c %----------------------------------------------------------% -c - call ssaitr (ido, bmat, n, 0, nev0, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then -c -c %-----------------------------------------------------% -c | ssaitr was unable to build an Lanczos factorization | -c | of length NEV0. INFO is returned with the size of | -c | the factorization built. Exit main loop. | -c %-----------------------------------------------------% -c - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N LANCZOS I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Lanczos | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_saup2: The length of the current Lanczos factorization') - call ivout (logfil, 1, np, ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if -c -c %------------------------------------------------------------% -c | Compute NP additional steps of the Lanczos factorization. | -c %------------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call ssaitr (ido, bmat, n, nev, np, mode, resid, rnorm, v, - & ldv, h, ldh, ipntr, workd, info) -c -c %---------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP and possibly B | -c %---------------------------------------------------% -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then -c -c %-----------------------------------------------------% -c | ssaitr was unable to build an Lanczos factorization | -c | of length NEV0+NP0. INFO is returned with the size | -c | of the factorization built. Exit main loop. | -c %-----------------------------------------------------% -c - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call svout (logfil, 1, rnorm, ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current symmetric tridiagonal matrix. | -c %--------------------------------------------------------% -c - call sseigt (rnorm, kplusp, h, ldh, ritz, bounds, workl, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %----------------------------------------------------% -c | Make a copy of eigenvalues and corresponding error | -c | bounds obtained from _seigt. | -c %----------------------------------------------------% -c - call scopy(kplusp, ritz, 1, workl(kplusp+1), 1) - call scopy(kplusp, bounds, 1, workl(2*kplusp+1), 1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The selection is based on the requested number of | -c | eigenvalues instead of the current NEV and NP to | -c | prevent possible misconvergence. | -c | * Wanted Ritz values := RITZ(NP+1:NEV+NP) | -c | * Shifts := RITZ(1:NP) := WORKL(1:NP) | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 - call ssgets (ishift, which, nev, np, ritz, bounds, workl) -c -c %-------------------% -c | Convergence test. | -c %-------------------% -c - call scopy (nev, bounds(np+1), 1, workl(np+1), 1) - call ssconv (nev, ritz(np+1), workl(np+1), tol, nconv) -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = nconv - call ivout (logfil, 3, kp, ndigit, - & '_saup2: NEV, NP, NCONV are') - call svout (logfil, kplusp, ritz, ndigit, - & '_saup2: The eigenvalues of H') - call svout (logfil, kplusp, bounds, ndigit, - & '_saup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. nev0) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP since we don't want to | -c | swap overlapping locations. | -c %------------------------------------------------% -c - if (which .eq. 'BE') then -c -c %-----------------------------------------------------% -c | Both ends of the spectrum are requested. | -c | Sort the eigenvalues into algebraically decreasing | -c | order first then swap low end of the spectrum next | -c | to high end in appropriate locations. | -c | NOTE: when np < floor(nev/2) be careful not to swap | -c | overlapping locations. | -c %-----------------------------------------------------% -c - wprime = 'SA' - call ssortr (wprime, .true., kplusp, ritz, bounds) - nevd2 = nev0 / 2 - nevm2 = nev0 - nevd2 - if ( nev .gt. 1 ) then - call sswap ( min(nevd2,np), ritz(nevm2+1), 1, - & ritz( max(kplusp-nevd2+1,kplusp-np+1) ), 1) - call sswap ( min(nevd2,np), bounds(nevm2+1), 1, - & bounds( max(kplusp-nevd2+1,kplusp-np+1)), 1) - end if -c - else -c -c %--------------------------------------------------% -c | LM, SM, LA, SA case. | -c | Sort the eigenvalues of H into the an order that | -c | is opposite to WHICH, and apply the resulting | -c | order to BOUNDS. The eigenvalues are sorted so | -c | that the wanted part are always within the first | -c | NEV locations. | -c %--------------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LA') wprime = 'SA' - if (which .eq. 'SA') wprime = 'LA' -c - call ssortr (wprime, .true., kplusp, ritz, bounds) -c - end if -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23,magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, nev0 - temp = max( eps23, abs(ritz(j)) ) - bounds(j) = bounds(j)/temp - 35 continue -c -c %----------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | esitmates. This will push all the converged ones | -c | towards the front of ritzr, ritzi, bounds | -c | (in the case when NCONV < NEV.) | -c %----------------------------------------------------% -c - wprime = 'LA' - call ssortr(wprime, .true., nev0, bounds, ritz) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, nev0 - temp = max( eps23, abs(ritz(j)) ) - bounds(j) = bounds(j)*temp - 40 continue -c -c %--------------------------------------------------% -c | Sort the "converged" Ritz values again so that | -c | the "threshold" values and their associated Ritz | -c | estimates appear at the appropriate position in | -c | ritz and bound. | -c %--------------------------------------------------% -c - if (which .eq. 'BE') then -c -c %------------------------------------------------% -c | Sort the "converged" Ritz values in increasing | -c | order. The "threshold" values are in the | -c | middle. | -c %------------------------------------------------% -c - wprime = 'LA' - call ssortr(wprime, .true., nconv, ritz, bounds) -c - else -c -c %----------------------------------------------% -c | In LM, SM, LA, SA case, sort the "converged" | -c | Ritz values according to WHICH so that the | -c | "threshold" value appears at the front of | -c | ritz. | -c %----------------------------------------------% - - call ssortr(which, .true., nconv, ritz, bounds) -c - end if -c -c %------------------------------------------% -c | Use h( 1,1 ) as storage to communicate | -c | rnorm to _seupd if needed | -c %------------------------------------------% -c - h(1,1) = rnorm -c - if (msglvl .gt. 1) then - call svout (logfil, kplusp, ritz, ndigit, - & '_saup2: Sorted Ritz values.') - call svout (logfil, kplusp, bounds, ndigit, - & '_saup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. nev) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. nev0) info = 2 -c - np = nconv - go to 1100 -c - else if (nconv .lt. nev .and. ishift .eq. 1) then -c -c %---------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the number | -c | of Ritz values and the shifts. | -c %---------------------------------------------------% -c - nevbef = nev - nev = nev + min (nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 2) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call ssgets (ishift, which, nev, np, ritz, bounds, - & workl) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_saup2: NEV and NP are') - call svout (logfil, nev, ritz(np+1), ndigit, - & '_saup2: "wanted" Ritz values.') - call svout (logfil, nev, bounds(np+1), ndigit, - & '_saup2: Ritz estimates of the "wanted" values ') - end if - end if - -c - if (ishift .eq. 0) then -c -c %-----------------------------------------------------% -c | User specified shifts: reverse communication to | -c | compute the shifts. They are returned in the first | -c | NP locations of WORKL. | -c %-----------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if -c - 50 continue -c -c %------------------------------------% -c | Back from reverse communication; | -c | User specified shifts are returned | -c | in WORKL(1:*NP) | -c %------------------------------------% -c - ushift = .false. -c -c -c %---------------------------------------------------------% -c | Move the NP shifts to the first NP locations of RITZ to | -c | free up WORKL. This is for the non-exact shift case; | -c | in the exact shift case, ssgets already handles this. | -c %---------------------------------------------------------% -c - if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_saup2: The number of shifts to apply ') - call svout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') - if (ishift .eq. 1) then - call svout (logfil, np, bounds, ndigit, - & '_saup2: corresponding Ritz estimates') - end if - end if -c -c %---------------------------------------------------------% -c | Apply the NP0 implicit shifts by QR bulge chasing. | -c | Each shift is applied to the entire tridiagonal matrix. | -c | The first 2*N locations of WORKD are used as workspace. | -c | After ssapps is done, we have a Lanczos | -c | factorization of length NEV. | -c %---------------------------------------------------------% -c - call ssapps (n, nev, np, ritz, v, ldv, h, ldh, resid, q, ldq, - & workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to ssaitr. | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call scopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call scopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - rnorm = sdot (n, resid, 1, workd, 1) - rnorm = sqrt(abs(rnorm)) - else if (bmat .eq. 'I') then - rnorm = snrm2(n, resid, 1) - end if - cnorm = .false. - 130 continue -c - if (msglvl .gt. 2) then - call svout (logfil, 1, rnorm, ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call svout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') - call svout (logfil, nev-1, h(2,1), ndigit, - & '_saup2: subdiagonal of compressed H matrix') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = nconv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error exit | -c %------------% -c - call arscnd (t1) - tsaup2 = t1 - t0 -c - 9000 continue - return -c -c %---------------% -c | End of ssaup2 | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,690 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssaupd -c -c\Description: -c -c Reverse communication interface for the Implicitly Restarted Arnoldi -c Iteration. For symmetric problems this reduces to a variant of the Lanczos -c method. This method has been designed to compute approximations to a -c few eigenpairs of a linear operator OP that is real and symmetric -c with respect to a real positive semi-definite symmetric matrix B, -c i.e. -c -c B*OP = (OP`)*B. -c -c Another way to express this condition is -c -c < x,OPy > = < OPx,y > where < z,w > = z`Bw . -c -c In the standard eigenproblem B is the identity matrix. -c ( A` denotes transpose of A) -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c ssaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x, A symmetric -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, A symmetric, M symmetric positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: K*x = lambda*M*x, K symmetric, M symmetric positive semi-definite -c ===> OP = (inv[K - sigma*M])*M and B = M. -c ===> Shift-and-Invert mode -c -c Mode 4: K*x = lambda*KG*x, K symmetric positive semi-definite, -c KG symmetric indefinite -c ===> OP = (inv[K - sigma*KG])*K and B = K. -c ===> Buckling mode -c -c Mode 5: A*x = lambda*M*x, A symmetric, M symmetric positive semi-definite -c ===> OP = inv[A - sigma*M]*[A + sigma*M] and B = M. -c ===> Cayley transformed mode -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call ssaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to ssaupd. IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c ssaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c (If Mode = 2 see remark 5 below) -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3,4 and 5, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute the IPARAM(8) shifts where -c IPNTR(11) is the pointer into WORKL for -c placing the shifts. See remark 6 below. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c Specify which of the Ritz values of OP to compute. -c -c 'LA' - compute the NEV largest (algebraic) eigenvalues. -c 'SA' - compute the NEV smallest (algebraic) eigenvalues. -c 'LM' - compute the NEV largest (in magnitude) eigenvalues. -c 'SM' - compute the NEV smallest (in magnitude) eigenvalues. -c 'BE' - compute NEV eigenvalues, half from each end of the -c spectrum. When NEV is odd, compute one more from the -c high end than from the low end. -c (see remark 1 below) -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N. -c -c TOL Real scalar. (INPUT) -c Stopping criterion: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)). -c If TOL .LE. 0. is passed a default is set: -c DEFAULT = SLAMCH('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine SLAMCH). -c -c RESID Real array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V (less than or equal to N). -c This will indicate how many Lanczos vectors are generated -c at each iteration. After the startup phase in which NEV -c Lanczos vectors are generated, the algorithm generates -c NCV-NEV Lanczos vectors at each subsequent update iteration. -c Most of the cost in generating each Lanczos vector is in the -c matrix-vector product OP*x. (See remark 4 below). -c -c V Real N by NCV array. (OUTPUT) -c The NCV columns of V contain the Lanczos basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to restart -c the Arnoldi iteration in an implicit fashion. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are provided by the user via -c reverse communication. The NCV eigenvalues of -c the current tridiagonal matrix T are returned in -c the part of WORKL array corresponding to RITZ. -c See remark 6 below. -c ISHIFT = 1: exact shifts with respect to the reduced -c tridiagonal matrix T. This is equivalent to -c restarting the iteration with a starting vector -c that is a linear combination of Ritz vectors -c associated with the "wanted" Ritz values. -c ------------------------------------------------------------- -c -c IPARAM(2) = LEVEC -c No longer referenced. See remark 2 below. -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3,4,5; See under \Description of ssaupd for the -c five modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), ssaupd returns NP, the number -c of shifts the user is to provide. 0 < NP <=NCV-NEV. See Remark -c 6 below. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 11. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Lanczos iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by 2 tridiagonal matrix T in WORKL. -c IPNTR(6): pointer to the NCV RITZ values array in WORKL. -c IPNTR(7): pointer to the Ritz estimates in array WORKL associated -c with the Ritz values located in RITZ in WORKL. -c IPNTR(11): pointer to the NP shifts in WORKL. See Remark 6 below. -c -c Note: IPNTR(8:10) is only referenced by sseupd. See Remark 2. -c IPNTR(8): pointer to the NCV RITZ values of the original system. -c IPNTR(9): pointer to the NCV corresponding error bounds. -c IPNTR(10): pointer to the NCV by NCV matrix of eigenvectors -c of the tridiagonal matrix T. Only referenced by -c sseupd if RVEC = .TRUE. See Remarks. -c ------------------------------------------------------------- -c -c WORKD Real work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration. Upon termination -c WORKD(1:N) contains B*RESID(1:N). If the Ritz vectors are desired -c subroutine sseupd uses this output. -c See Data Distribution Note below. -c -c WORKL Real work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least NCV**2 + 8*NCV . -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV must be greater than NEV and less than or equal to N. -c = -4: The maximum number of Arnoldi update iterations allowed -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LA', 'SA' or 'BE'. -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array WORKL is not sufficient. -c = -8: Error return from trid. eigenvalue calculation; -c Informatinal error from LAPACK routine ssteqr. -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4,5. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatable. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -13: NEV and WHICH = 'BE' are incompatable. -c = -9999: Could not build an Arnoldi factorization. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. The user is advised to check that -c enough workspace and array storage has been allocated. -c -c -c\Remarks -c 1. The converged Ritz values are always returned in ascending -c algebraic order. The computed Ritz values are approximate -c eigenvalues of OP. The selection of WHICH should be made -c with this in mind when Mode = 3,4,5. After convergence, -c approximate eigenvalues of the original problem may be obtained -c with the ARPACK subroutine sseupd. -c -c 2. If the Ritz vectors corresponding to the converged Ritz values -c are needed, the user must call sseupd immediately following completion -c of ssaupd. This is new starting with version 2.1 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requrement is that NCV > NEV. -c However, it is recommended that NCV .ge. 2*NEV. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c -c 5. If IPARAM(7) = 2 then in the Reverse commuication interface the user -c must do the following. When IDO = 1, Y = OP * X is to be computed. -c When IPARAM(7) = 2 OP = inv(B)*A. After computing A*X the user -c must overwrite X with A*X. Y is then the solution to the linear set -c of equations B*Y = A*X. -c -c 6. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) shifts in locations: -c 1 WORKL(IPNTR(11)) -c 2 WORKL(IPNTR(11)+1) -c . -c . -c . -c NP WORKL(IPNTR(11)+NP-1). -c -c The eigenvalues of the current tridiagonal matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1). They are in the -c order defined by WHICH. The associated Ritz estimates are located in -c WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c REAL RESID(N), V(LDV,NCV), WORKD(3*N), WORKL(LWORKL) -c DECOMPOSE D1(N), D2(N,NCV) -c ALIGN RESID(I) with D1(I) -c ALIGN V(I,J) with D2(I,J) -c ALIGN WORKD(I) with D1(I) range (1:N) -c ALIGN WORKD(I) with D1(I-N) range (N+1:2*N) -c ALIGN WORKD(I) with D1(I-2*N) range (2*N+1:3*N) -c DISTRIBUTE D1(BLOCK), D2(BLOCK,:) -c REPLICATED WORKL(LWORKL) -c -c Cray MPP syntax: -c =============== -c REAL RESID(N), V(LDV,NCV), WORKD(N,3), WORKL(LWORKL) -c SHARED RESID(BLOCK), V(BLOCK,:), WORKD(BLOCK,:) -c REPLICATED WORKL(LWORKL) -c -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c 8. R.B. Lehoucq, D.C. Sorensen, "Implementation of Some Spectral -c Transformations in a k-Step Arnoldi Method". In Preparation. -c -c\Routines called: -c ssaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c sstats ARPACK routine that initialize timing and other statistics -c variables. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c slamch LAPACK routine that determines machine constants. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: saupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(11) - Real - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0 , zero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, msglvl, mxiter, mode, nb, - & nev0, next, np, ritz, j - save bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, msglvl, mxiter, mode, nb, - & nev0, next, np, ritz -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external ssaup2, svout, ivout, arscnd, sstats -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slamch - external slamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call sstats - call arscnd (t0) - msglvl = msaupd -c - ierr = 0 - ishift = iparam(1) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c -c %----------------% -c | Error checking | -c %----------------% -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev .or. ncv .gt. n) then - ierr = -3 - end if -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c %----------------------------------------------% -c - np = ncv - nev -c - if (mxiter .le. 0) ierr = -4 - if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LA' .and. - & which .ne. 'SA' .and. - & which .ne. 'BE') ierr = -5 - if (bmat .ne. 'I' .and. bmat .ne. 'G') ierr = -6 -c - if (lworkl .lt. ncv**2 + 8*ncv) ierr = -7 - if (mode .lt. 1 .or. mode .gt. 5) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - else if (ishift .lt. 0 .or. ishift .gt. 1) then - ierr = -12 - else if (nev .eq. 1 .and. which .eq. 'BE') then - ierr = -13 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. zero) tol = slamch('EpsMach') -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, ncv**2 + 8*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:2*ncv) := generated tridiagonal matrix | -c | workl(2*ncv+1:2*ncv+ncv) := ritz values | -c | workl(3*ncv+1:3*ncv+ncv) := computed error bounds | -c | workl(4*ncv+1:4*ncv+ncv*ncv) := rotation matrix Q | -c | workl(4*ncv+ncv*ncv+1:7*ncv+ncv*ncv) := workspace | -c %-------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritz = ih + 2*ldh - bounds = ritz + ncv - iq = bounds + ncv - iw = iq + ncv**2 - next = iw + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritz - ipntr(7) = bounds - ipntr(11) = iw - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Lanczos Iteration. | -c %-------------------------------------------------------% -c - call ssaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritz), - & workl(bounds), workl(iq), ldq, workl(iw), ipntr, workd, - & info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP or shifts. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within ssaup2. | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_saupd: number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_saupd: number of "converged" Ritz values') - call svout (logfil, np, workl(Ritz), ndigit, - & '_saupd: final Ritz values') - call svout (logfil, np, workl(Bounds), ndigit, - & '_saupd: corresponding error bounds') - end if -c - call arscnd (t1) - tsaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tsaupd, tsaup2, tsaitr, titref, - & tgetv0, tseigt, tsgets, tsapps, tsconv - 1000 format (//, - & 5x, '==========================================',/ - & 5x, '= Symmetric implicit Arnoldi update code =',/ - & 5x, '= Version Number:', ' 2.4' , 19x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 14x, ' =',/ - & 5x, '==========================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '==========================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in saup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in trid eigenvalue subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of ssaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssconv.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssconv -c -c\Description: -c Convergence testing for the symmetric Arnoldi eigenvalue routine. -c -c\Usage: -c call ssconv -c ( N, RITZ, BOUNDS, TOL, NCONV ) -c -c\Arguments -c N Integer. (INPUT) -c Number of Ritz values to check for convergence. -c -c RITZ Real array of length N. (INPUT) -c The Ritz values to be checked for convergence. -c -c BOUNDS Real array of length N. (INPUT) -c Ritz estimates associated with the Ritz values in RITZ. -c -c TOL Real scalar. (INPUT) -c Desired relative accuracy for a Ritz value to be considered -c "converged". -c -c NCONV Integer scalar. (OUTPUT) -c Number of "converged" Ritz values. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c slamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: sconv.F SID: 2.4 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\Remarks -c 1. Starting with version 2.4, this routine no longer uses the -c Parlett strategy using the gap conditions. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssconv (n, ritz, bounds, tol, nconv) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer n, nconv - Real - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & ritz(n), bounds(n) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i - Real - & temp, eps23 -c -c %-------------------% -c | External routines | -c %-------------------% -c - Real - & slamch - external slamch - -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic abs -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - call arscnd (t0) -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0) -c - nconv = 0 - do 10 i = 1, n -c -c %-----------------------------------------------------% -c | The i-th Ritz value is considered "converged" | -c | when: bounds(i) .le. TOL*max(eps23, abs(ritz(i))) | -c %-----------------------------------------------------% -c - temp = max( eps23, abs(ritz(i)) ) - if ( bounds(i) .le. tol*temp ) then - nconv = nconv + 1 - end if -c - 10 continue -c - call arscnd (t1) - tsconv = tsconv + (t1 - t0) -c - return -c -c %---------------% -c | End of ssconv | -c %---------------% -c - end
--- a/libcruft/arpack/src/sseigt.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: sseigt -c -c\Description: -c Compute the eigenvalues of the current symmetric tridiagonal matrix -c and the corresponding error bounds given the current residual norm. -c -c\Usage: -c call sseigt -c ( RNORM, N, H, LDH, EIG, BOUNDS, WORKL, IERR ) -c -c\Arguments -c RNORM Real scalar. (INPUT) -c RNORM contains the residual norm corresponding to the current -c symmetric tridiagonal matrix H. -c -c N Integer. (INPUT) -c Size of the symmetric tridiagonal matrix H. -c -c H Real N by 2 array. (INPUT) -c H contains the symmetric tridiagonal matrix with the -c subdiagonal in the first column starting at H(2,1) and the -c main diagonal in second column. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c EIG Real array of length N. (OUTPUT) -c On output, EIG contains the N eigenvalues of H possibly -c unsorted. The BOUNDS arrays are returned in the -c same sorted order as EIG. -c -c BOUNDS Real array of length N. (OUTPUT) -c On output, BOUNDS contains the error estimates corresponding -c to the eigenvalues EIG. This is equal to RNORM times the -c last components of the eigenvectors corresponding to the -c eigenvalues in EIG. -c -c WORKL Real work array of length 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c IERR Integer. (OUTPUT) -c Error exit flag from sstqrb. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c sstqrb ARPACK routine that computes the eigenvalues and the -c last components of the eigenvectors of a symmetric -c and tridiagonal matrix. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c scopy Level 1 BLAS that copies one vector to another. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.4' -c -c\SCCS Information: @(#) -c FILE: seigt.F SID: 2.4 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine sseigt - & ( rnorm, n, h, ldh, eig, bounds, workl, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, ldh, n - Real - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & eig(n), bounds(n), h(ldh,2), workl(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & zero - parameter (zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, k, msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy, sstqrb, svout, arscnd -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mseigt -c - if (msglvl .gt. 0) then - call svout (logfil, n, h(1,2), ndigit, - & '_seigt: main diagonal of matrix H') - if (n .gt. 1) then - call svout (logfil, n-1, h(2,1), ndigit, - & '_seigt: sub diagonal of matrix H') - end if - end if -c - call scopy (n, h(1,2), 1, eig, 1) - call scopy (n-1, h(2,1), 1, workl, 1) - call sstqrb (n, eig, workl, bounds, workl(n+1), ierr) - if (ierr .ne. 0) go to 9000 - if (msglvl .gt. 1) then - call svout (logfil, n, bounds, ndigit, - & '_seigt: last row of the eigenvector matrix for H') - end if -c -c %-----------------------------------------------% -c | Finally determine the error bounds associated | -c | with the n Ritz values of H. | -c %-----------------------------------------------% -c - do 30 k = 1, n - bounds(k) = rnorm*abs(bounds(k)) - 30 continue -c - call arscnd (t1) - tseigt = tseigt + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of sseigt | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssesrt.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,217 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssesrt -c -c\Description: -c Sort the array X in the order specified by WHICH and optionally -c apply the permutation to the columns of the matrix A. -c -c\Usage: -c call ssesrt -c ( WHICH, APPLY, N, X, NA, A, LDA) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> X is sorted into increasing order of magnitude. -c 'SM' -> X is sorted into decreasing order of magnitude. -c 'LA' -> X is sorted into increasing order of algebraic. -c 'SA' -> X is sorted into decreasing order of algebraic. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to A. -c APPLY = .FALSE. -> do not apply the sorted order to A. -c -c N Integer. (INPUT) -c Dimension of the array X. -c -c X Real array of length N. (INPUT/OUTPUT) -c The array to be sorted. -c -c NA Integer. (INPUT) -c Number of rows of the matrix A. -c -c A Real array of length NA by N. (INPUT/OUTPUT) -c -c LDA Integer. (INPUT) -c Leading dimension of A. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines -c sswap Level 1 BLAS that swaps the contents of two vectors. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.1'. -c Adapted from the sort routine in LANSO and -c the ARPACK code ssortr -c -c\SCCS Information: @(#) -c FILE: sesrt.F SID: 2.3 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssesrt (which, apply, n, x, na, a, lda) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer lda, n, na -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & x(0:n-1), a(lda, 0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Real - & temp -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external sswap -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'SA') then -c -c X is sorted into decreasing order of algebraic. -c - 10 continue - if (igap .eq. 0) go to 9000 - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - if (x(j).lt.x(j+igap)) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call sswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 30 - endif - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c X is sorted into decreasing order of magnitude. -c - 40 continue - if (igap .eq. 0) go to 9000 - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j.lt.0) go to 60 -c - if (abs(x(j)).lt.abs(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call sswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LA') then -c -c X is sorted into increasing order of algebraic. -c - 70 continue - if (igap .eq. 0) go to 9000 - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (x(j).gt.x(j+igap)) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call sswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'LM') then -c -c X is sorted into increasing order of magnitude. -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (abs(x(j)).gt.abs(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp - if (apply) call sswap( na, a(1, j), 1, a(1,j+igap), 1) - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 - end if -c - 9000 continue - return -c -c %---------------% -c | End of ssesrt | -c %---------------% -c - end
--- a/libcruft/arpack/src/sseupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,857 +0,0 @@ -c\BeginDoc -c -c\Name: sseupd -c -c\Description: -c -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) the corresponding approximate eigenvectors, -c -c (2) an orthonormal (Lanczos) basis for the associated approximate -c invariant subspace, -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c (Lanczos) basis is always computed. There is an additional storage cost -c of n*nev if both are requested (in this case a separate array Z must be -c supplied). -c -c These quantities are obtained from the Lanczos factorization computed -c by SSAUPD for the linear operator OP prescribed by the MODE selection -c (see IPARAM(7) in SSAUPD documentation.) SSAUPD must be called before -c this routine is called. These approximate eigenvalues and vectors are -c commonly called Ritz values and Ritz vectors respectively. They are -c referred to as such in the comments that follow. The computed orthonormal -c basis for the invariant subspace corresponding to these Ritz values is -c referred to as a Lanczos basis. -c -c See documentation in the header of the subroutine SSAUPD for a definition -c of OP as well as other terms and the relation of computed Ritz values -c and vectors of OP with respect to the given problem A*z = lambda*B*z. -c -c The approximate eigenvalues of the original problem are returned in -c ascending algebraic order. The user may elect to call this routine -c once for each desired Ritz vector and store it peripherally if desired. -c There is also the option of computing a selected set of these vectors -c with a single call. -c -c\Usage: -c call sseupd -c ( RVEC, HOWMNY, SELECT, D, Z, LDZ, SIGMA, BMAT, N, WHICH, NEV, TOL, -c RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, WORKL, LWORKL, INFO ) -c -c RVEC LOGICAL (INPUT) -c Specifies whether Ritz vectors corresponding to the Ritz value -c approximations to the eigenproblem A*z = lambda*B*z are computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute Ritz vectors. -c -c HOWMNY Character*1 (INPUT) -c Specifies how many Ritz vectors are wanted and the form of Z -c the matrix of Ritz vectors. See remark 1 below. -c = 'A': compute NEV Ritz vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT/WORKSPACE) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value D(j), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' , SELECT is used as a workspace for -c reordering the Ritz values. -c -c D Real array of dimension NEV. (OUTPUT) -c On exit, D contains the Ritz value approximations to the -c eigenvalues of A*z = lambda*B*z. The values are returned -c in ascending order. If IPARAM(7) = 3,4,5 then D represents -c the Ritz values of OP computed by ssaupd transformed to -c those of the original eigensystem A*z = lambda*B*z. If -c IPARAM(7) = 1,2 then the Ritz values of OP are the same -c as the those of A*z = lambda*B*z. -c -c Z Real N by NEV array if HOWMNY = 'A'. (OUTPUT) -c On exit, Z contains the B-orthonormal Ritz vectors of the -c eigensystem A*z = lambda*B*z corresponding to the Ritz -c value approximations. -c If RVEC = .FALSE. then Z is not referenced. -c NOTE: The array Z may be set equal to first NEV columns of the -c Arnoldi/Lanczos basis array V computed by SSAUPD. -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ .ge. max( 1, N ). In any case, LDZ .ge. 1. -c -c SIGMA Real (INPUT) -c If IPARAM(7) = 3,4,5 represents the shift. Not referenced if -c IPARAM(7) = 1 or 2. -c -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to SSAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, INFO -c -c must be passed directly to SSEUPD following the last call -c to SSAUPD. These arguments MUST NOT BE MODIFIED between -c the the last call to SSAUPD and the call to SSEUPD. -c -c Two of these parameters (WORKL, INFO) are also output parameters: -c -c WORKL Real work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:4*ncv) contains information obtained in -c ssaupd. They are not changed by sseupd. -c WORKL(4*ncv+1:ncv*ncv+8*ncv) holds the -c untransformed Ritz values, the computed error estimates, -c and the associated eigenvector matrix of H. -c -c Note: IPNTR(8:10) contains the pointer into WORKL for addresses -c of the above information computed by sseupd. -c ------------------------------------------------------------- -c IPNTR(8): pointer to the NCV RITZ values of the original system. -c IPNTR(9): pointer to the NCV corresponding error bounds. -c IPNTR(10): pointer to the NCV by NCV matrix of eigenvectors -c of the tridiagonal matrix T. Only referenced by -c sseupd if RVEC = .TRUE. See Remarks. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c = 0: Normal exit. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV must be greater than NEV and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LA', 'SA' or 'BE'. -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from trid. eigenvalue calculation; -c Information error from LAPACK routine ssteqr. -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3,4,5. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: NEV and WHICH = 'BE' are incompatible. -c = -14: SSAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: HOWMNY must be one of 'A' or 'S' if RVEC = .true. -c = -16: HOWMNY = 'S' not yet implemented -c = -17: SSEUPD got a different count of the number of converged -c Ritz values than SSAUPD got. This indicates the user -c probably made an error in passing data from SSAUPD to -c SSEUPD or that the data was modified before entering -c SSEUPD. -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett, "The Symmetric Eigenvalue Problem". Prentice-Hall, -c 1980. -c 4. B.N. Parlett, B. Nour-Omid, "Towards a Black Box Lanczos Program", -c Computer Physics Communications, 53 (1989), pp 169-179. -c 5. B. Nour-Omid, B.N. Parlett, T. Ericson, P.S. Jensen, "How to -c Implement the Spectral Transformation", Math. Comp., 48 (1987), -c pp 663-673. -c 6. R.G. Grimes, J.G. Lewis and H.D. Simon, "A Shifted Block Lanczos -c Algorithm for Solving Sparse Symmetric Generalized Eigenproblems", -c SIAM J. Matr. Anal. Apps., January (1993). -c 7. L. Reichel, W.B. Gragg, "Algorithm 686: FORTRAN Subroutines -c for Updating the QR decomposition", ACM TOMS, December 1990, -c Volume 16 Number 4, pp 369-377. -c -c\Remarks -c 1. The converged Ritz values are always returned in increasing -c (algebraic) order. -c -c 2. Currently only HOWMNY = 'A' is implemented. It is included at this -c stage for the user who wants to incorporate it. -c -c\Routines called: -c ssesrt ARPACK routine that sorts an array X, and applies the -c corresponding permutation to a matrix A. -c ssortr ssortr ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c svout ARPACK utility routine that prints vectors. -c sgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c slacpy LAPACK matrix copy routine. -c slamch LAPACK routine that determines machine constants. -c sorm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c ssteqr LAPACK routine that computes eigenvalues and eigenvectors -c of a tridiagonal matrix. -c sger Level 2 BLAS rank one update to a matrix. -c scopy Level 1 BLAS that copies one vector to another . -c snrm2 Level 1 BLAS that computes the norm of a vector. -c sscal Level 1 BLAS that scales a vector. -c sswap Level 1 BLAS that swaps the contents of two vectors. - -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/15/93: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: seupd.F SID: 2.11 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine sseupd(rvec , howmny, select, d , - & z , ldz , sigma , bmat , - & n , which , nev , tol , - & resid , ncv , v , ldv , - & iparam, ipntr , workd , workl, - & lworkl, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Real - & sigma, tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(7), ipntr(11) - logical select(ncv) - Real - & d(nev) , resid(n) , v(ldv,ncv), - & z(ldz, nev), workd(2*n), workl(lworkl) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0 , zero = 0.0E+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds , ierr , ih , ihb , ihd , - & iq , iw , j , k , ldh , - & ldq , mode , msglvl, nconv , next , - & ritz , irz , ibd , np , ishift, - & leftptr, rghtptr, numcnv, jj - Real - & bnorm2 , rnorm, temp, temp1, eps23 - logical reord -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external scopy , sger , sgeqr2, slacpy, sorm2r, sscal, - & ssesrt, ssteqr, sswap , svout , ivout , ssortr -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & snrm2, slamch - external snrm2, slamch -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mseupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c %--------------% -c | Quick return | -c %--------------% -c - if (nconv .eq. 0) go to 9000 - ierr = 0 -c - if (nconv .le. 0) ierr = -14 - if (n .le. 0) ierr = -1 - if (nev .le. 0) ierr = -2 - if (ncv .le. nev .or. ncv .gt. n) ierr = -3 - if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LA' .and. - & which .ne. 'SA' .and. - & which .ne. 'BE') ierr = -5 - if (bmat .ne. 'I' .and. bmat .ne. 'G') ierr = -6 - if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) - & ierr = -15 - if (rvec .and. howmny .eq. 'S') ierr = -16 -c - if (rvec .and. lworkl .lt. ncv**2+8*ncv) ierr = -7 -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 ) then - type = 'SHIFTI' - else if (mode .eq. 4 ) then - type = 'BUCKLE' - else if (mode .eq. 5 ) then - type = 'CAYLEY' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 - if (nev .eq. 1 .and. which .eq. 'BE') ierr = -12 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %-------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:2*ncv) := generated tridiagonal matrix H | -c | The subdiagonal is stored in workl(2:ncv). | -c | The dead spot is workl(1) but upon exiting | -c | ssaupd stores the B-norm of the last residual | -c | vector in workl(1). We use this !!! | -c | workl(2*ncv+1:2*ncv+ncv) := ritz values | -c | The wanted values are in the first NCONV spots. | -c | workl(3*ncv+1:3*ncv+ncv) := computed Ritz estimates | -c | The wanted values are in the first NCONV spots. | -c | NOTE: workl(1:4*ncv) is set by ssaupd and is not | -c | modified by sseupd. | -c %-------------------------------------------------------% -c -c %-------------------------------------------------------% -c | The following is used and set by sseupd. | -c | workl(4*ncv+1:4*ncv+ncv) := used as workspace during | -c | computation of the eigenvectors of H. Stores | -c | the diagonal of H. Upon EXIT contains the NCV | -c | Ritz values of the original system. The first | -c | NCONV spots have the wanted values. If MODE = | -c | 1 or 2 then will equal workl(2*ncv+1:3*ncv). | -c | workl(5*ncv+1:5*ncv+ncv) := used as workspace during | -c | computation of the eigenvectors of H. Stores | -c | the subdiagonal of H. Upon EXIT contains the | -c | NCV corresponding Ritz estimates of the | -c | original system. The first NCONV spots have the | -c | wanted values. If MODE = 1,2 then will equal | -c | workl(3*ncv+1:4*ncv). | -c | workl(6*ncv+1:6*ncv+ncv*ncv) := orthogonal Q that is | -c | the eigenvector matrix for H as returned by | -c | ssteqr. Not referenced if RVEC = .False. | -c | Ordering follows that of workl(4*ncv+1:5*ncv) | -c | workl(6*ncv+ncv*ncv+1:6*ncv+ncv*ncv+2*ncv) := | -c | Workspace. Needed by ssteqr and by sseupd. | -c | GRAND total of NCV*(NCV+8) locations. | -c %-------------------------------------------------------% -c -c - ih = ipntr(5) - ritz = ipntr(6) - bounds = ipntr(7) - ldh = ncv - ldq = ncv - ihd = bounds + ldh - ihb = ihd + ldh - iq = ihb + ldh - iw = iq + ldh*ncv - next = iw + 2*ncv - ipntr(4) = next - ipntr(8) = ihd - ipntr(9) = ihb - ipntr(10) = iq -c -c %----------------------------------------% -c | irz points to the Ritz values computed | -c | by _seigt before exiting _saup2. | -c | ibd points to the Ritz estimates | -c | computed by _seigt before exiting | -c | _saup2. | -c %----------------------------------------% -c - irz = ipntr(11)+ncv - ibd = irz+ncv -c -c -c %---------------------------------% -c | Set machine dependent constant. | -c %---------------------------------% -c - eps23 = slamch('Epsilon-Machine') - eps23 = eps23**(2.0E+0 / 3.0E+0 ) -c -c %---------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c | BNORM2 is the 2 norm of B*RESID(1:N). | -c | Upon exit of ssaupd WORKD(1:N) has | -c | B*RESID(1:N). | -c %---------------------------------------% -c - rnorm = workl(ih) - if (bmat .eq. 'I') then - bnorm2 = rnorm - else if (bmat .eq. 'G') then - bnorm2 = snrm2(n, workd, 1) - end if -c - if (msglvl .gt. 2) then - call svout(logfil, ncv, workl(irz), ndigit, - & '_seupd: Ritz values passed in from _SAUPD.') - call svout(logfil, ncv, workl(ibd), ndigit, - & '_seupd: Ritz estimates passed in from _SAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(bound) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call ssgets(ishift, which , nev , - & np , workl(irz) , workl(bounds), - & workl) -c - if (msglvl .gt. 2) then - call svout(logfil, ncv, workl(irz), ndigit, - & '_seupd: Ritz values after calling _SGETS.') - call svout(logfil, ncv, workl(bounds), ndigit, - & '_seupd: Ritz value indices after calling _SGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - temp1 = max(eps23, abs(workl(irz+ncv-j)) ) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & workl(ibd+jj-1) .le. tol*temp1) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by _saupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the _saupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_seupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -17 - go to 9000 - end if -c -c %-----------------------------------------------------------% -c | Call LAPACK routine _steqr to compute the eigenvalues and | -c | eigenvectors of the final symmetric tridiagonal matrix H. | -c | Initialize the eigenvector matrix Q to the identity. | -c %-----------------------------------------------------------% -c - call scopy(ncv-1, workl(ih+1), 1, workl(ihb), 1) - call scopy(ncv, workl(ih+ldh), 1, workl(ihd), 1) -c - call ssteqr('Identity', ncv, workl(ihd), workl(ihb), - & workl(iq) , ldq, workl(iw), ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call scopy(ncv, workl(iq+ncv-1), ldq, workl(iw), 1) - call svout(logfil, ncv, workl(ihd), ndigit, - & '_seupd: NCV Ritz values of the final H matrix') - call svout(logfil, ncv, workl(iw), ndigit, - & '_seupd: last row of the eigenvector matrix for H') - end if -c - if (reord) then -c -c %---------------------------------------------% -c | Reordered the eigenvalues and eigenvectors | -c | computed by _steqr so that the "converged" | -c | eigenvalues appear in the first NCONV | -c | positions of workl(ihd), and the associated | -c | eigenvectors appear in the first NCONV | -c | columns. | -c %---------------------------------------------% -c - leftptr = 1 - rghtptr = ncv -c - if (ncv .eq. 1) go to 30 -c - 20 if (select(leftptr)) then -c -c %-------------------------------------------% -c | Search, from the left, for the first Ritz | -c | value that has not converged. | -c %-------------------------------------------% -c - leftptr = leftptr + 1 -c - else if ( .not. select(rghtptr)) then -c -c %----------------------------------------------% -c | Search, from the right, the first Ritz value | -c | that has converged. | -c %----------------------------------------------% -c - rghtptr = rghtptr - 1 -c - else -c -c %----------------------------------------------% -c | Swap the Ritz value on the left that has not | -c | converged with the Ritz value on the right | -c | that has converged. Swap the associated | -c | eigenvector of the tridiagonal matrix H as | -c | well. | -c %----------------------------------------------% -c - temp = workl(ihd+leftptr-1) - workl(ihd+leftptr-1) = workl(ihd+rghtptr-1) - workl(ihd+rghtptr-1) = temp - call scopy(ncv, workl(iq+ncv*(leftptr-1)), 1, - & workl(iw), 1) - call scopy(ncv, workl(iq+ncv*(rghtptr-1)), 1, - & workl(iq+ncv*(leftptr-1)), 1) - call scopy(ncv, workl(iw), 1, - & workl(iq+ncv*(rghtptr-1)), 1) - leftptr = leftptr + 1 - rghtptr = rghtptr - 1 -c - end if -c - if (leftptr .lt. rghtptr) go to 20 -c - end if -c - 30 if (msglvl .gt. 2) then - call svout (logfil, ncv, workl(ihd), ndigit, - & '_seupd: The eigenvalues of H--reordered') - end if -c -c %----------------------------------------% -c | Load the converged Ritz values into D. | -c %----------------------------------------% -c - call scopy(nconv, workl(ihd), 1, d, 1) -c - else -c -c %-----------------------------------------------------% -c | Ritz vectors not required. Load Ritz values into D. | -c %-----------------------------------------------------% -c - call scopy(nconv, workl(ritz), 1, d, 1) - call scopy(ncv, workl(ritz), 1, workl(ihd), 1) -c - end if -c -c %------------------------------------------------------------------% -c | Transform the Ritz values and possibly vectors and corresponding | -c | Ritz estimates of OP to those of A*x=lambda*B*x. The Ritz values | -c | (and corresponding data) are returned in ascending order. | -c %------------------------------------------------------------------% -c - if (type .eq. 'REGULR') then -c -c %---------------------------------------------------------% -c | Ascending sort of wanted Ritz values, vectors and error | -c | bounds. Not necessary if only Ritz values are desired. | -c %---------------------------------------------------------% -c - if (rvec) then - call ssesrt('LA', rvec , nconv, d, ncv, workl(iq), ldq) - else - call scopy(ncv, workl(bounds), 1, workl(ihb), 1) - end if -c - else -c -c %-------------------------------------------------------------% -c | * Make a copy of all the Ritz values. | -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | For TYPE = 'BUCKLE' the transformation is | -c | lambda = sigma * theta / ( theta - 1 ) | -c | For TYPE = 'CAYLEY' the transformation is | -c | lambda = sigma * (theta + 1) / (theta - 1 ) | -c | where the theta are the Ritz values returned by ssaupd. | -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c | They are only reordered. | -c %-------------------------------------------------------------% -c - call scopy (ncv, workl(ihd), 1, workl(iw), 1) - if (type .eq. 'SHIFTI') then - do 40 k=1, ncv - workl(ihd+k-1) = one / workl(ihd+k-1) + sigma - 40 continue - else if (type .eq. 'BUCKLE') then - do 50 k=1, ncv - workl(ihd+k-1) = sigma * workl(ihd+k-1) / - & (workl(ihd+k-1) - one) - 50 continue - else if (type .eq. 'CAYLEY') then - do 60 k=1, ncv - workl(ihd+k-1) = sigma * (workl(ihd+k-1) + one) / - & (workl(ihd+k-1) - one) - 60 continue - end if -c -c %-------------------------------------------------------------% -c | * Store the wanted NCONV lambda values into D. | -c | * Sort the NCONV wanted lambda in WORKL(IHD:IHD+NCONV-1) | -c | into ascending order and apply sort to the NCONV theta | -c | values in the transformed system. We will need this to | -c | compute Ritz estimates in the original system. | -c | * Finally sort the lambda`s into ascending order and apply | -c | to Ritz vectors if wanted. Else just sort lambda`s into | -c | ascending order. | -c | NOTES: | -c | *workl(iw:iw+ncv-1) contain the theta ordered so that they | -c | match the ordering of the lambda. We`ll use them again for | -c | Ritz vector purification. | -c %-------------------------------------------------------------% -c - call scopy(nconv, workl(ihd), 1, d, 1) - call ssortr('LA', .true., nconv, workl(ihd), workl(iw)) - if (rvec) then - call ssesrt('LA', rvec , nconv, d, ncv, workl(iq), ldq) - else - call scopy(ncv, workl(bounds), 1, workl(ihb), 1) - call sscal(ncv, bnorm2/rnorm, workl(ihb), 1) - call ssortr('LA', .true., nconv, d, workl(ihb)) - end if -c - end if -c -c %------------------------------------------------% -c | Compute the Ritz vectors. Transform the wanted | -c | eigenvectors of the symmetric tridiagonal H by | -c | the Lanczos basis matrix V. | -c %------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A') then -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(iq,ldq). | -c %----------------------------------------------------------% -c - call sgeqr2(ncv, nconv , workl(iq) , - & ldq, workl(iw+ncv), workl(ihb), - & ierr) -c -c %--------------------------------------------------------% -c | * Postmultiply V by Q. | -c | * Copy the first NCONV columns of VQ into Z. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(ihd). | -c %--------------------------------------------------------% -c - call sorm2r('Right', 'Notranspose', n , - & ncv , nconv , workl(iq), - & ldq , workl(iw+ncv), v , - & ldv , workd(n+1) , ierr) - call slacpy('All', n, nconv, v, ldv, z, ldz) -c -c %-----------------------------------------------------% -c | In order to compute the Ritz estimates for the Ritz | -c | values in both systems, need the last row of the | -c | eigenvector matrix. Remember, it`s in factored form | -c %-----------------------------------------------------% -c - do 65 j = 1, ncv-1 - workl(ihb+j-1) = zero - 65 continue - workl(ihb+ncv-1) = one - call sorm2r('Left', 'Transpose' , ncv , - & 1 , nconv , workl(iq) , - & ldq , workl(iw+ncv), workl(ihb), - & ncv , temp , ierr) -c - else if (rvec .and. howmny .eq. 'S') then -c -c Not yet implemented. See remark 2 above. -c - end if -c - if (type .eq. 'REGULR' .and. rvec) then -c - do 70 j=1, ncv - workl(ihb+j-1) = rnorm * abs( workl(ihb+j-1) ) - 70 continue -c - else if (type .ne. 'REGULR' .and. rvec) then -c -c %-------------------------------------------------% -c | * Determine Ritz estimates of the theta. | -c | If RVEC = .true. then compute Ritz estimates | -c | of the theta. | -c | If RVEC = .false. then copy Ritz estimates | -c | as computed by ssaupd. | -c | * Determine Ritz estimates of the lambda. | -c %-------------------------------------------------% -c - call sscal (ncv, bnorm2, workl(ihb), 1) - if (type .eq. 'SHIFTI') then -c - do 80 k=1, ncv - workl(ihb+k-1) = abs( workl(ihb+k-1) ) - & / workl(iw+k-1)**2 - 80 continue -c - else if (type .eq. 'BUCKLE') then -c - do 90 k=1, ncv - workl(ihb+k-1) = sigma * abs( workl(ihb+k-1) ) - & / (workl(iw+k-1)-one )**2 - 90 continue -c - else if (type .eq. 'CAYLEY') then -c - do 100 k=1, ncv - workl(ihb+k-1) = abs( workl(ihb+k-1) - & / workl(iw+k-1)*(workl(iw+k-1)-one) ) - 100 continue -c - end if -c - end if -c - if (type .ne. 'REGULR' .and. msglvl .gt. 1) then - call svout(logfil, nconv, d, ndigit, - & '_seupd: Untransformed converged Ritz values') - call svout(logfil, nconv, workl(ihb), ndigit, - & '_seupd: Ritz estimates of the untransformed Ritz values') - else if (msglvl .gt. 1) then - call svout(logfil, nconv, d, ndigit, - & '_seupd: Converged Ritz values') - call svout(logfil, nconv, workl(ihb), ndigit, - & '_seupd: Associated Ritz estimates') - end if -c -c %-------------------------------------------------% -c | Ritz vector purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 3,4,5. See reference 7 | -c %-------------------------------------------------% -c - if (rvec .and. (type .eq. 'SHIFTI' .or. type .eq. 'CAYLEY')) then -c - do 110 k=0, nconv-1 - workl(iw+k) = workl(iq+k*ldq+ncv-1) - & / workl(iw+k) - 110 continue -c - else if (rvec .and. type .eq. 'BUCKLE') then -c - do 120 k=0, nconv-1 - workl(iw+k) = workl(iq+k*ldq+ncv-1) - & / (workl(iw+k)-one) - 120 continue -c - end if -c - if (type .ne. 'REGULR') - & call sger (n, nconv, one, resid, 1, workl(iw), 1, z, ldz) -c - 9000 continue -c - return -c -c %---------------% -c | End of sseupd| -c %---------------% -c - end
--- a/libcruft/arpack/src/ssgets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssgets -c -c\Description: -c Given the eigenvalues of the symmetric tridiagonal matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: This is called even in the case of user specified shifts in -c order to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call ssgets -c ( ISHIFT, WHICH, KEV, NP, RITZ, BOUNDS, SHIFTS ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> KEV eigenvalues of largest magnitude are retained. -c 'SM' -> KEV eigenvalues of smallest magnitude are retained. -c 'LA' -> KEV eigenvalues of largest value are retained. -c 'SA' -> KEV eigenvalues of smallest value are retained. -c 'BE' -> KEV eigenvalues, half from each end of the spectrum. -c If KEV is odd, compute one more from the high end. -c -c KEV Integer. (INPUT) -c KEV+NP is the size of the matrix H. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be computed. -c -c RITZ Real array of length KEV+NP. (INPUT/OUTPUT) -c On INPUT, RITZ contains the eigenvalues of H. -c On OUTPUT, RITZ are sorted so that the unwanted eigenvalues -c are in the first NP locations and the wanted part is in -c the last KEV locations. When exact shifts are selected, the -c unwanted part corresponds to the shifts to be applied. -c -c BOUNDS Real array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c SHIFTS Real array of length NP. (INPUT/OUTPUT) -c On INPUT: contains the user specified shifts if ISHIFT = 0. -c On OUTPUT: contains the shifts sorted into decreasing order -c of magnitude with respect to the Ritz estimates contained in -c BOUNDS. If ISHIFT = 0, SHIFTS is not modified on exit. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c ssortr ARPACK utility sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c svout ARPACK utility routine that prints vectors. -c scopy Level 1 BLAS that copies one vector to another. -c sswap Level 1 BLAS that swaps the contents of two vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/93: Version ' 2.1' -c -c\SCCS Information: @(#) -c FILE: sgets.F SID: 2.4 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssgets ( ishift, which, kev, np, ritz, bounds, shifts ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & bounds(kev+np), ritz(kev+np), shifts(np) -c -c %------------% -c | Parameters | -c %------------% -c - Real - & one, zero - parameter (one = 1.0E+0, zero = 0.0E+0) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer kevd2, msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external sswap, scopy, ssortr, arscnd -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic max, min -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = msgets -c - if (which .eq. 'BE') then -c -c %-----------------------------------------------------% -c | Both ends of the spectrum are requested. | -c | Sort the eigenvalues into algebraically increasing | -c | order first then swap high end of the spectrum next | -c | to low end in appropriate locations. | -c | NOTE: when np < floor(kev/2) be careful not to swap | -c | overlapping locations. | -c %-----------------------------------------------------% -c - call ssortr ('LA', .true., kev+np, ritz, bounds) - kevd2 = kev / 2 - if ( kev .gt. 1 ) then - call sswap ( min(kevd2,np), ritz, 1, - & ritz( max(kevd2,np)+1 ), 1) - call sswap ( min(kevd2,np), bounds, 1, - & bounds( max(kevd2,np)+1 ), 1) - end if -c - else -c -c %----------------------------------------------------% -c | LM, SM, LA, SA case. | -c | Sort the eigenvalues of H into the desired order | -c | and apply the resulting order to BOUNDS. | -c | The eigenvalues are sorted so that the wanted part | -c | are always in the last KEV locations. | -c %----------------------------------------------------% -c - call ssortr (which, .true., kev+np, ritz, bounds) - end if -c - if (ishift .eq. 1 .and. np .gt. 0) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first. | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when the shifts | -c | are applied in subroutine ssapps. | -c %-------------------------------------------------------% -c - call ssortr ('SM', .true., np, bounds, ritz) - call scopy (np, ritz, 1, shifts, 1) - end if -c - call arscnd (t1) - tsgets = tsgets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') - call ivout (logfil, 1, np, ndigit, '_sgets: NP is') - call svout (logfil, kev+np, ritz, ndigit, - & '_sgets: Eigenvalues of current H matrix') - call svout (logfil, kev+np, bounds, ndigit, - & '_sgets: Associated Ritz estimates') - end if -c - return -c -c %---------------% -c | End of ssgets | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssortc.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,344 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssortc -c -c\Description: -c Sorts the complex array in XREAL and XIMAG into the order -c specified by WHICH and optionally applies the permutation to the -c real array Y. It is assumed that if an element of XIMAG is -c nonzero, then its negative is also an element. In other words, -c both members of a complex conjugate pair are to be sorted and the -c pairs are kept adjacent to each other. -c -c\Usage: -c call ssortc -c ( WHICH, APPLY, N, XREAL, XIMAG, Y ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> sort XREAL,XIMAG into increasing order of magnitude. -c 'SM' -> sort XREAL,XIMAG into decreasing order of magnitude. -c 'LR' -> sort XREAL into increasing order of algebraic. -c 'SR' -> sort XREAL into decreasing order of algebraic. -c 'LI' -> sort XIMAG into increasing order of magnitude. -c 'SI' -> sort XIMAG into decreasing order of magnitude. -c NOTE: If an element of XIMAG is non-zero, then its negative -c is also an element. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to array Y. -c APPLY = .FALSE. -> do not apply the sorted order to array Y. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c XREAL, Real array of length N. (INPUT/OUTPUT) -c XIMAG Real and imaginary part of the array to be sorted. -c -c Y Real array of length N. (INPUT/OUTPUT) -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c xx/xx/92: Version ' 2.1' -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortc.F SID: 2.3 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssortc (which, apply, n, xreal, ximag, y) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & xreal(0:n-1), ximag(0:n-1), y(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Real - & temp, temp1, temp2 -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Real - & slapy2 - external slapy2 -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'LM') then -c -c %------------------------------------------------------% -c | Sort XREAL,XIMAG into increasing order of magnitude. | -c %------------------------------------------------------% -c - 10 continue - if (igap .eq. 0) go to 9000 -c - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - temp1 = slapy2(xreal(j),ximag(j)) - temp2 = slapy2(xreal(j+igap),ximag(j+igap)) -c - if (temp1.gt.temp2) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 30 - end if - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c %------------------------------------------------------% -c | Sort XREAL,XIMAG into decreasing order of magnitude. | -c %------------------------------------------------------% -c - 40 continue - if (igap .eq. 0) go to 9000 -c - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j .lt. 0) go to 60 -c - temp1 = slapy2(xreal(j),ximag(j)) - temp2 = slapy2(xreal(j+igap),ximag(j+igap)) -c - if (temp1.lt.temp2) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LR') then -c -c %------------------------------------------------% -c | Sort XREAL into increasing order of algebraic. | -c %------------------------------------------------% -c - 70 continue - if (igap .eq. 0) go to 9000 -c - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (xreal(j).gt.xreal(j+igap)) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'SR') then -c -c %------------------------------------------------% -c | Sort XREAL into decreasing order of algebraic. | -c %------------------------------------------------% -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (xreal(j).lt.xreal(j+igap)) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 -c - else if (which .eq. 'LI') then -c -c %------------------------------------------------% -c | Sort XIMAG into increasing order of magnitude. | -c %------------------------------------------------% -c - 130 continue - if (igap .eq. 0) go to 9000 - do 150 i = igap, n-1 - j = i-igap - 140 continue -c - if (j.lt.0) go to 150 -c - if (abs(ximag(j)).gt.abs(ximag(j+igap))) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 150 - endif - j = j-igap - go to 140 - 150 continue - igap = igap / 2 - go to 130 -c - else if (which .eq. 'SI') then -c -c %------------------------------------------------% -c | Sort XIMAG into decreasing order of magnitude. | -c %------------------------------------------------% -c - 160 continue - if (igap .eq. 0) go to 9000 - do 180 i = igap, n-1 - j = i-igap - 170 continue -c - if (j.lt.0) go to 180 -c - if (abs(ximag(j)).lt.abs(ximag(j+igap))) then - temp = xreal(j) - xreal(j) = xreal(j+igap) - xreal(j+igap) = temp -c - temp = ximag(j) - ximag(j) = ximag(j+igap) - ximag(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 180 - endif - j = j-igap - go to 170 - 180 continue - igap = igap / 2 - go to 160 - end if -c - 9000 continue - return -c -c %---------------% -c | End of ssortc | -c %---------------% -c - end
--- a/libcruft/arpack/src/ssortr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,218 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: ssortr -c -c\Description: -c Sort the array X1 in the order specified by WHICH and optionally -c applies the permutation to the array X2. -c -c\Usage: -c call ssortr -c ( WHICH, APPLY, N, X1, X2 ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> X1 is sorted into increasing order of magnitude. -c 'SM' -> X1 is sorted into decreasing order of magnitude. -c 'LA' -> X1 is sorted into increasing order of algebraic. -c 'SA' -> X1 is sorted into decreasing order of algebraic. -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to X2. -c APPLY = .FALSE. -> do not apply the sorted order to X2. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c X1 Real array of length N. (INPUT/OUTPUT) -c The array to be sorted. -c -c X2 Real array of length N. (INPUT/OUTPUT) -c Only referenced if APPLY = .TRUE. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\Revision history: -c 12/16/93: Version ' 2.1'. -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortr.F SID: 2.3 DATE OF SID: 4/19/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine ssortr (which, apply, n, x1, x2) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & x1(0:n-1), x2(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Real - & temp -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'SA') then -c -c X1 is sorted into decreasing order of algebraic. -c - 10 continue - if (igap .eq. 0) go to 9000 - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - if (x1(j).lt.x1(j+igap)) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 30 - endif - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c X1 is sorted into decreasing order of magnitude. -c - 40 continue - if (igap .eq. 0) go to 9000 - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j.lt.0) go to 60 -c - if (abs(x1(j)).lt.abs(x1(j+igap))) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LA') then -c -c X1 is sorted into increasing order of algebraic. -c - 70 continue - if (igap .eq. 0) go to 9000 - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (x1(j).gt.x1(j+igap)) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'LM') then -c -c X1 is sorted into increasing order of magnitude. -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (abs(x1(j)).gt.abs(x1(j+igap))) then - temp = x1(j) - x1(j) = x1(j+igap) - x1(j+igap) = temp - if (apply) then - temp = x2(j) - x2(j) = x2(j+igap) - x2(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 - end if -c - 9000 continue - return -c -c %---------------% -c | End of ssortr | -c %---------------% -c - end
--- a/libcruft/arpack/src/sstatn.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -c -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for nonsymmetric Arnoldi code. | -c %---------------------------------------------% -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: statn.F SID: 2.4 DATE OF SID: 4/20/96 RELEASE: 2 -c - subroutine sstatn -c -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% -c - include 'stat.h' -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 -c - tnaupd = 0.0E+0 - tnaup2 = 0.0E+0 - tnaitr = 0.0E+0 - tneigh = 0.0E+0 - tngets = 0.0E+0 - tnapps = 0.0E+0 - tnconv = 0.0E+0 - titref = 0.0E+0 - tgetv0 = 0.0E+0 - trvec = 0.0E+0 -c -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% -c - tmvopx = 0.0E+0 - tmvbx = 0.0E+0 -c - return -c -c -c %---------------% -c | End of sstatn | -c %---------------% -c - end
--- a/libcruft/arpack/src/sstats.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -c -c\SCCS Information: @(#) -c FILE: stats.F SID: 2.1 DATE OF SID: 4/19/96 RELEASE: 2 -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for symmetric Arnoldi code. | -c %---------------------------------------------% - - subroutine sstats - -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% - include 'stat.h' - -c %-----------------------% -c | Executable Statements | -c %-----------------------% - - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 - - tsaupd = 0.0E+0 - tsaup2 = 0.0E+0 - tsaitr = 0.0E+0 - tseigt = 0.0E+0 - tsgets = 0.0E+0 - tsapps = 0.0E+0 - tsconv = 0.0E+0 - titref = 0.0E+0 - tgetv0 = 0.0E+0 - trvec = 0.0E+0 - -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% - tmvopx = 0.0E+0 - tmvbx = 0.0E+0 - - return -c -c End of sstats -c - end
--- a/libcruft/arpack/src/sstqrb.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,594 +0,0 @@ -c----------------------------------------------------------------------- -c\BeginDoc -c -c\Name: sstqrb -c -c\Description: -c Computes all eigenvalues and the last component of the eigenvectors -c of a symmetric tridiagonal matrix using the implicit QL or QR method. -c -c This is mostly a modification of the LAPACK routine ssteqr. -c See Remarks. -c -c\Usage: -c call sstqrb -c ( N, D, E, Z, WORK, INFO ) -c -c\Arguments -c N Integer. (INPUT) -c The number of rows and columns in the matrix. N >= 0. -c -c D Real array, dimension (N). (INPUT/OUTPUT) -c On entry, D contains the diagonal elements of the -c tridiagonal matrix. -c On exit, D contains the eigenvalues, in ascending order. -c If an error exit is made, the eigenvalues are correct -c for indices 1,2,...,INFO-1, but they are unordered and -c may not be the smallest eigenvalues of the matrix. -c -c E Real array, dimension (N-1). (INPUT/OUTPUT) -c On entry, E contains the subdiagonal elements of the -c tridiagonal matrix in positions 1 through N-1. -c On exit, E has been destroyed. -c -c Z Real array, dimension (N). (OUTPUT) -c On exit, Z contains the last row of the orthonormal -c eigenvector matrix of the symmetric tridiagonal matrix. -c If an error exit is made, Z contains the last row of the -c eigenvector matrix associated with the stored eigenvalues. -c -c WORK Real array, dimension (max(1,2*N-2)). (WORKSPACE) -c Workspace used in accumulating the transformation for -c computing the last components of the eigenvectors. -c -c INFO Integer. (OUTPUT) -c = 0: normal return. -c < 0: if INFO = -i, the i-th argument had an illegal value. -c > 0: if INFO = +i, the i-th eigenvalue has not converged -c after a total of 30*N iterations. -c -c\Remarks -c 1. None. -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx real -c -c\Routines called: -c saxpy Level 1 BLAS that computes a vector triad. -c scopy Level 1 BLAS that copies one vector to another. -c sswap Level 1 BLAS that swaps the contents of two vectors. -c lsame LAPACK character comparison routine. -c slae2 LAPACK routine that computes the eigenvalues of a 2-by-2 -c symmetric matrix. -c slaev2 LAPACK routine that eigendecomposition of a 2-by-2 symmetric -c matrix. -c slamch LAPACK routine that determines machine constants. -c slanst LAPACK routine that computes the norm of a matrix. -c slapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c slartg LAPACK Givens rotation construction routine. -c slascl LAPACK routine for careful scaling of a matrix. -c slaset LAPACK matrix initialization routine. -c slasr LAPACK routine that applies an orthogonal transformation to -c a matrix. -c slasrt LAPACK sorting routine. -c ssteqr LAPACK routine that computes eigenvalues and eigenvectors -c of a symmetric tridiagonal matrix. -c xerbla LAPACK error handler routine. -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: stqrb.F SID: 2.5 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c 1. Starting with version 2.5, this routine is a modified version -c of LAPACK version 2.0 subroutine SSTEQR. No lines are deleted, -c only commeted out and new lines inserted. -c All lines commented out have "c$$$" at the beginning. -c Note that the LAPACK version 1.0 subroutine SSTEQR contained -c bugs. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine sstqrb ( n, d, e, z, work, info ) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer info, n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Real - & d( n ), e( n-1 ), z( n ), work( 2*n-2 ) -c -c .. parameters .. - Real - & zero, one, two, three - parameter ( zero = 0.0E+0, one = 1.0E+0, - & two = 2.0E+0, three = 3.0E+0 ) - integer maxit - parameter ( maxit = 30 ) -c .. -c .. local scalars .. - integer i, icompz, ii, iscale, j, jtot, k, l, l1, lend, - & lendm1, lendp1, lendsv, lm1, lsv, m, mm, mm1, - & nm1, nmaxit - Real - & anorm, b, c, eps, eps2, f, g, p, r, rt1, rt2, - & s, safmax, safmin, ssfmax, ssfmin, tst -c .. -c .. external functions .. - logical lsame - Real - & slamch, slanst, slapy2 - external lsame, slamch, slanst, slapy2 -c .. -c .. external subroutines .. - external slae2, slaev2, slartg, slascl, slaset, slasr, - & slasrt, sswap, xerbla -c .. -c .. intrinsic functions .. - intrinsic abs, max, sign, sqrt -c .. -c .. executable statements .. -c -c test the input parameters. -c - info = 0 -c -c$$$ IF( LSAME( COMPZ, 'N' ) ) THEN -c$$$ ICOMPZ = 0 -c$$$ ELSE IF( LSAME( COMPZ, 'V' ) ) THEN -c$$$ ICOMPZ = 1 -c$$$ ELSE IF( LSAME( COMPZ, 'I' ) ) THEN -c$$$ ICOMPZ = 2 -c$$$ ELSE -c$$$ ICOMPZ = -1 -c$$$ END IF -c$$$ IF( ICOMPZ.LT.0 ) THEN -c$$$ INFO = -1 -c$$$ ELSE IF( N.LT.0 ) THEN -c$$$ INFO = -2 -c$$$ ELSE IF( ( LDZ.LT.1 ) .OR. ( ICOMPZ.GT.0 .AND. LDZ.LT.MAX( 1, -c$$$ $ N ) ) ) THEN -c$$$ INFO = -6 -c$$$ END IF -c$$$ IF( INFO.NE.0 ) THEN -c$$$ CALL XERBLA( 'SSTEQR', -INFO ) -c$$$ RETURN -c$$$ END IF -c -c *** New starting with version 2.5 *** -c - icompz = 2 -c ************************************* -c -c quick return if possible -c - if( n.eq.0 ) - $ return -c - if( n.eq.1 ) then - if( icompz.eq.2 ) z( 1 ) = one - return - end if -c -c determine the unit roundoff and over/underflow thresholds. -c - eps = slamch( 'e' ) - eps2 = eps**2 - safmin = slamch( 's' ) - safmax = one / safmin - ssfmax = sqrt( safmax ) / three - ssfmin = sqrt( safmin ) / eps2 -c -c compute the eigenvalues and eigenvectors of the tridiagonal -c matrix. -c -c$$ if( icompz.eq.2 ) -c$$$ $ call slaset( 'full', n, n, zero, one, z, ldz ) -c -c *** New starting with version 2.5 *** -c - if ( icompz .eq. 2 ) then - do 5 j = 1, n-1 - z(j) = zero - 5 continue - z( n ) = one - end if -c ************************************* -c - nmaxit = n*maxit - jtot = 0 -c -c determine where the matrix splits and choose ql or qr iteration -c for each block, according to whether top or bottom diagonal -c element is smaller. -c - l1 = 1 - nm1 = n - 1 -c - 10 continue - if( l1.gt.n ) - $ go to 160 - if( l1.gt.1 ) - $ e( l1-1 ) = zero - if( l1.le.nm1 ) then - do 20 m = l1, nm1 - tst = abs( e( m ) ) - if( tst.eq.zero ) - $ go to 30 - if( tst.le.( sqrt( abs( d( m ) ) )*sqrt( abs( d( m+ - $ 1 ) ) ) )*eps ) then - e( m ) = zero - go to 30 - end if - 20 continue - end if - m = n -c - 30 continue - l = l1 - lsv = l - lend = m - lendsv = lend - l1 = m + 1 - if( lend.eq.l ) - $ go to 10 -c -c scale submatrix in rows and columns l to lend -c - anorm = slanst( 'i', lend-l+1, d( l ), e( l ) ) - iscale = 0 - if( anorm.eq.zero ) - $ go to 10 - if( anorm.gt.ssfmax ) then - iscale = 1 - call slascl( 'g', 0, 0, anorm, ssfmax, lend-l+1, 1, d( l ), n, - $ info ) - call slascl( 'g', 0, 0, anorm, ssfmax, lend-l, 1, e( l ), n, - $ info ) - else if( anorm.lt.ssfmin ) then - iscale = 2 - call slascl( 'g', 0, 0, anorm, ssfmin, lend-l+1, 1, d( l ), n, - $ info ) - call slascl( 'g', 0, 0, anorm, ssfmin, lend-l, 1, e( l ), n, - $ info ) - end if -c -c choose between ql and qr iteration -c - if( abs( d( lend ) ).lt.abs( d( l ) ) ) then - lend = lsv - l = lendsv - end if -c - if( lend.gt.l ) then -c -c ql iteration -c -c look for small subdiagonal element. -c - 40 continue - if( l.ne.lend ) then - lendm1 = lend - 1 - do 50 m = l, lendm1 - tst = abs( e( m ) )**2 - if( tst.le.( eps2*abs( d( m ) ) )*abs( d( m+1 ) )+ - $ safmin )go to 60 - 50 continue - end if -c - m = lend -c - 60 continue - if( m.lt.lend ) - $ e( m ) = zero - p = d( l ) - if( m.eq.l ) - $ go to 80 -c -c if remaining matrix is 2-by-2, use slae2 or slaev2 -c to compute its eigensystem. -c - if( m.eq.l+1 ) then - if( icompz.gt.0 ) then - call slaev2( d( l ), e( l ), d( l+1 ), rt1, rt2, c, s ) - work( l ) = c - work( n-1+l ) = s -c$$$ call slasr( 'r', 'v', 'b', n, 2, work( l ), -c$$$ $ work( n-1+l ), z( 1, l ), ldz ) -c -c *** New starting with version 2.5 *** -c - tst = z(l+1) - z(l+1) = c*tst - s*z(l) - z(l) = s*tst + c*z(l) -c ************************************* - else - call slae2( d( l ), e( l ), d( l+1 ), rt1, rt2 ) - end if - d( l ) = rt1 - d( l+1 ) = rt2 - e( l ) = zero - l = l + 2 - if( l.le.lend ) - $ go to 40 - go to 140 - end if -c - if( jtot.eq.nmaxit ) - $ go to 140 - jtot = jtot + 1 -c -c form shift. -c - g = ( d( l+1 )-p ) / ( two*e( l ) ) - r = slapy2( g, one ) - g = d( m ) - p + ( e( l ) / ( g+sign( r, g ) ) ) -c - s = one - c = one - p = zero -c -c inner loop -c - mm1 = m - 1 - do 70 i = mm1, l, -1 - f = s*e( i ) - b = c*e( i ) - call slartg( g, f, c, s, r ) - if( i.ne.m-1 ) - $ e( i+1 ) = r - g = d( i+1 ) - p - r = ( d( i )-g )*s + two*c*b - p = s*r - d( i+1 ) = g + p - g = c*r - b -c -c if eigenvectors are desired, then save rotations. -c - if( icompz.gt.0 ) then - work( i ) = c - work( n-1+i ) = -s - end if -c - 70 continue -c -c if eigenvectors are desired, then apply saved rotations. -c - if( icompz.gt.0 ) then - mm = m - l + 1 -c$$$ call slasr( 'r', 'v', 'b', n, mm, work( l ), work( n-1+l ), -c$$$ $ z( 1, l ), ldz ) -c -c *** New starting with version 2.5 *** -c - call slasr( 'r', 'v', 'b', 1, mm, work( l ), - & work( n-1+l ), z( l ), 1 ) -c ************************************* - end if -c - d( l ) = d( l ) - p - e( l ) = g - go to 40 -c -c eigenvalue found. -c - 80 continue - d( l ) = p -c - l = l + 1 - if( l.le.lend ) - $ go to 40 - go to 140 -c - else -c -c qr iteration -c -c look for small superdiagonal element. -c - 90 continue - if( l.ne.lend ) then - lendp1 = lend + 1 - do 100 m = l, lendp1, -1 - tst = abs( e( m-1 ) )**2 - if( tst.le.( eps2*abs( d( m ) ) )*abs( d( m-1 ) )+ - $ safmin )go to 110 - 100 continue - end if -c - m = lend -c - 110 continue - if( m.gt.lend ) - $ e( m-1 ) = zero - p = d( l ) - if( m.eq.l ) - $ go to 130 -c -c if remaining matrix is 2-by-2, use slae2 or slaev2 -c to compute its eigensystem. -c - if( m.eq.l-1 ) then - if( icompz.gt.0 ) then - call slaev2( d( l-1 ), e( l-1 ), d( l ), rt1, rt2, c, s ) -c$$$ work( m ) = c -c$$$ work( n-1+m ) = s -c$$$ call slasr( 'r', 'v', 'f', n, 2, work( m ), -c$$$ $ work( n-1+m ), z( 1, l-1 ), ldz ) -c -c *** New starting with version 2.5 *** -c - tst = z(l) - z(l) = c*tst - s*z(l-1) - z(l-1) = s*tst + c*z(l-1) -c ************************************* - else - call slae2( d( l-1 ), e( l-1 ), d( l ), rt1, rt2 ) - end if - d( l-1 ) = rt1 - d( l ) = rt2 - e( l-1 ) = zero - l = l - 2 - if( l.ge.lend ) - $ go to 90 - go to 140 - end if -c - if( jtot.eq.nmaxit ) - $ go to 140 - jtot = jtot + 1 -c -c form shift. -c - g = ( d( l-1 )-p ) / ( two*e( l-1 ) ) - r = slapy2( g, one ) - g = d( m ) - p + ( e( l-1 ) / ( g+sign( r, g ) ) ) -c - s = one - c = one - p = zero -c -c inner loop -c - lm1 = l - 1 - do 120 i = m, lm1 - f = s*e( i ) - b = c*e( i ) - call slartg( g, f, c, s, r ) - if( i.ne.m ) - $ e( i-1 ) = r - g = d( i ) - p - r = ( d( i+1 )-g )*s + two*c*b - p = s*r - d( i ) = g + p - g = c*r - b -c -c if eigenvectors are desired, then save rotations. -c - if( icompz.gt.0 ) then - work( i ) = c - work( n-1+i ) = s - end if -c - 120 continue -c -c if eigenvectors are desired, then apply saved rotations. -c - if( icompz.gt.0 ) then - mm = l - m + 1 -c$$$ call slasr( 'r', 'v', 'f', n, mm, work( m ), work( n-1+m ), -c$$$ $ z( 1, m ), ldz ) -c -c *** New starting with version 2.5 *** -c - call slasr( 'r', 'v', 'f', 1, mm, work( m ), work( n-1+m ), - & z( m ), 1 ) -c ************************************* - end if -c - d( l ) = d( l ) - p - e( lm1 ) = g - go to 90 -c -c eigenvalue found. -c - 130 continue - d( l ) = p -c - l = l - 1 - if( l.ge.lend ) - $ go to 90 - go to 140 -c - end if -c -c undo scaling if necessary -c - 140 continue - if( iscale.eq.1 ) then - call slascl( 'g', 0, 0, ssfmax, anorm, lendsv-lsv+1, 1, - $ d( lsv ), n, info ) - call slascl( 'g', 0, 0, ssfmax, anorm, lendsv-lsv, 1, e( lsv ), - $ n, info ) - else if( iscale.eq.2 ) then - call slascl( 'g', 0, 0, ssfmin, anorm, lendsv-lsv+1, 1, - $ d( lsv ), n, info ) - call slascl( 'g', 0, 0, ssfmin, anorm, lendsv-lsv, 1, e( lsv ), - $ n, info ) - end if -c -c check for no convergence to an eigenvalue after a total -c of n*maxit iterations. -c - if( jtot.lt.nmaxit ) - $ go to 10 - do 150 i = 1, n - 1 - if( e( i ).ne.zero ) - $ info = info + 1 - 150 continue - go to 190 -c -c order eigenvalues and eigenvectors. -c - 160 continue - if( icompz.eq.0 ) then -c -c use quick sort -c - call slasrt( 'i', n, d, info ) -c - else -c -c use selection sort to minimize swaps of eigenvectors -c - do 180 ii = 2, n - i = ii - 1 - k = i - p = d( i ) - do 170 j = ii, n - if( d( j ).lt.p ) then - k = j - p = d( j ) - end if - 170 continue - if( k.ne.i ) then - d( k ) = d( i ) - d( i ) = p -c$$$ call sswap( n, z( 1, i ), 1, z( 1, k ), 1 ) -c *** New starting with version 2.5 *** -c - p = z(k) - z(k) = z(i) - z(i) = p -c ************************************* - end if - 180 continue - end if -c - 190 continue - return -c -c %---------------% -c | End of sstqrb | -c %---------------% -c - end
--- a/libcruft/arpack/src/stat.h Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% -c -c\SCCS Information: @(#) -c FILE: stat.h SID: 2.2 DATE OF SID: 11/16/95 RELEASE: 2 -c - real t0, t1, t2, t3, t4, t5 - save t0, t1, t2, t3, t4, t5 -c - integer nopx, nbx, nrorth, nitref, nrstrt - real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv, - & tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv, - & tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv, - & tmvopx, tmvbx, tgetv0, titref, trvec - common /timing/ - & nopx, nbx, nrorth, nitref, nrstrt, - & tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv, - & tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv, - & tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv, - & tmvopx, tmvbx, tgetv0, titref, trvec
--- a/libcruft/arpack/src/version.h Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - - In the current version, the parameter KAPPA in the Kahan's test - for orthogonality is set to 0.717, the same as used by Gragg & Reichel. - However computational experience indicates that this is a little too - strict and will frequently force reorthogonalization when it is not - necessary to do so. - - Also the "moving boundary" idea is not currently activated in the nonsymmetric - code since it is not conclusive that it's the right thing to do all the time. - Requires further investigation. - - As of 02/01/93 Richard Lehoucq assumes software control of the codes from - Phuong Vu. On 03/01/93 all the *.F files were migrated SCCS. The 1.1 version - of codes are those received from Phuong Vu. The frozen version of 07/08/92 - is now considered version 1.1. - - Version 2.1 contains two new symmetric routines, sesrt and seupd. - Changes as well as bug fixes for version 1.1 codes that were only corrected - for programming bugs are version 1.2. These 1.2 versions will also be in version 2.1. - Subroutine [d,s]saupd now requires slightly more workspace. See [d,s]saupd for the - details. - - \SCCS Information: @(#) - FILE: version.h SID: 2.3 DATE OF SID: 11/16/95 RELEASE: 2 - - */ - -#define VERSION_NUMBER ' 2.1' -#define VERSION_DATE ' 11/15/95'
--- a/libcruft/arpack/src/zgetv0.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,414 +0,0 @@ -c\BeginDoc -c -c\Name: zgetv0 -c -c\Description: -c Generate a random initial residual vector for the Arnoldi process. -c Force the residual vector to be in the range of the operator OP. -c -c\Usage: -c call zgetv0 -c ( IDO, BMAT, ITRY, INITV, N, J, V, LDV, RESID, RNORM, -c IPNTR, WORKD, IERR ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to zgetv0. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B in the (generalized) -c eigenvalue problem A*x = lambda*B*x. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*B*x -c -c ITRY Integer. (INPUT) -c ITRY counts the number of times that zgetv0 is called. -c It should be set to 1 on the initial call to zgetv0. -c -c INITV Logical variable. (INPUT) -c .TRUE. => the initial residual vector is given in RESID. -c .FALSE. => generate a random initial residual vector. -c -c N Integer. (INPUT) -c Dimension of the problem. -c -c J Integer. (INPUT) -c Index of the residual vector to be generated, with respect to -c the Arnoldi process. J > 1 in case of a "restart". -c -c V Complex*16 N by J array. (INPUT) -c The first J-1 columns of V contain the current Arnoldi basis -c if this is a "restart". -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c RESID Complex*16 array of length N. (INPUT/OUTPUT) -c Initial residual vector to be generated. If RESID is -c provided, force RESID into the range of the operator OP. -c -c RNORM Double precision scalar. (OUTPUT) -c B-norm of the generated residual. -c -c IPNTR Integer array of length 3. (OUTPUT) -c -c WORKD Complex*16 work array of length 2*N. (REVERSE COMMUNICATION). -c On exit, WORK(1:N) = B*RESID to be used in SSAITR. -c -c IERR Integer. (OUTPUT) -c = 0: Normal exit. -c = -1: Cannot generate a nontrivial restarted residual vector -c in the range of the operator OP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c arscnd ARPACK utility routine for timing. -c zvout ARPACK utility routine that prints vectors. -c zlarnv LAPACK routine for generating a random vector. -c zgemv Level 2 BLAS routine for matrix vector multiplication. -c zcopy Level 1 BLAS that copies one vector to another. -c zdotc Level 1 BLAS that computes the scalar product of two vectors. -c dznrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: getv0.F SID: 2.3 DATE OF SID: 08/27/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine zgetv0 - & ( ido, bmat, itry, initv, n, j, v, ldv, resid, rnorm, - & ipntr, workd, ierr ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - logical initv - integer ido, ierr, itry, j, ldv, n - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Complex*16 - & resid(n), v(ldv,j), workd(2*n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - Double precision - & rzero - parameter (one = (1.0D+0, 0.0D+0), zero = (0.0D+0, 0.0D+0), - & rzero = 0.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical first, inits, orth - integer idist, iseed(4), iter, msglvl, jj - Double precision - & rnorm0 - Complex*16 - & cnorm - save first, iseed, inits, iter, msglvl, orth, rnorm0 -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zcopy, zgemv, zlarnv, zvout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dznrm2, dlapy2 - Complex*16 - & zdotc - external zdotc, dznrm2, dlapy2 -c -c %-----------------% -c | Data Statements | -c %-----------------% -c - data inits /.true./ -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c -c %-----------------------------------% -c | Initialize the seed of the LAPACK | -c | random number generator | -c %-----------------------------------% -c - if (inits) then - iseed(1) = 1 - iseed(2) = 3 - iseed(3) = 5 - iseed(4) = 7 - inits = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mgetv0 -c - ierr = 0 - iter = 0 - first = .FALSE. - orth = .FALSE. -c -c %-----------------------------------------------------% -c | Possibly generate a random starting vector in RESID | -c | Use a LAPACK random number generator used by the | -c | matrix generation routines. | -c | idist = 1: uniform (0,1) distribution; | -c | idist = 2: uniform (-1,1) distribution; | -c | idist = 3: normal (0,1) distribution; | -c %-----------------------------------------------------% -c - if (.not.initv) then - idist = 2 - call zlarnv (idist, iseed, n, resid) - end if -c -c %----------------------------------------------------------% -c | Force the starting vector into the range of OP to handle | -c | the generalized problem when B is possibly (singular). | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nopx = nopx + 1 - ipntr(1) = 1 - ipntr(2) = n + 1 - call zcopy (n, resid, 1, workd, 1) - ido = -1 - go to 9000 - end if - end if -c -c %----------------------------------------% -c | Back from computing B*(initial-vector) | -c %----------------------------------------% -c - if (first) go to 20 -c -c %-----------------------------------------------% -c | Back from computing B*(orthogonalized-vector) | -c %-----------------------------------------------% -c - if (orth) go to 40 -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) -c -c %------------------------------------------------------% -c | Starting vector is now in the range of OP; r = OP*r; | -c | Compute B-norm of starting vector. | -c %------------------------------------------------------% -c - call arscnd (t2) - first = .TRUE. - if (bmat .eq. 'G') then - nbx = nbx + 1 - call zcopy (n, workd(n+1), 1, resid, 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd, 1) - end if -c - 20 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - first = .FALSE. - if (bmat .eq. 'G') then - cnorm = zdotc (n, resid, 1, workd, 1) - rnorm0 = sqrt(dlapy2(dble(cnorm),dimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm0 = dznrm2(n, resid, 1) - end if - rnorm = rnorm0 -c -c %---------------------------------------------% -c | Exit if this is the very first Arnoldi step | -c %---------------------------------------------% -c - if (j .eq. 1) go to 50 -c -c %---------------------------------------------------------------- -c | Otherwise need to B-orthogonalize the starting vector against | -c | the current Arnoldi basis using Gram-Schmidt with iter. ref. | -c | This is the case where an invariant subspace is encountered | -c | in the middle of the Arnoldi factorization. | -c | | -c | s = V^{T}*B*r; r = r - V*s; | -c | | -c | Stopping criteria used for iter. ref. is discussed in | -c | Parlett's book, page 107 and in Gragg & Reichel TOMS paper. | -c %---------------------------------------------------------------% -c - orth = .TRUE. - 30 continue -c - call zgemv ('C', n, j-1, one, v, ldv, workd, 1, - & zero, workd(n+1), 1) - call zgemv ('N', n, j-1, -one, v, ldv, workd(n+1), 1, - & one, resid, 1) -c -c %----------------------------------------------------------% -c | Compute the B-norm of the orthogonalized starting vector | -c %----------------------------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call zcopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd, 1) - end if -c - 40 continue -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - cnorm = zdotc (n, resid, 1, workd, 1) - rnorm = sqrt(dlapy2(dble(cnorm),dimag(cnorm))) - else if (bmat .eq. 'I') then - rnorm = dznrm2(n, resid, 1) - end if -c -c %--------------------------------------% -c | Check for further orthogonalization. | -c %--------------------------------------% -c - if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm0, ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') - call dvout (logfil, 1, rnorm, ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if -c - if (rnorm .gt. 0.717*rnorm0) go to 50 -c - iter = iter + 1 - if (iter .le. 1) then -c -c %-----------------------------------% -c | Perform iterative refinement step | -c %-----------------------------------% -c - rnorm0 = rnorm - go to 30 - else -c -c %------------------------------------% -c | Iterative refinement step "failed" | -c %------------------------------------% -c - do 45 jj = 1, n - resid(jj) = zero - 45 continue - rnorm = rzero - ierr = -1 - end if -c - 50 continue -c - if (msglvl .gt. 0) then - call dvout (logfil, 1, rnorm, ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then - call zvout (logfil, n, resid, ndigit, - & '_getv0: initial / restarted starting vector') - end if - ido = 99 -c - call arscnd (t1) - tgetv0 = tgetv0 + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of zgetv0 | -c %---------------% -c - end
--- a/libcruft/arpack/src/znaitr.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,850 +0,0 @@ -c\BeginDoc -c -c\Name: znaitr -c -c\Description: -c Reverse communication interface for applying NP additional steps to -c a K step nonsymmetric Arnoldi factorization. -c -c Input: OP*V_{k} - V_{k}*H = r_{k}*e_{k}^T -c -c with (V_{k}^T)*B*V_{k} = I, (V_{k}^T)*B*r_{k} = 0. -c -c Output: OP*V_{k+p} - V_{k+p}*H = r_{k+p}*e_{k+p}^T -c -c with (V_{k+p}^T)*B*V_{k+p} = I, (V_{k+p}^T)*B*r_{k+p} = 0. -c -c where OP and B are as in znaupd. The B-norm of r_{k+p} is also -c computed and returned. -c -c\Usage: -c call znaitr -c ( IDO, BMAT, N, K, NP, NB, RESID, RNORM, V, LDV, H, LDH, -c IPNTR, WORKD, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c This is for the restart phase to force the new -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y, -c IPNTR(3) is the pointer into WORK for B * X. -c IDO = 2: compute Y = B * X where -c IPNTR(1) is the pointer into WORK for X, -c IPNTR(2) is the pointer into WORK for Y. -c IDO = 99: done -c ------------------------------------------------------------- -c When the routine is used in the "shift-and-invert" mode, the -c vector B * Q is already available and do not need to be -c recomputed in forming OP * Q. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. See znaupd. -c B = 'I' -> standard eigenvalue problem A*x = lambda*x -c B = 'G' -> generalized eigenvalue problem A*x = lambda*M**x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c K Integer. (INPUT) -c Current size of V and H. -c -c NP Integer. (INPUT) -c Number of additional Arnoldi steps to take. -c -c NB Integer. (INPUT) -c Blocksize to be used in the recurrence. -c Only work for NB = 1 right now. The goal is to have a -c program that implement both the block and non-block method. -c -c RESID Complex*16 array of length N. (INPUT/OUTPUT) -c On INPUT: RESID contains the residual vector r_{k}. -c On OUTPUT: RESID contains the residual vector r_{k+p}. -c -c RNORM Double precision scalar. (INPUT/OUTPUT) -c B-norm of the starting residual on input. -c B-norm of the updated residual r_{k+p} on output. -c -c V Complex*16 N by K+NP array. (INPUT/OUTPUT) -c On INPUT: V contains the Arnoldi vectors in the first K -c columns. -c On OUTPUT: V contains the new NP Arnoldi vectors in the next -c NP columns. The first K columns are unchanged. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex*16 (K+NP) by (K+NP) array. (INPUT/OUTPUT) -c H is used to store the generated upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORK for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Complex*16 work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The calling program should not -c use WORKD as temporary workspace during the iteration !!!!!! -c On input, WORKD(1:N) = B*RESID and is used to save some -c computation at the first step. -c -c INFO Integer. (OUTPUT) -c = 0: Normal exit. -c > 0: Size of the spanning invariant subspace of OP found. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c zgetv0 ARPACK routine to generate the initial vector. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c zmout ARPACK utility routine that prints matrices -c zvout ARPACK utility routine that prints vectors. -c zlanhs LAPACK routine that computes various norms of a matrix. -c zlascl LAPACK routine for careful scaling of a matrix. -c dlabad LAPACK routine for defining the underflow and overflow -c limits. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c zgemv Level 2 BLAS routine for matrix vector multiplication. -c zaxpy Level 1 BLAS that computes a vector triad. -c zcopy Level 1 BLAS that copies one vector to another . -c zdotc Level 1 BLAS that computes the scalar product of two vectors. -c zscal Level 1 BLAS that scales a vector. -c zdscal Level 1 BLAS that scales a complex vector by a real number. -c dznrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naitr.F SID: 2.3 DATE OF SID: 8/27/96 RELEASE: 2 -c -c\Remarks -c The algorithm implemented is: -c -c restart = .false. -c Given V_{k} = [v_{1}, ..., v_{k}], r_{k}; -c r_{k} contains the initial residual vector even for k = 0; -c Also assume that rnorm = || B*r_{k} || and B*r_{k} are already -c computed by the calling program. -c -c betaj = rnorm ; p_{k+1} = B*r_{k} ; -c For j = k+1, ..., k+np Do -c 1) if ( betaj < tol ) stop or restart depending on j. -c ( At present tol is zero ) -c if ( restart ) generate a new starting vector. -c 2) v_{j} = r(j-1)/betaj; V_{j} = [V_{j-1}, v_{j}]; -c p_{j} = p_{j}/betaj -c 3) r_{j} = OP*v_{j} where OP is defined as in znaupd -c For shift-invert mode p_{j} = B*v_{j} is already available. -c wnorm = || OP*v_{j} || -c 4) Compute the j-th step residual vector. -c w_{j} = V_{j}^T * B * OP * v_{j} -c r_{j} = OP*v_{j} - V_{j} * w_{j} -c H(:,j) = w_{j}; -c H(j,j-1) = rnorm -c rnorm = || r_(j) || -c If (rnorm > 0.717*wnorm) accept step and go back to 1) -c 5) Re-orthogonalization step: -c s = V_{j}'*B*r_{j} -c r_{j} = r_{j} - V_{j}*s; rnorm1 = || r_{j} || -c alphaj = alphaj + s_{j}; -c 6) Iterative refinement step: -c If (rnorm1 > 0.717*rnorm) then -c rnorm = rnorm1 -c accept step and go back to 1) -c Else -c rnorm = rnorm1 -c If this is the first time in step 6), go to 5) -c Else r_{j} lies in the span of V_{j} numerically. -c Set r_{j} = 0 and rnorm = 0; go to 1) -c EndIf -c End Do -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine znaitr - & (ido, bmat, n, k, np, nb, resid, rnorm, v, ldv, h, ldh, - & ipntr, workd, info) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1 - integer ido, info, k, ldh, ldv, n, nb, np - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(3) - Complex*16 - & h(ldh,k+np), resid(n), v(ldv,k+np), workd(3*n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - Double precision - & rone, rzero - parameter (one = (1.0D+0, 0.0D+0), zero = (0.0D+0, 0.0D+0), - & rone = 1.0D+0, rzero = 0.0D+0) -c -c %--------------% -c | Local Arrays | -c %--------------% -c - Double precision - & rtemp(2) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical first, orth1, orth2, rstart, step3, step4 - integer ierr, i, infol, ipj, irj, ivj, iter, itry, j, msglvl, - & jj - Double precision - & ovfl, smlnum, tst1, ulp, unfl, betaj, - & temp1, rnorm1, wnorm - Complex*16 - & cnorm -c - save first, orth1, orth2, rstart, step3, step4, - & ierr, ipj, irj, ivj, iter, itry, j, msglvl, ovfl, - & betaj, rnorm1, smlnum, ulp, unfl, wnorm -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zaxpy, zcopy, zscal, zdscal, zgemv, zgetv0, - & dlabad, zvout, zmout, ivout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Complex*16 - & zdotc - Double precision - & dlamch, dznrm2, zlanhs, dlapy2 - external zdotc, dznrm2, zlanhs, dlamch, dlapy2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic dimag, dble, max, sqrt -c -c %-----------------% -c | Data statements | -c %-----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------% -c | Set machine-dependent constants for the | -c | the splitting and deflation criterion. | -c | If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine zlahqr | -c %-----------------------------------------% -c - unfl = dlamch( 'safe minimum' ) - ovfl = dble(one / unfl) - call dlabad( unfl, ovfl ) - ulp = dlamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcaitr -c -c %------------------------------% -c | Initial call to this routine | -c %------------------------------% -c - info = 0 - step3 = .false. - step4 = .false. - rstart = .false. - orth1 = .false. - orth2 = .false. - j = k + 1 - ipj = 1 - irj = ipj + n - ivj = irj + n - end if -c -c %-------------------------------------------------% -c | When in reverse communication mode one of: | -c | STEP3, STEP4, ORTH1, ORTH2, RSTART | -c | will be .true. when .... | -c | STEP3: return from computing OP*v_{j}. | -c | STEP4: return from computing B-norm of OP*v_{j} | -c | ORTH1: return from computing B-norm of r_{j+1} | -c | ORTH2: return from computing B-norm of | -c | correction to the residual vector. | -c | RSTART: return from OP computations needed by | -c | zgetv0. | -c %-------------------------------------------------% -c - if (step3) go to 50 - if (step4) go to 60 - if (orth1) go to 70 - if (orth2) go to 90 - if (rstart) go to 30 -c -c %-----------------------------% -c | Else this is the first step | -c %-----------------------------% -c -c %--------------------------------------------------------------% -c | | -c | A R N O L D I I T E R A T I O N L O O P | -c | | -c | Note: B*r_{j-1} is already in WORKD(1:N)=WORKD(IPJ:IPJ+N-1) | -c %--------------------------------------------------------------% - - 1000 continue -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: generating Arnoldi vector number') - call dvout (logfil, 1, rnorm, ndigit, - & '_naitr: B-norm of the current residual is') - end if -c -c %---------------------------------------------------% -c | STEP 1: Check if the B norm of j-th residual | -c | vector is zero. Equivalent to determine whether | -c | an exact j-step Arnoldi factorization is present. | -c %---------------------------------------------------% -c - betaj = rnorm - if (rnorm .gt. rzero) go to 40 -c -c %---------------------------------------------------% -c | Invariant subspace found, generate a new starting | -c | vector which is orthogonal to the current Arnoldi | -c | basis and continue the iteration. | -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if -c -c %---------------------------------------------% -c | ITRY is the loop variable that controls the | -c | maximum amount of times that a restart is | -c | attempted. NRSTRT is used by stat.h | -c %---------------------------------------------% -c - betaj = rzero - nrstrt = nrstrt + 1 - itry = 1 - 20 continue - rstart = .true. - ido = 0 - 30 continue -c -c %--------------------------------------% -c | If in reverse communication mode and | -c | RSTART = .true. flow returns here. | -c %--------------------------------------% -c - call zgetv0 (ido, bmat, itry, .false., n, j, v, ldv, - & resid, rnorm, ipntr, workd, ierr) - if (ido .ne. 99) go to 9000 - if (ierr .lt. 0) then - itry = itry + 1 - if (itry .le. 3) go to 20 -c -c %------------------------------------------------% -c | Give up after several restart attempts. | -c | Set INFO to the size of the invariant subspace | -c | which spans OP and exit. | -c %------------------------------------------------% -c - info = j - 1 - call arscnd (t1) - tcaitr = tcaitr + (t1 - t0) - ido = 99 - go to 9000 - end if -c - 40 continue -c -c %---------------------------------------------------------% -c | STEP 2: v_{j} = r_{j-1}/rnorm and p_{j} = p_{j}/rnorm | -c | Note that p_{j} = B*r_{j-1}. In order to avoid overflow | -c | when reciprocating a small RNORM, test against lower | -c | machine bound. | -c %---------------------------------------------------------% -c - call zcopy (n, resid, 1, v(1,j), 1) - if ( rnorm .ge. unfl) then - temp1 = rone / rnorm - call zdscal (n, temp1, v(1,j), 1) - call zdscal (n, temp1, workd(ipj), 1) - else -c -c %-----------------------------------------% -c | To scale both v_{j} and p_{j} carefully | -c | use LAPACK routine zlascl | -c %-----------------------------------------% -c - call zlascl ('General', i, i, rnorm, rone, - & n, 1, v(1,j), n, infol) - call zlascl ('General', i, i, rnorm, rone, - & n, 1, workd(ipj), n, infol) - end if -c -c %------------------------------------------------------% -c | STEP 3: r_{j} = OP*v_{j}; Note that p_{j} = B*v_{j} | -c | Note that this is not quite yet r_{j}. See STEP 4 | -c %------------------------------------------------------% -c - step3 = .true. - nopx = nopx + 1 - call arscnd (t2) - call zcopy (n, v(1,j), 1, workd(ivj), 1) - ipntr(1) = ivj - ipntr(2) = irj - ipntr(3) = ipj - ido = 1 -c -c %-----------------------------------% -c | Exit in order to compute OP*v_{j} | -c %-----------------------------------% -c - go to 9000 - 50 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IRJ:IRJ+N-1) := OP*v_{j} | -c | if step3 = .true. | -c %----------------------------------% -c - call arscnd (t3) - tmvopx = tmvopx + (t3 - t2) - - step3 = .false. -c -c %------------------------------------------% -c | Put another copy of OP*v_{j} into RESID. | -c %------------------------------------------% -c - call zcopy (n, workd(irj), 1, resid, 1) -c -c %---------------------------------------% -c | STEP 4: Finish extending the Arnoldi | -c | factorization to length j. | -c %---------------------------------------% -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - step4 = .true. - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-------------------------------------% -c | Exit in order to compute B*OP*v_{j} | -c %-------------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd(ipj), 1) - end if - 60 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(IPJ:IPJ+N-1) := B*OP*v_{j} | -c | if step4 = .true. | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - step4 = .false. -c -c %-------------------------------------% -c | The following is needed for STEP 5. | -c | Compute the B-norm of OP*v_{j}. | -c %-------------------------------------% -c - if (bmat .eq. 'G') then - cnorm = zdotc (n, resid, 1, workd(ipj), 1) - wnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - wnorm = dznrm2(n, resid, 1) - end if -c -c %-----------------------------------------% -c | Compute the j-th residual corresponding | -c | to the j step factorization. | -c | Use Classical Gram Schmidt and compute: | -c | w_{j} <- V_{j}^T * B * OP * v_{j} | -c | r_{j} <- OP*v_{j} - V_{j} * w_{j} | -c %-----------------------------------------% -c -c -c %------------------------------------------% -c | Compute the j Fourier coefficients w_{j} | -c | WORKD(IPJ:IPJ+N-1) contains B*OP*v_{j}. | -c %------------------------------------------% -c - call zgemv ('C', n, j, one, v, ldv, workd(ipj), 1, - & zero, h(1,j), 1) -c -c %--------------------------------------% -c | Orthogonalize r_{j} against V_{j}. | -c | RESID contains OP*v_{j}. See STEP 3. | -c %--------------------------------------% -c - call zgemv ('N', n, j, -one, v, ldv, h(1,j), 1, - & one, resid, 1) -c - if (j .gt. 1) h(j,j-1) = dcmplx(betaj, rzero) -c - call arscnd (t4) -c - orth1 = .true. -c - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call zcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*r_{j} | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd(ipj), 1) - end if - 70 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH1 = .true. | -c | WORKD(IPJ:IPJ+N-1) := B*r_{j}. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - orth1 = .false. -c -c %------------------------------% -c | Compute the B-norm of r_{j}. | -c %------------------------------% -c - if (bmat .eq. 'G') then - cnorm = zdotc (n, resid, 1, workd(ipj), 1) - rnorm = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm = dznrm2(n, resid, 1) - end if -c -c %-----------------------------------------------------------% -c | STEP 5: Re-orthogonalization / Iterative refinement phase | -c | Maximum NITER_ITREF tries. | -c | | -c | s = V_{j}^T * B * r_{j} | -c | r_{j} = r_{j} - V_{j}*s | -c | alphaj = alphaj + s_{j} | -c | | -c | The stopping criteria used for iterative refinement is | -c | discussed in Parlett's book SEP, page 107 and in Gragg & | -c | Reichel ACM TOMS paper; Algorithm 686, Dec. 1990. | -c | Determine if we need to correct the residual. The goal is | -c | to enforce ||v(:,1:j)^T * r_{j}|| .le. eps * || r_{j} || | -c | The following test determines whether the sine of the | -c | angle between OP*x and the computed residual is less | -c | than or equal to 0.717. | -c %-----------------------------------------------------------% -c - if ( rnorm .gt. 0.717*wnorm ) go to 100 -c - iter = 0 - nrorth = nrorth + 1 -c -c %---------------------------------------------------% -c | Enter the Iterative refinement phase. If further | -c | refinement is necessary, loop back here. The loop | -c | variable is ITER. Perform a step of Classical | -c | Gram-Schmidt using all the Arnoldi vectors V_{j} | -c %---------------------------------------------------% -c - 80 continue -c - if (msglvl .gt. 2) then - rtemp(1) = wnorm - rtemp(2) = rnorm - call dvout (logfil, 2, rtemp, ndigit, - & '_naitr: re-orthogonalization; wnorm and rnorm are') - call zvout (logfil, j, h(1,j), ndigit, - & '_naitr: j-th column of H') - end if -c -c %----------------------------------------------------% -c | Compute V_{j}^T * B * r_{j}. | -c | WORKD(IRJ:IRJ+J-1) = v(:,1:J)'*WORKD(IPJ:IPJ+N-1). | -c %----------------------------------------------------% -c - call zgemv ('C', n, j, one, v, ldv, workd(ipj), 1, - & zero, workd(irj), 1) -c -c %---------------------------------------------% -c | Compute the correction to the residual: | -c | r_{j} = r_{j} - V_{j} * WORKD(IRJ:IRJ+J-1). | -c | The correction to H is v(:,1:J)*H(1:J,1:J) | -c | + v(:,1:J)*WORKD(IRJ:IRJ+J-1)*e'_j. | -c %---------------------------------------------% -c - call zgemv ('N', n, j, -one, v, ldv, workd(irj), 1, - & one, resid, 1) - call zaxpy (j, one, workd(irj), 1, h(1,j), 1) -c - orth2 = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call zcopy (n, resid, 1, workd(irj), 1) - ipntr(1) = irj - ipntr(2) = ipj - ido = 2 -c -c %-----------------------------------% -c | Exit in order to compute B*r_{j}. | -c | r_{j} is the corrected residual. | -c %-----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd(ipj), 1) - end if - 90 continue -c -c %---------------------------------------------------% -c | Back from reverse communication if ORTH2 = .true. | -c %---------------------------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c -c %-----------------------------------------------------% -c | Compute the B-norm of the corrected residual r_{j}. | -c %-----------------------------------------------------% -c - if (bmat .eq. 'G') then - cnorm = zdotc (n, resid, 1, workd(ipj), 1) - rnorm1 = sqrt( dlapy2(dble(cnorm),dimag(cnorm)) ) - else if (bmat .eq. 'I') then - rnorm1 = dznrm2(n, resid, 1) - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0 ) then - call ivout (logfil, 1, j, ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - rtemp(1) = rnorm - rtemp(2) = rnorm1 - call dvout (logfil, 2, rtemp, ndigit, - & '_naitr: iterative refinement ; rnorm and rnorm1 are') - end if - end if -c -c %-----------------------------------------% -c | Determine if we need to perform another | -c | step of re-orthogonalization. | -c %-----------------------------------------% -c - if ( rnorm1 .gt. 0.717*rnorm ) then -c -c %---------------------------------------% -c | No need for further refinement. | -c | The cosine of the angle between the | -c | corrected residual vector and the old | -c | residual vector is greater than 0.717 | -c | In other words the corrected residual | -c | and the old residual vector share an | -c | angle of less than arcCOS(0.717) | -c %---------------------------------------% -c - rnorm = rnorm1 -c - else -c -c %-------------------------------------------% -c | Another step of iterative refinement step | -c | is required. NITREF is used by stat.h | -c %-------------------------------------------% -c - nitref = nitref + 1 - rnorm = rnorm1 - iter = iter + 1 - if (iter .le. 1) go to 80 -c -c %-------------------------------------------------% -c | Otherwise RESID is numerically in the span of V | -c %-------------------------------------------------% -c - do 95 jj = 1, n - resid(jj) = zero - 95 continue - rnorm = rzero - end if -c -c %----------------------------------------------% -c | Branch here directly if iterative refinement | -c | wasn't necessary or after at most NITER_REF | -c | steps of iterative refinement. | -c %----------------------------------------------% -c - 100 continue -c - rstart = .false. - orth2 = .false. -c - call arscnd (t5) - titref = titref + (t5 - t4) -c -c %------------------------------------% -c | STEP 6: Update j = j+1; Continue | -c %------------------------------------% -c - j = j + 1 - if (j .gt. k+np) then - call arscnd (t1) - tcaitr = tcaitr + (t1 - t0) - ido = 99 - do 110 i = max(1,k), k+np-1 -c -c %--------------------------------------------% -c | Check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine zlahqr | -c %--------------------------------------------% -c - tst1 = dlapy2(dble(h(i,i)),dimag(h(i,i))) - & + dlapy2(dble(h(i+1,i+1)), dimag(h(i+1,i+1))) - if( tst1.eq.dble(zero) ) - & tst1 = zlanhs( '1', k+np, h, ldh, workd(n+1) ) - if( dlapy2(dble(h(i+1,i)),dimag(h(i+1,i))) .le. - & max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 110 continue -c - if (msglvl .gt. 2) then - call zmout (logfil, k+np, k+np, h, ldh, ndigit, - & '_naitr: Final upper Hessenberg matrix H of order K+NP') - end if -c - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Loop back to extend the factorization by another step. | -c %--------------------------------------------------------% -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 9000 continue - return -c -c %---------------% -c | End of znaitr | -c %---------------% -c - end
--- a/libcruft/arpack/src/znapps.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,507 +0,0 @@ -c\BeginDoc -c -c\Name: znapps -c -c\Description: -c Given the Arnoldi factorization -c -c A*V_{k} - V_{k}*H_{k} = r_{k+p}*e_{k+p}^T, -c -c apply NP implicit shifts resulting in -c -c A*(V_{k}*Q) - (V_{k}*Q)*(Q^T* H_{k}*Q) = r_{k+p}*e_{k+p}^T * Q -c -c where Q is an orthogonal matrix which is the product of rotations -c and reflections resulting from the NP bulge change sweeps. -c The updated Arnoldi factorization becomes: -c -c A*VNEW_{k} - VNEW_{k}*HNEW_{k} = rnew_{k}*e_{k}^T. -c -c\Usage: -c call znapps -c ( N, KEV, NP, SHIFT, V, LDV, H, LDH, RESID, Q, LDQ, -c WORKL, WORKD ) -c -c\Arguments -c N Integer. (INPUT) -c Problem size, i.e. size of matrix A. -c -c KEV Integer. (INPUT/OUTPUT) -c KEV+NP is the size of the input matrix H. -c KEV is the size of the updated matrix HNEW. -c -c NP Integer. (INPUT) -c Number of implicit shifts to be applied. -c -c SHIFT Complex*16 array of length NP. (INPUT) -c The shifts to be applied. -c -c V Complex*16 N by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, V contains the current KEV+NP Arnoldi vectors. -c On OUTPUT, V contains the updated KEV Arnoldi vectors -c in the first KEV columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex*16 (KEV+NP) by (KEV+NP) array. (INPUT/OUTPUT) -c On INPUT, H contains the current KEV+NP by KEV+NP upper -c Hessenberg matrix of the Arnoldi factorization. -c On OUTPUT, H contains the updated KEV by KEV upper Hessenberg -c matrix in the KEV leading submatrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RESID Complex*16 array of length N. (INPUT/OUTPUT) -c On INPUT, RESID contains the the residual vector r_{k+p}. -c On OUTPUT, RESID is the update residual vector rnew_{k} -c in the first KEV locations. -c -c Q Complex*16 KEV+NP by KEV+NP work array. (WORKSPACE) -c Work array used to accumulate the rotations and reflections -c during the bulge chase sweep. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex*16 work array of length (KEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c WORKD Complex*16 work array of length 2*N. (WORKSPACE) -c Distributed array used in the application of the accumulated -c orthogonal matrix Q. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c zmout ARPACK utility routine that prints matrices -c zvout ARPACK utility routine that prints vectors. -c zlacpy LAPACK matrix copy routine. -c zlanhs LAPACK routine that computes various norms of a matrix. -c zlartg LAPACK Givens rotation construction routine. -c zlaset LAPACK matrix initialization routine. -c dlabad LAPACK routine for defining the underflow and overflow -c limits. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c zgemv Level 2 BLAS routine for matrix vector multiplication. -c zaxpy Level 1 BLAS that computes a vector triad. -c zcopy Level 1 BLAS that copies one vector to another. -c zscal Level 1 BLAS that scales a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: napps.F SID: 2.3 DATE OF SID: 3/28/97 RELEASE: 2 -c -c\Remarks -c 1. In this version, each shift is applied to all the sublocks of -c the Hessenberg matrix H and not just to the submatrix that it -c comes from. Deflation as in LAPACK routine zlahqr (QR algorithm -c for upper Hessenberg matrices ) is used. -c Upon output, the subdiagonals of H are enforced to be non-negative -c real numbers. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine znapps - & ( n, kev, np, shift, v, ldv, h, ldh, resid, q, ldq, - & workl, workd ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer kev, ldh, ldq, ldv, n, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex*16 - & h(ldh,kev+np), resid(n), shift(np), - & v(ldv,kev+np), q(ldq,kev+np), workd(2*n), workl(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - Double precision - & rzero - parameter (one = (1.0D+0, 0.0D+0), zero = (0.0D+0, 0.0D+0), - & rzero = 0.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - integer i, iend, istart, j, jj, kplusp, msglvl - logical first - Complex*16 - & cdum, f, g, h11, h21, r, s, sigma, t - Double precision - & c, ovfl, smlnum, ulp, unfl, tst1 - save first, ovfl, smlnum, ulp, unfl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zaxpy, zcopy, zgemv, zscal, zlacpy, zlartg, - & zvout, zlaset, dlabad, zmout, arscnd, ivout -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & zlanhs, dlamch, dlapy2 - external zlanhs, dlamch, dlapy2 -c -c %----------------------% -c | Intrinsics Functions | -c %----------------------% -c - intrinsic abs, dimag, conjg, dcmplx, max, min, dble -c -c %---------------------% -c | Statement Functions | -c %---------------------% -c - Double precision - & zabs1 - zabs1( cdum ) = abs( dble( cdum ) ) + abs( dimag( cdum ) ) -c -c %----------------% -c | Data statments | -c %----------------% -c - data first / .true. / -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (first) then -c -c %-----------------------------------------------% -c | Set machine-dependent constants for the | -c | stopping criterion. If norm(H) <= sqrt(OVFL), | -c | overflow should not occur. | -c | REFERENCE: LAPACK subroutine zlahqr | -c %-----------------------------------------------% -c - unfl = dlamch( 'safe minimum' ) - ovfl = dble(one / unfl) - call dlabad( unfl, ovfl ) - ulp = dlamch( 'precision' ) - smlnum = unfl*( n / ulp ) - first = .false. - end if -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcapps -c - kplusp = kev + np -c -c %--------------------------------------------% -c | Initialize Q to the identity to accumulate | -c | the rotations and reflections | -c %--------------------------------------------% -c - call zlaset ('All', kplusp, kplusp, zero, one, q, ldq) -c -c %----------------------------------------------% -c | Quick return if there are no shifts to apply | -c %----------------------------------------------% -c - if (np .eq. 0) go to 9000 -c -c %----------------------------------------------% -c | Chase the bulge with the application of each | -c | implicit shift. Each shift is applied to the | -c | whole matrix including each block. | -c %----------------------------------------------% -c - do 110 jj = 1, np - sigma = shift(jj) -c - if (msglvl .gt. 2 ) then - call ivout (logfil, 1, jj, ndigit, - & '_napps: shift number.') - call zvout (logfil, 1, sigma, ndigit, - & '_napps: Value of the shift ') - end if -c - istart = 1 - 20 continue -c - do 30 i = istart, kplusp-1 -c -c %----------------------------------------% -c | Check for splitting and deflation. Use | -c | a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine zlahqr | -c %----------------------------------------% -c - tst1 = zabs1( h( i, i ) ) + zabs1( h( i+1, i+1 ) ) - if( tst1.eq.rzero ) - & tst1 = zlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if ( abs(dble(h(i+1,i))) - & .le. max(ulp*tst1, smlnum) ) then - if (msglvl .gt. 0) then - call ivout (logfil, 1, i, ndigit, - & '_napps: matrix splitting at row/column no.') - call ivout (logfil, 1, jj, ndigit, - & '_napps: matrix splitting with shift number.') - call zvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') - end if - iend = i - h(i+1,i) = zero - go to 40 - end if - 30 continue - iend = kplusp - 40 continue -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, istart, ndigit, - & '_napps: Start of current block ') - call ivout (logfil, 1, iend, ndigit, - & '_napps: End of current block ') - end if -c -c %------------------------------------------------% -c | No reason to apply a shift to block of order 1 | -c | or if the current block starts after the point | -c | of compression since we'll discard this stuff | -c %------------------------------------------------% -c - if ( istart .eq. iend .or. istart .gt. kev) go to 100 -c - h11 = h(istart,istart) - h21 = h(istart+1,istart) - f = h11 - sigma - g = h21 -c - do 80 i = istart, iend-1 -c -c %------------------------------------------------------% -c | Construct the plane rotation G to zero out the bulge | -c %------------------------------------------------------% -c - call zlartg (f, g, c, s, r) - if (i .gt. istart) then - h(i,i-1) = r - h(i+1,i-1) = zero - end if -c -c %---------------------------------------------% -c | Apply rotation to the left of H; H <- G'*H | -c %---------------------------------------------% -c - do 50 j = i, kplusp - t = c*h(i,j) + s*h(i+1,j) - h(i+1,j) = -conjg(s)*h(i,j) + c*h(i+1,j) - h(i,j) = t - 50 continue -c -c %---------------------------------------------% -c | Apply rotation to the right of H; H <- H*G | -c %---------------------------------------------% -c - do 60 j = 1, min(i+2,iend) - t = c*h(j,i) + conjg(s)*h(j,i+1) - h(j,i+1) = -s*h(j,i) + c*h(j,i+1) - h(j,i) = t - 60 continue -c -c %-----------------------------------------------------% -c | Accumulate the rotation in the matrix Q; Q <- Q*G' | -c %-----------------------------------------------------% -c - do 70 j = 1, min(i+jj, kplusp) - t = c*q(j,i) + conjg(s)*q(j,i+1) - q(j,i+1) = - s*q(j,i) + c*q(j,i+1) - q(j,i) = t - 70 continue -c -c %---------------------------% -c | Prepare for next rotation | -c %---------------------------% -c - if (i .lt. iend-1) then - f = h(i+1,i) - g = h(i+2,i) - end if - 80 continue -c -c %-------------------------------% -c | Finished applying the shift. | -c %-------------------------------% -c - 100 continue -c -c %---------------------------------------------------------% -c | Apply the same shift to the next block if there is any. | -c %---------------------------------------------------------% -c - istart = iend + 1 - if (iend .lt. kplusp) go to 20 -c -c %---------------------------------------------% -c | Loop back to the top to get the next shift. | -c %---------------------------------------------% -c - 110 continue -c -c %---------------------------------------------------% -c | Perform a similarity transformation that makes | -c | sure that the compressed H will have non-negative | -c | real subdiagonal elements. | -c %---------------------------------------------------% -c - do 120 j=1,kev - if ( dble( h(j+1,j) ) .lt. rzero .or. - & dimag( h(j+1,j) ) .ne. rzero ) then - t = h(j+1,j) / dlapy2(dble(h(j+1,j)),dimag(h(j+1,j))) - call zscal( kplusp-j+1, conjg(t), h(j+1,j), ldh ) - call zscal( min(j+2, kplusp), t, h(1,j+1), 1 ) - call zscal( min(j+np+1,kplusp), t, q(1,j+1), 1 ) - h(j+1,j) = dcmplx( dble( h(j+1,j) ), rzero ) - end if - 120 continue -c - do 130 i = 1, kev -c -c %--------------------------------------------% -c | Final check for splitting and deflation. | -c | Use a standard test as in the QR algorithm | -c | REFERENCE: LAPACK subroutine zlahqr. | -c | Note: Since the subdiagonals of the | -c | compressed H are nonnegative real numbers, | -c | we take advantage of this. | -c %--------------------------------------------% -c - tst1 = zabs1( h( i, i ) ) + zabs1( h( i+1, i+1 ) ) - if( tst1 .eq. rzero ) - & tst1 = zlanhs( '1', kev, h, ldh, workl ) - if( dble( h( i+1,i ) ) .le. max( ulp*tst1, smlnum ) ) - & h(i+1,i) = zero - 130 continue -c -c %-------------------------------------------------% -c | Compute the (kev+1)-st column of (V*Q) and | -c | temporarily store the result in WORKD(N+1:2*N). | -c | This is needed in the residual update since we | -c | cannot GUARANTEE that the corresponding entry | -c | of H would be zero as in exact arithmetic. | -c %-------------------------------------------------% -c - if ( dble( h(kev+1,kev) ) .gt. rzero ) - & call zgemv ('N', n, kplusp, one, v, ldv, q(1,kev+1), 1, zero, - & workd(n+1), 1) -c -c %----------------------------------------------------------% -c | Compute column 1 to kev of (V*Q) in backward order | -c | taking advantage of the upper Hessenberg structure of Q. | -c %----------------------------------------------------------% -c - do 140 i = 1, kev - call zgemv ('N', n, kplusp-i+1, one, v, ldv, - & q(1,kev-i+1), 1, zero, workd, 1) - call zcopy (n, workd, 1, v(1,kplusp-i+1), 1) - 140 continue -c -c %-------------------------------------------------% -c | Move v(:,kplusp-kev+1:kplusp) into v(:,1:kev). | -c %-------------------------------------------------% -c - call zlacpy ('A', n, kev, v(1,kplusp-kev+1), ldv, v, ldv) -c -c %--------------------------------------------------------------% -c | Copy the (kev+1)-st column of (V*Q) in the appropriate place | -c %--------------------------------------------------------------% -c - if ( dble( h(kev+1,kev) ) .gt. rzero ) - & call zcopy (n, workd(n+1), 1, v(1,kev+1), 1) -c -c %-------------------------------------% -c | Update the residual vector: | -c | r <- sigmak*r + betak*v(:,kev+1) | -c | where | -c | sigmak = (e_{kev+p}'*Q)*e_{kev} | -c | betak = e_{kev+1}'*H*e_{kev} | -c %-------------------------------------% -c - call zscal (n, q(kplusp,kev), resid, 1) - if ( dble( h(kev+1,kev) ) .gt. rzero ) - & call zaxpy (n, h(kev+1,kev), v(1,kev+1), 1, resid, 1) -c - if (msglvl .gt. 1) then - call zvout (logfil, 1, q(kplusp,kev), ndigit, - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call zvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') - call ivout (logfil, 1, kev, ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call zmout (logfil, kev, kev, h, ldh, ndigit, - & '_napps: updated Hessenberg matrix H for next iteration') - end if -c - end if -c - 9000 continue - call arscnd (t1) - tcapps = tcapps + (t1 - t0) -c - return -c -c %---------------% -c | End of znapps | -c %---------------% -c - end
--- a/libcruft/arpack/src/znaup2.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,801 +0,0 @@ -c\BeginDoc -c -c\Name: znaup2 -c -c\Description: -c Intermediate level interface called by znaupd . -c -c\Usage: -c call znaup2 -c ( IDO, BMAT, N, WHICH, NEV, NP, TOL, RESID, MODE, IUPD, -c ISHIFT, MXITER, V, LDV, H, LDH, RITZ, BOUNDS, -c Q, LDQ, WORKL, IPNTR, WORKD, RWORK, INFO ) -c -c\Arguments -c -c IDO, BMAT, N, WHICH, NEV, TOL, RESID: same as defined in znaupd . -c MODE, ISHIFT, MXITER: see the definition of IPARAM in znaupd . -c -c NP Integer. (INPUT/OUTPUT) -c Contains the number of implicit shifts to apply during -c each Arnoldi iteration. -c If ISHIFT=1, NP is adjusted dynamically at each iteration -c to accelerate convergence and prevent stagnation. -c This is also roughly equal to the number of matrix-vector -c products (involving the operator OP) per Arnoldi iteration. -c The logic for adjusting is contained within the current -c subroutine. -c If ISHIFT=0, NP is the number of shifts the user needs -c to provide via reverse comunication. 0 < NP < NCV-NEV. -c NP may be less than NCV-NEV since a leading block of the current -c upper Hessenberg matrix has split off and contains "unwanted" -c Ritz values. -c Upon termination of the IRA iteration, NP contains the number -c of "converged" wanted Ritz values. -c -c IUPD Integer. (INPUT) -c IUPD .EQ. 0: use explicit restart instead implicit update. -c IUPD .NE. 0: use implicit update. -c -c V Complex*16 N by (NEV+NP) array. (INPUT/OUTPUT) -c The Arnoldi basis vectors are returned in the first NEV -c columns of V. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling -c program. -c -c H Complex*16 (NEV+NP) by (NEV+NP) array. (OUTPUT) -c H is used to store the generated upper Hessenberg matrix -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Complex*16 array of length NEV+NP. (OUTPUT) -c RITZ(1:NEV) contains the computed Ritz values of OP. -c -c BOUNDS Complex*16 array of length NEV+NP. (OUTPUT) -c BOUNDS(1:NEV) contain the error bounds corresponding to -c the computed Ritz values. -c -c Q Complex*16 (NEV+NP) by (NEV+NP) array. (WORKSPACE) -c Private (replicated) work array used to accumulate the -c rotation in the shift application step. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex*16 work array of length at least -c (NEV+NP)**2 + 3*(NEV+NP). (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. It is used in shifts calculation, shifts -c application and convergence checking. -c -c -c IPNTR Integer array of length 3. (OUTPUT) -c Pointer to mark the starting locations in the WORKD for -c vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X. -c IPNTR(2): pointer to the current result vector Y. -c IPNTR(3): pointer to the vector B * X when used in the -c shift-and-invert mode. X is the current operand. -c ------------------------------------------------------------- -c -c WORKD Complex*16 work array of length 3*N. (WORKSPACE) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note in ZNAUPD . -c -c RWORK Double precision work array of length NEV+NP ( WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal return. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. -c NP returns the number of converged Ritz values. -c = 2: No shifts could be applied. -c = -8: Error return from LAPACK eigenvalue calculation; -c This should never happen. -c = -9: Starting vector is zero. -c = -9999: Could not build an Arnoldi factorization. -c Size that was built in returned in NP. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c -c\Routines called: -c zgetv0 ARPACK initial vector generation routine. -c znaitr ARPACK Arnoldi factorization routine. -c znapps ARPACK application of implicit shifts routine. -c zneigh ARPACK compute Ritz values and error bounds routine. -c zngets ARPACK reorder Ritz values and error bounds routine. -c zsortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c zmout ARPACK utility routine that prints matrices -c zvout ARPACK utility routine that prints vectors. -c dvout ARPACK utility routine that prints vectors. -c dlamch LAPACK routine that determines machine constants. -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c zcopy Level 1 BLAS that copies one vector to another . -c zdotc Level 1 BLAS that computes the scalar product of two vectors. -c zswap Level 1 BLAS that swaps two vectors. -c dznrm2 Level 1 BLAS that computes the norm of a vector. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice Universitya -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naup2.F SID: 2.6 DATE OF SID: 06/01/00 RELEASE: 2 -c -c\Remarks -c 1. None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine znaup2 - & ( ido, bmat, n, which, nev, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, h, ldh, ritz, bounds, - & q, ldq, workl, ipntr, workd, rwork, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ishift, iupd, mode, ldh, ldq, ldv, mxiter, - & n, nev, np - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer ipntr(13) - Complex*16 - & bounds(nev+np), h(ldh,nev+np), q(ldq,nev+np), - & resid(n), ritz(nev+np), v(ldv,nev+np), - & workd(3*n), workl( (nev+np)*(nev+np+3) ) - Double precision - & rwork(nev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - Double precision - & rzero - parameter (one = (1.0D+0, 0.0D+0) , zero = (0.0D+0, 0.0D+0) , - & rzero = 0.0D+0 ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - logical cnorm , getv0, initv , update, ushift - integer ierr , iter , kplusp, msglvl, nconv, - & nevbef, nev0 , np0 , nptemp, i , - & j - Complex*16 - & cmpnorm - Double precision - & rnorm , eps23, rtemp - character wprime*2 -c - save cnorm, getv0, initv , update, ushift, - & rnorm, iter , kplusp, msglvl, nconv , - & nevbef, nev0 , np0 , eps23 -c -c -c %-----------------------% -c | Local array arguments | -c %-----------------------% -c - integer kp(3) -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zcopy , zgetv0 , znaitr , zneigh , zngets , znapps , - & zsortc , zswap , zmout , zvout , ivout, arscnd -c -c %--------------------% -c | External functions | -c %--------------------% -c - Complex*16 - & zdotc - Double precision - & dznrm2 , dlamch , dlapy2 - external zdotc , dznrm2 , dlamch , dlapy2 -c -c %---------------------% -c | Intrinsic Functions | -c %---------------------% -c - intrinsic dimag , dble , min, max -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c - call arscnd (t0) -c - msglvl = mcaup2 -c - nev0 = nev - np0 = np -c -c %-------------------------------------% -c | kplusp is the bound on the largest | -c | Lanczos factorization built. | -c | nconv is the current number of | -c | "converged" eigenvalues. | -c | iter is the counter on the current | -c | iteration step. | -c %-------------------------------------% -c - kplusp = nev + np - nconv = 0 - iter = 0 -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch ('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0 ) -c -c %---------------------------------------% -c | Set flags for computing the first NEV | -c | steps of the Arnoldi factorization. | -c %---------------------------------------% -c - getv0 = .true. - update = .false. - ushift = .false. - cnorm = .false. -c - if (info .ne. 0) then -c -c %--------------------------------------------% -c | User provides the initial residual vector. | -c %--------------------------------------------% -c - initv = .true. - info = 0 - else - initv = .false. - end if - end if -c -c %---------------------------------------------% -c | Get a possibly random starting vector and | -c | force it into the range of the operator OP. | -c %---------------------------------------------% -c - 10 continue -c - if (getv0) then - call zgetv0 (ido, bmat, 1, initv, n, 1, v, ldv, resid, rnorm, - & ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (rnorm .eq. rzero) then -c -c %-----------------------------------------% -c | The initial vector is zero. Error exit. | -c %-----------------------------------------% -c - info = -9 - go to 1100 - end if - getv0 = .false. - ido = 0 - end if -c -c %-----------------------------------% -c | Back from reverse communication : | -c | continue with update step | -c %-----------------------------------% -c - if (update) go to 20 -c -c %-------------------------------------------% -c | Back from computing user specified shifts | -c %-------------------------------------------% -c - if (ushift) go to 50 -c -c %-------------------------------------% -c | Back from computing residual norm | -c | at the end of the current iteration | -c %-------------------------------------% -c - if (cnorm) go to 100 -c -c %----------------------------------------------------------% -c | Compute the first NEV steps of the Arnoldi factorization | -c %----------------------------------------------------------% -c - call znaitr (ido, bmat, n, 0, nev, mode, resid, rnorm, v, ldv, - & h, ldh, ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if -c -c %--------------------------------------------------------------% -c | | -c | M A I N ARNOLDI I T E R A T I O N L O O P | -c | Each iteration implicitly restarts the Arnoldi | -c | factorization in place. | -c | | -c %--------------------------------------------------------------% -c - 1000 continue -c - iter = iter + 1 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, - & '_naup2: **** Start of major iteration number ****') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c | Adjust NP since NEV might have been updated by last call | -c | to the shift application routine znapps . | -c %-----------------------------------------------------------% -c - np = kplusp - nev -c - if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, - & '_naup2: The length of the current Arnoldi factorization') - call ivout (logfil, 1, np, ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if -c -c %-----------------------------------------------------------% -c | Compute NP additional steps of the Arnoldi factorization. | -c %-----------------------------------------------------------% -c - ido = 0 - 20 continue - update = .true. -c - call znaitr (ido, bmat, n, nev, np, mode, resid, rnorm, - & v , ldv , h, ldh, ipntr, workd, info) -c - if (ido .ne. 99) go to 9000 -c - if (info .gt. 0) then - np = info - mxiter = iter - info = -9999 - go to 1200 - end if - update = .false. -c - if (msglvl .gt. 1) then - call dvout (logfil, 1, rnorm, ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if -c -c %--------------------------------------------------------% -c | Compute the eigenvalues and corresponding error bounds | -c | of the current upper Hessenberg matrix. | -c %--------------------------------------------------------% -c - call zneigh (rnorm, kplusp, h, ldh, ritz, bounds, - & q, ldq, workl, rwork, ierr) -c - if (ierr .ne. 0) then - info = -8 - go to 1200 - end if -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | error bounds are in the last NEV loc. of RITZ, | -c | and BOUNDS respectively. | -c %---------------------------------------------------% -c - nev = nev0 - np = np0 -c -c %--------------------------------------------------% -c | Make a copy of Ritz values and the corresponding | -c | Ritz estimates obtained from zneigh . | -c %--------------------------------------------------% -c - call zcopy (kplusp,ritz,1,workl(kplusp**2+1),1) - call zcopy (kplusp,bounds,1,workl(kplusp**2+kplusp+1),1) -c -c %---------------------------------------------------% -c | Select the wanted Ritz values and their bounds | -c | to be used in the convergence test. | -c | The wanted part of the spectrum and corresponding | -c | bounds are in the last NEV loc. of RITZ | -c | BOUNDS respectively. | -c %---------------------------------------------------% -c - call zngets (ishift, which, nev, np, ritz, bounds) -c -c %------------------------------------------------------------% -c | Convergence test: currently we use the following criteria. | -c | The relative accuracy of a Ritz value is considered | -c | acceptable if: | -c | | -c | error_bounds(i) .le. tol*max(eps23, magnitude_of_ritz(i)). | -c | | -c %------------------------------------------------------------% -c - nconv = 0 -c - do 25 i = 1, nev - rtemp = max( eps23, dlapy2 ( dble (ritz(np+i)), - & dimag (ritz(np+i)) ) ) - if ( dlapy2 (dble (bounds(np+i)),dimag (bounds(np+i))) - & .le. tol*rtemp ) then - nconv = nconv + 1 - end if - 25 continue -c - if (msglvl .gt. 2) then - kp(1) = nev - kp(2) = np - kp(3) = nconv - call ivout (logfil, 3, kp, ndigit, - & '_naup2: NEV, NP, NCONV are') - call zvout (logfil, kplusp, ritz, ndigit, - & '_naup2: The eigenvalues of H') - call zvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Ritz estimates of the current NCV Ritz values') - end if -c -c %---------------------------------------------------------% -c | Count the number of unwanted Ritz values that have zero | -c | Ritz estimates. If any Ritz estimates are equal to zero | -c | then a leading block of H of order equal to at least | -c | the number of Ritz values with zero Ritz estimates has | -c | split off. None of these Ritz values may be removed by | -c | shifting. Decrease NP the number of shifts to apply. If | -c | no shifts may be applied, then prepare to exit | -c %---------------------------------------------------------% -c - nptemp = np - do 30 j=1, nptemp - if (bounds(j) .eq. zero) then - np = np - 1 - nev = nev + 1 - end if - 30 continue -c - if ( (nconv .ge. nev0) .or. - & (iter .gt. mxiter) .or. - & (np .eq. 0) ) then -c - if (msglvl .gt. 4) then - call zvout (logfil, kplusp, workl(kplusp**2+1), ndigit, - & '_naup2: Eigenvalues computed by _neigh:') - call zvout (logfil, kplusp, workl(kplusp**2+kplusp+1), - & ndigit, - & '_naup2: Ritz estimates computed by _neigh:') - end if -c -c %------------------------------------------------% -c | Prepare to exit. Put the converged Ritz values | -c | and corresponding bounds in RITZ(1:NCONV) and | -c | BOUNDS(1:NCONV) respectively. Then sort. Be | -c | careful when NCONV > NP | -c %------------------------------------------------% -c -c %------------------------------------------% -c | Use h( 3,1 ) as storage to communicate | -c | rnorm to zneupd if needed | -c %------------------------------------------% - - h(3,1) = dcmplx (rnorm,rzero) -c -c %----------------------------------------------% -c | Sort Ritz values so that converged Ritz | -c | values appear within the first NEV locations | -c | of ritz and bounds, and the most desired one | -c | appears at the front. | -c %----------------------------------------------% -c - if (which .eq. 'LM') wprime = 'SM' - if (which .eq. 'SM') wprime = 'LM' - if (which .eq. 'LR') wprime = 'SR' - if (which .eq. 'SR') wprime = 'LR' - if (which .eq. 'LI') wprime = 'SI' - if (which .eq. 'SI') wprime = 'LI' -c - call zsortc (wprime, .true., kplusp, ritz, bounds) -c -c %--------------------------------------------------% -c | Scale the Ritz estimate of each Ritz value | -c | by 1 / max(eps23, magnitude of the Ritz value). | -c %--------------------------------------------------% -c - do 35 j = 1, nev0 - rtemp = max( eps23, dlapy2 ( dble (ritz(j)), - & dimag (ritz(j)) ) ) - bounds(j) = bounds(j)/rtemp - 35 continue -c -c %---------------------------------------------------% -c | Sort the Ritz values according to the scaled Ritz | -c | estimates. This will push all the converged ones | -c | towards the front of ritz, bounds (in the case | -c | when NCONV < NEV.) | -c %---------------------------------------------------% -c - wprime = 'LM' - call zsortc (wprime, .true., nev0, bounds, ritz) -c -c %----------------------------------------------% -c | Scale the Ritz estimate back to its original | -c | value. | -c %----------------------------------------------% -c - do 40 j = 1, nev0 - rtemp = max( eps23, dlapy2 ( dble (ritz(j)), - & dimag (ritz(j)) ) ) - bounds(j) = bounds(j)*rtemp - 40 continue -c -c %-----------------------------------------------% -c | Sort the converged Ritz values again so that | -c | the "threshold" value appears at the front of | -c | ritz and bound. | -c %-----------------------------------------------% -c - call zsortc (which, .true., nconv, ritz, bounds) -c - if (msglvl .gt. 1) then - call zvout (logfil, kplusp, ritz, ndigit, - & '_naup2: Sorted eigenvalues') - call zvout (logfil, kplusp, bounds, ndigit, - & '_naup2: Sorted ritz estimates.') - end if -c -c %------------------------------------% -c | Max iterations have been exceeded. | -c %------------------------------------% -c - if (iter .gt. mxiter .and. nconv .lt. nev0) info = 1 -c -c %---------------------% -c | No shifts to apply. | -c %---------------------% -c - if (np .eq. 0 .and. nconv .lt. nev0) info = 2 -c - np = nconv - go to 1100 -c - else if ( (nconv .lt. nev0) .and. (ishift .eq. 1) ) then -c -c %-------------------------------------------------% -c | Do not have all the requested eigenvalues yet. | -c | To prevent possible stagnation, adjust the size | -c | of NEV. | -c %-------------------------------------------------% -c - nevbef = nev - nev = nev + min(nconv, np/2) - if (nev .eq. 1 .and. kplusp .ge. 6) then - nev = kplusp / 2 - else if (nev .eq. 1 .and. kplusp .gt. 3) then - nev = 2 - end if - np = kplusp - nev -c -c %---------------------------------------% -c | If the size of NEV was just increased | -c | resort the eigenvalues. | -c %---------------------------------------% -c - if (nevbef .lt. nev) - & call zngets (ishift, which, nev, np, ritz, bounds) -c - end if -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev - kp(2) = np - call ivout (logfil, 2, kp, ndigit, - & '_naup2: NEV and NP are') - call zvout (logfil, nev, ritz(np+1), ndigit, - & '_naup2: "wanted" Ritz values ') - call zvout (logfil, nev, bounds(np+1), ndigit, - & '_naup2: Ritz estimates of the "wanted" values ') - end if - end if -c - if (ishift .eq. 0) then -c -c %-------------------------------------------------------% -c | User specified shifts: pop back out to get the shifts | -c | and return them in the first 2*NP locations of WORKL. | -c %-------------------------------------------------------% -c - ushift = .true. - ido = 3 - go to 9000 - end if - 50 continue - ushift = .false. -c - if ( ishift .ne. 1 ) then -c -c %----------------------------------% -c | Move the NP shifts from WORKL to | -c | RITZ, to free up WORKL | -c | for non-exact shift case. | -c %----------------------------------% -c - call zcopy (np, workl, 1, ritz, 1) - end if -c - if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, - & '_naup2: The number of shifts to apply ') - call zvout (logfil, np, ritz, ndigit, - & '_naup2: values of the shifts') - if ( ishift .eq. 1 ) - & call zvout (logfil, np, bounds, ndigit, - & '_naup2: Ritz estimates of the shifts') - end if -c -c %---------------------------------------------------------% -c | Apply the NP implicit shifts by QR bulge chasing. | -c | Each shift is applied to the whole upper Hessenberg | -c | matrix H. | -c | The first 2*N locations of WORKD are used as workspace. | -c %---------------------------------------------------------% -c - call znapps (n, nev, np, ritz, v, ldv, - & h, ldh, resid, q, ldq, workl, workd) -c -c %---------------------------------------------% -c | Compute the B-norm of the updated residual. | -c | Keep B*RESID in WORKD(1:N) to be used in | -c | the first step of the next call to znaitr . | -c %---------------------------------------------% -c - cnorm = .true. - call arscnd (t2) - if (bmat .eq. 'G') then - nbx = nbx + 1 - call zcopy (n, resid, 1, workd(n+1), 1) - ipntr(1) = n + 1 - ipntr(2) = 1 - ido = 2 -c -c %----------------------------------% -c | Exit in order to compute B*RESID | -c %----------------------------------% -c - go to 9000 - else if (bmat .eq. 'I') then - call zcopy (n, resid, 1, workd, 1) - end if -c - 100 continue -c -c %----------------------------------% -c | Back from reverse communication; | -c | WORKD(1:N) := B*RESID | -c %----------------------------------% -c - if (bmat .eq. 'G') then - call arscnd (t3) - tmvbx = tmvbx + (t3 - t2) - end if -c - if (bmat .eq. 'G') then - cmpnorm = zdotc (n, resid, 1, workd, 1) - rnorm = sqrt(dlapy2 (dble (cmpnorm),dimag (cmpnorm))) - else if (bmat .eq. 'I') then - rnorm = dznrm2 (n, resid, 1) - end if - cnorm = .false. -c - if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm, ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call zmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') - end if -c - go to 1000 -c -c %---------------------------------------------------------------% -c | | -c | E N D O F M A I N I T E R A T I O N L O O P | -c | | -c %---------------------------------------------------------------% -c - 1100 continue -c - mxiter = iter - nev = nconv -c - 1200 continue - ido = 99 -c -c %------------% -c | Error Exit | -c %------------% -c - call arscnd (t1) - tcaup2 = t1 - t0 -c - 9000 continue -c -c %---------------% -c | End of znaup2 | -c %---------------% -c - return - end
--- a/libcruft/arpack/src/znaupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,664 +0,0 @@ -c\BeginDoc -c -c\Name: znaupd -c -c\Description: -c Reverse communication interface for the Implicitly Restarted Arnoldi -c iteration. This is intended to be used to find a few eigenpairs of a -c complex linear operator OP with respect to a semi-inner product defined -c by a hermitian positive semi-definite real matrix B. B may be the identity -c matrix. NOTE: if both OP and B are real, then dsaupd or dnaupd should -c be used. -c -c -c The computed approximate eigenvalues are called Ritz values and -c the corresponding approximate eigenvectors are called Ritz vectors. -c -c znaupd is usually called iteratively to solve one of the -c following problems: -c -c Mode 1: A*x = lambda*x. -c ===> OP = A and B = I. -c -c Mode 2: A*x = lambda*M*x, M hermitian positive definite -c ===> OP = inv[M]*A and B = M. -c ===> (If M can be factored see remark 3 below) -c -c Mode 3: A*x = lambda*M*x, M hermitian semi-definite -c ===> OP = inv[A - sigma*M]*M and B = M. -c ===> shift-and-invert mode -c If OP*x = amu*x, then lambda = sigma + 1/amu. -c -c -c NOTE: The action of w <- inv[A - sigma*M]*v or w <- inv[M]*v -c should be accomplished either by a direct method -c using a sparse matrix factorization and solving -c -c [A - sigma*M]*w = v or M*w = v, -c -c or through an iterative method for solving these -c systems. If an iterative method is used, the -c convergence test must be more stringent than -c the accuracy requirements for the eigenvalue -c approximations. -c -c\Usage: -c call znaupd -c ( IDO, BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, -c IPNTR, WORKD, WORKL, LWORKL, RWORK, INFO ) -c -c\Arguments -c IDO Integer. (INPUT/OUTPUT) -c Reverse communication flag. IDO must be zero on the first -c call to znaupd . IDO will be set internally to -c indicate the type of operation to be performed. Control is -c then given back to the calling routine which has the -c responsibility to carry out the requested operation and call -c znaupd with the result. The operand is given in -c WORKD(IPNTR(1)), the result must be put in WORKD(IPNTR(2)). -c ------------------------------------------------------------- -c IDO = 0: first call to the reverse communication interface -c IDO = -1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c This is for the initialization phase to force the -c starting vector into the range of OP. -c IDO = 1: compute Y = OP * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c In mode 3, the vector B * X is already -c available in WORKD(ipntr(3)). It does not -c need to be recomputed in forming OP * X. -c IDO = 2: compute Y = M * X where -c IPNTR(1) is the pointer into WORKD for X, -c IPNTR(2) is the pointer into WORKD for Y. -c IDO = 3: compute and return the shifts in the first -c NP locations of WORKL. -c IDO = 99: done -c ------------------------------------------------------------- -c After the initialization phase, when the routine is used in -c the "shift-and-invert" mode, the vector M * X is already -c available and does not need to be recomputed in forming OP*X. -c -c BMAT Character*1. (INPUT) -c BMAT specifies the type of the matrix B that defines the -c semi-inner product for the operator OP. -c BMAT = 'I' -> standard eigenvalue problem A*x = lambda*x -c BMAT = 'G' -> generalized eigenvalue problem A*x = lambda*M*x -c -c N Integer. (INPUT) -c Dimension of the eigenproblem. -c -c WHICH Character*2. (INPUT) -c 'LM' -> want the NEV eigenvalues of largest magnitude. -c 'SM' -> want the NEV eigenvalues of smallest magnitude. -c 'LR' -> want the NEV eigenvalues of largest real part. -c 'SR' -> want the NEV eigenvalues of smallest real part. -c 'LI' -> want the NEV eigenvalues of largest imaginary part. -c 'SI' -> want the NEV eigenvalues of smallest imaginary part. -c -c NEV Integer. (INPUT) -c Number of eigenvalues of OP to be computed. 0 < NEV < N-1. -c -c TOL Double precision scalar. (INPUT) -c Stopping criteria: the relative accuracy of the Ritz value -c is considered acceptable if BOUNDS(I) .LE. TOL*ABS(RITZ(I)) -c where ABS(RITZ(I)) is the magnitude when RITZ(I) is complex. -c DEFAULT = dlamch ('EPS') (machine precision as computed -c by the LAPACK auxiliary subroutine dlamch ). -c -c RESID Complex*16 array of length N. (INPUT/OUTPUT) -c On INPUT: -c If INFO .EQ. 0, a random initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c On OUTPUT: -c RESID contains the final residual vector. -c -c NCV Integer. (INPUT) -c Number of columns of the matrix V. NCV must satisfy the two -c inequalities 1 <= NCV-NEV and NCV <= N. -c This will indicate how many Arnoldi vectors are generated -c at each iteration. After the startup phase in which NEV -c Arnoldi vectors are generated, the algorithm generates -c approximately NCV-NEV Arnoldi vectors at each subsequent update -c iteration. Most of the cost in generating each Arnoldi vector is -c in the matrix-vector operation OP*x. (See remark 4 below.) -c -c V Complex*16 array N by NCV. (OUTPUT) -c Contains the final set of Arnoldi basis vectors. -c -c LDV Integer. (INPUT) -c Leading dimension of V exactly as declared in the calling program. -c -c IPARAM Integer array of length 11. (INPUT/OUTPUT) -c IPARAM(1) = ISHIFT: method for selecting the implicit shifts. -c The shifts selected at each iteration are used to filter out -c the components of the unwanted eigenvector. -c ------------------------------------------------------------- -c ISHIFT = 0: the shifts are to be provided by the user via -c reverse communication. The NCV eigenvalues of -c the Hessenberg matrix H are returned in the part -c of WORKL array corresponding to RITZ. -c ISHIFT = 1: exact shifts with respect to the current -c Hessenberg matrix H. This is equivalent to -c restarting the iteration from the beginning -c after updating the starting vector with a linear -c combination of Ritz vectors associated with the -c "wanted" eigenvalues. -c ISHIFT = 2: other choice of internal shift to be defined. -c ------------------------------------------------------------- -c -c IPARAM(2) = No longer referenced -c -c IPARAM(3) = MXITER -c On INPUT: maximum number of Arnoldi update iterations allowed. -c On OUTPUT: actual number of Arnoldi update iterations taken. -c -c IPARAM(4) = NB: blocksize to be used in the recurrence. -c The code currently works only for NB = 1. -c -c IPARAM(5) = NCONV: number of "converged" Ritz values. -c This represents the number of Ritz values that satisfy -c the convergence criterion. -c -c IPARAM(6) = IUPD -c No longer referenced. Implicit restarting is ALWAYS used. -c -c IPARAM(7) = MODE -c On INPUT determines what type of eigenproblem is being solved. -c Must be 1,2,3; See under \Description of znaupd for the -c four modes available. -c -c IPARAM(8) = NP -c When ido = 3 and the user provides shifts through reverse -c communication (IPARAM(1)=0), _naupd returns NP, the number -c of shifts the user is to provide. 0 < NP < NCV-NEV. -c -c IPARAM(9) = NUMOP, IPARAM(10) = NUMOPB, IPARAM(11) = NUMREO, -c OUTPUT: NUMOP = total number of OP*x operations, -c NUMOPB = total number of B*x operations if BMAT='G', -c NUMREO = total number of steps of re-orthogonalization. -c -c IPNTR Integer array of length 14. (OUTPUT) -c Pointer to mark the starting locations in the WORKD and WORKL -c arrays for matrices/vectors used by the Arnoldi iteration. -c ------------------------------------------------------------- -c IPNTR(1): pointer to the current operand vector X in WORKD. -c IPNTR(2): pointer to the current result vector Y in WORKD. -c IPNTR(3): pointer to the vector B * X in WORKD when used in -c the shift-and-invert mode. -c IPNTR(4): pointer to the next available location in WORKL -c that is untouched by the program. -c IPNTR(5): pointer to the NCV by NCV upper Hessenberg -c matrix H in WORKL. -c IPNTR(6): pointer to the ritz value array RITZ -c IPNTR(7): pointer to the (projected) ritz vector array Q -c IPNTR(8): pointer to the error BOUNDS array in WORKL. -c IPNTR(14): pointer to the NP shifts in WORKL. See Remark 5 below. -c -c Note: IPNTR(9:13) is only referenced by zneupd . See Remark 2 below. -c -c IPNTR(9): pointer to the NCV RITZ values of the -c original system. -c IPNTR(10): Not Used -c IPNTR(11): pointer to the NCV corresponding error bounds. -c IPNTR(12): pointer to the NCV by NCV upper triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c zneupd if RVEC = .TRUE. See Remark 2 below. -c -c ------------------------------------------------------------- -c -c WORKD Complex*16 work array of length 3*N. (REVERSE COMMUNICATION) -c Distributed array to be used in the basic Arnoldi iteration -c for reverse communication. The user should not use WORKD -c as temporary workspace during the iteration !!!!!!!!!! -c See Data Distribution Note below. -c -c WORKL Complex*16 work array of length LWORKL. (OUTPUT/WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. See Data Distribution Note below. -c -c LWORKL Integer. (INPUT) -c LWORKL must be at least 3*NCV**2 + 5*NCV. -c -c RWORK Double precision work array of length NCV (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c -c INFO Integer. (INPUT/OUTPUT) -c If INFO .EQ. 0, a randomly initial residual vector is used. -c If INFO .NE. 0, RESID contains the initial residual vector, -c possibly from a previous run. -c Error flag on output. -c = 0: Normal exit. -c = 1: Maximum number of iterations taken. -c All possible eigenvalues of OP has been found. IPARAM(5) -c returns the number of wanted converged Ritz values. -c = 2: No longer an informational error. Deprecated starting -c with release 2 of ARPACK. -c = 3: No shifts could be applied during a cycle of the -c Implicitly restarted Arnoldi iteration. One possibility -c is to increase the size of NCV relative to NEV. -c See remark 4 below. -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -4: The maximum number of Arnoldi update iteration -c must be greater than zero. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation; -c = -9: Starting vector is zero. -c = -10: IPARAM(7) must be 1,2,3. -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: IPARAM(1) must be equal to 0 or 1. -c = -9999: Could not build an Arnoldi factorization. -c User input error highly likely. Please -c check actual array dimensions and layout. -c IPARAM(5) returns the size of the current Arnoldi -c factorization. -c -c\Remarks -c 1. The computed Ritz values are approximate eigenvalues of OP. The -c selection of WHICH should be made with this in mind when using -c Mode = 3. When operating in Mode = 3 setting WHICH = 'LM' will -c compute the NEV eigenvalues of the original problem that are -c closest to the shift SIGMA . After convergence, approximate eigenvalues -c of the original problem may be obtained with the ARPACK subroutine zneupd . -c -c 2. If a basis for the invariant subspace corresponding to the converged Ritz -c values is needed, the user must call zneupd immediately following -c completion of znaupd . This is new starting with release 2 of ARPACK. -c -c 3. If M can be factored into a Cholesky factorization M = LL` -c then Mode = 2 should not be selected. Instead one should use -c Mode = 1 with OP = inv(L)*A*inv(L`). Appropriate triangular -c linear systems should be solved with L and L` rather -c than computing inverses. After convergence, an approximate -c eigenvector z of the original problem is recovered by solving -c L`z = x where x is a Ritz vector of OP. -c -c 4. At present there is no a-priori analysis to guide the selection -c of NCV relative to NEV. The only formal requirement is that NCV > NEV + 1. -c However, it is recommended that NCV .ge. 2*NEV. If many problems of -c the same type are to be solved, one should experiment with increasing -c NCV while keeping NEV fixed for a given test problem. This will -c usually decrease the required number of OP*x operations but it -c also increases the work and storage required to maintain the orthogonal -c basis vectors. The optimal "cross-over" with respect to CPU time -c is problem dependent and must be determined empirically. -c See Chapter 8 of Reference 2 for further information. -c -c 5. When IPARAM(1) = 0, and IDO = 3, the user needs to provide the -c NP = IPARAM(8) complex shifts in locations -c WORKL(IPNTR(14)), WORKL(IPNTR(14)+1), ... , WORKL(IPNTR(14)+NP). -c Eigenvalues of the current upper Hessenberg matrix are located in -c WORKL(IPNTR(6)) through WORKL(IPNTR(6)+NCV-1). They are ordered -c according to the order defined by WHICH. The associated Ritz estimates -c are located in WORKL(IPNTR(8)), WORKL(IPNTR(8)+1), ... , -c WORKL(IPNTR(8)+NCV-1). -c -c----------------------------------------------------------------------- -c -c\Data Distribution Note: -c -c Fortran-D syntax: -c ================ -c Complex*16 resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) -c decompose d1(n), d2(n,ncv) -c align resid(i) with d1(i) -c align v(i,j) with d2(i,j) -c align workd(i) with d1(i) range (1:n) -c align workd(i) with d1(i-n) range (n+1:2*n) -c align workd(i) with d1(i-2*n) range (2*n+1:3*n) -c distribute d1(block), d2(block,:) -c replicated workl(lworkl) -c -c Cray MPP syntax: -c =============== -c Complex*16 resid(n), v(ldv,ncv), workd(n,3), workl(lworkl) -c shared resid(block), v(block,:), workd(block,:) -c replicated workl(lworkl) -c -c CM2/CM5 syntax: -c ============== -c -c----------------------------------------------------------------------- -c -c include 'ex-nonsym.doc' -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B.N. Parlett & Y. Saad, "_Complex_ Shift and Invert Strategies for -c _Real_ Matrices", Linear Algebra and its Applications, vol 88/89, -c pp 575-595, (1987). -c -c\Routines called: -c znaup2 ARPACK routine that implements the Implicitly Restarted -c Arnoldi Iteration. -c zstatn ARPACK routine that initializes the timing variables. -c ivout ARPACK utility routine that prints integers. -c zvout ARPACK utility routine that prints vectors. -c arscnd ARPACK utility routine for timing. -c dlamch LAPACK routine that determines machine constants. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: naupd.F SID: 2.8 DATE OF SID: 04/10/01 RELEASE: 2 -c -c\Remarks -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine znaupd - & ( ido, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, - & ipntr, workd, workl, lworkl, rwork, info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat*1, which*2 - integer ido, info, ldv, lworkl, n, ncv, nev - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - Complex*16 - & resid(n), v(ldv,ncv), workd(3*n), workl(lworkl) - Double precision - & rwork(ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - parameter (one = (1.0D+0, 0.0D+0) , zero = (0.0D+0, 0.0D+0) ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer bounds, ierr, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritz, j - save bounds, ih, iq, ishift, iupd, iw, - & ldh, ldq, levec, mode, msglvl, mxiter, nb, - & nev0, next, np, ritz -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external znaup2 , zvout , ivout, arscnd, zstatn -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dlamch - external dlamch -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - if (ido .eq. 0) then -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call zstatn - call arscnd (t0) - msglvl = mcaupd -c -c %----------------% -c | Error checking | -c %----------------% -c - ierr = 0 - ishift = iparam(1) -c levec = iparam(2) - mxiter = iparam(3) -c nb = iparam(4) - nb = 1 -c -c %--------------------------------------------% -c | Revision 2 performs only implicit restart. | -c %--------------------------------------------% -c - iupd = 1 - mode = iparam(7) -c - if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev .or. ncv .gt. n) then - ierr = -3 - else if (mxiter .le. 0) then - ierr = -4 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 5*ncv) then - ierr = -7 - else if (mode .lt. 1 .or. mode .gt. 3) then - ierr = -10 - else if (mode .eq. 1 .and. bmat .eq. 'G') then - ierr = -11 - end if -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - ido = 99 - go to 9000 - end if -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - if (nb .le. 0) nb = 1 - if (tol .le. 0.0D+0 ) tol = dlamch ('EpsMach') - if (ishift .ne. 0 .and. - & ishift .ne. 1 .and. - & ishift .ne. 2) ishift = 1 -c -c %----------------------------------------------% -c | NP is the number of additional steps to | -c | extend the length NEV Lanczos factorization. | -c | NEV0 is the local variable designating the | -c | size of the invariant subspace desired. | -c %----------------------------------------------% -c - np = ncv - nev - nev0 = nev -c -c %-----------------------------% -c | Zero out internal workspace | -c %-----------------------------% -c - do 10 j = 1, 3*ncv**2 + 5*ncv - workl(j) = zero - 10 continue -c -c %-------------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, BOUNDS, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+ncv) := the ritz values | -c | workl(ncv*ncv+ncv+1:ncv*ncv+2*ncv) := error bounds | -c | workl(ncv*ncv+2*ncv+1:2*ncv*ncv+2*ncv) := rotation matrix Q | -c | workl(2*ncv*ncv+2*ncv+1:3*ncv*ncv+5*ncv) := workspace | -c | The final workspace is needed by subroutine zneigh called | -c | by znaup2 . Subroutine zneigh calls LAPACK routines for | -c | calculating eigenvalues and the last row of the eigenvector | -c | matrix. | -c %-------------------------------------------------------------% -c - ldh = ncv - ldq = ncv - ih = 1 - ritz = ih + ldh*ncv - bounds = ritz + ncv - iq = bounds + ncv - iw = iq + ldq*ncv - next = iw + ncv**2 + 3*ncv -c - ipntr(4) = next - ipntr(5) = ih - ipntr(6) = ritz - ipntr(7) = iq - ipntr(8) = bounds - ipntr(14) = iw - end if -c -c %-------------------------------------------------------% -c | Carry out the Implicitly restarted Arnoldi Iteration. | -c %-------------------------------------------------------% -c - call znaup2 - & ( ido, bmat, n, which, nev0, np, tol, resid, mode, iupd, - & ishift, mxiter, v, ldv, workl(ih), ldh, workl(ritz), - & workl(bounds), workl(iq), ldq, workl(iw), - & ipntr, workd, rwork, info ) -c -c %--------------------------------------------------% -c | ido .ne. 99 implies use of reverse communication | -c | to compute operations involving OP. | -c %--------------------------------------------------% -c - if (ido .eq. 3) iparam(8) = np - if (ido .ne. 99) go to 9000 -c - iparam(3) = mxiter - iparam(5) = np - iparam(9) = nopx - iparam(10) = nbx - iparam(11) = nrorth -c -c %------------------------------------% -c | Exit if there was an informational | -c | error within znaup2 . | -c %------------------------------------% -c - if (info .lt. 0) go to 9000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, mxiter, ndigit, - & '_naupd: Number of update iterations taken') - call ivout (logfil, 1, np, ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call zvout (logfil, np, workl(ritz), ndigit, - & '_naupd: The final Ritz values') - call zvout (logfil, np, workl(bounds), ndigit, - & '_naupd: Associated Ritz estimates') - end if -c - call arscnd (t1) - tcaupd = t1 - t0 -c - if (msglvl .gt. 0) then -c -c %--------------------------------------------------------% -c | Version Number & Version Date are defined in version.h | -c %--------------------------------------------------------% -c - write (6,1000) - write (6,1100) mxiter, nopx, nbx, nrorth, nitref, nrstrt, - & tmvopx, tmvbx, tcaupd, tcaup2, tcaitr, titref, - & tgetv0, tceigh, tcgets, tcapps, tcconv, trvec - 1000 format (//, - & 5x, '=============================================',/ - & 5x, '= Complex implicit Arnoldi update code =',/ - & 5x, '= Version Number: ', ' 2.3' , 21x, ' =',/ - & 5x, '= Version Date: ', ' 07/31/96' , 16x, ' =',/ - & 5x, '=============================================',/ - & 5x, '= Summary of timing statistics =',/ - & 5x, '=============================================',//) - 1100 format ( - & 5x, 'Total number update iterations = ', i5,/ - & 5x, 'Total number of OP*x operations = ', i5,/ - & 5x, 'Total number of B*x operations = ', i5,/ - & 5x, 'Total number of reorthogonalization steps = ', i5,/ - & 5x, 'Total number of iterative refinement steps = ', i5,/ - & 5x, 'Total number of restart steps = ', i5,/ - & 5x, 'Total time in user OP*x operation = ', f12.6,/ - & 5x, 'Total time in user B*x operation = ', f12.6,/ - & 5x, 'Total time in Arnoldi update routine = ', f12.6,/ - & 5x, 'Total time in naup2 routine = ', f12.6,/ - & 5x, 'Total time in basic Arnoldi iteration loop = ', f12.6,/ - & 5x, 'Total time in reorthogonalization phase = ', f12.6,/ - & 5x, 'Total time in (re)start vector generation = ', f12.6,/ - & 5x, 'Total time in Hessenberg eig. subproblem = ', f12.6,/ - & 5x, 'Total time in getting the shifts = ', f12.6,/ - & 5x, 'Total time in applying the shifts = ', f12.6,/ - & 5x, 'Total time in convergence testing = ', f12.6,/ - & 5x, 'Total time in computing final Ritz vectors = ', f12.6/) - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of znaupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/zneigh.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,257 +0,0 @@ -c\BeginDoc -c -c\Name: zneigh -c -c\Description: -c Compute the eigenvalues of the current upper Hessenberg matrix -c and the corresponding Ritz estimates given the current residual norm. -c -c\Usage: -c call zneigh -c ( RNORM, N, H, LDH, RITZ, BOUNDS, Q, LDQ, WORKL, RWORK, IERR ) -c -c\Arguments -c RNORM Double precision scalar. (INPUT) -c Residual norm corresponding to the current upper Hessenberg -c matrix H. -c -c N Integer. (INPUT) -c Size of the matrix H. -c -c H Complex*16 N by N array. (INPUT) -c H contains the current upper Hessenberg matrix. -c -c LDH Integer. (INPUT) -c Leading dimension of H exactly as declared in the calling -c program. -c -c RITZ Complex*16 array of length N. (OUTPUT) -c On output, RITZ(1:N) contains the eigenvalues of H. -c -c BOUNDS Complex*16 array of length N. (OUTPUT) -c On output, BOUNDS contains the Ritz estimates associated with -c the eigenvalues held in RITZ. This is equal to RNORM -c times the last components of the eigenvectors corresponding -c to the eigenvalues in RITZ. -c -c Q Complex*16 N by N array. (WORKSPACE) -c Workspace needed to store the eigenvectors of H. -c -c LDQ Integer. (INPUT) -c Leading dimension of Q exactly as declared in the calling -c program. -c -c WORKL Complex*16 work array of length N**2 + 3*N. (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. This is needed to keep the full Schur form -c of H and also in the calculation of the eigenvectors of H. -c -c RWORK Double precision work array of length N (WORKSPACE) -c Private (replicated) array on each PE or array allocated on -c the front end. -c -c IERR Integer. (OUTPUT) -c Error exit flag from zlahqr or ztrevc. -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c zmout ARPACK utility routine that prints matrices -c zvout ARPACK utility routine that prints vectors. -c dvout ARPACK utility routine that prints vectors. -c zlacpy LAPACK matrix copy routine. -c zlahqr LAPACK routine to compute the Schur form of an -c upper Hessenberg matrix. -c zlaset LAPACK matrix initialization routine. -c ztrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper triangular form -c zcopy Level 1 BLAS that copies one vector to another. -c zdscal Level 1 BLAS that scales a complex vector by a real number. -c dznrm2 Level 1 BLAS that computes the norm of a vector. -c -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neigh.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c None -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine zneigh (rnorm, n, h, ldh, ritz, bounds, - & q, ldq, workl, rwork, ierr) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - integer ierr, n, ldh, ldq - Double precision - & rnorm -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex*16 - & bounds(n), h(ldh,n), q(ldq,n), ritz(n), - & workl(n*(n+3)) - Double precision - & rwork(n) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - Double precision - & rone - parameter (one = (1.0D+0, 0.0D+0), zero = (0.0D+0, 0.0D+0), - & rone = 1.0D+0) -c -c %------------------------% -c | Local Scalars & Arrays | -c %------------------------% -c - logical select(1) - integer j, msglvl - Complex*16 - & vl(1) - Double precision - & temp -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zlacpy, zlahqr, ztrevc, zcopy, - & zdscal, zmout, zvout, arscnd -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dznrm2 - external dznrm2 -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mceigh -c - if (msglvl .gt. 2) then - call zmout (logfil, n, n, h, ldh, ndigit, - & '_neigh: Entering upper Hessenberg matrix H ') - end if -c -c %----------------------------------------------------------% -c | 1. Compute the eigenvalues, the last components of the | -c | corresponding Schur vectors and the full Schur form T | -c | of the current upper Hessenberg matrix H. | -c | zlahqr returns the full Schur form of H | -c | in WORKL(1:N**2), and the Schur vectors in q. | -c %----------------------------------------------------------% -c - call zlacpy ('All', n, n, h, ldh, workl, n) - call zlaset ('All', n, n, zero, one, q, ldq) - call zlahqr (.true., .true., n, 1, n, workl, ldh, ritz, - & 1, n, q, ldq, ierr) - if (ierr .ne. 0) go to 9000 -c - call zcopy (n, q(n-1,1), ldq, bounds, 1) - if (msglvl .gt. 1) then - call zvout (logfil, n, bounds, ndigit, - & '_neigh: last row of the Schur matrix for H') - end if -c -c %----------------------------------------------------------% -c | 2. Compute the eigenvectors of the full Schur form T and | -c | apply the Schur vectors to get the corresponding | -c | eigenvectors. | -c %----------------------------------------------------------% -c - call ztrevc ('Right', 'Back', select, n, workl, n, vl, n, q, - & ldq, n, n, workl(n*n+1), rwork, ierr) -c - if (ierr .ne. 0) go to 9000 -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | ztrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1; here the magnitude of a complex | -c | number (x,y) is taken to be |x| + |y|. | -c %------------------------------------------------% -c - do 10 j=1, n - temp = dznrm2( n, q(1,j), 1 ) - call zdscal ( n, rone / temp, q(1,j), 1 ) - 10 continue -c - if (msglvl .gt. 1) then - call zcopy(n, q(n,1), ldq, workl, 1) - call zvout (logfil, n, workl, ndigit, - & '_neigh: Last row of the eigenvector matrix for H') - end if -c -c %----------------------------% -c | Compute the Ritz estimates | -c %----------------------------% -c - call zcopy(n, q(n,1), n, bounds, 1) - call zdscal(n, rnorm, bounds, 1) -c - if (msglvl .gt. 2) then - call zvout (logfil, n, ritz, ndigit, - & '_neigh: The eigenvalues of H') - call zvout (logfil, n, bounds, ndigit, - & '_neigh: Ritz estimates for the eigenvalues of H') - end if -c - call arscnd(t1) - tceigh = tceigh + (t1 - t0) -c - 9000 continue - return -c -c %---------------% -c | End of zneigh | -c %---------------% -c - end
--- a/libcruft/arpack/src/zneupd.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,876 +0,0 @@ -c\BeginDoc -c -c\Name: zneupd -c -c\Description: -c This subroutine returns the converged approximations to eigenvalues -c of A*z = lambda*B*z and (optionally): -c -c (1) The corresponding approximate eigenvectors; -c -c (2) An orthonormal basis for the associated approximate -c invariant subspace; -c -c (3) Both. -c -c There is negligible additional cost to obtain eigenvectors. An orthonormal -c basis is always computed. There is an additional storage cost of n*nev -c if both are requested (in this case a separate array Z must be supplied). -c -c The approximate eigenvalues and eigenvectors of A*z = lambda*B*z -c are derived from approximate eigenvalues and eigenvectors of -c of the linear operator OP prescribed by the MODE selection in the -c call to ZNAUPD . ZNAUPD must be called before this routine is called. -c These approximate eigenvalues and vectors are commonly called Ritz -c values and Ritz vectors respectively. They are referred to as such -c in the comments that follow. The computed orthonormal basis for the -c invariant subspace corresponding to these Ritz values is referred to as a -c Schur basis. -c -c The definition of OP as well as other terms and the relation of computed -c Ritz values and vectors of OP with respect to the given problem -c A*z = lambda*B*z may be found in the header of ZNAUPD . For a brief -c description, see definitions of IPARAM(7), MODE and WHICH in the -c documentation of ZNAUPD . -c -c\Usage: -c call zneupd -c ( RVEC, HOWMNY, SELECT, D, Z, LDZ, SIGMA, WORKEV, BMAT, -c N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, WORKD, -c WORKL, LWORKL, RWORK, INFO ) -c -c\Arguments: -c RVEC LOGICAL (INPUT) -c Specifies whether a basis for the invariant subspace corresponding -c to the converged Ritz value approximations for the eigenproblem -c A*z = lambda*B*z is computed. -c -c RVEC = .FALSE. Compute Ritz values only. -c -c RVEC = .TRUE. Compute Ritz vectors or Schur vectors. -c See Remarks below. -c -c HOWMNY Character*1 (INPUT) -c Specifies the form of the basis for the invariant subspace -c corresponding to the converged Ritz values that is to be computed. -c -c = 'A': Compute NEV Ritz vectors; -c = 'P': Compute NEV Schur vectors; -c = 'S': compute some of the Ritz vectors, specified -c by the logical array SELECT. -c -c SELECT Logical array of dimension NCV. (INPUT) -c If HOWMNY = 'S', SELECT specifies the Ritz vectors to be -c computed. To select the Ritz vector corresponding to a -c Ritz value D(j), SELECT(j) must be set to .TRUE.. -c If HOWMNY = 'A' or 'P', SELECT need not be initialized -c but it is used as internal workspace. -c -c D Complex*16 array of dimension NEV+1. (OUTPUT) -c On exit, D contains the Ritz approximations -c to the eigenvalues lambda for A*z = lambda*B*z. -c -c Z Complex*16 N by NEV array (OUTPUT) -c On exit, if RVEC = .TRUE. and HOWMNY = 'A', then the columns of -c Z represents approximate eigenvectors (Ritz vectors) corresponding -c to the NCONV=IPARAM(5) Ritz values for eigensystem -c A*z = lambda*B*z. -c -c If RVEC = .FALSE. or HOWMNY = 'P', then Z is NOT REFERENCED. -c -c NOTE: If if RVEC = .TRUE. and a Schur basis is not required, -c the array Z may be set equal to first NEV+1 columns of the Arnoldi -c basis array V computed by ZNAUPD . In this case the Arnoldi basis -c will be destroyed and overwritten with the eigenvector basis. -c -c LDZ Integer. (INPUT) -c The leading dimension of the array Z. If Ritz vectors are -c desired, then LDZ .ge. max( 1, N ) is required. -c In any case, LDZ .ge. 1 is required. -c -c SIGMA Complex*16 (INPUT) -c If IPARAM(7) = 3 then SIGMA represents the shift. -c Not referenced if IPARAM(7) = 1 or 2. -c -c WORKEV Complex*16 work array of dimension 2*NCV. (WORKSPACE) -c -c **** The remaining arguments MUST be the same as for the **** -c **** call to ZNAUPD that was just completed. **** -c -c NOTE: The remaining arguments -c -c BMAT, N, WHICH, NEV, TOL, RESID, NCV, V, LDV, IPARAM, IPNTR, -c WORKD, WORKL, LWORKL, RWORK, INFO -c -c must be passed directly to ZNEUPD following the last call -c to ZNAUPD . These arguments MUST NOT BE MODIFIED between -c the the last call to ZNAUPD and the call to ZNEUPD . -c -c Three of these parameters (V, WORKL and INFO) are also output parameters: -c -c V Complex*16 N by NCV array. (INPUT/OUTPUT) -c -c Upon INPUT: the NCV columns of V contain the Arnoldi basis -c vectors for OP as constructed by ZNAUPD . -c -c Upon OUTPUT: If RVEC = .TRUE. the first NCONV=IPARAM(5) columns -c contain approximate Schur vectors that span the -c desired invariant subspace. -c -c NOTE: If the array Z has been set equal to first NEV+1 columns -c of the array V and RVEC=.TRUE. and HOWMNY= 'A', then the -c Arnoldi basis held by V has been overwritten by the desired -c Ritz vectors. If a separate array Z has been passed then -c the first NCONV=IPARAM(5) columns of V will contain approximate -c Schur vectors that span the desired invariant subspace. -c -c WORKL Double precision work array of length LWORKL. (OUTPUT/WORKSPACE) -c WORKL(1:ncv*ncv+2*ncv) contains information obtained in -c znaupd . They are not changed by zneupd . -c WORKL(ncv*ncv+2*ncv+1:3*ncv*ncv+4*ncv) holds the -c untransformed Ritz values, the untransformed error estimates of -c the Ritz values, the upper triangular matrix for H, and the -c associated matrix representation of the invariant subspace for H. -c -c Note: IPNTR(9:13) contains the pointer into WORKL for addresses -c of the above information computed by zneupd . -c ------------------------------------------------------------- -c IPNTR(9): pointer to the NCV RITZ values of the -c original system. -c IPNTR(10): Not used -c IPNTR(11): pointer to the NCV corresponding error estimates. -c IPNTR(12): pointer to the NCV by NCV upper triangular -c Schur matrix for H. -c IPNTR(13): pointer to the NCV by NCV matrix of eigenvectors -c of the upper Hessenberg matrix H. Only referenced by -c zneupd if RVEC = .TRUE. See Remark 2 below. -c ------------------------------------------------------------- -c -c INFO Integer. (OUTPUT) -c Error flag on output. -c = 0: Normal exit. -c -c = 1: The Schur form computed by LAPACK routine csheqr -c could not be reordered by LAPACK routine ztrsen . -c Re-enter subroutine zneupd with IPARAM(5)=NCV and -c increase the size of the array D to have -c dimension at least dimension NCV and allocate at least NCV -c columns for Z. NOTE: Not necessary if Z and V share -c the same space. Please notify the authors if this error -c occurs. -c -c = -1: N must be positive. -c = -2: NEV must be positive. -c = -3: NCV-NEV >= 2 and less than or equal to N. -c = -5: WHICH must be one of 'LM', 'SM', 'LR', 'SR', 'LI', 'SI' -c = -6: BMAT must be one of 'I' or 'G'. -c = -7: Length of private work WORKL array is not sufficient. -c = -8: Error return from LAPACK eigenvalue calculation. -c This should never happened. -c = -9: Error return from calculation of eigenvectors. -c Informational error from LAPACK routine ztrevc . -c = -10: IPARAM(7) must be 1,2,3 -c = -11: IPARAM(7) = 1 and BMAT = 'G' are incompatible. -c = -12: HOWMNY = 'S' not yet implemented -c = -13: HOWMNY must be one of 'A' or 'P' if RVEC = .true. -c = -14: ZNAUPD did not find any eigenvalues to sufficient -c accuracy. -c = -15: ZNEUPD got a different count of the number of converged -c Ritz values than ZNAUPD got. This indicates the user -c probably made an error in passing data from ZNAUPD to -c ZNEUPD or that the data was modified before entering -c ZNEUPD -c -c\BeginLib -c -c\References: -c 1. D.C. Sorensen, "Implicit Application of Polynomial Filters in -c a k-Step Arnoldi Method", SIAM J. Matr. Anal. Apps., 13 (1992), -c pp 357-385. -c 2. R.B. Lehoucq, "Analysis and Implementation of an Implicitly -c Restarted Arnoldi Iteration", Rice University Technical Report -c TR95-13, Department of Computational and Applied Mathematics. -c 3. B. Nour-Omid, B. N. Parlett, T. Ericsson and P. S. Jensen, -c "How to Implement the Spectral Transformation", Math Comp., -c Vol. 48, No. 178, April, 1987 pp. 664-673. -c -c\Routines called: -c ivout ARPACK utility routine that prints integers. -c zmout ARPACK utility routine that prints matrices -c zvout ARPACK utility routine that prints vectors. -c zgeqr2 LAPACK routine that computes the QR factorization of -c a matrix. -c zlacpy LAPACK matrix copy routine. -c zlahqr LAPACK routine that computes the Schur form of a -c upper Hessenberg matrix. -c zlaset LAPACK matrix initialization routine. -c ztrevc LAPACK routine to compute the eigenvectors of a matrix -c in upper triangular form. -c ztrsen LAPACK routine that re-orders the Schur form. -c zunm2r LAPACK routine that applies an orthogonal matrix in -c factored form. -c dlamch LAPACK routine that determines machine constants. -c ztrmm Level 3 BLAS matrix times an upper triangular matrix. -c zgeru Level 2 BLAS rank one update to a matrix. -c zcopy Level 1 BLAS that copies one vector to another . -c zscal Level 1 BLAS that scales a vector. -c zdscal Level 1 BLAS that scales a complex vector by a real number. -c dznrm2 Level 1 BLAS that computes the norm of a complex vector. -c -c\Remarks -c -c 1. Currently only HOWMNY = 'A' and 'P' are implemented. -c -c 2. Schur vectors are an orthogonal representation for the basis of -c Ritz vectors. Thus, their numerical properties are often superior. -c If RVEC = .true. then the relationship -c A * V(:,1:IPARAM(5)) = V(:,1:IPARAM(5)) * T, and -c transpose( V(:,1:IPARAM(5)) ) * V(:,1:IPARAM(5)) = I -c are approximately satisfied. -c Here T is the leading submatrix of order IPARAM(5) of the -c upper triangular matrix stored workl(ipntr(12)). -c -c\Authors -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Chao Yang Houston, Texas -c Dept. of Computational & -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: neupd.F SID: 2.7 DATE OF SID: 09/20/00 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- - subroutine zneupd (rvec , howmny, select, d , - & z , ldz , sigma , workev, - & bmat , n , which , nev , - & tol , resid , ncv , v , - & ldv , iparam, ipntr , workd , - & workl, lworkl, rwork , info ) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character bmat, howmny, which*2 - logical rvec - integer info, ldz, ldv, lworkl, n, ncv, nev - Complex*16 - & sigma - Double precision - & tol -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - integer iparam(11), ipntr(14) - logical select(ncv) - Double precision - & rwork(ncv) - Complex*16 - & d(nev) , resid(n) , v(ldv,ncv), - & z(ldz, nev), - & workd(3*n) , workl(lworkl), workev(2*ncv) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - parameter (one = (1.0D+0, 0.0D+0) , zero = (0.0D+0, 0.0D+0) ) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - character type*6 - integer bounds, ierr , ih , ihbds, iheig , nconv , - & invsub, iuptri, iwev , j , ldh , ldq , - & mode , msglvl, ritz , wr , k , irz , - & ibd , outncv, iq , np , numcnv, jj , - & ishift, nconv2 - Complex*16 - & rnorm, temp, vl(1) - Double precision - & conds, sep, rtemp, eps23 - logical reord -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zcopy , zgeru , zgeqr2 , zlacpy , zmout , - & zunm2r , ztrmm , zvout , ivout, - & zlahqr -c -c %--------------------% -c | External Functions | -c %--------------------% -c - Double precision - & dznrm2 , dlamch , dlapy2 - external dznrm2 , dlamch , dlapy2 -c - Complex*16 - & zdotc - external zdotc -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %------------------------% -c | Set default parameters | -c %------------------------% -c - msglvl = mceupd - mode = iparam(7) - nconv = iparam(5) - info = 0 -c -c -c %---------------------------------% -c | Get machine dependent constant. | -c %---------------------------------% -c - eps23 = dlamch ('Epsilon-Machine') - eps23 = eps23**(2.0D+0 / 3.0D+0 ) -c -c %-------------------------------% -c | Quick return | -c | Check for incompatible input | -c %-------------------------------% -c - ierr = 0 -c - if (nconv .le. 0) then - ierr = -14 - else if (n .le. 0) then - ierr = -1 - else if (nev .le. 0) then - ierr = -2 - else if (ncv .le. nev+1 .or. ncv .gt. n) then - ierr = -3 - else if (which .ne. 'LM' .and. - & which .ne. 'SM' .and. - & which .ne. 'LR' .and. - & which .ne. 'SR' .and. - & which .ne. 'LI' .and. - & which .ne. 'SI') then - ierr = -5 - else if (bmat .ne. 'I' .and. bmat .ne. 'G') then - ierr = -6 - else if (lworkl .lt. 3*ncv**2 + 4*ncv) then - ierr = -7 - else if ( (howmny .ne. 'A' .and. - & howmny .ne. 'P' .and. - & howmny .ne. 'S') .and. rvec ) then - ierr = -13 - else if (howmny .eq. 'S' ) then - ierr = -12 - end if -c - if (mode .eq. 1 .or. mode .eq. 2) then - type = 'REGULR' - else if (mode .eq. 3 ) then - type = 'SHIFTI' - else - ierr = -10 - end if - if (mode .eq. 1 .and. bmat .eq. 'G') ierr = -11 -c -c %------------% -c | Error Exit | -c %------------% -c - if (ierr .ne. 0) then - info = ierr - go to 9000 - end if -c -c %--------------------------------------------------------% -c | Pointer into WORKL for address of H, RITZ, WORKEV, Q | -c | etc... and the remaining workspace. | -c | Also update pointer to be used on output. | -c | Memory is laid out as follows: | -c | workl(1:ncv*ncv) := generated Hessenberg matrix | -c | workl(ncv*ncv+1:ncv*ncv+ncv) := ritz values | -c | workl(ncv*ncv+ncv+1:ncv*ncv+2*ncv) := error bounds | -c %--------------------------------------------------------% -c -c %-----------------------------------------------------------% -c | The following is used and set by ZNEUPD . | -c | workl(ncv*ncv+2*ncv+1:ncv*ncv+3*ncv) := The untransformed | -c | Ritz values. | -c | workl(ncv*ncv+3*ncv+1:ncv*ncv+4*ncv) := The untransformed | -c | error bounds of | -c | the Ritz values | -c | workl(ncv*ncv+4*ncv+1:2*ncv*ncv+4*ncv) := Holds the upper | -c | triangular matrix | -c | for H. | -c | workl(2*ncv*ncv+4*ncv+1: 3*ncv*ncv+4*ncv) := Holds the | -c | associated matrix | -c | representation of | -c | the invariant | -c | subspace for H. | -c | GRAND total of NCV * ( 3 * NCV + 4 ) locations. | -c %-----------------------------------------------------------% -c - ih = ipntr(5) - ritz = ipntr(6) - iq = ipntr(7) - bounds = ipntr(8) - ldh = ncv - ldq = ncv - iheig = bounds + ldh - ihbds = iheig + ldh - iuptri = ihbds + ldh - invsub = iuptri + ldh*ncv - ipntr(9) = iheig - ipntr(11) = ihbds - ipntr(12) = iuptri - ipntr(13) = invsub - wr = 1 - iwev = wr + ncv -c -c %-----------------------------------------% -c | irz points to the Ritz values computed | -c | by _neigh before exiting _naup2. | -c | ibd points to the Ritz estimates | -c | computed by _neigh before exiting | -c | _naup2. | -c %-----------------------------------------% -c - irz = ipntr(14) + ncv*ncv - ibd = irz + ncv -c -c %------------------------------------% -c | RNORM is B-norm of the RESID(1:N). | -c %------------------------------------% -c - rnorm = workl(ih+2) - workl(ih+2) = zero -c - if (msglvl .gt. 2) then - call zvout (logfil, ncv, workl(irz), ndigit, - & '_neupd: Ritz values passed in from _NAUPD.') - call zvout (logfil, ncv, workl(ibd), ndigit, - & '_neupd: Ritz estimates passed in from _NAUPD.') - end if -c - if (rvec) then -c - reord = .false. -c -c %---------------------------------------------------% -c | Use the temporary bounds array to store indices | -c | These will be used to mark the select array later | -c %---------------------------------------------------% -c - do 10 j = 1,ncv - workl(bounds+j-1) = j - select(j) = .false. - 10 continue -c -c %-------------------------------------% -c | Select the wanted Ritz values. | -c | Sort the Ritz values so that the | -c | wanted ones appear at the tailing | -c | NEV positions of workl(irr) and | -c | workl(iri). Move the corresponding | -c | error estimates in workl(ibd) | -c | accordingly. | -c %-------------------------------------% -c - np = ncv - nev - ishift = 0 - call zngets (ishift, which , nev , - & np , workl(irz), workl(bounds)) -c - if (msglvl .gt. 2) then - call zvout (logfil, ncv, workl(irz), ndigit, - & '_neupd: Ritz values after calling _NGETS.') - call zvout (logfil, ncv, workl(bounds), ndigit, - & '_neupd: Ritz value indices after calling _NGETS.') - end if -c -c %-----------------------------------------------------% -c | Record indices of the converged wanted Ritz values | -c | Mark the select array for possible reordering | -c %-----------------------------------------------------% -c - numcnv = 0 - do 11 j = 1,ncv - rtemp = max(eps23, - & dlapy2 ( dble (workl(irz+ncv-j)), - & dimag (workl(irz+ncv-j)) )) - jj = workl(bounds + ncv - j) - if (numcnv .lt. nconv .and. - & dlapy2 ( dble (workl(ibd+jj-1)), - & dimag (workl(ibd+jj-1)) ) - & .le. tol*rtemp) then - select(jj) = .true. - numcnv = numcnv + 1 - if (jj .gt. nev) reord = .true. - endif - 11 continue -c -c %-----------------------------------------------------------% -c | Check the count (numcnv) of converged Ritz values with | -c | the number (nconv) reported by dnaupd. If these two | -c | are different then there has probably been an error | -c | caused by incorrect passing of the dnaupd data. | -c %-----------------------------------------------------------% -c - if (msglvl .gt. 2) then - call ivout(logfil, 1, numcnv, ndigit, - & '_neupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if -c - if (numcnv .ne. nconv) then - info = -15 - go to 9000 - end if -c -c %-------------------------------------------------------% -c | Call LAPACK routine zlahqr to compute the Schur form | -c | of the upper Hessenberg matrix returned by ZNAUPD . | -c | Make a copy of the upper Hessenberg matrix. | -c | Initialize the Schur vector matrix Q to the identity. | -c %-------------------------------------------------------% -c - call zcopy (ldh*ncv, workl(ih), 1, workl(iuptri), 1) - call zlaset ('All', ncv, ncv , - & zero , one, workl(invsub), - & ldq) - call zlahqr (.true., .true. , ncv , - & 1 , ncv , workl(iuptri), - & ldh , workl(iheig) , 1 , - & ncv , workl(invsub), ldq , - & ierr) - call zcopy (ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c - if (ierr .ne. 0) then - info = -8 - go to 9000 - end if -c - if (msglvl .gt. 1) then - call zvout (logfil, ncv, workl(iheig), ndigit, - & '_neupd: Eigenvalues of H') - call zvout (logfil, ncv, workl(ihbds), ndigit, - & '_neupd: Last row of the Schur vector matrix') - if (msglvl .gt. 3) then - call zmout (logfil , ncv, ncv , - & workl(iuptri), ldh, ndigit, - & '_neupd: The upper triangular matrix ') - end if - end if -c - if (reord) then -c -c %-----------------------------------------------% -c | Reorder the computed upper triangular matrix. | -c %-----------------------------------------------% -c - call ztrsen ('None' , 'V' , select , - & ncv , workl(iuptri), ldh , - & workl(invsub), ldq , workl(iheig), - & nconv2 , conds , sep , - & workev , ncv , ierr) -c - if (nconv2 .lt. nconv) then - nconv = nconv2 - end if - - if (ierr .eq. 1) then - info = 1 - go to 9000 - end if -c - if (msglvl .gt. 2) then - call zvout (logfil, ncv, workl(iheig), ndigit, - & '_neupd: Eigenvalues of H--reordered') - if (msglvl .gt. 3) then - call zmout (logfil , ncv, ncv , - & workl(iuptri), ldq, ndigit, - & '_neupd: Triangular matrix after re-ordering') - end if - end if -c - end if -c -c %---------------------------------------------% -c | Copy the last row of the Schur basis matrix | -c | to workl(ihbds). This vector will be used | -c | to compute the Ritz estimates of converged | -c | Ritz values. | -c %---------------------------------------------% -c - call zcopy (ncv , workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) -c -c %--------------------------------------------% -c | Place the computed eigenvalues of H into D | -c | if a spectral transformation was not used. | -c %--------------------------------------------% -c - if (type .eq. 'REGULR') then - call zcopy (nconv, workl(iheig), 1, d, 1) - end if -c -c %----------------------------------------------------------% -c | Compute the QR factorization of the matrix representing | -c | the wanted invariant subspace located in the first NCONV | -c | columns of workl(invsub,ldq). | -c %----------------------------------------------------------% -c - call zgeqr2 (ncv , nconv , workl(invsub), - & ldq , workev, workev(ncv+1), - & ierr) -c -c %--------------------------------------------------------% -c | * Postmultiply V by Q using zunm2r . | -c | * Copy the first NCONV columns of VQ into Z. | -c | * Postmultiply Z by R. | -c | The N by NCONV matrix Z is now a matrix representation | -c | of the approximate invariant subspace associated with | -c | the Ritz values in workl(iheig). The first NCONV | -c | columns of V are now approximate Schur vectors | -c | associated with the upper triangular matrix of order | -c | NCONV in workl(iuptri). | -c %--------------------------------------------------------% -c - call zunm2r ('Right', 'Notranspose', n , - & ncv , nconv , workl(invsub), - & ldq , workev , v , - & ldv , workd(n+1) , ierr) - call zlacpy ('All', n, nconv, v, ldv, z, ldz) -c - do 20 j=1, nconv -c -c %---------------------------------------------------% -c | Perform both a column and row scaling if the | -c | diagonal element of workl(invsub,ldq) is negative | -c | I'm lazy and don't take advantage of the upper | -c | triangular form of workl(iuptri,ldq). | -c | Note that since Q is orthogonal, R is a diagonal | -c | matrix consisting of plus or minus ones. | -c %---------------------------------------------------% -c - if ( dble ( workl(invsub+(j-1)*ldq+j-1) ) .lt. - & dble (zero) ) then - call zscal (nconv, -one, workl(iuptri+j-1), ldq) - call zscal (nconv, -one, workl(iuptri+(j-1)*ldq), 1) - end if -c - 20 continue -c - if (howmny .eq. 'A') then -c -c %--------------------------------------------% -c | Compute the NCONV wanted eigenvectors of T | -c | located in workl(iuptri,ldq). | -c %--------------------------------------------% -c - do 30 j=1, ncv - if (j .le. nconv) then - select(j) = .true. - else - select(j) = .false. - end if - 30 continue -c - call ztrevc ('Right', 'Select' , select , - & ncv , workl(iuptri), ldq , - & vl , 1 , workl(invsub), - & ldq , ncv , outncv , - & workev , rwork , ierr) -c - if (ierr .ne. 0) then - info = -9 - go to 9000 - end if -c -c %------------------------------------------------% -c | Scale the returning eigenvectors so that their | -c | Euclidean norms are all one. LAPACK subroutine | -c | ztrevc returns each eigenvector normalized so | -c | that the element of largest magnitude has | -c | magnitude 1. | -c %------------------------------------------------% -c - do 40 j=1, nconv - rtemp = dznrm2 (ncv, workl(invsub+(j-1)*ldq), 1) - rtemp = dble (one) / rtemp - call zdscal ( ncv, rtemp, - & workl(invsub+(j-1)*ldq), 1 ) -c -c %------------------------------------------% -c | Ritz estimates can be obtained by taking | -c | the inner product of the last row of the | -c | Schur basis of H with eigenvectors of T. | -c | Note that the eigenvector matrix of T is | -c | upper triangular, thus the length of the | -c | inner product can be set to j. | -c %------------------------------------------% -c - workev(j) = zdotc (j, workl(ihbds), 1, - & workl(invsub+(j-1)*ldq), 1) - 40 continue -c - if (msglvl .gt. 2) then - call zcopy (nconv, workl(invsub+ncv-1), ldq, - & workl(ihbds), 1) - call zvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Last row of the eigenvector matrix for T') - if (msglvl .gt. 3) then - call zmout (logfil , ncv, ncv , - & workl(invsub), ldq, ndigit, - & '_neupd: The eigenvector matrix for T') - end if - end if -c -c %---------------------------------------% -c | Copy Ritz estimates into workl(ihbds) | -c %---------------------------------------% -c - call zcopy (nconv, workev, 1, workl(ihbds), 1) -c -c %----------------------------------------------% -c | The eigenvector matrix Q of T is triangular. | -c | Form Z*Q. | -c %----------------------------------------------% -c - call ztrmm ('Right' , 'Upper' , 'No transpose', - & 'Non-unit', n , nconv , - & one , workl(invsub), ldq , - & z , ldz) - end if -c - else -c -c %--------------------------------------------------% -c | An approximate invariant subspace is not needed. | -c | Place the Ritz values computed ZNAUPD into D. | -c %--------------------------------------------------% -c - call zcopy (nconv, workl(ritz), 1, d, 1) - call zcopy (nconv, workl(ritz), 1, workl(iheig), 1) - call zcopy (nconv, workl(bounds), 1, workl(ihbds), 1) -c - end if -c -c %------------------------------------------------% -c | Transform the Ritz values and possibly vectors | -c | and corresponding error bounds of OP to those | -c | of A*x = lambda*B*x. | -c %------------------------------------------------% -c - if (type .eq. 'REGULR') then -c - if (rvec) - & call zscal (ncv, rnorm, workl(ihbds), 1) -c - else -c -c %---------------------------------------% -c | A spectral transformation was used. | -c | * Determine the Ritz estimates of the | -c | Ritz values in the original system. | -c %---------------------------------------% -c - if (rvec) - & call zscal (ncv, rnorm, workl(ihbds), 1) -c - do 50 k=1, ncv - temp = workl(iheig+k-1) - workl(ihbds+k-1) = workl(ihbds+k-1) / temp / temp - 50 continue -c - end if -c -c %-----------------------------------------------------------% -c | * Transform the Ritz values back to the original system. | -c | For TYPE = 'SHIFTI' the transformation is | -c | lambda = 1/theta + sigma | -c | NOTES: | -c | *The Ritz vectors are not affected by the transformation. | -c %-----------------------------------------------------------% -c - if (type .eq. 'SHIFTI') then - do 60 k=1, nconv - d(k) = one / workl(iheig+k-1) + sigma - 60 continue - end if -c - if (type .ne. 'REGULR' .and. msglvl .gt. 1) then - call zvout (logfil, nconv, d, ndigit, - & '_neupd: Untransformed Ritz values.') - call zvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Ritz estimates of the untransformed Ritz values.') - else if ( msglvl .gt. 1) then - call zvout (logfil, nconv, d, ndigit, - & '_neupd: Converged Ritz values.') - call zvout (logfil, nconv, workl(ihbds), ndigit, - & '_neupd: Associated Ritz estimates.') - end if -c -c %-------------------------------------------------% -c | Eigenvector Purification step. Formally perform | -c | one of inverse subspace iteration. Only used | -c | for MODE = 3. See reference 3. | -c %-------------------------------------------------% -c - if (rvec .and. howmny .eq. 'A' .and. type .eq. 'SHIFTI') then -c -c %------------------------------------------------% -c | Purify the computed Ritz vectors by adding a | -c | little bit of the residual vector: | -c | T | -c | resid(:)*( e s ) / theta | -c | NCV | -c | where H s = s theta. | -c %------------------------------------------------% -c - do 100 j=1, nconv - if (workl(iheig+j-1) .ne. zero) then - workev(j) = workl(invsub+(j-1)*ldq+ncv-1) / - & workl(iheig+j-1) - endif - 100 continue - -c %---------------------------------------% -c | Perform a rank one update to Z and | -c | purify all the Ritz vectors together. | -c %---------------------------------------% -c - call zgeru (n, nconv, one, resid, 1, workev, 1, z, ldz) -c - end if -c - 9000 continue -c - return -c -c %---------------% -c | End of zneupd | -c %---------------% -c - end
--- a/libcruft/arpack/src/zngets.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -c\BeginDoc -c -c\Name: zngets -c -c\Description: -c Given the eigenvalues of the upper Hessenberg matrix H, -c computes the NP shifts AMU that are zeros of the polynomial of -c degree NP which filters out components of the unwanted eigenvectors -c corresponding to the AMU's based on some given criteria. -c -c NOTE: call this even in the case of user specified shifts in order -c to sort the eigenvalues, and error bounds of H for later use. -c -c\Usage: -c call zngets -c ( ISHIFT, WHICH, KEV, NP, RITZ, BOUNDS ) -c -c\Arguments -c ISHIFT Integer. (INPUT) -c Method for selecting the implicit shifts at each iteration. -c ISHIFT = 0: user specified shifts -c ISHIFT = 1: exact shift with respect to the matrix H. -c -c WHICH Character*2. (INPUT) -c Shift selection criteria. -c 'LM' -> want the KEV eigenvalues of largest magnitude. -c 'SM' -> want the KEV eigenvalues of smallest magnitude. -c 'LR' -> want the KEV eigenvalues of largest REAL part. -c 'SR' -> want the KEV eigenvalues of smallest REAL part. -c 'LI' -> want the KEV eigenvalues of largest imaginary part. -c 'SI' -> want the KEV eigenvalues of smallest imaginary part. -c -c KEV Integer. (INPUT) -c The number of desired eigenvalues. -c -c NP Integer. (INPUT) -c The number of shifts to compute. -c -c RITZ Complex*16 array of length KEV+NP. (INPUT/OUTPUT) -c On INPUT, RITZ contains the the eigenvalues of H. -c On OUTPUT, RITZ are sorted so that the unwanted -c eigenvalues are in the first NP locations and the wanted -c portion is in the last KEV locations. When exact shifts are -c selected, the unwanted part corresponds to the shifts to -c be applied. Also, if ISHIFT .eq. 1, the unwanted eigenvalues -c are further sorted so that the ones with largest Ritz values -c are first. -c -c BOUNDS Complex*16 array of length KEV+NP. (INPUT/OUTPUT) -c Error bounds corresponding to the ordering in RITZ. -c -c -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Local variables: -c xxxxxx Complex*16 -c -c\Routines called: -c zsortc ARPACK sorting routine. -c ivout ARPACK utility routine that prints integers. -c arscnd ARPACK utility routine for timing. -c zvout ARPACK utility routine that prints vectors. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c\SCCS Information: @(#) -c FILE: ngets.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\Remarks -c 1. This routine does not keep complex conjugate pairs of -c eigenvalues together. -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine zngets ( ishift, which, kev, np, ritz, bounds) -c -c %----------------------------------------------------% -c | Include files for debugging and timing information | -c %----------------------------------------------------% -c - include 'debug.h' - include 'stat.h' -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - integer ishift, kev, np -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex*16 - & bounds(kev+np), ritz(kev+np) -c -c %------------% -c | Parameters | -c %------------% -c - Complex*16 - & one, zero - parameter (one = (1.0D+0, 0.0D+0), zero = (0.0D+0, 0.0D+0)) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer msglvl -c -c %----------------------% -c | External Subroutines | -c %----------------------% -c - external zvout, zsortc, arscnd -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c -c %-------------------------------% -c | Initialize timing statistics | -c | & message level for debugging | -c %-------------------------------% -c - call arscnd (t0) - msglvl = mcgets -c - call zsortc (which, .true., kev+np, ritz, bounds) -c - if ( ishift .eq. 1 ) then -c -c %-------------------------------------------------------% -c | Sort the unwanted Ritz values used as shifts so that | -c | the ones with largest Ritz estimates are first | -c | This will tend to minimize the effects of the | -c | forward instability of the iteration when the shifts | -c | are applied in subroutine znapps. | -c | Be careful and use 'SM' since we want to sort BOUNDS! | -c %-------------------------------------------------------% -c - call zsortc ( 'SM', .true., np, bounds, ritz ) -c - end if -c - call arscnd (t1) - tcgets = tcgets + (t1 - t0) -c - if (msglvl .gt. 0) then - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') - call zvout (logfil, kev+np, ritz, ndigit, - & '_ngets: Eigenvalues of current H matrix ') - call zvout (logfil, kev+np, bounds, ndigit, - & '_ngets: Ritz estimates of the current KEV+NP Ritz values') - end if -c - return -c -c %---------------% -c | End of zngets | -c %---------------% -c - end
--- a/libcruft/arpack/src/zsortc.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,322 +0,0 @@ -c\BeginDoc -c -c\Name: zsortc -c -c\Description: -c Sorts the Complex*16 array in X into the order -c specified by WHICH and optionally applies the permutation to the -c Double precision array Y. -c -c\Usage: -c call zsortc -c ( WHICH, APPLY, N, X, Y ) -c -c\Arguments -c WHICH Character*2. (Input) -c 'LM' -> sort X into increasing order of magnitude. -c 'SM' -> sort X into decreasing order of magnitude. -c 'LR' -> sort X with real(X) in increasing algebraic order -c 'SR' -> sort X with real(X) in decreasing algebraic order -c 'LI' -> sort X with imag(X) in increasing algebraic order -c 'SI' -> sort X with imag(X) in decreasing algebraic order -c -c APPLY Logical. (Input) -c APPLY = .TRUE. -> apply the sorted order to array Y. -c APPLY = .FALSE. -> do not apply the sorted order to array Y. -c -c N Integer. (INPUT) -c Size of the arrays. -c -c X Complex*16 array of length N. (INPUT/OUTPUT) -c This is the array to be sorted. -c -c Y Complex*16 array of length N. (INPUT/OUTPUT) -c -c\EndDoc -c -c----------------------------------------------------------------------- -c -c\BeginLib -c -c\Routines called: -c dlapy2 LAPACK routine to compute sqrt(x**2+y**2) carefully. -c -c\Author -c Danny Sorensen Phuong Vu -c Richard Lehoucq CRPC / Rice University -c Dept. of Computational & Houston, Texas -c Applied Mathematics -c Rice University -c Houston, Texas -c -c Adapted from the sort routine in LANSO. -c -c\SCCS Information: @(#) -c FILE: sortc.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c\EndLib -c -c----------------------------------------------------------------------- -c - subroutine zsortc (which, apply, n, x, y) -c -c %------------------% -c | Scalar Arguments | -c %------------------% -c - character*2 which - logical apply - integer n -c -c %-----------------% -c | Array Arguments | -c %-----------------% -c - Complex*16 - & x(0:n-1), y(0:n-1) -c -c %---------------% -c | Local Scalars | -c %---------------% -c - integer i, igap, j - Complex*16 - & temp - Double precision - & temp1, temp2 -c -c %--------------------% -c | External functions | -c %--------------------% -c - Double precision - & dlapy2 -c -c %--------------------% -c | Intrinsic Functions | -c %--------------------% - Intrinsic - & dble, dimag -c -c %-----------------------% -c | Executable Statements | -c %-----------------------% -c - igap = n / 2 -c - if (which .eq. 'LM') then -c -c %--------------------------------------------% -c | Sort X into increasing order of magnitude. | -c %--------------------------------------------% -c - 10 continue - if (igap .eq. 0) go to 9000 -c - do 30 i = igap, n-1 - j = i-igap - 20 continue -c - if (j.lt.0) go to 30 -c - temp1 = dlapy2(dble(x(j)),dimag(x(j))) - temp2 = dlapy2(dble(x(j+igap)),dimag(x(j+igap))) -c - if (temp1.gt.temp2) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 30 - end if - j = j-igap - go to 20 - 30 continue - igap = igap / 2 - go to 10 -c - else if (which .eq. 'SM') then -c -c %--------------------------------------------% -c | Sort X into decreasing order of magnitude. | -c %--------------------------------------------% -c - 40 continue - if (igap .eq. 0) go to 9000 -c - do 60 i = igap, n-1 - j = i-igap - 50 continue -c - if (j .lt. 0) go to 60 -c - temp1 = dlapy2(dble(x(j)),dimag(x(j))) - temp2 = dlapy2(dble(x(j+igap)),dimag(x(j+igap))) -c - if (temp1.lt.temp2) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 60 - endif - j = j-igap - go to 50 - 60 continue - igap = igap / 2 - go to 40 -c - else if (which .eq. 'LR') then -c -c %------------------------------------------------% -c | Sort XREAL into increasing order of algebraic. | -c %------------------------------------------------% -c - 70 continue - if (igap .eq. 0) go to 9000 -c - do 90 i = igap, n-1 - j = i-igap - 80 continue -c - if (j.lt.0) go to 90 -c - if (dble(x(j)).gt.dble(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 90 - endif - j = j-igap - go to 80 - 90 continue - igap = igap / 2 - go to 70 -c - else if (which .eq. 'SR') then -c -c %------------------------------------------------% -c | Sort XREAL into decreasing order of algebraic. | -c %------------------------------------------------% -c - 100 continue - if (igap .eq. 0) go to 9000 - do 120 i = igap, n-1 - j = i-igap - 110 continue -c - if (j.lt.0) go to 120 -c - if (dble(x(j)).lt.dble(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 120 - endif - j = j-igap - go to 110 - 120 continue - igap = igap / 2 - go to 100 -c - else if (which .eq. 'LI') then -c -c %--------------------------------------------% -c | Sort XIMAG into increasing algebraic order | -c %--------------------------------------------% -c - 130 continue - if (igap .eq. 0) go to 9000 - do 150 i = igap, n-1 - j = i-igap - 140 continue -c - if (j.lt.0) go to 150 -c - if (dimag(x(j)).gt.dimag(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 150 - endif - j = j-igap - go to 140 - 150 continue - igap = igap / 2 - go to 130 -c - else if (which .eq. 'SI') then -c -c %---------------------------------------------% -c | Sort XIMAG into decreasing algebraic order | -c %---------------------------------------------% -c - 160 continue - if (igap .eq. 0) go to 9000 - do 180 i = igap, n-1 - j = i-igap - 170 continue -c - if (j.lt.0) go to 180 -c - if (dimag(x(j)).lt.dimag(x(j+igap))) then - temp = x(j) - x(j) = x(j+igap) - x(j+igap) = temp -c - if (apply) then - temp = y(j) - y(j) = y(j+igap) - y(j+igap) = temp - end if - else - go to 180 - endif - j = j-igap - go to 170 - 180 continue - igap = igap / 2 - go to 160 - end if -c - 9000 continue - return -c -c %---------------% -c | End of zsortc | -c %---------------% -c - end
--- a/libcruft/arpack/src/zstatn.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -c -c\SCCS Information: @(#) -c FILE: statn.F SID: 2.2 DATE OF SID: 4/20/96 RELEASE: 2 -c -c %---------------------------------------------% -c | Initialize statistic and timing information | -c | for complex nonsymmetric Arnoldi code. | -c %---------------------------------------------% - - subroutine zstatn -c -c %--------------------------------% -c | See stat.doc for documentation | -c %--------------------------------% -c - include 'stat.h' - -c %-----------------------% -c | Executable Statements | -c %-----------------------% - - nopx = 0 - nbx = 0 - nrorth = 0 - nitref = 0 - nrstrt = 0 - - tcaupd = 0.0D+0 - tcaup2 = 0.0D+0 - tcaitr = 0.0D+0 - tceigh = 0.0D+0 - tcgets = 0.0D+0 - tcapps = 0.0D+0 - tcconv = 0.0D+0 - titref = 0.0D+0 - tgetv0 = 0.0D+0 - trvec = 0.0D+0 - -c %----------------------------------------------------% -c | User time including reverse communication overhead | -c %----------------------------------------------------% - tmvopx = 0.0D+0 - tmvbx = 0.0D+0 - - return -c -c %---------------% -c | End of zstatn | -c %---------------% -c - end
--- a/libcruft/arpack/util/cmout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,250 +0,0 @@ -* -* Routine: CMOUT -* -* Purpose: Complex matrix output routine. -* -* Usage: CALL CMOUT (LOUT, M, N, A, LDA, IDIGIT, IFMT) -* -* Arguments -* M - Number of rows of A. (Input) -* N - Number of columns of A. (Input) -* A - Complex M by N matrix to be printed. (Input) -* LDA - Leading dimension of A exactly as specified in the -* dimension statement of the calling program. (Input) -* IFMT - Format to be used in printing matrix A. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*\SCCS Information: @(#) -* FILE: cmout.f SID: 2.1 DATE OF SID: 11/16/95 RELEASE: 2 -* -*----------------------------------------------------------------------- -* - SUBROUTINE CMOUT( LOUT, M, N, A, LDA, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER M, N, IDIGIT, LDA, LOUT - Complex - & A( LDA, * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, J, NDIGIT, K1, K2, LLL - CHARACTER*1 ICOL( 3 ) - CHARACTER*80 LINE -* ... -* ... SPECIFICATIONS INTRINSICS - INTRINSIC MIN -* - DATA ICOL( 1 ), ICOL( 2 ), ICOL( 3 ) / 'C', 'o', - $ 'l' / -* ... -* ... FIRST EXECUTABLE STATEMENT -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( M.LE.0 .OR. N.LE.0 .OR. LDA.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 40 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 30 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9994 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9984 )I, ( A( I, J ), J = K1, K2 ) - END IF - 30 CONTINUE - 40 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 60 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 50 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9993 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9983 )I, ( A( I, J ), J = K1, K2 ) - END IF - 50 CONTINUE - 60 CONTINUE -* - ELSE IF( NDIGIT.LE.8 ) THEN - DO 80 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 70 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9992 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9982 )I, ( A( I, J ), J = K1, K2 ) - END IF - 70 CONTINUE - 80 CONTINUE -* - ELSE - DO 100 K1 = 1, N - WRITE( LOUT, 9995 ) ICOL, K1 - DO 90 I = 1, M - WRITE( LOUT, 9991 )I, A( I, K1 ) - 90 CONTINUE - 100 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 120 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 110 I = 1, M - IF ((K1+3).LE.N) THEN - WRITE( LOUT, 9974 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+3-N).EQ.1) THEN - WRITE( LOUT, 9964 )I, ( A( I, J ), J = k1, K2 ) - ELSE IF ((K1+3-N).EQ.2) THEN - WRITE( LOUT, 9954 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+3-N).EQ.3) THEN - WRITE( LOUT, 9944 )I, ( A( I, J ), J = K1, K2 ) - END IF - 110 CONTINUE - 120 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 140 K1 = 1, N, 3 - K2 = MIN0( N, K1+ 2) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 130 I = 1, M - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9973 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.1) THEN - WRITE( LOUT, 9963 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.2) THEN - WRITE( LOUT, 9953 )I, ( A( I, J ), J = K1, K2 ) - END IF - 130 CONTINUE - 140 CONTINUE -* - ELSE IF( NDIGIT.LE.8 ) THEN - DO 160 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 150 I = 1, M - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9972 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.1) THEN - WRITE( LOUT, 9962 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.2) THEN - WRITE( LOUT, 9952 )I, ( A( I, J ), J = K1, K2 ) - END IF - 150 CONTINUE - 160 CONTINUE -* - ELSE - DO 180 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9995 )( ICOL, I, I = K1, K2 ) - DO 170 I = 1, M - IF ((K1+1).LE.N) THEN - WRITE( LOUT, 9971 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9961 )I, ( A( I, J ), J = K1, K2 ) - END IF - 170 CONTINUE - 180 CONTINUE - END IF - END IF - WRITE( LOUT, 9990 ) -* - 9998 FORMAT( 11X, 4( 9X, 3A1, I4, 9X ) ) - 9997 FORMAT( 10X, 4( 11X, 3A1, I4, 11X ) ) - 9996 FORMAT( 10X, 3( 13X, 3A1, I4, 13X ) ) - 9995 FORMAT( 12X, 2( 18x, 3A1, I4, 18X ) ) -* -*======================================================== -* FORMAT FOR 72 COLUMN -*======================================================== -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9994 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E10.3,',',E10.3,') ') ) - 9984 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E10.3,',',E10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9993 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E12.5,',',E12.5,') ') ) - 9983 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E12.5,',',E12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9992 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E14.7,',',E14.7,') ') ) - 9982 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E14.7,',',E14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9991 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E20.13,',',E20.13,')') ) - 9990 FORMAT( 1X, ' ' ) -* -* -*======================================================== -* FORMAT FOR 132 COLUMN -*======================================================== -* -* DISPLAY 4 SIGNIFICANT DIGIT -* - 9974 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,4('(',E10.3,',',E10.3,') ') ) - 9964 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',E10.3,',',E10.3,') ') ) - 9954 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E10.3,',',E10.3,') ') ) - 9944 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E10.3,',',E10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGIT -* - 9973 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',E12.5,',',E12.5,') ') ) - 9963 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E12.5,',',E12.5,') ') ) - 9953 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E12.5,',',E12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGIT -* - 9972 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',E14.7,',',E14.7,') ') ) - 9962 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E14.7,',',E14.7,') ') ) - 9952 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E14.7,',',E14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGIT -* - 9971 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',E20.13,',',E20.13, - & ') ')) - 9961 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',E20.13,',',E20.13, - & ') ')) - -* -* -* -* - RETURN - END
--- a/libcruft/arpack/util/cvout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,240 +0,0 @@ -c----------------------------------------------------------------------- -c -c\SCCS Information: @(#) -c FILE: cvout.f SID: 2.1 DATE OF SID: 11/16/95 RELEASE: 2 -c -*----------------------------------------------------------------------- -* Routine: CVOUT -* -* Purpose: Complex vector output routine. -* -* Usage: CALL CVOUT (LOUT, N, CX, IDIGIT, IFMT) -* -* Arguments -* N - Length of array CX. (Input) -* CX - Complex array to be printed. (Input) -* IFMT - Format to be used in printing array CX. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE CVOUT( LOUT, N, CX, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER N, IDIGIT, LOUT - Complex - & CX( * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, NDIGIT, K1, K2, LLL - CHARACTER*80 LINE -* ... -* ... FIRST EXECUTABLE STATEMENT -* -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( N.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 30 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9998 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9997 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 30 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 40 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9988 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9987 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 40 CONTINUE - ELSE IF( NDIGIT.LE.8 ) THEN - DO 50 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9978 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9977 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 50 CONTINUE - ELSE - DO 60 K1 = 1, N - WRITE( LOUT, 9968 )K1, K1, CX( I ) - 60 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 70 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - IF ((K1+3).LE.N) THEN - WRITE( LOUT, 9958 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 1) THEN - WRITE( LOUT, 9957 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 2) THEN - WRITE( LOUT, 9956 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 1) THEN - WRITE( LOUT, 9955 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 70 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 80 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9948 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9947 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 2) THEN - WRITE( LOUT, 9946 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 80 CONTINUE - ELSE IF( NDIGIT.LE.8 ) THEN - DO 90 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9938 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9937 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 2) THEN - WRITE( LOUT, 9936 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 90 CONTINUE - ELSE - DO 100 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9928 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9927 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 100 CONTINUE - END IF - END IF - WRITE( LOUT, 9994 ) - RETURN -* -*======================================================================= -* FORMAT FOR 72 COLUMNS -*======================================================================= -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9998 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E10.3,',',E10.3,') ') ) - 9997 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E10.3,',',E10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9988 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E12.5,',',E12.5,') ') ) - 9987 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E12.5,',',E12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9978 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E14.7,',',E14.7,') ') ) - 9977 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E14.7,',',E14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9968 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E20.13,',',E20.13,') ') ) -* -*========================================================================= -* FORMAT FOR 132 COLUMNS -*========================================================================= -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9958 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,4('(',E10.3,',',E10.3,') ') ) - 9957 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',E10.3,',',E10.3,') ') ) - 9956 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E10.3,',',E10.3,') ') ) - 9955 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E10.3,',',E10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9948 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',E12.5,',',E12.5,') ') ) - 9947 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E12.5,',',E12.5,') ') ) - 9946 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E12.5,',',E12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9938 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',E14.7,',',E14.7,') ') ) - 9937 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E14.7,',',E14.7,') ') ) - 9936 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E14.7,',',E14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9928 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',E20.13,',',E20.13,') ') ) - 9927 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',E20.13,',',E20.13,') ') ) -* -* -* - 9994 FORMAT( 1X, ' ' ) - END
--- a/libcruft/arpack/util/dmout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -*----------------------------------------------------------------------- -* Routine: DMOUT -* -* Purpose: Real matrix output routine. -* -* Usage: CALL DMOUT (LOUT, M, N, A, LDA, IDIGIT, IFMT) -* -* Arguments -* M - Number of rows of A. (Input) -* N - Number of columns of A. (Input) -* A - Real M by N matrix to be printed. (Input) -* LDA - Leading dimension of A exactly as specified in the -* dimension statement of the calling program. (Input) -* IFMT - Format to be used in printing matrix A. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE DMOUT( LOUT, M, N, A, LDA, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES -* .. Scalar Arguments .. - CHARACTER*( * ) IFMT - INTEGER IDIGIT, LDA, LOUT, M, N -* .. -* .. Array Arguments .. - DOUBLE PRECISION A( LDA, * ) -* .. -* .. Local Scalars .. - CHARACTER*80 LINE - INTEGER I, J, K1, K2, LLL, NDIGIT -* .. -* .. Local Arrays .. - CHARACTER ICOL( 3 ) -* .. -* .. Intrinsic Functions .. - INTRINSIC LEN, MIN, MIN0 -* .. -* .. Data statements .. - DATA ICOL( 1 ), ICOL( 2 ), ICOL( 3 ) / 'C', 'o', - $ 'l' / -* .. -* .. Executable Statements .. -* ... -* ... FIRST EXECUTABLE STATEMENT -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, FMT = 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A, / 1X, A ) -* - IF( M.LE.0 .OR. N.LE.0 .OR. LDA.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 40 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, FMT = 9998 )( ICOL, I, I = K1, K2 ) - DO 30 I = 1, M - WRITE( LOUT, FMT = 9994 )I, ( A( I, J ), J = K1, K2 ) - 30 CONTINUE - 40 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 60 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, FMT = 9997 )( ICOL, I, I = K1, K2 ) - DO 50 I = 1, M - WRITE( LOUT, FMT = 9993 )I, ( A( I, J ), J = K1, K2 ) - 50 CONTINUE - 60 CONTINUE -* - ELSE IF( NDIGIT.LE.10 ) THEN - DO 80 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, FMT = 9996 )( ICOL, I, I = K1, K2 ) - DO 70 I = 1, M - WRITE( LOUT, FMT = 9992 )I, ( A( I, J ), J = K1, K2 ) - 70 CONTINUE - 80 CONTINUE -* - ELSE - DO 100 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, FMT = 9995 )( ICOL, I, I = K1, K2 ) - DO 90 I = 1, M - WRITE( LOUT, FMT = 9991 )I, ( A( I, J ), J = K1, K2 ) - 90 CONTINUE - 100 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 120 K1 = 1, N, 10 - K2 = MIN0( N, K1+9 ) - WRITE( LOUT, FMT = 9998 )( ICOL, I, I = K1, K2 ) - DO 110 I = 1, M - WRITE( LOUT, FMT = 9994 )I, ( A( I, J ), J = K1, K2 ) - 110 CONTINUE - 120 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 140 K1 = 1, N, 8 - K2 = MIN0( N, K1+7 ) - WRITE( LOUT, FMT = 9997 )( ICOL, I, I = K1, K2 ) - DO 130 I = 1, M - WRITE( LOUT, FMT = 9993 )I, ( A( I, J ), J = K1, K2 ) - 130 CONTINUE - 140 CONTINUE -* - ELSE IF( NDIGIT.LE.10 ) THEN - DO 160 K1 = 1, N, 6 - K2 = MIN0( N, K1+5 ) - WRITE( LOUT, FMT = 9996 )( ICOL, I, I = K1, K2 ) - DO 150 I = 1, M - WRITE( LOUT, FMT = 9992 )I, ( A( I, J ), J = K1, K2 ) - 150 CONTINUE - 160 CONTINUE -* - ELSE - DO 180 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, FMT = 9995 )( ICOL, I, I = K1, K2 ) - DO 170 I = 1, M - WRITE( LOUT, FMT = 9991 )I, ( A( I, J ), J = K1, K2 ) - 170 CONTINUE - 180 CONTINUE - END IF - END IF - WRITE( LOUT, FMT = 9990 ) -* - 9998 FORMAT( 10X, 10( 4X, 3A1, I4, 1X ) ) - 9997 FORMAT( 10X, 8( 5X, 3A1, I4, 2X ) ) - 9996 FORMAT( 10X, 6( 7X, 3A1, I4, 4X ) ) - 9995 FORMAT( 10X, 5( 9X, 3A1, I4, 6X ) ) - 9994 FORMAT( 1X, ' Row', I4, ':', 1X, 1P, 10D12.3 ) - 9993 FORMAT( 1X, ' Row', I4, ':', 1X, 1P, 8D14.5 ) - 9992 FORMAT( 1X, ' Row', I4, ':', 1X, 1P, 6D18.9 ) - 9991 FORMAT( 1X, ' Row', I4, ':', 1X, 1P, 5D22.13 ) - 9990 FORMAT( 1X, ' ' ) -* - RETURN - END
--- a/libcruft/arpack/util/dvout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -*----------------------------------------------------------------------- -* Routine: DVOUT -* -* Purpose: Real vector output routine. -* -* Usage: CALL DVOUT (LOUT, N, SX, IDIGIT, IFMT) -* -* Arguments -* N - Length of array SX. (Input) -* SX - Real array to be printed. (Input) -* IFMT - Format to be used in printing array SX. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE DVOUT( LOUT, N, SX, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES -* .. Scalar Arguments .. - CHARACTER*( * ) IFMT - INTEGER IDIGIT, LOUT, N -* .. -* .. Array Arguments .. - DOUBLE PRECISION SX( * ) -* .. -* .. Local Scalars .. - CHARACTER*80 LINE - INTEGER I, K1, K2, LLL, NDIGIT -* .. -* .. Intrinsic Functions .. - INTRINSIC LEN, MIN, MIN0 -* .. -* .. Executable Statements .. -* ... -* ... FIRST EXECUTABLE STATEMENT -* -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, FMT = 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A, / 1X, A ) -* - IF( N.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 30 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, FMT = 9998 )K1, K2, ( SX( I ), I = K1, K2 ) - 30 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 40 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, FMT = 9997 )K1, K2, ( SX( I ), I = K1, K2 ) - 40 CONTINUE - ELSE IF( NDIGIT.LE.10 ) THEN - DO 50 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, FMT = 9996 )K1, K2, ( SX( I ), I = K1, K2 ) - 50 CONTINUE - ELSE - DO 60 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, FMT = 9995 )K1, K2, ( SX( I ), I = K1, K2 ) - 60 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 70 K1 = 1, N, 10 - K2 = MIN0( N, K1+9 ) - WRITE( LOUT, FMT = 9998 )K1, K2, ( SX( I ), I = K1, K2 ) - 70 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 80 K1 = 1, N, 8 - K2 = MIN0( N, K1+7 ) - WRITE( LOUT, FMT = 9997 )K1, K2, ( SX( I ), I = K1, K2 ) - 80 CONTINUE - ELSE IF( NDIGIT.LE.10 ) THEN - DO 90 K1 = 1, N, 6 - K2 = MIN0( N, K1+5 ) - WRITE( LOUT, FMT = 9996 )K1, K2, ( SX( I ), I = K1, K2 ) - 90 CONTINUE - ELSE - DO 100 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, FMT = 9995 )K1, K2, ( SX( I ), I = K1, K2 ) - 100 CONTINUE - END IF - END IF - WRITE( LOUT, FMT = 9994 ) - RETURN - 9998 FORMAT( 1X, I4, ' - ', I4, ':', 1P, 10D12.3 ) - 9997 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P, 8D14.5 ) - 9996 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P, 6D18.9 ) - 9995 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P, 5D24.13 ) - 9994 FORMAT( 1X, ' ' ) - END
--- a/libcruft/arpack/util/icnteq.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -c -c----------------------------------------------------------------------- -c -c Count the number of elements equal to a specified integer value. -c - integer function icnteq (n, array, value) -c - integer n, value - integer array(*) -c - k = 0 - do 10 i = 1, n - if (array(i) .eq. value) k = k + 1 - 10 continue - icnteq = k -c - return - end
--- a/libcruft/arpack/util/icopy.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -*-------------------------------------------------------------------- -*\Documentation -* -*\Name: ICOPY -* -*\Description: -* ICOPY copies an integer vector lx to an integer vector ly. -* -*\Usage: -* call icopy ( n, lx, inc, ly, incy ) -* -*\Arguments: -* n integer (input) -* On entry, n is the number of elements of lx to be -c copied to ly. -* -* lx integer array (input) -* On entry, lx is the integer vector to be copied. -* -* incx integer (input) -* On entry, incx is the increment between elements of lx. -* -* ly integer array (input) -* On exit, ly is the integer vector that contains the -* copy of lx. -* -* incy integer (input) -* On entry, incy is the increment between elements of ly. -* -*\Enddoc -* -*-------------------------------------------------------------------- -* - subroutine icopy( n, lx, incx, ly, incy ) -* -* ---------------------------- -* Specifications for arguments -* ---------------------------- - integer incx, incy, n - integer lx( 1 ), ly( 1 ) -* -* ---------------------------------- -* Specifications for local variables -* ---------------------------------- - integer i, ix, iy -* -* -------------------------- -* First executable statement -* -------------------------- - if( n.le.0 ) - $ return - if( incx.eq.1 .and. incy.eq.1 ) - $ go to 20 -c -c.....code for unequal increments or equal increments -c not equal to 1 - ix = 1 - iy = 1 - if( incx.lt.0 ) - $ ix = ( -n+1 )*incx + 1 - if( incy.lt.0 ) - $ iy = ( -n+1 )*incy + 1 - do 10 i = 1, n - ly( iy ) = lx( ix ) - ix = ix + incx - iy = iy + incy - 10 continue - return -c -c.....code for both increments equal to 1 -c - 20 continue - do 30 i = 1, n - ly( i ) = lx( i ) - 30 continue - return - end
--- a/libcruft/arpack/util/iset.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -c -c----------------------------------------------------------------------- -c -c Only work with increment equal to 1 right now. -c - subroutine iset (n, value, array, inc) -c - integer n, value, inc - integer array(*) -c - do 10 i = 1, n - array(i) = value - 10 continue -c - return - end
--- a/libcruft/arpack/util/iswap.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ - subroutine iswap (n,sx,incx,sy,incy) -c -c interchanges two vectors. -c uses unrolled loops for increments equal to 1. -c jack dongarra, linpack, 3/11/78. -c - integer sx(1),sy(1),stemp - integer i,incx,incy,ix,iy,m,mp1,n -c - if(n.le.0)return - if(incx.eq.1.and.incy.eq.1)go to 20 -c -c code for unequal increments or equal increments not equal -c to 1 -c - ix = 1 - iy = 1 - if(incx.lt.0)ix = (-n+1)*incx + 1 - if(incy.lt.0)iy = (-n+1)*incy + 1 - do 10 i = 1,n - stemp = sx(ix) - sx(ix) = sy(iy) - sy(iy) = stemp - ix = ix + incx - iy = iy + incy - 10 continue - return -c -c code for both increments equal to 1 -c -c -c clean-up loop -c - 20 m = mod(n,3) - if( m .eq. 0 ) go to 40 - do 30 i = 1,m - stemp = sx(i) - sx(i) = sy(i) - sy(i) = stemp - 30 continue - if( n .lt. 3 ) return - 40 mp1 = m + 1 - do 50 i = mp1,n,3 - stemp = sx(i) - sx(i) = sy(i) - sy(i) = stemp - stemp = sx(i + 1) - sx(i + 1) = sy(i + 1) - sy(i + 1) = stemp - stemp = sx(i + 2) - sx(i + 2) = sy(i + 2) - sy(i + 2) = stemp - 50 continue - return - end
--- a/libcruft/arpack/util/ivout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -C----------------------------------------------------------------------- -C Routine: IVOUT -C -C Purpose: Integer vector output routine. -C -C Usage: CALL IVOUT (LOUT, N, IX, IDIGIT, IFMT) -C -C Arguments -C N - Length of array IX. (Input) -C IX - Integer array to be printed. (Input) -C IFMT - Format to be used in printing array IX. (Input) -C IDIGIT - Print up to ABS(IDIGIT) decimal digits / number. (Input) -C If IDIGIT .LT. 0, printing is done with 72 columns. -C If IDIGIT .GT. 0, printing is done with 132 columns. -C -C----------------------------------------------------------------------- -C - SUBROUTINE IVOUT (LOUT, N, IX, IDIGIT, IFMT) -C ... -C ... SPECIFICATIONS FOR ARGUMENTS - INTEGER IX(*), N, IDIGIT, LOUT - CHARACTER IFMT*(*) -C ... -C ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, NDIGIT, K1, K2, LLL - CHARACTER*80 LINE -* ... -* ... SPECIFICATIONS INTRINSICS - INTRINSIC MIN -* -C - LLL = MIN ( LEN ( IFMT ), 80 ) - DO 1 I = 1, LLL - LINE(I:I) = '-' - 1 CONTINUE -C - DO 2 I = LLL+1, 80 - LINE(I:I) = ' ' - 2 CONTINUE -C - WRITE ( LOUT, 2000 ) IFMT, LINE(1:LLL) - 2000 FORMAT ( /1X, A /1X, A ) -C - IF (N .LE. 0) RETURN - NDIGIT = IDIGIT - IF (IDIGIT .EQ. 0) NDIGIT = 4 -C -C======================================================================= -C CODE FOR OUTPUT USING 72 COLUMNS FORMAT -C======================================================================= -C - IF (IDIGIT .LT. 0) THEN -C - NDIGIT = -IDIGIT - IF (NDIGIT .LE. 4) THEN - DO 10 K1 = 1, N, 10 - K2 = MIN0(N,K1+9) - WRITE(LOUT,1000) K1,K2,(IX(I),I=K1,K2) - 10 CONTINUE -C - ELSE IF (NDIGIT .LE. 6) THEN - DO 30 K1 = 1, N, 7 - K2 = MIN0(N,K1+6) - WRITE(LOUT,1001) K1,K2,(IX(I),I=K1,K2) - 30 CONTINUE -C - ELSE IF (NDIGIT .LE. 10) THEN - DO 50 K1 = 1, N, 5 - K2 = MIN0(N,K1+4) - WRITE(LOUT,1002) K1,K2,(IX(I),I=K1,K2) - 50 CONTINUE -C - ELSE - DO 70 K1 = 1, N, 3 - K2 = MIN0(N,K1+2) - WRITE(LOUT,1003) K1,K2,(IX(I),I=K1,K2) - 70 CONTINUE - END IF -C -C======================================================================= -C CODE FOR OUTPUT USING 132 COLUMNS FORMAT -C======================================================================= -C - ELSE -C - IF (NDIGIT .LE. 4) THEN - DO 90 K1 = 1, N, 20 - K2 = MIN0(N,K1+19) - WRITE(LOUT,1000) K1,K2,(IX(I),I=K1,K2) - 90 CONTINUE -C - ELSE IF (NDIGIT .LE. 6) THEN - DO 110 K1 = 1, N, 15 - K2 = MIN0(N,K1+14) - WRITE(LOUT,1001) K1,K2,(IX(I),I=K1,K2) - 110 CONTINUE -C - ELSE IF (NDIGIT .LE. 10) THEN - DO 130 K1 = 1, N, 10 - K2 = MIN0(N,K1+9) - WRITE(LOUT,1002) K1,K2,(IX(I),I=K1,K2) - 130 CONTINUE -C - ELSE - DO 150 K1 = 1, N, 7 - K2 = MIN0(N,K1+6) - WRITE(LOUT,1003) K1,K2,(IX(I),I=K1,K2) - 150 CONTINUE - END IF - END IF - WRITE (LOUT,1004) -C - 1000 FORMAT(1X,I4,' - ',I4,':',20(1X,I5)) - 1001 FORMAT(1X,I4,' - ',I4,':',15(1X,I7)) - 1002 FORMAT(1X,I4,' - ',I4,':',10(1X,I11)) - 1003 FORMAT(1X,I4,' - ',I4,':',7(1X,I15)) - 1004 FORMAT(1X,' ') -C - RETURN - END
--- a/libcruft/arpack/util/second.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ - SUBROUTINE ARSCND( T ) -* - REAL T -* -* -- LAPACK auxiliary routine (preliminary version) -- -* Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., -* Courant Institute, Argonne National Lab, and Rice University -* July 26, 1991 -* -* Purpose -* ======= -* -* SECOND returns the user time for a process in arscnds. -* This version gets the time from the system function ETIME. -* -* .. Local Scalars .. - REAL T1 -* .. -* .. Local Arrays .. - REAL TARRAY( 2 ) -* .. -* .. External Functions .. - REAL ETIME - INTRINSIC ETIME -* .. -* .. Executable Statements .. -* - - T1 = ETIME( TARRAY ) - T = TARRAY( 1 ) - - RETURN -* -* End of ARSCND -* - END
--- a/libcruft/arpack/util/smout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -*----------------------------------------------------------------------- -* Routine: SMOUT -* -* Purpose: Real matrix output routine. -* -* Usage: CALL SMOUT (LOUT, M, N, A, LDA, IDIGIT, IFMT) -* -* Arguments -* M - Number of rows of A. (Input) -* N - Number of columns of A. (Input) -* A - Real M by N matrix to be printed. (Input) -* LDA - Leading dimension of A exactly as specified in the -* dimension statement of the calling program. (Input) -* IFMT - Format to be used in printing matrix A. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE SMOUT( LOUT, M, N, A, LDA, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER M, N, IDIGIT, LDA, LOUT - REAL A( LDA, * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, J, NDIGIT, K1, K2, LLL - CHARACTER*1 ICOL( 3 ) - CHARACTER*80 LINE -* ... -* ... SPECIFICATIONS INTRINSICS - INTRINSIC MIN -* - DATA ICOL( 1 ), ICOL( 2 ), ICOL( 3 ) / 'C', 'o', - $ 'l' / -* ... -* ... FIRST EXECUTABLE STATEMENT -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( M.LE.0 .OR. N.LE.0 .OR. LDA.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 40 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 30 I = 1, M - WRITE( LOUT, 9994 )I, ( A( I, J ), J = K1, K2 ) - 30 CONTINUE - 40 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 60 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 50 I = 1, M - WRITE( LOUT, 9993 )I, ( A( I, J ), J = K1, K2 ) - 50 CONTINUE - 60 CONTINUE -* - ELSE IF( NDIGIT.LE.10 ) THEN - DO 80 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 70 I = 1, M - WRITE( LOUT, 9992 )I, ( A( I, J ), J = K1, K2 ) - 70 CONTINUE - 80 CONTINUE -* - ELSE - DO 100 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9995 )( ICOL, I, I = K1, K2 ) - DO 90 I = 1, M - WRITE( LOUT, 9991 )I, ( A( I, J ), J = K1, K2 ) - 90 CONTINUE - 100 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 120 K1 = 1, N, 10 - K2 = MIN0( N, K1+9 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 110 I = 1, M - WRITE( LOUT, 9994 )I, ( A( I, J ), J = K1, K2 ) - 110 CONTINUE - 120 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 140 K1 = 1, N, 8 - K2 = MIN0( N, K1+7 ) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 130 I = 1, M - WRITE( LOUT, 9993 )I, ( A( I, J ), J = K1, K2 ) - 130 CONTINUE - 140 CONTINUE -* - ELSE IF( NDIGIT.LE.10 ) THEN - DO 160 K1 = 1, N, 6 - K2 = MIN0( N, K1+5 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 150 I = 1, M - WRITE( LOUT, 9992 )I, ( A( I, J ), J = K1, K2 ) - 150 CONTINUE - 160 CONTINUE -* - ELSE - DO 180 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, 9995 )( ICOL, I, I = K1, K2 ) - DO 170 I = 1, M - WRITE( LOUT, 9991 )I, ( A( I, J ), J = K1, K2 ) - 170 CONTINUE - 180 CONTINUE - END IF - END IF - WRITE( LOUT, 9990 ) -* - 9998 FORMAT( 10X, 10( 4X, 3A1, I4, 1X ) ) - 9997 FORMAT( 10X, 8( 5X, 3A1, I4, 2X ) ) - 9996 FORMAT( 10X, 6( 7X, 3A1, I4, 4X ) ) - 9995 FORMAT( 10X, 5( 9X, 3A1, I4, 6X ) ) - 9994 FORMAT( 1X, ' Row', I4, ':', 1X, 1P10E12.3 ) - 9993 FORMAT( 1X, ' Row', I4, ':', 1X, 1P8E14.5 ) - 9992 FORMAT( 1X, ' Row', I4, ':', 1X, 1P6E18.9 ) - 9991 FORMAT( 1X, ' Row', I4, ':', 1X, 1P5E22.13 ) - 9990 FORMAT( 1X, ' ' ) -* - RETURN - END
--- a/libcruft/arpack/util/svout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +0,0 @@ -*----------------------------------------------------------------------- -* Routine: SVOUT -* -* Purpose: Real vector output routine. -* -* Usage: CALL SVOUT (LOUT, N, SX, IDIGIT, IFMT) -* -* Arguments -* N - Length of array SX. (Input) -* SX - Real array to be printed. (Input) -* IFMT - Format to be used in printing array SX. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE SVOUT( LOUT, N, SX, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER N, IDIGIT, LOUT - REAL SX( * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, NDIGIT, K1, K2, LLL - CHARACTER*80 LINE -* ... -* ... FIRST EXECUTABLE STATEMENT -* -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( N.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 30 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, 9998 )K1, K2, ( SX( I ), I = K1, K2 ) - 30 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 40 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, 9997 )K1, K2, ( SX( I ), I = K1, K2 ) - 40 CONTINUE - ELSE IF( NDIGIT.LE.10 ) THEN - DO 50 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, 9996 )K1, K2, ( SX( I ), I = K1, K2 ) - 50 CONTINUE - ELSE - DO 60 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9995 )K1, K2, ( SX( I ), I = K1, K2 ) - 60 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 70 K1 = 1, N, 10 - K2 = MIN0( N, K1+9 ) - WRITE( LOUT, 9998 )K1, K2, ( SX( I ), I = K1, K2 ) - 70 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 80 K1 = 1, N, 8 - K2 = MIN0( N, K1+7 ) - WRITE( LOUT, 9997 )K1, K2, ( SX( I ), I = K1, K2 ) - 80 CONTINUE - ELSE IF( NDIGIT.LE.10 ) THEN - DO 90 K1 = 1, N, 6 - K2 = MIN0( N, K1+5 ) - WRITE( LOUT, 9996 )K1, K2, ( SX( I ), I = K1, K2 ) - 90 CONTINUE - ELSE - DO 100 K1 = 1, N, 5 - K2 = MIN0( N, K1+4 ) - WRITE( LOUT, 9995 )K1, K2, ( SX( I ), I = K1, K2 ) - 100 CONTINUE - END IF - END IF - WRITE( LOUT, 9994 ) - RETURN - 9998 FORMAT( 1X, I4, ' - ', I4, ':', 1P10E12.3 ) - 9997 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P8E14.5 ) - 9996 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P6E18.9 ) - 9995 FORMAT( 1X, I4, ' - ', I4, ':', 1X, 1P5E24.13 ) - 9994 FORMAT( 1X, ' ' ) - END
--- a/libcruft/arpack/util/zmout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,250 +0,0 @@ -* -* Routine: ZMOUT -* -* Purpose: Complex*16 matrix output routine. -* -* Usage: CALL ZMOUT (LOUT, M, N, A, LDA, IDIGIT, IFMT) -* -* Arguments -* M - Number of rows of A. (Input) -* N - Number of columns of A. (Input) -* A - Complex*16 M by N matrix to be printed. (Input) -* LDA - Leading dimension of A exactly as specified in the -* dimension statement of the calling program. (Input) -* IFMT - Format to be used in printing matrix A. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*\SCCS Information: @(#) -* FILE: zmout.f SID: 2.1 DATE OF SID: 11/16/95 RELEASE: 2 -* -*----------------------------------------------------------------------- -* - SUBROUTINE ZMOUT( LOUT, M, N, A, LDA, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER M, N, IDIGIT, LDA, LOUT - Complex*16 - & A( LDA, * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, J, NDIGIT, K1, K2, LLL - CHARACTER*1 ICOL( 3 ) - CHARACTER*80 LINE -* ... -* ... SPECIFICATIONS INTRINSICS - INTRINSIC MIN -* - DATA ICOL( 1 ), ICOL( 2 ), ICOL( 3 ) / 'C', 'o', - $ 'l' / -* ... -* ... FIRST EXECUTABLE STATEMENT -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( M.LE.0 .OR. N.LE.0 .OR. LDA.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 40 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 30 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9994 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9984 )I, ( A( I, J ), J = K1, K2 ) - END IF - 30 CONTINUE - 40 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 60 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 50 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9993 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9983 )I, ( A( I, J ), J = K1, K2 ) - END IF - 50 CONTINUE - 60 CONTINUE -* - ELSE IF( NDIGIT.LE.8 ) THEN - DO 80 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 70 I = 1, M - IF (K1.NE.N) THEN - WRITE( LOUT, 9992 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9982 )I, ( A( I, J ), J = K1, K2 ) - END IF - 70 CONTINUE - 80 CONTINUE -* - ELSE - DO 100 K1 = 1, N - WRITE( LOUT, 9995 ) ICOL, K1 - DO 90 I = 1, M - WRITE( LOUT, 9991 )I, A( I, K1 ) - 90 CONTINUE - 100 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 120 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - WRITE( LOUT, 9998 )( ICOL, I, I = K1, K2 ) - DO 110 I = 1, M - IF ((K1+3).LE.N) THEN - WRITE( LOUT, 9974 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+3-N).EQ.1) THEN - WRITE( LOUT, 9964 )I, ( A( I, J ), J = k1, K2 ) - ELSE IF ((K1+3-N).EQ.2) THEN - WRITE( LOUT, 9954 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+3-N).EQ.3) THEN - WRITE( LOUT, 9944 )I, ( A( I, J ), J = K1, K2 ) - END IF - 110 CONTINUE - 120 CONTINUE -* - ELSE IF( NDIGIT.LE.6 ) THEN - DO 140 K1 = 1, N, 3 - K2 = MIN0( N, K1+ 2) - WRITE( LOUT, 9997 )( ICOL, I, I = K1, K2 ) - DO 130 I = 1, M - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9973 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.1) THEN - WRITE( LOUT, 9963 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.2) THEN - WRITE( LOUT, 9953 )I, ( A( I, J ), J = K1, K2 ) - END IF - 130 CONTINUE - 140 CONTINUE -* - ELSE IF( NDIGIT.LE.8 ) THEN - DO 160 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - WRITE( LOUT, 9996 )( ICOL, I, I = K1, K2 ) - DO 150 I = 1, M - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9972 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.1) THEN - WRITE( LOUT, 9962 )I, ( A( I, J ), J = K1, K2 ) - ELSE IF ((K1+2-N).EQ.2) THEN - WRITE( LOUT, 9952 )I, ( A( I, J ), J = K1, K2 ) - END IF - 150 CONTINUE - 160 CONTINUE -* - ELSE - DO 180 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - WRITE( LOUT, 9995 )( ICOL, I, I = K1, K2 ) - DO 170 I = 1, M - IF ((K1+1).LE.N) THEN - WRITE( LOUT, 9971 )I, ( A( I, J ), J = K1, K2 ) - ELSE - WRITE( LOUT, 9961 )I, ( A( I, J ), J = K1, K2 ) - END IF - 170 CONTINUE - 180 CONTINUE - END IF - END IF - WRITE( LOUT, 9990 ) -* - 9998 FORMAT( 11X, 4( 9X, 3A1, I4, 9X ) ) - 9997 FORMAT( 10X, 4( 11X, 3A1, I4, 11X ) ) - 9996 FORMAT( 10X, 3( 13X, 3A1, I4, 13X ) ) - 9995 FORMAT( 12X, 2( 18x, 3A1, I4, 18X ) ) -* -*======================================================== -* FORMAT FOR 72 COLUMN -*======================================================== -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9994 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D10.3,',',D10.3,') ') ) - 9984 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D10.3,',',D10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9993 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D12.5,',',D12.5,') ') ) - 9983 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D12.5,',',D12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9992 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D14.7,',',D14.7,') ') ) - 9982 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D14.7,',',D14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9991 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D20.13,',',D20.13,')') ) - 9990 FORMAT( 1X, ' ' ) -* -* -*======================================================== -* FORMAT FOR 132 COLUMN -*======================================================== -* -* DISPLAY 4 SIGNIFICANT DIGIT -* - 9974 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,4('(',D10.3,',',D10.3,') ') ) - 9964 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',D10.3,',',D10.3,') ') ) - 9954 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D10.3,',',D10.3,') ') ) - 9944 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D10.3,',',D10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGIT -* - 9973 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',D12.5,',',D12.5,') ') ) - 9963 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D12.5,',',D12.5,') ') ) - 9953 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D12.5,',',D12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGIT -* - 9972 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,3('(',D14.7,',',D14.7,') ') ) - 9962 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D14.7,',',D14.7,') ') ) - 9952 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D14.7,',',D14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGIT -* - 9971 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,2('(',D20.13,',',D20.13, - & ') ')) - 9961 FORMAT( 1X, ' Row', I4, ':', 1X, 1P,1('(',D20.13,',',D20.13, - & ') ')) - -* -* -* -* - RETURN - END
--- a/libcruft/arpack/util/zvout.f Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,240 +0,0 @@ -c----------------------------------------------------------------------- -c -c\SCCS Information: @(#) -c FILE: zvout.f SID: 2.1 DATE OF SID: 11/16/95 RELEASE: 2 -c -*----------------------------------------------------------------------- -* Routine: ZVOUT -* -* Purpose: Complex*16 vector output routine. -* -* Usage: CALL ZVOUT (LOUT, N, CX, IDIGIT, IFMT) -* -* Arguments -* N - Length of array CX. (Input) -* CX - Complex*16 array to be printed. (Input) -* IFMT - Format to be used in printing array CX. (Input) -* IDIGIT - Print up to IABS(IDIGIT) decimal digits per number. (In) -* If IDIGIT .LT. 0, printing is done with 72 columns. -* If IDIGIT .GT. 0, printing is done with 132 columns. -* -*----------------------------------------------------------------------- -* - SUBROUTINE ZVOUT( LOUT, N, CX, IDIGIT, IFMT ) -* ... -* ... SPECIFICATIONS FOR ARGUMENTS - INTEGER N, IDIGIT, LOUT - Complex*16 - & CX( * ) - CHARACTER IFMT*( * ) -* ... -* ... SPECIFICATIONS FOR LOCAL VARIABLES - INTEGER I, NDIGIT, K1, K2, LLL - CHARACTER*80 LINE -* ... -* ... FIRST EXECUTABLE STATEMENT -* -* - LLL = MIN( LEN( IFMT ), 80 ) - DO 10 I = 1, LLL - LINE( I: I ) = '-' - 10 CONTINUE -* - DO 20 I = LLL + 1, 80 - LINE( I: I ) = ' ' - 20 CONTINUE -* - WRITE( LOUT, 9999 )IFMT, LINE( 1: LLL ) - 9999 FORMAT( / 1X, A / 1X, A ) -* - IF( N.LE.0 ) - $ RETURN - NDIGIT = IDIGIT - IF( IDIGIT.EQ.0 ) - $ NDIGIT = 4 -* -*======================================================================= -* CODE FOR OUTPUT USING 72 COLUMNS FORMAT -*======================================================================= -* - IF( IDIGIT.LT.0 ) THEN - NDIGIT = -IDIGIT - IF( NDIGIT.LE.4 ) THEN - DO 30 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9998 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9997 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 30 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 40 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9988 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9987 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 40 CONTINUE - ELSE IF( NDIGIT.LE.8 ) THEN - DO 50 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF (K1.NE.N) THEN - WRITE( LOUT, 9978 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE - WRITE( LOUT, 9977 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 50 CONTINUE - ELSE - DO 60 K1 = 1, N - WRITE( LOUT, 9968 )K1, K1, CX( I ) - 60 CONTINUE - END IF -* -*======================================================================= -* CODE FOR OUTPUT USING 132 COLUMNS FORMAT -*======================================================================= -* - ELSE - IF( NDIGIT.LE.4 ) THEN - DO 70 K1 = 1, N, 4 - K2 = MIN0( N, K1+3 ) - IF ((K1+3).LE.N) THEN - WRITE( LOUT, 9958 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 1) THEN - WRITE( LOUT, 9957 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 2) THEN - WRITE( LOUT, 9956 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+3-N) .EQ. 1) THEN - WRITE( LOUT, 9955 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 70 CONTINUE - ELSE IF( NDIGIT.LE.6 ) THEN - DO 80 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9948 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9947 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 2) THEN - WRITE( LOUT, 9946 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 80 CONTINUE - ELSE IF( NDIGIT.LE.8 ) THEN - DO 90 K1 = 1, N, 3 - K2 = MIN0( N, K1+2 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9938 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9937 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 2) THEN - WRITE( LOUT, 9936 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 90 CONTINUE - ELSE - DO 100 K1 = 1, N, 2 - K2 = MIN0( N, K1+1 ) - IF ((K1+2).LE.N) THEN - WRITE( LOUT, 9928 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - ELSE IF ((K1+2-N) .EQ. 1) THEN - WRITE( LOUT, 9927 )K1, K2, ( CX( I ), - $ I = K1, K2 ) - END IF - 100 CONTINUE - END IF - END IF - WRITE( LOUT, 9994 ) - RETURN -* -*======================================================================= -* FORMAT FOR 72 COLUMNS -*======================================================================= -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9998 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D10.3,',',D10.3,') ') ) - 9997 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D10.3,',',D10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9988 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D12.5,',',D12.5,') ') ) - 9987 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D12.5,',',D12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9978 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D14.7,',',D14.7,') ') ) - 9977 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D14.7,',',D14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9968 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D20.13,',',D20.13,') ') ) -* -*========================================================================= -* FORMAT FOR 132 COLUMNS -*========================================================================= -* -* DISPLAY 4 SIGNIFICANT DIGITS -* - 9958 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,4('(',D10.3,',',D10.3,') ') ) - 9957 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',D10.3,',',D10.3,') ') ) - 9956 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D10.3,',',D10.3,') ') ) - 9955 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D10.3,',',D10.3,') ') ) -* -* DISPLAY 6 SIGNIFICANT DIGITS -* - 9948 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',D12.5,',',D12.5,') ') ) - 9947 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D12.5,',',D12.5,') ') ) - 9946 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D12.5,',',D12.5,') ') ) -* -* DISPLAY 8 SIGNIFICANT DIGITS -* - 9938 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,3('(',D14.7,',',D14.7,') ') ) - 9937 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D14.7,',',D14.7,') ') ) - 9936 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D14.7,',',D14.7,') ') ) -* -* DISPLAY 13 SIGNIFICANT DIGITS -* - 9928 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,2('(',D20.13,',',D20.13,') ') ) - 9927 FORMAT( 1X, I4, ' - ', I4, ':', 1X, - $ 1P,1('(',D20.13,',',D20.13,') ') ) -* -* -* - 9994 FORMAT( 1X, ' ' ) - END
--- a/libcruft/blas-xtra/cconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/cconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/cdotc3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/cdotc3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/cmatm3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/cmatm3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/csconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/csconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/dconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/dconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/ddot3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/ddot3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/dmatm3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/dmatm3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/sconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/sconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/sdot3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/sdot3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/smatm3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/smatm3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/zconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/zconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/zdconv2.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/zdconv2.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/zdotc3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/zdotc3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/blas-xtra/zmatm3.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/blas-xtra/zmatm3.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2009-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2009-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/lapack-xtra/crsf2csf.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/lapack-xtra/crsf2csf.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/lapack-xtra/zrsf2csf.f Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/lapack-xtra/zrsf2csf.f Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -c Copyright (C) 2010-2011 VZLU Prague, a.s., Czech Republic +c Copyright (C) 2010-2012 VZLU Prague, a.s., Czech Republic c c Author: Jaroslav Hajek <highegg@gmail.com> c
--- a/libcruft/misc/blaswrap.c Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/blaswrap.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Jarno Rajahalme +Copyright (C) 2012 Jarno Rajahalme This file is part of Octave.
--- a/libcruft/misc/cquit.c Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/cquit.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/f77-extern.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/f77-extern.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // misc-extern.cc -*- C++ -*- /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/f77-fcn.c Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/f77-fcn.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/f77-fcn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/f77-fcn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/lo-error.c Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/lo-error.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/lo-error.h Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/lo-error.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/quit.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/quit.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/misc/quit.h Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/misc/quit.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/libcruft/mkf77def.in Sat Dec 24 23:15:29 2011 +0000 +++ b/libcruft/mkf77def.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2006-2011 John W. Eaton +# Copyright (C) 2006-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/Array-C.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-C.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/Array-b.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-b.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-ch.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-ch.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-d.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-d.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/Array-f.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-f.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/Array-fC.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-fC.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/Array-i.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-i.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-idx-vec.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-idx-vec.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-str.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-str.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-util.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-util.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/Array-util.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-util.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array-voidp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array-voidp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague @@ -783,7 +783,7 @@ if (i.extent (r) != r) gripe_index_out_of_range (2, 1, i.extent (r), r); // throws if (j.extent (c) != c) - gripe_index_out_of_range (2, 2, i.extent (c), c); // throws + gripe_index_out_of_range (2, 2, j.extent (c), c); // throws octave_idx_type n = numel (), il = i.length (r), jl = j.length (c);
--- a/liboctave/Array.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2010 VZLU Prague
--- a/liboctave/Array2.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array2.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Array3.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Array3.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/ArrayN.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ArrayN.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CColVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CColVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // ColumnVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/CColVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CColVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/CDiagMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CDiagMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // DiagMatrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/CDiagMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CDiagMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague, a.s.
--- a/liboctave/CMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/CNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CRowVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CRowVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // RowVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CRowVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CRowVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CSparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CSparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/liboctave/CSparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CSparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/CmplxAEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxAEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/CmplxAEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxAEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/CmplxCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/CmplxCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/CmplxGEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxGEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxGEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxGEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxHESS.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxHESS.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxHESS.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxHESS.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/CmplxLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/CmplxQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/CmplxQRP.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxQRP.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/CmplxQRP.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxQRP.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxSCHUR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxSCHUR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxSCHUR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxSCHUR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxSVD.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxSVD.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CmplxSVD.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CmplxSVD.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CollocWt.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CollocWt.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/CollocWt.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/CollocWt.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DAE.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DAE.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DAEFunc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DAEFunc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DAERT.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DAERT.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DAERTFunc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DAERTFunc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASPK-opts.in Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASPK-opts.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/DASPK.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASPK.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASPK.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASPK.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASRT-opts.in Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASRT-opts.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/DASRT.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASRT.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASRT.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASRT.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASSL-opts.in Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASSL-opts.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/DASSL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASSL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DASSL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DASSL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/DET.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DET.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/DiagArray2.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DiagArray2.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/DiagArray2.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/DiagArray2.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2010 VZLU Prague @@ -43,7 +43,7 @@ public: - using Array<T>::element_type; + using typename Array<T>::element_type; DiagArray2 (void) : Array<T> (), d1 (0), d2 (0) { }
--- a/liboctave/EIG.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/EIG.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/EIG.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/EIG.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/LSODE-opts.in Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/LSODE-opts.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/LSODE.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/LSODE.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/LSODE.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/LSODE.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-C.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-C.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-d.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-d.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-decl.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-decl.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/MArray-f.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-f.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-fC.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-fC.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-i.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-i.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/MArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes with like-type math ops /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/MArray2.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArray2.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes with like-type math ops /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MArrayN.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MArrayN.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes with like-type math ops /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MDiagArray2.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MDiagArray2.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/MDiagArray2.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MDiagArray2.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template array classes with like-type math ops /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/MSparse-C.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MSparse-C.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/MSparse-d.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MSparse-d.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/MSparse-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MSparse-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/MSparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MSparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/MSparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MSparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's liboctave directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/Matrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Matrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/MatrixType.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MatrixType.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 David Bateman +Copyright (C) 2006-2012 David Bateman Copyright (C) 2006 Andy Adler Copyright (C) 2009 VZLU Prague
--- a/liboctave/MatrixType.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/MatrixType.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 David Bateman +Copyright (C) 2006-2012 David Bateman Copyright (C) 2006 Andy Adler This file is part of Octave.
--- a/liboctave/ODE.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ODE.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/ODEFunc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ODEFunc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/ODES.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ODES.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/ODES.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ODES.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/ODESFunc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/ODESFunc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/PermMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/PermMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/PermMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/PermMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/Quad-opts.in Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Quad-opts.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/Quad.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Quad.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Quad.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Quad.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Range.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Range.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Range.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Range.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/Sparse-C.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-C.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/Sparse-b.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-b.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/Sparse-d.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-d.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/Sparse-diag-op-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-diag-op-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -*- C++ -*- -Copyright (C) 2009-2011 Jason Riedy, Jaroslav Hajek +Copyright (C) 2009-2012 Jason Riedy, Jaroslav Hajek This file is part of Octave.
--- a/liboctave/Sparse-op-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-op-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2008 Jaroslav Hajek
--- a/liboctave/Sparse-perm-op-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse-perm-op-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -*- C++ -*- -Copyright (C) 2009-2011 Jason Riedy +Copyright (C) 2009-2012 Jason Riedy This file is part of Octave.
--- a/liboctave/Sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template sparse array class /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/liboctave/Sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/Sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Template sparse classes /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/liboctave/SparseCmplxCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/SparseCmplxCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/SparseCmplxLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/SparseCmplxLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/SparseCmplxQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/SparseCmplxQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseCmplxQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/SparseQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/SparseQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparseQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/SparsedbleCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparsedbleCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/SparsedbleCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparsedbleCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/SparsedbleLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparsedbleLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/SparsedbleLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/SparsedbleLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/base-aepbal.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-aepbal.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/base-dae.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-dae.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/base-de.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-de.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/base-list.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-list.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/base-lu.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-lu.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/base-lu.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-lu.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/base-min.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-min.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/base-qr.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-qr.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/base-qr.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/base-qr.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/boolMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/boolMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/boolNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/boolNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/boolSparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolSparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/liboctave/boolSparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/boolSparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/bsxfun-decl.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/bsxfun-decl.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/bsxfun-defs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/bsxfun-defs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/bsxfun.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/bsxfun.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Jordi Gutiérrez Hermoso <jordigh@octave.org> +Copyright (C) 2012 Jordi Gutiérrez Hermoso <jordigh@octave.org> This file is part of Octave. @@ -42,7 +42,7 @@ } (*current_liboctave_warning_with_id_handler) - ("Octave:auto-bsxfun", "%s: automatic broadcasting operation applied", name.c_str ()); + ("Octave:broadcast", "%s: automatic broadcasting operation applied", name.c_str ()); return true; } @@ -69,7 +69,7 @@ } (*current_liboctave_warning_with_id_handler) - ("Octave:auto-bsxfun", "%s: automatic broadcasting operation applied", name.c_str ()); + ("Octave:broadcast", "%s: automatic broadcasting operation applied", name.c_str ()); return true; }
--- a/liboctave/byte-swap.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/byte-swap.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/caseless-str.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/caseless-str.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 Shai Ayal +Copyright (C) 2007-2012 Shai Ayal This file is part of Octave.
--- a/liboctave/chMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/chMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/chMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/chMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/chNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/chNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/chNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/chNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/cmd-edit.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/cmd-edit.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/cmd-edit.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/cmd-edit.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/cmd-hist.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/cmd-hist.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/cmd-hist.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/cmd-hist.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dColVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dColVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // ColumnVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/dColVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dColVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/dDiagMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dDiagMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // DiagMatrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/dDiagMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dDiagMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek Copyright (C) 2009 VZLU Prague, a.s.
--- a/liboctave/dMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/dNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dRowVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dRowVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // RowVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dRowVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dRowVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dSparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dSparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/liboctave/dSparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dSparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/data-conv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/data-conv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/data-conv.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/data-conv.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleAEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleAEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/dbleAEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleAEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/dbleCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/dbleCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/dbleGEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleGEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleGEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleGEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleHESS.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleHESS.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleHESS.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleHESS.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/dbleLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/dbleQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/dbleQRP.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleQRP.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/dbleQRP.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleQRP.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleSCHUR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleSCHUR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleSCHUR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleSCHUR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleSVD.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleSVD.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dbleSVD.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dbleSVD.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/dim-vector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dim-vector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyirght (C) 2009, 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/dim-vector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dim-vector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyirght (C) 2009, 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/dir-ops.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dir-ops.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -77,7 +77,7 @@ struct dirent *dir_ent; - while ((dir_ent = readdir (static_cast<DIR *> (dir)))) + while ((dir_ent = gnulib::readdir (static_cast<DIR *> (dir)))) { if (dir_ent) dirlist.push_back (dir_ent->d_name);
--- a/liboctave/dir-ops.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/dir-ops.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/eigs-base.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/eigs-base.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave. @@ -44,6 +44,7 @@ #include "dbleLU.h" #include "CmplxLU.h" +#ifdef HAVE_ARPACK typedef ColumnVector (*EigsFunc) (const ColumnVector &x, int &eigs_error); typedef ComplexColumnVector (*EigsComplexFunc) (const ComplexColumnVector &x, int &eigs_error); @@ -3829,6 +3830,7 @@ ComplexColumnVector &resid, std::ostream& os, double tol = DBL_EPSILON, bool rvec = false, bool cholB = 0, int disp = 0, int maxit = 300); +#endif #ifndef _MSC_VER template static octave_idx_type
--- a/liboctave/f2c-main.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/f2c-main.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCColVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCColVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // ColumnVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/fCColVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCColVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/fCDiagMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCDiagMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // DiagMatrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/fCDiagMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCDiagMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague, a.s.
--- a/liboctave/fCMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/fCNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCRowVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCRowVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // RowVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCRowVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCRowVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxAEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxAEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/fCmplxAEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxAEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/fCmplxCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/fCmplxCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/fCmplxGEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxGEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxGEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxGEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxHESS.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxHESS.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxHESS.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxHESS.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/fCmplxLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/fCmplxQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/fCmplxQRP.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxQRP.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/fCmplxQRP.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxQRP.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxSCHUR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxSCHUR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxSCHUR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxSCHUR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxSVD.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxSVD.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fCmplxSVD.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fCmplxSVD.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fColVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fColVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // ColumnVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/fColVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fColVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/fDiagMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fDiagMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // FloatDiagMatrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/fDiagMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fDiagMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fEIG.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fEIG.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fEIG.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fEIG.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fMatrix.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fMatrix.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // Matrix manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague, a.s.
--- a/liboctave/fMatrix.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fMatrix.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/fNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fRowVector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fRowVector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // RowVector manipulations. /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/fRowVector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/fRowVector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/file-ops.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/file-ops.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/file-ops.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/file-ops.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/file-stat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/file-stat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/file-stat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/file-stat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatAEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatAEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/floatAEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatAEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/floatCHOL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatCHOL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/floatCHOL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatCHOL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/floatGEPBAL.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatGEPBAL.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatGEPBAL.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatGEPBAL.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatHESS.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatHESS.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatHESS.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatHESS.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatLU.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatLU.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/floatLU.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatLU.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatQR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatQR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/floatQR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatQR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/floatQRP.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatQRP.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/floatQRP.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatQRP.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatSCHUR.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatSCHUR.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatSCHUR.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatSCHUR.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatSVD.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatSVD.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/floatSVD.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/floatSVD.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/functor.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/functor.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 John W. Eaton +Copyright (C) 2008-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/glob-match.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/glob-match.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/glob-match.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/glob-match.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/idx-vector.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/idx-vector.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague
--- a/liboctave/idx-vector.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/idx-vector.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/int16NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int16NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int16NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int16NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int32NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int32NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int32NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int32NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int64NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int64NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int64NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int64NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int8NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int8NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/int8NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/int8NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/intNDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/intNDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/intNDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/intNDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave. @@ -33,7 +33,7 @@ { public: - using MArray<T>::element_type; + using typename MArray<T>::element_type; intNDArray (void) : MArray<T> () { }
--- a/liboctave/kpse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/kpse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -225,10 +225,6 @@ #define DEBUGF4(str, e1, e2, e3, e4) \ DEBUGF_START (); gnulib::fprintf (stderr, str, e1, e2, e3, e4); DEBUGF_END () -#undef fopen -#define fopen kpse_fopen_trace -static FILE *fopen (const char *filename, const char *mode); - #endif /* not NO_DEBUG */ #ifdef KPSE_DEBUG @@ -362,11 +358,15 @@ assert (! filename.empty () && mode); - f = fopen (filename.c_str (), mode); + f = gnulib::fopen (filename.c_str (), mode); if (! f) FATAL_PERROR (filename.c_str ()); + if (KPSE_DEBUG_P (KPSE_DEBUG_FOPEN)) + DEBUGF3 ("fopen (%s, %s) => 0x%lx\n", filename.c_str (), mode, + reinterpret_cast<unsigned long> (f)); + return f; } @@ -2282,7 +2282,7 @@ name.resize (elt_length); } - while ((e = readdir (dir))) + while ((e = gnulib::readdir (dir))) { /* If it begins with a `.', never mind. (This allows ``hidden'' directories that the algorithm won't find.) */ @@ -2446,28 +2446,6 @@ } #endif -/* Help the user discover what's going on. */ - -#ifdef KPSE_DEBUG - -/* If the real definitions of fopen or fclose are macros, we lose -- the - #undef won't restore them. */ - -static FILE * -fopen (const char *filename, const char *mode) -{ -#undef fopen - FILE *ret = fopen (filename, mode); - - if (KPSE_DEBUG_P (KPSE_DEBUG_FOPEN)) - DEBUGF3 ("fopen (%s, %s) => 0x%lx\n", filename, mode, - reinterpret_cast<unsigned long> (ret)); - - return ret; -} - -#endif - /* Implementation of a linked list of strings. */ /* Add the new string STR to the end of the list L. */
--- a/liboctave/lo-array-gripes.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-array-gripes.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/lo-array-gripes.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-array-gripes.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-cieee.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-cieee.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-cutils.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-cutils.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-cutils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-cutils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 John W. Eaton +Copyright (C) 2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-ieee.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-ieee.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-ieee.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-ieee.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-macros.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-macros.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/liboctave/lo-mappers.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-mappers.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/lo-mappers.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-mappers.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/lo-math.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-math.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-specfun.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-specfun.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 Jaroslav Hajek Copyright (C) 2010 VZLU Prague
--- a/liboctave/lo-specfun.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-specfun.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/liboctave/lo-sysdep.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-sysdep.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -77,7 +77,7 @@ path += "\\"; #endif - return chdir (path.c_str ()); + return gnulib::chdir (path.c_str ()); } #if defined (__WIN32__) && ! defined (__CYGWIN__) @@ -141,73 +141,3 @@ } #endif - -#if defined (_MSC_VER) && ! defined (HAVE_DIRENT_H) - -// FIXME -- it would probably be better to adapt the versions of -// opendir, readdir, and closedir from Emacs as they appear to be more -// complete implementations (do the functions below work for network -// paths, for example)? We can probably get along without rewinddir. - -struct __DIR -{ - HANDLE hnd; - WIN32_FIND_DATA fd; - int dirty; - struct direct d; - const char *current; -}; - -DIR * -opendir (const char *name) -{ - DIR *d = static_cast<DIR *> (malloc (sizeof (DIR))); - static char buffer[MAX_PATH]; - - strncpy (buffer, name, MAX_PATH); - if (buffer[strnlen(buffer, MAX_PATH)-1] != '\\') - strncat (buffer, "\\*", MAX_PATH); - else - strncat (buffer, "*", MAX_PATH); - d->current = buffer; - d->hnd = FindFirstFile (buffer, &(d->fd)); - if (d->hnd == INVALID_HANDLE_VALUE) - { - free (d); - return 0; - } - d->dirty = 1; - return d; -} - -void -rewinddir (DIR *d) -{ - if (d->hnd != INVALID_HANDLE_VALUE) - FindClose (d->hnd); - d->hnd = FindFirstFile (d->current, &(d->fd)); - d->dirty = 1; -} - -void -closedir (DIR *d) -{ - if (d->hnd != INVALID_HANDLE_VALUE) - FindClose (d->hnd); - free (d); -} - -struct direct * -readdir (DIR *d) -{ - if (! d->dirty) - { - if (! FindNextFile(d->hnd, &(d->fd))) - return 0; - } - d->d.d_name = d->fd.cFileName; - d->dirty = 0; - return &(d->d); -} - -#endif
--- a/liboctave/lo-sysdep.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-sysdep.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -37,25 +37,4 @@ bool, int *, std::string&); #endif -#if defined (_MSC_VER) && ! defined (HAVE_DIRENT_H) - -// FIXME -- it would probably be better to adapt the versions of -// opendir, readdir, and closedir from Emacs as they appear to be more -// complete implementations. We can probably get along without -// rewinddir. - -struct direct -{ - char *d_name; -}; - -typedef struct __DIR DIR; - -extern DIR* opendir (const char *name); -extern void rewinddir (DIR *d); -extern void closedir (DIR *d); -extern struct direct *readdir (DIR *d); - #endif - -#endif
--- a/liboctave/lo-traits.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-traits.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-utils.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-utils.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // utils.cc /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/lo-utils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/lo-utils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mach-info.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mach-info.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mach-info.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mach-info.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mk-ops.awk Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mk-ops.awk Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2011 John W. Eaton +# Copyright (C) 2003-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/mx-base.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-base.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mx-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mx-ext.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-ext.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/mx-inlines.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-inlines.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague
--- a/liboctave/mx-op-decl.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-op-decl.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009 VZLU Prague, a.s.
--- a/liboctave/mx-op-defs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-op-defs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague, a.s.
--- a/liboctave/mx-ops Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/mx-ops Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2011 John W. Eaton +# Copyright (C) 2003-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/oct-alloc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-alloc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-alloc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-alloc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-binmap.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-binmap.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-cmplx.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-cmplx.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/oct-convn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-convn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-convn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-convn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-env.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-env.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-env.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-env.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-fftw.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-fftw.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 John W. Eaton +Copyright (C) 2001-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-fftw.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-fftw.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 John W. Eaton +Copyright (C) 2001-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-glob.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-glob.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 John W. Eaton +Copyright (C) 2010-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-glob.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-glob.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 John W. Eaton +Copyright (C) 2010-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-group.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-group.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-group.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-group.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-inttypes.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-inttypes.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/oct-inttypes.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-inttypes.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave. @@ -366,8 +366,8 @@ { // Promotion type for multiplication (if exists). typedef typename query_integer_type<2*sizeof (T), false>::type mptype; - return truncate_int (static_cast<mptype> (x) - * static_cast<mptype> (y)); + return octave_int_base<T>::truncate_int (static_cast<mptype> (x) + * static_cast<mptype> (y)); } // Division with rounding to nearest. Note that / and % are probably @@ -621,8 +621,8 @@ { // Promotion type for multiplication (if exists). typedef typename query_integer_type<2*sizeof (T), true>::type mptype; - return truncate_int (static_cast<mptype> (x) - * static_cast<mptype> (y)); + return octave_int_base<T>::truncate_int (static_cast<mptype> (x) + * static_cast<mptype> (y)); } // Division.
--- a/liboctave/oct-locbuf.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-locbuf.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/oct-locbuf.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-locbuf.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/oct-md5.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-md5.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman This file is part of Octave. @@ -62,7 +62,7 @@ { std::string retval; - FILE *ifile = fopen (file.c_str (), "rb"); + FILE *ifile = gnulib::fopen (file.c_str (), "rb"); if (ifile) {
--- a/liboctave/oct-md5.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-md5.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman This file is part of Octave.
--- a/liboctave/oct-mem.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-mem.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 VZLU Prague +Copyright (C) 2009-2012 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-mutex.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-mutex.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/liboctave/oct-mutex.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-mutex.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/liboctave/oct-norm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-norm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 VZLU Prague, a.s. +Copyright (C) 2008-2012 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/oct-norm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-norm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 VZLU Prague, a.s. +Copyright (C) 2008-2012 VZLU Prague, a.s. This file is part of Octave.
--- a/liboctave/oct-openmp.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-openmp.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 David Bateman +Copyright (C) 2010-2012 David Bateman This file is part of Octave.
--- a/liboctave/oct-passwd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-passwd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-passwd.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-passwd.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-rand.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rand.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-rand.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rand.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-refcount.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-refcount.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Jaroslav Hajek +Copyright (C) 2012 Jaroslav Hajek This file is part of Octave.
--- a/liboctave/oct-rl-edit.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rl-edit.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-rl-edit.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rl-edit.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-rl-hist.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rl-hist.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-rl-hist.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-rl-hist.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-shlib.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-shlib.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-shlib.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-shlib.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-sort.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-sort.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 David Bateman +Copyright (C) 2003-2012 David Bateman Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague
--- a/liboctave/oct-sort.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-sort.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ /* -Copyright (C) 2003-2011 David Bateman +Copyright (C) 2003-2012 David Bateman Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/liboctave/oct-sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/oct-spparms.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-spparms.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/oct-spparms.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-spparms.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/oct-syscalls.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-syscalls.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-syscalls.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-syscalls.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-time.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-time.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-time.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-time.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-uname.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-uname.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 John W. Eaton +Copyright (C) 2005-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/oct-uname.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/oct-uname.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 John W. Eaton +Copyright (C) 2005-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/pathlen.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/pathlen.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/pathsearch.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/pathsearch.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/pathsearch.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/pathsearch.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randgamma.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randgamma.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randgamma.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randgamma.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randmtzig.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randmtzig.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randmtzig.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randmtzig.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randpoisson.c Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randpoisson.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/randpoisson.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/randpoisson.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/regexp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/regexp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 2011 John W. Eaton -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2012 John W. Eaton +Copyright (C) 2005-2012 David Bateman Copyright (C) 2002-2005 Paul Kienzle This file is part of Octave.
--- a/liboctave/regexp.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/regexp.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 2011 John W. Eaton -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2012 John W. Eaton +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/liboctave/singleton-cleanup.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/singleton-cleanup.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 John W. Eaton +Copyright (C) 2012 John W. Eaton This file is part of Octave.
--- a/liboctave/sparse-base-chol.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-base-chol.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-base-chol.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-base-chol.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-base-lu.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-base-lu.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-base-lu.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-base-lu.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-dmsolve.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-dmsolve.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 David Bateman +Copyright (C) 2006-2012 David Bateman This file is part of Octave.
--- a/liboctave/sparse-mk-ops.awk Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-mk-ops.awk Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 John W. Eaton +# Copyright (C) 2004-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/sparse-mx-ops Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-mx-ops Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 John W. Eaton +# Copyright (C) 2004-2012 John W. Eaton # # This file is part of Octave. #
--- a/liboctave/sparse-sort.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-sort.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-sort.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-sort.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-util.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-util.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/sparse-util.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sparse-util.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/liboctave/statdefs.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/statdefs.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/str-vec.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/str-vec.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/str-vec.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/str-vec.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/sun-utils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sun-utils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/sysdir.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/sysdir.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/syswait.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/syswait.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint16NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint16NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint16NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint16NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint32NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint32NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint32NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint32NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint64NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint64NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint64NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint64NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint8NDArray.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint8NDArray.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // N-D Array manipulations. /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/uint8NDArray.h Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/uint8NDArray.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/liboctave/vx-ops Sat Dec 24 23:15:29 2011 +0000 +++ b/liboctave/vx-ops Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2011 John W. Eaton +# Copyright (C) 2003-2012 John W. Eaton # # This file is part of Octave. #
--- a/m4/acinclude.m4 Sat Dec 24 23:15:29 2011 +0000 +++ b/m4/acinclude.m4 Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ dnl aclocal.m4 -- extra macros for configuring Octave dnl -dnl Copyright (C) 1995-2011 John W. Eaton +dnl Copyright (C) 1995-2012 John W. Eaton dnl dnl This file is part of Octave. dnl @@ -1015,6 +1015,156 @@ fi ]) dnl +dnl Check whether ARPACK works (does not crash) +dnl +dnl Using a pure Fortran program doesn't seem to crash when linked +dnl with the buggy ARPACK library but the C++ program does. Maybe +dnl it is the memory allocation that exposes the bug and using statically +dnl allocated arrays in Fortran does not? +dnl +AC_DEFUN([OCTAVE_CHECK_ARPACK_OK], [ + AC_LANG_PUSH(C++) + AC_CACHE_CHECK([whether the arpack library works], + [octave_cv_lib_arpack_ok], [ + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +// External functions from ARPACK library +extern "C" int +F77_FUNC (dnaupd, DNAUPD) (int&, const char *, const int&, const char *, + int&, const double&, double*, const int&, + double*, const int&, int*, int*, double*, + double*, const int&, int&, long int, long int); + +extern "C" int +F77_FUNC (dneupd, DNEUPD) (const int&, const char *, int*, double*, + double*, double*, const int&, + const double&, const double&, double*, + const char*, const int&, const char *, + int&, const double&, double*, const int&, + double*, const int&, int*, int*, double*, + double*, const int&, int&, long int, + long int, long int); + +extern "C" int +F77_FUNC (dgemv, DGEMV) (const char *, const int&, const int&, + const double&, const double*, const int&, + const double*, const int&, const double&, + double*, const int&, long int); + +#include <cfloat> + +void +doit (void) +{ + // Based on function EigsRealNonSymmetricMatrix from liboctave/eigs-base.cc. + + // Problem matrix. See bug #31479 + int n = 4; + double *m = new double [n * n]; + m[0] = 1, m[4] = 0, m[8] = 0, m[12] = -1; + m[1] = 0, m[5] = 1, m[9] = 0, m[13] = 0; + m[2] = 0, m[6] = 0, m[10] = 1, m[14] = 0; + m[3] = 0, m[7] = 0, m[11] = 2, m[15] = 1; + + double *resid = new double [4]; + + resid[0] = 0.960966; + resid[1] = 0.741195; + resid[2] = 0.150143; + resid[3] = 0.868067; + + int *ip = new int [11]; + + ip[0] = 1; // ishift + ip[1] = 0; // ip[1] not referenced + ip[2] = 300; // mxiter, maximum number of iterations + ip[3] = 1; // NB blocksize in recurrence + ip[4] = 0; // nconv, number of Ritz values that satisfy convergence + ip[5] = 0; // ip[5] not referenced + ip[6] = 1; // mode + ip[7] = 0; // ip[7] to ip[10] are return values + ip[8] = 0; + ip[9] = 0; + ip[10] = 0; + + int *ipntr = new int [14]; + + int k = 1; + int p = 3; + int lwork = 3 * p * (p + 2); + + double *v = new double [n * (p + 1)]; + double *workl = new double [lwork + 1]; + double *workd = new double [3 * n + 1]; + + int ido = 0; + int info = 0; + + double tol = DBL_EPSILON; + + do + { + F77_FUNC (dnaupd, DNAUPD) (ido, "I", n, "LM", k, tol, resid, p, + v, n, ip, ipntr, workd, workl, lwork, + info, 1L, 2L); + + if (ido == -1 || ido == 1 || ido == 2) + { + double *x = workd + ipntr[0] - 1; + double *y = workd + ipntr[1] - 1; + + F77_FUNC (dgemv, DGEMV) ("N", n, n, 1.0, m, n, x, 1, 0.0, + y, 1, 1L); + } + else + { + if (info < 0) + { + return; // Error + } + + break; + } + } + while (1); + + int *sel = new int [p]; + + // In Octave, the dimensions of dr and di are k+1, but k+2 avoids segfault + double *dr = new double [k + 1]; + double *di = new double [k + 1]; + double *workev = new double [3 * p]; + + for (int i = 0; i < k + 1; i++) + dr[i] = di[i] = 0.; + + int rvec = 1; + + double sigmar = 0.0; + double sigmai = 0.0; + + // In Octave, this is n*(k+1), but k+2 avoids segfault + double *z = new double [n * (k + 1)]; + + F77_FUNC (dneupd, DNEUPD) (rvec, "A", sel, dr, di, z, n, sigmar, + sigmai, workev, "I", n, "LM", k, tol, + resid, p, v, n, ip, ipntr, workd, + workl, lwork, info, 1L, 1L, 2L); +} +]], [[ + for (int i = 0; i < 10; i++) + doit (); +]])], + [octave_cv_lib_arpack_ok=yes], + [octave_cv_lib_arpack_ok=no], + [octave_cv_lib_arpack_ok=yes])]) + AC_LANG_POP(C++) + if test "$octave_cv_lib_arpack_ok" = "yes"; then + $1 + else + $2 + fi +]) +dnl dnl Check for OpenGL. If found, define OPENGL_LIBS dnl dnl FIXME -- the following tests should probably check for the
--- a/run-octave.in Sat Dec 24 23:15:29 2011 +0000 +++ b/run-octave.in Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ ## ## run-octave -- run Octave in the build tree. ## -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/@ftp/ascii.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/ascii.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/binary.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/binary.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/cd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/cd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/close.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/close.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/delete.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/delete.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/dir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/dir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/display.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/display.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/ftp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/ftp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/loadobj.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/loadobj.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/mget.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/mget.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/mkdir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/mkdir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/mput.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/mput.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/rename.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/rename.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/rmdir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/rmdir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/@ftp/saveobj.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/@ftp/saveobj.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 David Bateman +## Copyright (C) 2009-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's scripts directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. #
--- a/scripts/audio/lin2mu.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/lin2mu.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/loadaudio.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/loadaudio.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/mu2lin.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/mu2lin.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/playaudio.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/playaudio.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/record.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/record.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/saveaudio.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/saveaudio.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/setaudio.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/setaudio.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/audio/wavread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/wavread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Michael Zeising +## Copyright (C) 2005-2012 Michael Zeising ## ## This file is part of Octave. ##
--- a/scripts/audio/wavwrite.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/audio/wavwrite.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Michael Zeising +## Copyright (C) 2005-2012 Michael Zeising ## ## This file is part of Octave. ##
--- a/scripts/deprecated/__error_text__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/__error_text__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/autocor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/autocor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/deprecated/autocov.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/autocov.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/deprecated/betai.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/betai.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/cellidx.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/cellidx.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Auburn University. All rights reserved. +## Copyright (C) 2000-2012 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/deprecated/clg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/clg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/cor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/cor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/deprecated/corrcoef.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/corrcoef.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/cquad.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/cquad.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/cut.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/cut.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/deprecated/dispatch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/dispatch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/error_text.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/error_text.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/fstat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/fstat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 VZLU Prague +## Copyright (C) 2010-2012 VZLU Prague ## ## This file is part of Octave. ##
--- a/scripts/deprecated/gammai.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/gammai.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/glpkmex.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/glpkmex.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Nicolo' Giorgetti +## Copyright (C) 2005-2012 Nicolo' Giorgetti ## ## This file is part of Octave. ##
--- a/scripts/deprecated/intwarning.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/intwarning.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/deprecated/is_duplicate_entry.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/is_duplicate_entry.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 A. S. Hodel +## Copyright (C) 1996-2012 A. S. Hodel ## ## This file is part of Octave. ##
--- a/scripts/deprecated/is_global.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/is_global.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/isstr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/isstr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/krylovb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/krylovb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 A. Scottedward Hodel +## Copyright (C) 1993-2012 A. Scottedward Hodel ## ## This file is part of Octave. ##
--- a/scripts/deprecated/module.mk Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/module.mk Mon Jan 09 15:19:21 2012 -0500 @@ -27,8 +27,6 @@ deprecated/saveimage.m \ deprecated/setstr.m \ deprecated/shell_cmd.m \ - deprecated/sphcat.m \ - deprecated/spvcat.m \ deprecated/strerror.m \ deprecated/studentize.m \ deprecated/sylvester_matrix.m \
--- a/scripts/deprecated/perror.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/perror.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/polyderiv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/polyderiv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/replot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/replot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/saveimage.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/saveimage.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/setstr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/setstr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/shell_cmd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/shell_cmd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Rik Wehbring +## Copyright (C) 2012 Rik Wehbring ## ## This file is part of Octave. ##
--- a/scripts/deprecated/sphcat.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{y} =} sphcat (@var{a1}, @var{a2}, @dots{}, @var{aN}) -## Return the horizontal concatenation of sparse matrices. This function -## is obselete and @code{horzcat} should be used instead. -## @seealso {horzcat, spvcat, vertcat, cat} -## @end deftypefn - -function y = sphcat (varargin) - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "sphcat is obsolete and will be removed from a future version of Octave; please use horzcat instead"); - endif - - y = horzcat (varargin{:}); -endfunction
--- a/scripts/deprecated/spvcat.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{y} =} spvcat (@var{a1}, @var{a2}, @dots{}, @var{aN}) -## Return the vertical concatenation of sparse matrices. This function -## is obselete and @code{vertcat} should be used instead. -## @seealso{vertcat, sphcat, horzcat, cat} -## @end deftypefn - -function y = spvcat (varargin) - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "spvcat is obsolete and will be removed from a future version of Octave; please use vertcat instead"); - endif - - y = vertcat (varargin{:}); -endfunction
--- a/scripts/deprecated/strerror.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/strerror.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/studentize.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/studentize.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/deprecated/sylvester_matrix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/sylvester_matrix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/values.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/values.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/deprecated/weibcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/weibcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/weibinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/weibinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/weibpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/weibpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/deprecated/weibrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/deprecated/weibrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/acosd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acosd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/acot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/acotd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acotd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/acoth.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acoth.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/acsc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acsc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/acscd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acscd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/acsch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/acsch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/asec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/asec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/asecd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/asecd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/asech.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/asech.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/asind.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/asind.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/atand.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/atand.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/cosd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/cosd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/cot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/cot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/cotd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/cotd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/coth.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/coth.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/csc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/csc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/cscd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/cscd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/csch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/csch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/sec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/sec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/secd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/secd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/sech.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/sech.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/elfun/sind.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/sind.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/elfun/tand.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/elfun/tand.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/accumarray.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/accumarray.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## Copyright (C) 2009-2010 VZLU Prague ## ## This file is part of Octave. @@ -26,14 +26,16 @@ ## the rows of the matrix @var{subs} and the values by @var{vals}. Each ## row of @var{subs} corresponds to one of the values in @var{vals}. If ## @var{vals} is a scalar, it will be used for each of the row of -## @var{subs}. +## @var{subs}. If @var{subs} is a cell array of vectors, all vectors +## must be of the same length, and the subscripts in the @var{k}th +## vector must correspond to the @var{k}th dimension of the result. ## ## The size of the matrix will be determined by the subscripts ## themselves. However, if @var{sz} is defined it determines the matrix ## size. The length of @var{sz} must correspond to the number of columns ## in @var{subs}. An exception is if @var{subs} has only one column, in -## which case @var{sz} may be the dimensions of a vector and the subscripts -## of @var{subs} are taken as the indices into it. +## which case @var{sz} may be the dimensions of a vector and the +## subscripts of @var{subs} are taken as the indices into it. ## ## The default action of @code{accumarray} is to sum the elements with ## the same subscripts. This behavior can be modified by defining the @@ -63,9 +65,9 @@ ## ## @example ## @group -## x = [91, 92, 90, 92, 90, 89, 91, 89, 90, 100, 100, 100]; -## [u, ~, j] = unique (x); -## [accumarray(j', 1), u'] +## @var{x} = [91, 92, 90, 92, 90, 89, 91, 89, 90, 100, 100, 100]; +## [@var{u}, ~, @var{j}] = unique (@var{x}); +## [accumarray(@var{j}', 1), @var{u}'] ## @result{} 2 89 ## 3 90 ## 2 91 @@ -89,16 +91,38 @@ ## @end group ## @end example ## -## The complexity in the non-sparse case is generally O(M+N), where N is -## the number of subscripts and M is the maximum subscript (linearized -## in multi-dimensional case). If @var{func} is one of @code{@@sum} -## (default), @code{@@max}, @code{@@min} or @code{@@(x) @{x@}}, an -## optimized code path is used. Note that for general reduction function -## the interpreter overhead can play a major part and it may be more -## efficient to do multiple accumarray calls and compute the results in -## a vectorized manner. +## The sparse option can be used as an alternative to the @code{sparse} +## constructor (@pxref{doc-sparse}). Thus +## +## @example +## sparse (@var{i}, @var{j}, @var{sv}) +## @end example +## +## @noindent +## can be written with @code{accumarray} as +## +## @example +## accumarray ([@var{i}, @var{j}], @var{sv}', [], [], 0, true) +## @end example ## -## @seealso{accumdim, unique} +## @noindent +## For repeated indices, @code{sparse} adds the corresponding value. To +## take the minimum instead, use @code{min} as an accumulator function: +## +## @example +## accumarray ([@var{i}, @var{j}], @var{sv}', [], @@min, 0, true) +## @end example +## +## The complexity of accumarray in general for the non-sparse case is +## generally O(M+N), where N is the number of subscripts and M is the +## maximum subscript (linearized in multi-dimensional case). If +## @var{func} is one of @code{@@sum} (default), @code{@@max}, +## @code{@@min} or @code{@@(x) @{x@}}, an optimized code path is used. +## Note that for general reduction function the interpreter overhead can +## play a major part and it may be more efficient to do multiple +## accumarray calls and compute the results in a vectorized manner. +## +## @seealso{accumdim, unique, sparse} ## @end deftypefn function A = accumarray (subs, vals, sz = [], func = [], fillval = [], issparse = []) @@ -107,14 +131,27 @@ print_usage (); endif + lenvals = length (vals); + if (iscell (subs)) - subs = cellfun ("vec", subs, "uniformoutput", false); + subs = cellfun (@vec, subs, "uniformoutput", false); ndims = numel (subs); if (ndims == 1) subs = subs{1}; endif + + lensubs = cellfun (@length, subs); + + if (any (lensubs != lensubs(1)) || + (lenvals > 1 && lenvals != lensubs(1))) + error ("accumarray: dimension mismatch"); + endif + else ndims = columns (subs); + if (lenvals > 1 && lenvals != rows (subs)) + error ("accumarray: dimension mismatch") + endif endif if (isempty (fillval)) @@ -127,7 +164,8 @@ if (issparse) - ## Sparse case. Avoid linearizing the subscripts, because it could overflow. + ## Sparse case. Avoid linearizing the subscripts, because it could + ## overflow. if (fillval != 0) error ("accumarray: FILLVAL must be zero in the sparse case"); @@ -153,8 +191,8 @@ if (! (isempty (func) || func == @sum)) - ## Reduce values. This is not needed if we're about to sum them, because - ## "sparse" can do that. + ## Reduce values. This is not needed if we're about to sum them, + ## because "sparse" can do that. ## Sort indices. [subs, idx] = sortrows (subs); @@ -238,7 +276,8 @@ elseif (islogical (vals)) zero = false; elseif (fillval == 0 && all (vals(:) >= 0)) - ## This is a common case - fillval is zero, all numbers nonegative. + ## This is a common case - fillval is zero, all numbers + ## nonegative. zero = 0; else zero = NaN; # Neutral value. @@ -264,7 +303,8 @@ elseif (islogical (vals)) zero = true; elseif (fillval == 0 && all (vals(:) <= 0)) - ## This is a common case - fillval is zero, all numbers non-positive. + ## This is a common case - fillval is zero, all numbers + ## non-positive. zero = 0; else zero = NaN; # Neutral value. @@ -298,14 +338,21 @@ jdx = find (subs(1:n-1) != subs(2:n)); jdx = [jdx; n]; vals = mat2cell (vals(idx), diff ([0; jdx])); - ## Optimize the case when function is @(x) {x}, i.e. we just want to - ## collect the values to cells. + ## Optimize the case when function is @(x) {x}, i.e. we just want + ## to collect the values to cells. persistent simple_cell_str = func2str (@(x) {x}); if (! strcmp (func2str (func), simple_cell_str)) vals = cellfun (func, vals); endif subs = subs(jdx); + if (isempty (sz)) + sz = max (subs); + if (length (sz) == 1) + sz(2) = 1; + endif + endif + ## Construct matrix of fillvals. if (iscell (vals)) A = cell (sz); @@ -328,6 +375,7 @@ %!assert (accumarray ([1,1,1;2,1,2;2,3,2;2,1,2;2,3,2],101:105,[],@(x)sin(sum(x))),sin(cat(3, [101,0,0;0,0,0],[0,0,0;206,0,208]))) %!assert (accumarray ({[1 3 3 2 3 1 2 2 3 3 1 2],[3 4 2 1 4 3 4 2 2 4 3 4],[1 1 2 2 1 1 2 1 1 1 2 2]},101:112),cat(3,[0,0,207,0;0,108,0,0;0,109,0,317],[0,0,111,0;104,0,0,219;0,103,0,0])) %!assert (accumarray ([1,1;2,1;2,3;2,1;2,3],101:105,[2,4],@max,NaN),[101,NaN,NaN,NaN;104,NaN,105,NaN]) +%!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105, [], @prod), [101, 0, 0; 10608, 0, 10815]) %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105,[2 4],@prod,0,true),sparse([1,2,2],[1,1,3],[101,10608,10815],2,4)) %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],1,[2,4]), [1,0,0,0;2,0,2,0]) %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105,[2,4],@(x)length(x)>1),[false,false,false,false;true,false,true,false])
--- a/scripts/general/accumdim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/accumdim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 VZLU Prague +## Copyright (C) 2010-2012 VZLU Prague ## ## This file is part of Octave. ## @@ -22,32 +22,37 @@ ## positions defined by their subscripts along a specified dimension. ## The subscripts are defined by the index vector @var{subs}. ## The dimension is specified by @var{dim}. If not given, it defaults -## to the first non-singleton dimension. +## to the first non-singleton dimension. The length of @var{subs} must +## be equal to @code{size (@var{vals}, @var{dim})}. ## -## The extent of the result matrix in the working dimension will be determined -## by the subscripts themselves. -## However, if @var{n} is defined it determines this extent. +## The extent of the result matrix in the working dimension will be +## determined by the subscripts themselves. However, if @var{n} is +## defined it determines this extent. ## ## The default action of @code{accumdim} is to sum the subarrays with the -## same subscripts. This behavior can be modified by defining the @var{func} -## function. This should be a function or function handle that accepts an -## array and a dimension, and reduces the array along this dimension. -## As a special exception, the built-in @code{min} and @code{max} functions -## can be used directly, and @code{accumdim} accounts for the middle empty -## argument that is used in their calling. +## same subscripts. This behavior can be modified by defining the +## @var{func} function. This should be a function or function handle +## that accepts an array and a dimension, and reduces the array along +## this dimension. As a special exception, the built-in @code{min} and +## @code{max} functions can be used directly, and @code{accumdim} +## accounts for the middle empty argument that is used in their calling. ## -## The slices of the returned array that have no subscripts associated with -## them are set to zero. Defining @var{fillval} to some other value allows -## these values to be defined. +## The slices of the returned array that have no subscripts associated +## with them are set to zero. Defining @var{fillval} to some other +## value allows these values to be defined. ## ## An example of the use of @code{accumdim} is: ## -## @smallexample +## @example ## @group -## accumdim ([1, 2, 1, 2, 1], [7,-10,4;-5,-12,8;-12,2,8;-10,9,-3;-5,-3,-13]) +## accumdim ([1, 2, 1, 2, 1], [ 7, -10, 4; +## -5, -12, 8; +## -12, 2, 8; +## -10, 9, -3; +## -5, -3, -13]) ## @result{} ans = [-10,-11,-1;-15,-3,5] ## @end group -## @end smallexample +## @end example ## ## @seealso{accumarray} ## @end deftypefn @@ -68,7 +73,7 @@ error ("accumdim: indices must be positive integers"); else m = max (subs); - if (n == 0) + if (n == 0 || isempty (n)) n = m; elseif (n < m) error ("accumdim: N index out of range"); @@ -86,6 +91,10 @@ endif sz(dim) = n; + if (length (subs) != size (vals, dim)) + error ("accumdim: dimension mismatch") + endif + if (isempty (func) || func == @sum) ## Fast summation case. A = __accumdim_sum__ (subs, vals, dim, n);
--- a/scripts/general/bicubic.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/bicubic.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Hoxide Ma +## Copyright (C) 2005-2012 Hoxide Ma ## ## This file is part of Octave. ##
--- a/scripts/general/bitcmp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/bitcmp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/bitget.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/bitget.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/bitset.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/bitset.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/blkdiag.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/blkdiag.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Daniel Calvelo +## Copyright (C) 2000-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/general/cart2pol.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/cart2pol.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/cart2sph.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/cart2sph.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/cell2mat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/cell2mat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Laurent Mazet +## Copyright (C) 2005-2012 Laurent Mazet ## Copyright (C) 2010 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/general/celldisp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/celldisp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/chop.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/chop.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/circshift.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/circshift.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/colon.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/colon.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/common_size.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/common_size.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2009 VZLU Prague ## Copyright (C) 2009 Jaroslav Hajek ##
--- a/scripts/general/cplxpair.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/cplxpair.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/general/cumtrapz.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/cumtrapz.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/curl.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/curl.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Kai Habel +## Copyright (C) 2009-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/dblquad.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/dblquad.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/deal.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/deal.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1998-2011 Ariel Tankus +## Copyright (C) 1998-2012 Ariel Tankus ## ## This file is part of Octave. ##
--- a/scripts/general/del2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/del2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## Copyright (C) 2007 David Bateman ## ## This file is part of Octave.
--- a/scripts/general/display.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/display.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/divergence.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/divergence.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Kai Habel +## Copyright (C) 2009-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/flipdim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/flipdim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/general/fliplr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/fliplr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/flipud.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/flipud.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/genvarname.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/genvarname.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney, Robert Platt +## Copyright (C) 2008-2012 Bill Denney, Robert Platt ## ## This file is part of Octave. ##
--- a/scripts/general/gradient.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/gradient.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/idivide.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/idivide.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/int2str.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/int2str.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/interp1.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interp1.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/general/interp1q.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interp1q.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/interp2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interp2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/general/interp3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interp3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/interpft.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interpft.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ## @@ -27,7 +27,7 @@ ## along the dimension @var{dim}. ## ## @code{interpft} assumes that the interpolated function is periodic, -## and so assumptions are made about the end points of the interpolation. +## and so assumptions are made about the endpoints of the interpolation. ## ## @seealso{interp1} ## @end deftypefn
--- a/scripts/general/interpn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/interpn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/isa.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isa.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/iscolumn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/iscolumn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/isdir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isdir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Alois Schloegl +## Copyright (C) 2004-2012 Alois Schloegl ## ## This file is part of Octave. ##
--- a/scripts/general/isequal.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isequal.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 William Poetra Yoga Hadisoeseno +## Copyright (C) 2005-2012 William Poetra Yoga Hadisoeseno ## ## This file is part of Octave. ##
--- a/scripts/general/isequalwithequalnans.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isequalwithequalnans.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 William Poetra Yoga Hadisoeseno +## Copyright (C) 2005-2012 William Poetra Yoga Hadisoeseno ## ## This file is part of Octave. ##
--- a/scripts/general/isrow.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isrow.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/isscalar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isscalar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/issquare.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/issquare.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/isvector.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/isvector.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/loadobj.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/loadobj.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/logspace.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/logspace.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/nargchk.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/nargchk.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/general/narginchk.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/narginchk.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Carnë Draug +## Copyright (C) 2012 Carnë Draug ## ## This file is part of Octave. ##
--- a/scripts/general/nargoutchk.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/nargoutchk.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2008-2011 Bill Denney -## Copyright (C) 2011 Carnë Draug +## Copyright (C) 2008-2012 Bill Denney +## Copyright (C) 2012 Carnë Draug ## ## This file is part of Octave. ##
--- a/scripts/general/nextpow2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/nextpow2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/general/nthargout.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/nthargout.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Jordi Gutiérrez Hermoso +## Copyright (C) 2012 Jordi Gutiérrez Hermoso ## ## This file is part of Octave. ##
--- a/scripts/general/num2str.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/num2str.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/pol2cart.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/pol2cart.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/polyarea.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/polyarea.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 David M. Doolin +## Copyright (C) 1999-2012 David M. Doolin ## ## This file is part of Octave. ##
--- a/scripts/general/postpad.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/postpad.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/prepad.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/prepad.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/private/__isequal__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/private/__isequal__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/general/private/__splinen__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/private/__splinen__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/profexplore.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/profexplore.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Daniel Kraft +## Copyright (C) 2012 Daniel Kraft ## ## This file is part of Octave. ##
--- a/scripts/general/profile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/profile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Daniel Kraft +## Copyright (C) 2012 Daniel Kraft ## ## This file is part of Octave. ##
--- a/scripts/general/profshow.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/profshow.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Daniel Kraft +## Copyright (C) 2012 Daniel Kraft ## ## This file is part of Octave. ##
--- a/scripts/general/quadgk.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/quadgk.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/quadl.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/quadl.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1998-2011 Walter Gautschi +## Copyright (C) 1998-2012 Walter Gautschi ## ## This file is part of Octave. ##
--- a/scripts/general/quadv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/quadv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2008-2011 David Bateman -## Copyright (C) 2011 Alexander Klein +## Copyright (C) 2008-2012 David Bateman +## Copyright (C) 2012 Alexander Klein ## ## This file is part of Octave. ##
--- a/scripts/general/randi.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/randi.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Rik Wehbring +## Copyright (C) 2010-2012 Rik Wehbring ## ## This file is part of Octave. ##
--- a/scripts/general/rat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/rat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/general/repmat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/repmat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2008 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/general/rot90.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/rot90.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/general/rotdim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/rotdim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman +## Copyright (C) 2004-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/saveobj.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/saveobj.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/shift.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/shift.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/general/shiftdim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/shiftdim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John Eaton and David Bateman +## Copyright (C) 2004-2012 John Eaton and David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/sortrows.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/sortrows.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Daniel Calvelo +## Copyright (C) 2000-2012 Daniel Calvelo ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/general/sph2cart.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/sph2cart.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/structfun.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/structfun.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/general/subsindex.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/subsindex.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/general/trapz.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/trapz.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/general/triplequad.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/general/triplequad.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/convhull.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/convhull.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/geometry/delaunay.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/delaunay.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/geometry/delaunay3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/delaunay3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/geometry/delaunayn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/delaunayn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/dsearch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/dsearch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/dsearchn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/dsearchn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/griddata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/griddata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/geometry/griddata3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/griddata3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/griddatan.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/griddatan.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/inpolygon.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/inpolygon.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Frederick (Rick) A Niles +## Copyright (C) 2006-2012 Frederick (Rick) A Niles ## and S�ren Hauberg ## ## This file is part of Octave.
--- a/scripts/geometry/rectint.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/rectint.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/geometry/tsearchn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/tsearchn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/geometry/voronoi.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/voronoi.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/geometry/voronoin.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/geometry/voronoin.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/gethelp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/gethelp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/scripts/help/__makeinfo__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/__makeinfo__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/doc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/doc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Søren Hauberg +## Copyright (C) 2005-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/gen_doc_cache.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/gen_doc_cache.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/get_first_help_sentence.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/get_first_help_sentence.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/help.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/help.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/lookfor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/lookfor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Søren Hauberg +## Copyright (C) 2009-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/print_usage.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/print_usage.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/private/__additional_help_message__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/private/__additional_help_message__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Søren Hauberg +## Copyright (C) 2009-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/private/__strip_html_tags__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/private/__strip_html_tags__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Søren Hauberg +## Copyright (C) 2009-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/type.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/type.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 S�ren Hauberg +## Copyright (C) 2009-2012 S�ren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/help/unimplemented.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/unimplemented.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/help/which.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/help/which.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 John W. Eaton +## Copyright (C) 2009-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/autumn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/autumn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/bone.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/bone.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/brighten.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/brighten.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/colormap.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/colormap.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/contrast.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/contrast.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/image/cool.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/cool.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/copper.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/copper.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/flag.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/flag.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/gmap40.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/gmap40.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/image/gray.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/gray.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/gray2ind.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/gray2ind.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/hot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/hot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/hsv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/hsv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/hsv2rgb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/hsv2rgb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/image.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/image.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/imagesc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/imagesc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/imfinfo.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/imfinfo.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Soren Hauberg <hauberg@gmail.com> +## Copyright (C) 2008-2012 Soren Hauberg <hauberg@gmail.com> ## ## This file is part of Octave. ##
--- a/scripts/image/imread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/imread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Thomas L. Scofield <scofield@calvin.edu> +## Copyright (C) 2008-2012 Thomas L. Scofield <scofield@calvin.edu> ## Copyright (C) 2008 Kristian Rumberg <kristianrumberg@gmail.com> ## Copyright (C) 2006 Thomas Weber <thomas.weber.mail@gmail.com> ## Copyright (C) 2005 Stefan van der Walt <stefan@sun.ac.za>
--- a/scripts/image/imshow.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/imshow.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/imwrite.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/imwrite.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 John W. Eaton +## Copyright (C) 2008-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/ind2gray.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/ind2gray.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/ind2rgb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/ind2rgb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/jet.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/jet.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/ntsc2rgb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/ntsc2rgb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/ocean.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/ocean.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/pink.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/pink.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/prism.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/prism.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/rainbow.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/rainbow.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/rgb2hsv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/rgb2hsv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/rgb2ind.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/rgb2ind.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/rgb2ntsc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/rgb2ntsc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/image/spring.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/spring.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/summer.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/summer.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/white.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/white.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/image/winter.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/image/winter.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Kai Habel +## Copyright (C) 1999-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/io/beep.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/beep.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/io/csvread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/csvread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/io/csvwrite.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/csvwrite.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/io/dlmwrite.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/dlmwrite.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2002-2011 Paul Kienzle +## Copyright (C) 2002-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/io/fileread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/fileread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 VZLU Prague +## Copyright (C) 2010-2012 VZLU Prague ## ## This file is part of Octave. ##
--- a/scripts/io/is_valid_file_id.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/is_valid_file_id.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/io/strread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/strread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2009-2011 Eric Chassande-Mottin, CNRS (France) -## Copyright (C) 2011 Philip Nienhuis +## Copyright (C) 2009-2012 Eric Chassande-Mottin, CNRS (France) +## Copyright (C) 2012 Philip Nienhuis ## ## This file is part of Octave. ## @@ -126,7 +126,7 @@ ## ## @item "emptyvalue": ## Value to return for empty numeric values in non-whitespace delimited data. -## The default is NaN. When the data type does not support NaN +## The default is NaN@. When the data type does not support NaN ## (int32 for example), then default is zero. ## ## @item "multipledelimsasone"
--- a/scripts/io/textread.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/textread.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Eric Chassande-Mottin, CNRS (France) +## Copyright (C) 2009-2012 Eric Chassande-Mottin, CNRS (France) ## ## This file is part of Octave. ##
--- a/scripts/io/textscan.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/io/textscan.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott <bpabbott@mac.com> +## Copyright (C) 2010-2012 Ben Abbott <bpabbott@mac.com> ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/commutation_matrix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/commutation_matrix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/cond.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/cond.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/condest.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/condest.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Regents of the University of California +## Copyright (C) 2007-2012 Regents of the University of California ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/cross.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/cross.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/duplication_matrix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/duplication_matrix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/expm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/expm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek, Marco Caliari +## Copyright (C) 2008-2012 Jaroslav Hajek, Marco Caliari ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/housh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/housh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 A. Scottedward Hodel +## Copyright (C) 1995-2012 A. Scottedward Hodel ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/isdefinite.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/isdefinite.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 Gabriele Pannocchia +## Copyright (C) 2003-2012 Gabriele Pannocchia ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/ishermitian.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/ishermitian.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/linear-algebra/issymmetric.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/issymmetric.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/linear-algebra/krylov.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/krylov.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 Auburn University. All rights reserved. +## Copyright (C) 1993-2012 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/logm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/logm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 N.J. Higham +## Copyright (C) 2008-2012 N.J. Higham ## Copyright (C) 2010 Richard T. Guy <guyrt7@wfu.edu> ## Copyright (C) 2010 Marco Caliari <marco.caliari@univr.it> ##
--- a/scripts/linear-algebra/normest.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/normest.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman and Marco Caliari +## Copyright (C) 2006-2012 David Bateman and Marco Caliari ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/linear-algebra/null.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/null.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/onenormest.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/onenormest.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Regents of the University of California +## Copyright (C) 2007-2012 Regents of the University of California ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/orth.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/orth.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/planerot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/planerot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/qzhess.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/qzhess.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/rank.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/rank.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/rref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/rref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/subspace.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/subspace.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s., Czech Republic +## Copyright (C) 2008-2012 VZLU Prague, a.s., Czech Republic ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/trace.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/trace.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/linear-algebra/vech.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/linear-algebra/vech.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/miscellaneous/ans.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ans.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/bincoeff.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/bincoeff.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/bug_report.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/bug_report.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/bunzip2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/bunzip2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Bill Denney +## Copyright (C) 2006-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/bzip2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/bzip2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Thorsten Meyer +## Copyright (C) 2008-2012 Thorsten Meyer ## (based on gzip.m by David Bateman) ## ## This file is part of Octave.
--- a/scripts/miscellaneous/cast.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/cast.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/comma.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/comma.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/compare_versions.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/compare_versions.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Bill Denney +## Copyright (C) 2006-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/computer.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/computer.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/copyfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/copyfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/debug.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/debug.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/delete.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/delete.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/dir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/dir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/dos.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/dos.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/dump_prefs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/dump_prefs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/edit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/edit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/miscellaneous/fact.m Mon Jan 09 15:19:21 2012 -0500 @@ -0,0 +1,269 @@ +## Copyright (C) 2007-2012 Jordi Gutiérrez Hermoso +## Copyright (C) 2007 Stallmanfacts.com +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +## -*- texinfo -*- +## @deftypefn {Command} {} fact +## @deftypefnx {Function File} {T =} fact() +## Display an amazing and random fact about the world's greatest hacker. +## @end deftypefn + + +function f = fact() + persistent wisdom = \ + { + "Richard Stallman takes notes in binary."; + "Richard Stallman doesn't need sudo. I will make him a sandwich anyway."; + "Richard Stallman is my shephurd, and I am his GNU."; + "Richard Stallman doesn't wget, Richard Stallman wdemands!"; + "Richard Stallman can touch MC Hammer"; + "Richard Stallman doesn't read web pages. They write to him."; + "Richard Stallman gets 9 bits to the byte."; + "Richard Stallman doesn't really believe in open software, because it's not free enough."; + "Richard Stallman can leave neutral or negative feedback on eBay."; + "Richard Stallman is the only man alive who can pronounce GNU the way it is meant to be pronounced."; + "Richard Stallman does not own a mobile phone because he can fashion a crude convex dish and shout into it at the exact resonant frequency of the ozone, causing a voice to seemingly come from the sky above his intended recipient."; + "Richard Stallman is so handsome that when he was young he was responsible for all other geeks not being able to get girls. This is why he has to cover his face with a thick layer of hair."; + "Some people check their computers for viruses. Viruses check their computers for Richard Stallman."; + "Richard Stallman memorises all his documents. In binary. He just types everything in whenever he needs a document."; + "When Richard Stallman makes a sudo command, he loses permissions."; + "Richard Stallman's beard is made of parentheses."; + "Richard Stallman's DNA is in binary."; + "Richard Stallman's nervous system is completely wireless."; + "Richard Stallman's brain accepts UNIX commands."; + "If Richard Stallman has 1GB of RAM, and if you have 1GB of RAM, Richard Stallman has more RAM than you."; + "Richard Stallman eats ethernet cables. That's why they invented wireless."; + "Richard Stallman has a katana. 'Nuff said."; + "Richard Stallman wrote a program that divides by zero."; + "Ricahrd Stallman doesn't use zip drives, he just squeezes the hard drive."; + "Richard Stallman's compiler is afraid to report errors."; + "Richard Stallman wrote the compiler God used. The Big Bang was the Universe's first segfault."; + "Richard Stallman successfully compiled a kernel of popcorn."; + "Richard Stallman doesn't write programs, they write themselves out of reverence."; + "Richard Stallman can make infinite loops end."; + "Richard Stallman's anti-virus programs cures HIV."; + "Richard Stallman's computer doesn't have a clock; it defines what time it is."; + "Richard Stallman wrote a program to compute the last digit of pi."; + "Richard Stallman doesn't use web browsers. He sends a link to a demon that uses wget to fetch the page and sends it back to him."; + "Richard Stallman can solve the halting problem... in polynomial time."; + "For Richard Stallman, polynomial time is O(1)."; + "Richard Stallman didn't \"write\" Emacs or created it in his own image. Richard Stallman made Emacs an instance of himself."; + "Richard Stallman can coerce meaningful data from /dev/null."; + "Some people wear Linus Torvalds pyjamas to bed, Linus Torvalds wears Richard Stallman pyjamas."; + "There is no software development process, only a bunch of programs Richard Stallman allows to exist. "; + "Richard Stallman spends his leisure time programming with Guile on GNU Hurd. "; + "Richard Stallman's left and right hands are named \"(\" and \")\" "; + "Richard Stallman first words were actually syscalls. "; + "Richard Stallman didn't create the singularity. He is the singularity. GNU/Linux is only the event horizon. "; + "When Richard Stallman pipes to more, he gets less "; + "Richard Stallman never showers: he runs 'make clean'. "; + "Richard Stallman needs neither mouse nor keyboard to operate his computer. He just stares it down until it does what he wants. "; + "Richard Stallman didn't write the GPL. He is the GPL. "; + "Richad Stallman's pinky finger is really a USB memory stick. "; + "Richard Stallman called his operating system GNU because he created it before computers existed, when actual gnus were used for calcuations. "; + "In Soviet Russia, Richard Stallman is still Richard Stallman! "; + "Richard Stallman's flute only plays free music. "; + "When Richard Stallman uses floats, there are no rounding errors."; + "Richard Stallman wrote a program so powerful, it knows the question to 42."; + "Richard Stallman released his own DNA under GNU FDL."; + "Richard Stallman knows the entire wikipedia by heart, markup included."; + "Richard Stallman wrote the HAL9000 OS."; + "Richard Stallman's laser pointer is a lightsaber."; + "Richard Stallman never steps down; he shifts the universe up ."; + "Richard Stallman doesn't maintain code; he stares at it until it fixes itself out of reverence."; + "Richard Stallman doesn't use an editor; he sets the fundamental constants of the universe so that a magnetic platter with his code on it evolves itself."; + "Richard Stallman doesn’t code; he dares the computer to not do his bidding."; + "Global warming is caused by Richard Stallman’s rage toward non-free software."; + "Rather than being birthed like a normal child, Richard Stallman instead instantiated himself polymorphically. Shortly thereafter he grew a beard."; + "Richard Stallman discovered extra-terrestrial life but killed them because they used non-free software."; + "Richard Stallman doesn't evaluate expressions, expressions evaluate to Richard Stallman."; + "Richard Stallman can see Russia from his house."; + "Richard Stallman proved P=NP, twice!"; + "Richard Stallman knows of an unfixed bug in TeX."; + "Richard Stallman can write a context-free grammar for C."; + "Richard Stallman can determine whether an arbitrary program will terminate."; + "Richard Stallman's computer has only two buttons. One is for guests."; + "Richard Stallman does not actually write programs. He comes up with a length and digit index in pi."; + "Richard Stallman's distributed version control system is a flamewar on Usenet."; + "Richard Stallman wrote the first version of Emacs on a typewriter."; + "Richard Stallman has no known weaknesses, except for a phobia against soap."; + "Richard Stallman is not affected by Godwin's Law."; + "Richard Stallman can write an anti-virus program that cures HIV. Too bad he never writes anti-virus programs."; + "Richard Stallman' facial hair is \"free as in beard\""; + "Richard Stallman is licensed under GPL, so you can clone him and redistribute copies so you can help your neighbor. For example a version that take a bath more often."; + "Richard Stallman doesn't code; he just travels around the world."; + "Richard Stallman was coded by himself in lisp with Emacs."; + "Richard Stallman doesn't eat McDonald's because the machine that kills the cows uses proprietary software."; + "There is no chin behind Richard Stallman's legendary beard, there is only another Emacs."; + "In an average living room there are 1,242 objects Richard Stallman could use to write an OS, including the room itself."; + "Vendor lock-in is when vendors lock themselves inside of a building out of fear of Richard Stallman's wrath."; + "When Richard Stallman executes ps -e, you show up."; + "When Richard Stallman gets angry he doesn't swear; he recurses."; + "On Richard Stallman's computer the bootloader is contained in his .emacs."; + "Richard Satallman can make any operating system free, free from drivers."; + "Richard Stallman programmed Chuck Norris."; + "Behind Richard Stallman's beard there is another fist, to code faster."; + "Richard Stallman won a Suduku that started with only one number in each line"; + "Richard Stallman's brain compiles and runs C code."; + "Richard Stallman wrote the first version of Emacs using Emacs."; + "Richard Stallman never gonna give you up, never gonna let you down, never gonna run around and desert you, never gonna make you cry, never gonna say goodbye, never gonna tell a lie and hurt you."; + "Richard Stallman, upon reading these facts, didn't laugh at all. Instead, he complained that he is being linked to that dirty \"open source\" software. He also asked it to be changed to \"free software\", in order to raise awareness for software freedom in our society."; + "Richard Stallman has no problem using Emacs. He wrote it with his 4 hands."; + "Richard Stallman will revert the big rip by adding parenthesis to the dark matter."; + "When you make a Google search and it doesn't find the answer, Google gently consults Richard Stallman."; + "Richard Stallman's uptime is over 53 years. And counting up."; + "Richard Stallman's portable music player plays ogg and WMA."; + "Richard Stallman will never die, but may some day go to /dev/null."; + "Richard Stallman once got swine flu, but it got cleansed by hereditay GPL and thus got assimilated."; + "Richard Stallman don't cut his hair because there are no GNU/Scissors"; + "Richard Stallman is the one who trims Chuck Norris beard. And he does it freely, of course."; + "Richard Stallman does not take bath, for the hydroelectric company uses proprietary software."; + "Agent Smith loves Richard Stallman's scent."; + "Richard Stallman is the One."; + "\"They can take our lives, but they can never take our freedom.\" Willian Wallace after a litle talk with Richard Stallman."; + "Richard Stallman can connect to any brain using an Emacs ssh client."; + "Richard Stallman ported Emacs to Intel 4004 chip."; + "Richard Stallman did not write GNU Emacs, he simply read the source code from /dev/null."; + "Richard Stallman once used GDB to reverse-engineer Windows 7 into a free operating system - able to run on GNU Emacs!"; + "Richard Stallman does not contribute to open source projects; open source projects contribute to Richard Stallman, and then call themselves free software projects."; + "Richard Stallman programmed himself before he could even exist"; + "Richard Stallman can fill up /dev/null."; + "Richard Stallman is so zealous about privacy he has /dev/null as his home."; + "When Richard Stallman runs /bin/false, it returns \"true\"."; + "Richard Stallman doesn't like money, because banks don't run on free software."; + "Richard Stallman user GNU tar to compress air."; + "Richard Stallman was installed in the world, it runs on a free program .."; + "When Richard Stallman reports a bug, the bug prefers to squash itself instead of facing Richard Stallman's wrath."; + "There is no Windows in Richard Stallman's house... only Doors..."; + "Richard Stallman doesn't like neither PCs-Intel nor Burger King... He prefers e-Macs..."; + "Richard Stallman can use grep to find Jimmy Hoffa."; + "Richard Stallman made it possible to not absolutely abhor HPUX."; + "When Richard Stallman pours his alphabets cereal into a bowl, only G's, N's, and U's come out."; + "Richard Stallman is pronounced \"GNU slash Stallman\""; + "Richard Stallman doesn't mind if you read his mail as long as you don't delete it before he reads it."; + "Richard Stallman is just a guy who has strong principles and decided to follow them."; + "Richard Stallman knows that you don't have class because it is a keyword that he defined."; + "Richard Stallman doesn't need a qwerty/dvorak keyboard only two buttons \"1\" and \"0\" and his erect penis."; + "On the first day Richard Stallman said M-x create-light."; + "Richard Stallman once went out of scope for a while. The garbage collector never dared to touch him."; + "Richard Stallman does not compile; he closes his eyes, and see energy lines created between bit blocks by the compiler optimizations..."; + "intx80 first calls Richard Stallman before calling sys_call"; + "Tron is actually a biographical story about Richard Stallman. The director decided to tone it down or audiences wouldn't find it believable."; + "Richard Stallman always wears a red shirt to make sure that whatever attacks his away-team has to go through him first."; + "kill -9 invokes Richard Stallman's rage against a process."; + "If Richard were to stumble upon stallmanfacts.com, he would find it a gnuisance."; + "Richard Stallman can telnet into Mordor."; + "sudo chown Richard:Stallman /all/your/base"; + "Richard Stallman's nervous system is completely wireless."; + "Richard Stallman does not sleep. He yields."; + "Some people say M-x psychoanalyse-pinhead is a merely a program. Others say M-x psychoanalyse-pinhead *is* Richard Stallman. All I know is, Richard Stallman is The Stig."; + "If you execute Emacs backward it either undoes the industrial revolution or induces the rapture. But only Richard Stallman knows which."; + "If Richard Stallman's beard were ever trimmed, the clippings would re-marshal into an exact copy of Richard Stallman."; + "Richard Stallman never sleeps because he altered his own source to gain background garbage collection."; + "Richard Stallman's doctor can retrieve a blood sample via CVS."; + "Richard Stallman can touch this"; + "Because Richard Stallman's DNA is licensed under the FDL, his doctor can't draw his blood without violating HIPAA."; + "Richard Stallman can remove his own appendix, using only gdb."; + "Richard Stallman's DNA includes debugging symbols. But he doesn't need them."; + "Richard Stallman met Chuck Norris once. Chuck tried a roundhouse, but Richard bashed him in the skull."; + "Richard Stallman doesn't need to buy a bigger hard drive. He can compress data infinitely. "; + "When Richard Stallman cannot take your call, his beard answers the phone for you."; + "The R in RMS stands for RMS."; + "Richard Stallman can parse HTML with regular expressions."; + "Richard Stallman's traceroute goes all the way through an infinite number of anonymous proxies back to the traffic's source."; + "Richard Stallman's beard is in fact not a just a beard, but a microprinted hard copy of Emacs source code. New patches must be checked against new hair growth before being approved."; + "In the beginning-of-buffer there was Richard Stallman."; + "The NOOP was created to give Richard Stallman some time to comb his beard."; + "Whenever Richard Stallman looks at a Windows computer, it segfaults. Whenever Richard Stallman doesn't look at a Windows computer, it segfaults."; + "Richard Stallman can walk on Windows!"; + "After being unable to satisfy my wife for years, Richard Stallman was able to single-handedly unlock her orgasm within seconds and managed to write a texinfo manual minutes later for other users."; + "Richard Stallman's tabbed browser is a set to wget/telnet fg/bg processes."; + "There is no chin under Richard Stallman' beard. There's only another beard. Recursively."; + "Stallman can chown anything! stallman@stallman~$ chown stallman:stallman Earth (for example)"; + "Richard Stallman freed his beard so he can always check what's in it."; + "In the beginning was the Word, and the Word was with RMS, and the Word was GNU."; + "RMS means \"RMS means Stallman\""; + "Richard Stallman is the babelfish of his own speeches."; + "Richard Stallman wrote his own library and lives in it."; + "Richard Stallman found Waldo using grep in /dev/null"; + "Richard Stallman doesn't sleep; he is compiling"; + "Richard Stallman will get Coca Cola to release their recipe under the GPL."; + "Richard Stallman doesn't change clothes. He makes case mods."; + "Richard Stallman compiled the first version of gcc with an hexadecimal editor."; + "Richard Stallman will be the last guest on Linux Outlaws"; + "Richard Stallman calculates the universe's entropy by exploiting forced stack overflows."; + "Richard Stallman's consciousness will one day become the singularity, which will create Deep Thought, and answer the meaning of life, the universe and everything."; + "C is actually written in RMS."; + "Richard Stallman can write software that does not have a buffer overflow when counting money lost by Jerome Kerviel."; + "There were no double rainbows before Richard Stallman."; + "Chuck Norris had to shorten his beard in the presence of Stallman because two beards that awsome, so close would segfault the universe (again)."; + "RMS is Titanic."; + "Richard Stallman is the answer to the Turing Test."; + "Richard Stallman's beard makes ads for Gillette and Braun appear."; + "for i = 1 to Stallman will never stop."; + "\"RMS\" stands for \"RMS Makes Software\""; + "Whenever someone writes a \"Hello, world\" program, Richard Stallman says \"Hello\" back."; + "Richard Stallman wasn't born. He was compiled from source."; + "Richard Stallman has a URL tatooed on the left side of his chest where you can download his genetic code."; + "The GNU command line idiom that Richard Stallman never needs: \"date | more\""; + "Richard Stallman's toe cheese is aged to perfection."; + "Richard Stallman doesn't always run an OS kernel, but when he does he prefers GNU/Hurd. He is... the most interesting hacker in the world. Stay free, my friends."; + "When Richard Stallman gets hungry, he just picks debris from his foot and eats it."; + "Richard Stallman can GPL your code just by looking at it funny."; + "Richard Mathew Stallman loves birds. Birds make auricular love to Richard Mathew Stallman."; + "Richard Stallman is so free that the primitive recursive function for computing his liberty causes a stack overflow."; + "GNU Hurd is taking more than twenty years to develop because Richard Stallman is using a programming language comprised entirely of different lengths of time."; + "Richard Stallman's beard contains Richard Stallman, whose beard contains Richard Stallman...."; + "Richard Stallman had a Google Plus account in 2010."; + "sudo chown rms:gnu ~/base -R"; + "Richard Stallman pipes the Emacs binaries to /dev/dsp before he goes to sleep."; + "When Richard Stallman counted his fingers as a kid, he always started with 0."; + "When Richard Stallman's computer gets a virus, he simply applies a GPL license to it which converts the whole botnet to Linux. I mean, GNU/Linux."; + "Richard Stallman's beard trimmings can cure cancer. Too bad he never shaves."; + "Richard Stallman's doesn't kill a process, he just dares it to stay running."; + "Richard Stallman exists because he compiled himself into being. "; + "Richard Stallman's first words were in binary. When they couldn't understand him, he wrote a parser."; + "Richard Stallman doesn't need any codecs, he just opens a multimedia file with Emacs, and reads the bytes of the file as plain text. He then performs all the necessary decoding in his mind. But he refuses to decode files encrypted with DRM, although his mind is able to."; + }; + + w = wisdom{randi([1, numel(wisdom)])}; + if nargout > 0 + f = w; + else + w = wordwrap (w); + printf ("%s", w); + endif +endfunction + +function out = wordwrap (w) + cols = terminal_size ()(2); + wc = strsplit (w, " "); + out = "\n"; + i = 1; + numwords = numel (wc); + while i <= numwords; + line = wc{i}; + while (i < numwords && length (newline = cstrcat (line, " ", wc{i+1})) < cols) + line = newline; + i++; + endwhile + out = cstrcat (out, line, "\n"); + i++; + endwhile + out = cstrcat(out, "\n"); +endfunction \ No newline at end of file
--- a/scripts/miscellaneous/fileattrib.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/fileattrib.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/fileparts.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/fileparts.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/fullfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/fullfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/getappdata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/getappdata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by
--- a/scripts/miscellaneous/getfield.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/getfield.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Etienne Grossmann +## Copyright (C) 2000-2012 Etienne Grossmann ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/miscellaneous/gunzip.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/gunzip.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Bill Denney +## Copyright (C) 2006-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/gzip.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/gzip.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/info.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/info.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Julian Schnidder +## Copyright (C) 2008-2012 Julian Schnidder ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/inputname.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/inputname.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/isappdata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/isappdata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by
--- a/scripts/miscellaneous/isdeployed.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/isdeployed.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/ismac.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ismac.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Thomas Treichl +## Copyright (C) 2007-2012 Thomas Treichl ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/ispc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ispc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/isunix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/isunix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/license.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/license.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 William Poetra Yoga Hadisoeseno +## Copyright (C) 2005-2012 William Poetra Yoga Hadisoeseno ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/list_primes.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/list_primes.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/ls.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ls.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/ls_command.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ls_command.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/menu.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/menu.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/mex.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/mex.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/mexext.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/mexext.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/mkoctfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/mkoctfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Keith Goodman +## Copyright (C) 2006-2012 Keith Goodman ## ## This file is part of Octave. ## @@ -18,6 +18,7 @@ ## -*- texinfo -*- ## @deftypefn {Command} {} mkoctfile [-options] file @dots{} +## @deftypefnx {Function File} {[@var{output}, @var{status} =} mkoctfile (@dots{}) ## ## The @code{mkoctfile} function compiles source code written in C, ## C++, or Fortran. Depending on the options used with @code{mkoctfile}, the @@ -25,7 +26,9 @@ ## application. ## ## @code{mkoctfile} can be called from the shell prompt or from the Octave -## prompt. +## prompt. Calling it from the Octave prompt simply delegates the +## call to the shell prompt. The output is stored in the @var{output} +## variable and the exit status in the @var{status} variable. ## ## @code{mkoctfile} accepts the following options, all of which are optional ## except for the file name of the code you wish to compile: @@ -137,7 +140,7 @@ ## @end table ## @end deftypefn -function mkoctfile (varargin) +function [output, status] = mkoctfile (varargin) bindir = octave_config_info ("bindir"); @@ -148,9 +151,15 @@ cmd = cstrcat (cmd, " \"", varargin{i}, "\""); endfor - status = system (cmd); + [sys, out] = system (cmd); - if (status == 127) + if (nargout > 0) + [output, status] = deal (out, sys); + else + printf ("%s", out); + endif + + if (sys == 127) warning ("unable to find mkoctfile in expected location: `%s'", shell_script);
--- a/scripts/miscellaneous/module.mk Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/module.mk Mon Jan 09 15:19:21 2012 -0500 @@ -20,6 +20,7 @@ miscellaneous/dos.m \ miscellaneous/dump_prefs.m \ miscellaneous/edit.m \ + miscellaneous/fact.m \ miscellaneous/fileattrib.m \ miscellaneous/fileparts.m \ miscellaneous/fullfile.m \
--- a/scripts/miscellaneous/movefile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/movefile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/namelengthmax.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/namelengthmax.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/news.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/news.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/orderfields.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/orderfields.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Paul Kienzle +## Copyright (C) 2006-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/pack.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/pack.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 John W. Eaton +## Copyright (C) 1999-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/paren.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/paren.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/parseparams.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/parseparams.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Alexander Barth +## Copyright (C) 2006-2012 Alexander Barth ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave. @@ -48,7 +48,7 @@ ## with their default values given as name-value pairs. ## If @var{params} do not form name-value pairs, or if an option occurs ## that does not match any of the available options, an error occurs. -## When called from a m-file function, the error is prefixed with the +## When called from an m-file function, the error is prefixed with the ## name of the caller function. ## The matching of options is case-insensitive. ##
--- a/scripts/miscellaneous/perl.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/perl.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Julian Schnidder +## Copyright (C) 2008-2012 Julian Schnidder ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/private/__xzip__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/private/__xzip__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Thorsten Meyer +## Copyright (C) 2008-2012 Thorsten Meyer ## based on the original gzip function by David Bateman ## ## This file is part of Octave.
--- a/scripts/miscellaneous/python.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/python.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2008-2011 Julian Schnidder -## Copyright (C) 2011 Carnë Draug +## Copyright (C) 2008-2012 Julian Schnidder +## Copyright (C) 2012 Carnë Draug ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/recycle.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/recycle.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/rmappdata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/rmappdata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by
--- a/scripts/miscellaneous/run.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/run.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/semicolon.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/semicolon.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/setappdata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/setappdata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by
--- a/scripts/miscellaneous/setfield.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/setfield.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Etienne Grossmann +## Copyright (C) 2000-2012 Etienne Grossmann ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/miscellaneous/substruct.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/substruct.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/miscellaneous/swapbytes.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/swapbytes.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/symvar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/symvar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/tar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/tar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Søren Hauberg +## Copyright (C) 2005-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/tempdir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/tempdir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/tempname.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/tempname.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 John W. Eaton +## Copyright (C) 2003-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/unix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/unix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 John W. Eaton +## Copyright (C) 2004-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/unpack.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/unpack.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Bill Denney +## Copyright (C) 2006-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/untar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/untar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Søren Hauberg +## Copyright (C) 2005-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/unzip.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/unzip.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Søren Hauberg +## Copyright (C) 2005-2012 Søren Hauberg ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/usejava.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/usejava.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Rik Wehbring +## Copyright (C) 2012 Rik Wehbring ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/ver.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/ver.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 William Poetra Yoga Hadisoeseno +## Copyright (C) 2005-2012 William Poetra Yoga Hadisoeseno ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/version.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/version.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/warning_ids.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/warning_ids.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -17,6 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- +## @cindex warning ids ## @table @code ## @item Octave:abbreviated-property-match ## By default, the @code{Octave:abbreviated-property-match} warning is enabled. @@ -120,6 +121,11 @@ ## directory as the .oct file referred to by the autoload() command. ## By default, the @code{Octave:autoload-relative-file-name} warning is enabled. ## +## @item Octave:broadcast +## Warn when performing broadcasting operations. By default, this is +## enabled. See @ref{Broadcasting} in the chapter Vectorization and Faster +## Code Execution of the manual. +## ## @item Octave:built-in-variable-assignment ## By default, the @code{Octave:built-in-variable-assignment} warning is ## enabled.
--- a/scripts/miscellaneous/what.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/what.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/xor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/xor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/miscellaneous/zip.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/miscellaneous/zip.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Sylvain Pelissier +## Copyright (C) 2006-2012 Sylvain Pelissier ## ## This file is part of Octave. ##
--- a/scripts/mk-pkg-add Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/mk-pkg-add Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002-2011 John W. Eaton +# Copyright (C) 2002-2012 John W. Eaton # # This file is part of Octave. #
--- a/scripts/mkdoc Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/mkdoc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1999-2011 John W. Eaton +# Copyright (C) 1999-2012 John W. Eaton # # This file is part of Octave. #
--- a/scripts/optimization/__all_opts__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/__all_opts__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 VZLU Prague +## Copyright (C) 2009-2012 VZLU Prague ## ## This file is part of Octave. ##
--- a/scripts/optimization/fminbnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/fminbnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s. +## Copyright (C) 2008-2012 VZLU Prague, a.s. ## ## This file is part of Octave. ##
--- a/scripts/optimization/fminunc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/fminunc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s. +## Copyright (C) 2008-2012 VZLU Prague, a.s. ## ## This file is part of Octave. ##
--- a/scripts/optimization/fsolve.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/fsolve.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s. +## Copyright (C) 2008-2012 VZLU Prague, a.s. ## ## This file is part of Octave. ## @@ -86,7 +86,6 @@ ## ## Note: If you only have a single nonlinear equation of one variable, using ## @code{fzero} is usually a much better idea. -## @seealso{fzero, optimset} ## ## Note about user-supplied Jacobians: ## As an inherent property of the algorithm, Jacobian is always requested for a @@ -121,10 +120,11 @@ ## endif ## endfunction ## -## ## @dots{}. +## ## @dots{} ## ## fsolve (@@user_func, x0, optimset ("OutputFcn", @@user_func, @dots{})) ## @end example +## @seealso{fzero, optimset} ## @end deftypefn ## PKG_ADD: ## Discard result to avoid polluting workspace with ans at startup.
--- a/scripts/optimization/fzero.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/fzero.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s. +## Copyright (C) 2008-2012 VZLU Prague, a.s. ## ## This file is part of Octave. ##
--- a/scripts/optimization/glpk.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/glpk.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Nicolo' Giorgetti +## Copyright (C) 2005-2012 Nicolo' Giorgetti ## ## This file is part of Octave. ##
--- a/scripts/optimization/lsqnonneg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/lsqnonneg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## Copyright (C) 2008 Jaroslav Hajek ## Copyright (C) 2009 VZLU Prague ##
--- a/scripts/optimization/optimget.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/optimget.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek +## Copyright (C) 2008-2012 Jaroslav Hajek ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/optimization/optimset.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/optimset.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/optimization/pqpnonneg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/pqpnonneg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## Copyright (C) 2008 Jaroslav Hajek ## Copyright (C) 2009 VZLU Prague ##
--- a/scripts/optimization/private/__fdjac__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/private/__fdjac__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek +## Copyright (C) 2008-2012 Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/optimization/qp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/qp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Gabriele Pannocchia. +## Copyright (C) 2000-2012 Gabriele Pannocchia. ## ## This file is part of Octave. ##
--- a/scripts/optimization/sqp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/optimization/sqp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/path/matlabroot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/path/matlabroot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott +## Copyright (C) 2008-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/path/pathdef.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/path/pathdef.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Bill Denney +## Copyright (C) 2005-2012 Bill Denney ## Copyright (C) 2007-2009 Ben Abbott ## ## This file is part of Octave.
--- a/scripts/path/savepath.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/path/savepath.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Bill Denney +## Copyright (C) 2005-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/pkg/pkg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/pkg/pkg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 S�ren Hauberg +## Copyright (C) 2005-2012 S�ren Hauberg ## Copyright (C) 2010 VZLU Prague, a.s. ## ## This file is part of Octave.
--- a/scripts/pkg/private/get_forge_pkg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/pkg/private/get_forge_pkg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 VZLU Prague, a.s. +## Copyright (C) 2010-2012 VZLU Prague, a.s. ## ## This file is part of Octave. ##
--- a/scripts/plot/__gnuplot_drawnow__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/__gnuplot_drawnow__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/__plt_get_axis_arg__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/__plt_get_axis_arg__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/allchild.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/allchild.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/plot/ancestor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ancestor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Michael Goffioul +## Copyright (C) 2007-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/area.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/area.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Michael Goffioul +## Copyright (C) 2007-2012 Michael Goffioul ## Copyright (C) 2007-2009 David Bateman ## ## This file is part of Octave.
--- a/scripts/plot/axes.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/axes.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/axis.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/axis.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/bar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/bar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/barh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/barh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/box.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/box.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/caxis.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/caxis.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/cla.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/cla.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott +## Copyright (C) 2008-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/clabel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/clabel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/clf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/clf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/close.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/close.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2002-2011 John W. Eaton +## Copyright (C) 2002-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/closereq.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/closereq.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/colorbar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/colorbar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/colstyle.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/colstyle.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 David Bateman +## Copyright (C) 2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/comet.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/comet.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott +## Copyright (C) 2008-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/comet3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/comet3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott and John W. Eaton +## Copyright (C) 2010-2012 Ben Abbott and John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/compass.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/compass.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/contour.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/contour.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 Shai Ayal +## Copyright (C) 1993-2012 Shai Ayal ## ## This file is part of Octave. ##
--- a/scripts/plot/contour3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/contour3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David BAteman +## Copyright (C) 2007-2012 David BAteman ## ## This file is part of Octave. ##
--- a/scripts/plot/contourc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/contourc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2003-2011 Shai Ayal +## Copyright (C) 2003-2012 Shai Ayal ## ## This file is part of Octave. ##
--- a/scripts/plot/contourf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/contourf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel +## Copyright (C) 2007-2012 Kai Habel ## Copyright (C) 2003 Shai Ayal ## ## This file is part of Octave.
--- a/scripts/plot/cylinder.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/cylinder.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Michael Goffioul and Kai Habel +## Copyright (C) 2007-2012 Michael Goffioul and Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/daspect.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/daspect.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/diffuse.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/diffuse.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Kai Habel +## Copyright (C) 2009-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/ellipsoid.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ellipsoid.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Sylvain Pelissier +## Copyright (C) 2007-2012 Sylvain Pelissier ## ## This file is part of Octave. ##
--- a/scripts/plot/errorbar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/errorbar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Teemu Ikonen +## Copyright (C) 2000-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/ezcontour.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezcontour.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezcontourf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezcontourf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezmesh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezmesh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezmeshc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezmeshc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezplot3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezplot3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezpolar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezpolar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezsurf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezsurf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ezsurfc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ezsurfc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/feather.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/feather.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/figure.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/figure.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/fill.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/fill.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/findall.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/findall.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/plot/findobj.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/findobj.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Ben Abbott +## Copyright (C) 2007-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/fplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/fplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Paul Kienzle +## Copyright (C) 2005-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/plot/gca.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gca.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/gcbf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gcbf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Michael Goffioul +## Copyright (C) 2008-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/gcbo.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gcbo.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Michael Goffioul +## Copyright (C) 2008-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/gcf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gcf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/ginput.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ginput.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/gnuplot_binary.in Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gnuplot_binary.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 John W. Eaton +## Copyright (C) 2008-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/graphics_toolkit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/graphics_toolkit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Michael Goffioul +## Copyright (C) 2008-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/grid.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/grid.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/gtext.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/gtext.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/guidata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/guidata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/guihandles.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/guihandles.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/hggroup.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/hggroup.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Michael Goffioul +## Copyright (C) 2008-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/hidden.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/hidden.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Michael Goffioul +## Copyright (C) 2007-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/hist.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/hist.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/hold.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/hold.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/isfigure.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/isfigure.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/ishghandle.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ishghandle.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ishold.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ishold.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/isocolors.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/isocolors.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Martin Helm +## Copyright (C) 2009-2012 Martin Helm ## ## This file is part of Octave. ##
--- a/scripts/plot/isonormals.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/isonormals.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Martin Helm +## Copyright (C) 2009-2012 Martin Helm ## ## This file is part of Octave. ##
--- a/scripts/plot/isosurface.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/isosurface.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Martin Helm +## Copyright (C) 2009-2012 Martin Helm ## ## This file is part of Octave. ##
--- a/scripts/plot/isprop.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/isprop.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/legend.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/legend.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/line.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/line.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/linkprop.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/linkprop.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/loglog.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/loglog.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/loglogerr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/loglogerr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Teemu Ikonen +## Copyright (C) 2000-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/mesh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/mesh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/meshc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/meshc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/meshgrid.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/meshgrid.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/meshz.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/meshz.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ndgrid.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ndgrid.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Alexander Barth +## Copyright (C) 2006-2012 Alexander Barth ## ## This file is part of Octave. ##
--- a/scripts/plot/newplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/newplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/orient.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/orient.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/plot/pareto.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/pareto.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## Copyright (C) 2003 Alberto Terruzzi ## ## This file is part of Octave.
--- a/scripts/plot/patch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/patch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/pbaspect.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/pbaspect.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/pcolor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/pcolor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel +## Copyright (C) 2007-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/peaks.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/peaks.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Paul Kienzle +## Copyright (C) 2007-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/plot/pie.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/pie.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/pie3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/pie3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## Copyright (C) 2010 Kai Habel ## ## This file is part of Octave.
--- a/scripts/plot/plot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/plot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/plot3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/plot3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/plotmatrix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/plotmatrix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/plotyy.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/plotyy.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/polar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/polar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/print.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/print.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__actual_axis_position__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__actual_axis_position__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Ben Abbott +## Copyright (C) 2009-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__add_datasource__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__add_datasource__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__add_default_menu__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__add_default_menu__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__axes_limits__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__axes_limits__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__axis_label__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__axis_label__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__bar__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__bar__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__clabel__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__clabel__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__color_str_rgb__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__color_str_rgb__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__contour__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__contour__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__default_plot_options__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__default_plot_options__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__errcomm__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__errcomm__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Teemu Ikonen +## Copyright (C) 2001-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__errplot__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__errplot__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Teemu Ikonen +## Copyright (C) 2000-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__ezplot__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__ezplot__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__file_filter__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__file_filter__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__fltk_file_filter__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__fltk_file_filter__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__fltk_ginput__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__fltk_ginput__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Shai Ayal +## Copyright (C) 2010-2012 Shai Ayal ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__fltk_print__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__fltk_print__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Shai Ayal +## Copyright (C) 2010-2012 Shai Ayal ## ## This file is part of Octave. ## @@ -52,15 +52,17 @@ dot = find (opts.name == ".", 1, "last"); if ((! isempty (dot)) && any (strcmpi (opts.name(dot:end), ... - {".eps", ".ps", ".pdf", ".tex", "."}))) + {strcat(".", suffix), ".tex", "."}))) name = opts.name(1:dot-1); if (dot < numel (opts.name) && any (strcmpi (opts.name(dot+1:end), {"eps", "ps", "pdf"}))) ## If user provides eps/ps/pdf suffix, use it. suffix = opts.name(dot+1:end); endif - elseif (dot == numel (opts.name)) - name = opts.name; + else + error ("print:invalid-suffix", + "invalid suffix `%s' for device `%s'.", + opts.name(dot:end), lower (opts.devopt)); endif gl2ps_device = {sprintf("%snotxt", lower (suffix))}; gl2ps_device{2} = "tex";
--- a/scripts/plot/private/__getlegenddata__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__getlegenddata__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__ghostscript__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__ghostscript__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_get_var__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_get_var__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Ben Abbott +## Copyright (C) 2009-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_ginput__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_ginput__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Petr Mikulik +## Copyright (C) 2004-2012 Petr Mikulik ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_has_feature__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_has_feature__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Ben Abbott +## Copyright (C) 2009-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_has_terminal__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_has_terminal__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_open_stream__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_open_stream__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Ben Abbott +## Copyright (C) 2009-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__gnuplot_print__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_print__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Daniel Heiserer +## Copyright (C) 1999-2012 Daniel Heiserer ## Copyright (C) 2001 Laurent Mazet ## ## This file is part of Octave. @@ -69,10 +69,16 @@ endif case {"epslatex", "pslatex", "pstex", "epslatexstandalone"} dot = find (opts.name == ".", 1, "last"); - if ((! isempty (dot)) - && any (strcmpi (opts.name(dot:end), - {".eps", ".ps", ".pdf", ".tex", "."}))) - name = opts.name(1:dot-1); + n = find (opts.devopt == "l", 1); + suffix = opts.devopt(1:n-1); + if (! isempty (dot)) + if (any (strcmpi (opts.name(dot:end), {strcat(".", suffix), ".tex", "."}))) + name = opts.name(1:dot-1); + else + error ("print:invalid-suffix", + "invalid suffix `%s' for device `%s'.", + opts.name(dot:end), lower (opts.devopt)); + endif endif if (strfind (opts.devopt, "standalone")) term = sprintf ("%s ",
--- a/scripts/plot/private/__gnuplot_version__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__gnuplot_version__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Daniel Sebald +## Copyright (C) 2006-2012 Daniel Sebald ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__go_draw_axes__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__go_draw_axes__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -694,25 +694,12 @@ else ccol = cdat; endif - if (strncmp (obj.facecolor, "interp", 6) && nd == 3 - && numel (xcol) == 3 && isempty (ccol)) - ## FIXME - Use isonormals to render interpolated - ## triangular patches. - obj.facecolor = "flat"; - endif if (strncmp (obj.facecolor, "flat", 4)) - if (numel (ccol) == 3) + if (isequal (size (ccol), [1, 3])) + ## RGB Triplet color = ccol; elseif (nd == 3 && numel (xcol) == 3) - if (isempty (ccol)) - z = mean (zcol); - nr = size (cmap, 1); - r = interp1 (linspace (clim(1), clim(2), nr), - (1:nr), z, "nearest", "extrap"); - color = cmap (r, :); - else - ccdat = ccol * ones (3,1); - endif + ccdat = ccol; else if (cdatadirect) r = round (ccol);
--- a/scripts/plot/private/__go_draw_figure__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__go_draw_figure__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__interp_cube__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__interp_cube__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Martin Helm +## Copyright (C) 2009-2012 Martin Helm ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__is_function__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__is_function__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__line__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__line__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__marching_cube__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__marching_cube__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Martin Helm +## Copyright (C) 2009-2012 Martin Helm ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__next_line_color__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__next_line_color__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__next_line_style__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__next_line_style__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__patch__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__patch__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton, Shai Ayal, Kai Habel +## Copyright (C) 2007-2012 John W. Eaton, Shai Ayal, Kai Habel ## ## This file is part of Octave. ## @@ -274,8 +274,10 @@ c = cat(3, reshape (fvc(idx, 1), size(idx)), reshape (fvc(idx, 2), size(idx)), reshape (fvc(idx, 3), size(idx))); - else + elseif (isempty (fvc)) c = []; + else ## if (size (fvc, 2) == 1) + c = permute (fvc(faces), [2, 1]); endif endif args = {"xdata", x, "ydata", y, "zdata", z, "cdata", c, args{:}}; @@ -335,10 +337,8 @@ if (ndims (c) == 3) fvc = reshape (c, size (c, 1) * size (c, 2), size(c, 3)); - elseif (isvector (c)) + else fvc = c(:); - else - fvc = c.'(:); endif args = {"faces", faces, "vertices", vert, "facevertexcdata", fvc, args{:}};
--- a/scripts/plot/private/__pie__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__pie__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## Copyright (C) 2010 Kai Habel ## ## This file is part of Octave.
--- a/scripts/plot/private/__plt__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__plt__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__pltopt__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__pltopt__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__print_parse_opts__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__print_parse_opts__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2010-2012 Shai Ayal ## ## This file is part of Octave. ## @@ -17,11 +17,9 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{x}, @var{y}, @var{buttons}] =} ginput (@var{n}) -## Return which mouse buttons were pressed and keys were hit on the current -## figure. If @var{n} is defined, then wait for @var{n} mouse clicks -## before returning. If @var{n} is not defined, then @code{ginput} will -## loop until the return key is pressed. +## @deftypefn {Function File} {@var{args} =} __print_parse_opts__ (@var{propname}, @var{propvalue}) +## @deftypefnx {Function File} {@var{args} =} __print_parse_opts__ (@var{struct}) +## Undocumented internal function. ## @end deftypefn function arg_st = __print_parse_opts__ (varargin)
--- a/scripts/plot/private/__quiver__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__quiver__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__scatter__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__scatter__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__stem__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__stem__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Michel D. Schmid +## Copyright (C) 2006-2012 Michel D. Schmid ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__tight_eps_bbox__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__tight_eps_bbox__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__uigetdir_fltk__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__uigetdir_fltk__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__uigetfile_fltk__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__uigetfile_fltk__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__uiobject_split_args__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__uiobject_split_args__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/private/__uiputfile_fltk__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/private/__uiputfile_fltk__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/quiver.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/quiver.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/quiver3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/quiver3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/rectangle.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/rectangle.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 David Bateman +## Copyright (C) 2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/refresh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/refresh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/refreshdata.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/refreshdata.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/ribbon.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ribbon.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel +## Copyright (C) 2007-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/rose.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/rose.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/saveas.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/saveas.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/scatter.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/scatter.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/scatter3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/scatter3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/semilogx.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/semilogx.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/semilogxerr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/semilogxerr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Teemu Ikonen +## Copyright (C) 2000-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/semilogy.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/semilogy.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/semilogyerr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/semilogyerr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Teemu Ikonen +## Copyright (C) 2000-2012 Teemu Ikonen ## ## This file is part of Octave. ##
--- a/scripts/plot/shading.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/shading.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Kai Habel +## Copyright (C) 2006-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/shg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/shg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/slice.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/slice.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel, David Bateman +## Copyright (C) 2007-2012 Kai Habel, David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/sombrero.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/sombrero.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/specular.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/specular.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Kai Habel +## Copyright (C) 2009-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/sphere.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/sphere.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Michael Goffioul +## Copyright (C) 2007-2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/spinmap.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/spinmap.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel +## Copyright (C) 2007-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/stairs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/stairs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/stem.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/stem.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Michel D. Schmid +## Copyright (C) 2006-2012 Michel D. Schmid ## ## This file is part of Octave. ##
--- a/scripts/plot/stem3.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/stem3.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/subplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/subplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/surf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/surf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Kai Habel +## Copyright (C) 2007-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/surface.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/surface.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/surfc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/surfc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/surfl.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/surfl.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Kai Habel +## Copyright (C) 2009-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/surfnorm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/surfnorm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/text.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/text.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/title.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/title.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/trimesh.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/trimesh.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/triplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/triplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/trisurf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/trisurf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ## @@ -71,6 +71,27 @@ endfunction +%!demo +%! clf +%! N = 31; +%! [x, y] = meshgrid (1:N); +%! tri = delaunay (x, y); +%! z = peaks (N); +%! h = trisurf (tri, x, y, z, "facecolor", "interp"); +%! axis tight +%! zlim auto +%! title (sprintf ("facecolor = %s", get (h, "facecolor"))) + +%!demo +%! clf +%! N = 31; +%! [x, y] = meshgrid (1:N); +%! tri = delaunay (x, y); +%! z = peaks (N); +%! h = trisurf (tri, x, y, z, "facecolor", "flat"); +%! axis tight +%! zlim auto +%! title (sprintf ("facecolor = %s", get (h, "facecolor"))) %!demo %! clf
--- a/scripts/plot/uicontextmenu.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uicontextmenu.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uicontrol.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uicontrol.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uigetdir.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uigetdir.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/uigetfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uigetfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/uimenu.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uimenu.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/uipanel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uipanel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uipushtool.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uipushtool.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uiputfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uiputfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Kai Habel +## Copyright (C) 2010-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/plot/uiresume.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uiresume.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uitoggletool.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uitoggletool.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uitoolbar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uitoolbar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/uiwait.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/uiwait.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 Michael Goffioul +## Copyright (C) 2012 Michael Goffioul ## ## This file is part of Octave. ##
--- a/scripts/plot/view.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/view.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/waitbar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/waitbar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ## @@ -143,7 +143,7 @@ %! for i = 0:0.01:0.6 %! waitbar (i); %! endfor -%! i = 0.3 +%! i = 0.3; %! waitbar (i, h, "don't you hate taking a step backward?") %! pause (0.5); %! for i = i:0.005:0.7
--- a/scripts/plot/waitforbuttonpress.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/waitforbuttonpress.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Petr Mikulik +## Copyright (C) 2004-2012 Petr Mikulik ## ## This file is part of Octave. ##
--- a/scripts/plot/whitebg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/whitebg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/xlabel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/xlabel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/xlim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/xlim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ## @@ -17,6 +17,10 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- +## @c List other forms of function in documentation index +## @findex ylim +## @findex zlim +## ## @deftypefn {Function File} {@var{xl} =} xlim () ## @deftypefnx {Function File} {} xlim (@var{xl}) ## @deftypefnx {Function File} {@var{m} =} xlim ('mode')
--- a/scripts/plot/ylabel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ylabel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/ylim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/ylim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/plot/zlabel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/zlabel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/plot/zlim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/plot/zlim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/polynomial/compan.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/compan.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/conv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/conv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/deconv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/deconv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/mkpp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/mkpp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/polynomial/mpoles.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/mpoles.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 Ben Abbott +## Copyright (C) 2007-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/polynomial/pchip.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/pchip.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Kai Habel +## Copyright (C) 2001-2012 Kai Habel ## ## This file is part of Octave. ##
--- a/scripts/polynomial/poly.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/poly.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyaffine.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyaffine.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Tony Richardson, Jaroslav Hajek +## Copyright (C) 2009-2012 Tony Richardson, Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyder.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyder.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyfit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyfit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -81,6 +81,8 @@ error ("polyfit: N must be a non-negative integer"); endif + y_is_row_vector = (rows (y) == 1); + ## Reshape x & y into column vectors. l = numel (x); x = x(:); @@ -97,7 +99,7 @@ if (nargout > 1) yf = v*p; - if (isrow (y)) + if (y_is_row_vector) s.yf = yf.'; else s.yf = yf;
--- a/scripts/polynomial/polygcd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polygcd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyint.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyint.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyout.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyout.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Auburn University. All rights reserved. +## Copyright (C) 1995-2012 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyreduce.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyreduce.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyval.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyval.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/polyvalm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/polyvalm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/polynomial/ppder.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/ppder.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s., Czech Republic +## Copyright (C) 2008-2012 VZLU Prague, a.s., Czech Republic ## ## This file is part of Octave. ##
--- a/scripts/polynomial/ppint.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/ppint.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s., Czech Republic +## Copyright (C) 2008-2012 VZLU Prague, a.s., Czech Republic ## ## This file is part of Octave. ##
--- a/scripts/polynomial/ppjumps.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/ppjumps.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 VZLU Prague, a.s., Czech Republic +## Copyright (C) 2008-2012 VZLU Prague, a.s., Czech Republic ## ## This file is part of Octave. ##
--- a/scripts/polynomial/ppval.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/ppval.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/polynomial/residue.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/residue.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## Copyright (C) 2007 Ben Abbott ## ## This file is part of Octave.
--- a/scripts/polynomial/roots.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/roots.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/polynomial/spline.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/spline.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## Copyright (C) 2006 David Bateman ## ## This file is part of Octave.
--- a/scripts/polynomial/unmkpp.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/polynomial/unmkpp.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/prefs/addpref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/addpref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/getpref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/getpref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/ispref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/ispref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/private/loadprefs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/private/loadprefs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/private/prefsfile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/private/prefsfile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/private/saveprefs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/private/saveprefs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/rmpref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/rmpref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/prefs/setpref.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/prefs/setpref.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/set/intersect.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/intersect.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2008-2009 Jaroslav Hajek ## ## This file is part of Octave. @@ -57,6 +57,7 @@ [c, ic] = sortrows (c); ii = find (all (c(1:end-1,:) == c(2:end,:), 2)); c = c(ii,:); + len_a = rows (a); else c = [a(:); b(:)]; [c, ic] = sort (c); ## [a(:);b(:)](ic) == c @@ -66,11 +67,12 @@ ii = find (c(1:end-1) == c(2:end)); endif c = c(ii); + len_a = length (a); endif if (nargout > 1) ia = ja(ic(ii)); ## a(ia) == c - ib = jb(ic(ii+1) - length (a)); ## b(ib) == c + ib = jb(ic(ii+1) - len_a); ## b(ib) == c endif if (nargin == 2 && (size (b, 1) == 1 || size (a, 1) == 1)) @@ -105,3 +107,9 @@ %! b = [1 2 3 4 5 6]; %! c = intersect(a,b); %! assert(c, [1,2]); +%!test +%! a = [1 2 3 4; 5 6 7 8; 9 10 11 12]; +%! [b, ia, ib] = intersect(a, a, "rows"); +%! assert(b, a); +%! assert(ia, [1:3]'); +%! assert(ib, [1:3]');
--- a/scripts/set/ismember.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/ismember.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/set/powerset.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/powerset.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Jaroslav Hajek +## Copyright (C) 2010-2012 Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/set/private/validargs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/private/validargs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2009-2010 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/set/setdiff.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/setdiff.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2008-2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/set/setxor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/setxor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek +## Copyright (C) 2008-2012 Jaroslav Hajek ## Copyright (C) 2000, 2006-2007 Paul Kienzle ## ## This file is part of Octave.
--- a/scripts/set/union.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/union.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## Copyright (C) 2008-2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/set/unique.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/set/unique.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2008-2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/signal/arch_fit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/arch_fit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/signal/arch_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/arch_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/signal/arch_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/arch_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/signal/arma_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/arma_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/autoreg_matrix.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/autoreg_matrix.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/signal/bartlett.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/bartlett.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/blackman.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/blackman.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/detrend.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/detrend.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/signal/diffpara.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/diffpara.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/durbinlevinson.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/durbinlevinson.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/fftconv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/fftconv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/signal/fftfilt.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/fftfilt.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/signal/fftshift.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/fftshift.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1997-2011 Vincent Cautaerts +## Copyright (C) 1997-2012 Vincent Cautaerts ## ## This file is part of Octave. ##
--- a/scripts/signal/filter2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/filter2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/signal/fractdiff.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/fractdiff.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/freqz.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/freqz.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/signal/freqz_plot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/freqz_plot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2002-2011 John W. Eaton +## Copyright (C) 2002-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/signal/hamming.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/hamming.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/hanning.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/hanning.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/hurst.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/hurst.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/ifftshift.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/ifftshift.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1997-2011 Vincent Cautaerts +## Copyright (C) 1997-2012 Vincent Cautaerts ## ## This file is part of Octave. ##
--- a/scripts/signal/periodogram.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/periodogram.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## Copyright (C) 2010 Alois Schloegl ## ## This file is part of Octave.
--- a/scripts/signal/private/rectangle_lw.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/private/rectangle_lw.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/private/rectangle_sw.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/private/rectangle_sw.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/private/triangle_lw.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/private/triangle_lw.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/private/triangle_sw.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/private/triangle_sw.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/sinc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/sinc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/signal/sinetone.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/sinetone.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/sinewave.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/sinewave.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/spectral_adf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/spectral_adf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/spectral_xdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/spectral_xdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/spencer.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/spencer.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/signal/stft.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/stft.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/synthesis.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/synthesis.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Andreas Weingessel +## Copyright (C) 1995-2012 Andreas Weingessel ## ## This file is part of Octave. ##
--- a/scripts/signal/unwrap.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/unwrap.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Bill Lash +## Copyright (C) 2000-2012 Bill Lash ## ## This file is part of Octave. ##
--- a/scripts/signal/yulewalker.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/signal/yulewalker.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/sparse/bicg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/bicg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ ## Copyright (C) 2006 Sylvain Pelissier <sylvain.pelissier@gmail.com> -## Copyright (C) 2011 Carlo de Falco +## Copyright (C) 2012 Carlo de Falco ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by
--- a/scripts/sparse/bicgstab.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/bicgstab.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2008-2011 Radek Salac -## Copyright (C) 2011 Carlo de Falco +## Copyright (C) 2008-2012 Radek Salac +## Copyright (C) 2012 Carlo de Falco ## ## This file is part of Octave. ##
--- a/scripts/sparse/cgs.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/cgs.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2008-2011 Radek Salac -## Copyright (C) 2011 Carlo de Falco +## Copyright (C) 2008-2012 Radek Salac +## Copyright (C) 2012 Carlo de Falco ## ## This file is part of Octave. ##
--- a/scripts/sparse/colperm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/colperm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler +## Copyright (C) 2004-2012 David Bateman and Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/etreeplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/etreeplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Ivana Varekova +## Copyright (C) 2005-2012 Ivana Varekova ## ## This file is part of Octave. ##
--- a/scripts/sparse/gmres.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/gmres.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Carlo de Falco +## Copyright (C) 2009-2012 Carlo de Falco ## ## This file is part of Octave. ##
--- a/scripts/sparse/gplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/gplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Ivana Varekova +## Copyright (C) 2005-2012 Ivana Varekova ## ## This file is part of Octave. ##
--- a/scripts/sparse/nonzeros.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/nonzeros.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/sparse/pcg.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/pcg.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Piotr Krzyzanowski +## Copyright (C) 2004-2012 Piotr Krzyzanowski ## ## This file is part of Octave. ##
--- a/scripts/sparse/pcr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/pcr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Piotr Krzyzanowski +## Copyright (C) 2004-2012 Piotr Krzyzanowski ## ## This file is part of Octave. ##
--- a/scripts/sparse/private/__sprand_impl__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/private/__sprand_impl__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2004-2011 Paul Kienzle -## Copyright (C) 2011 Jordi Gutiérrez Hermoso +## Copyright (C) 2004-2012 Paul Kienzle +## Copyright (C) 2012 Jordi Gutiérrez Hermoso ## ## This file is part of Octave. ##
--- a/scripts/sparse/spaugment.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spaugment.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/sparse/spconvert.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spconvert.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler +## Copyright (C) 2004-2012 David Bateman and Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/spdiags.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spdiags.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/sparse/speye.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/speye.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler +## Copyright (C) 2004-2012 David Bateman and Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/spfun.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spfun.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler +## Copyright (C) 2004-2012 David Bateman and Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/spones.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spones.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler +## Copyright (C) 2004-2012 David Bateman and Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/sprand.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/sprand.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/sparse/sprandn.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/sprandn.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/sparse/sprandsym.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/sprandsym.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2004-2011 David Bateman and Andy Adler -## Copyright (C) 2011 Jordi Gutiérrez Hermoso +## Copyright (C) 2004-2012 David Bateman and Andy Adler +## Copyright (C) 2012 Jordi Gutiérrez Hermoso ## ## This file is part of Octave. ##
--- a/scripts/sparse/spstats.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spstats.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/sparse/spy.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/spy.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1998-2011 Andy Adler +## Copyright (C) 1998-2012 Andy Adler ## ## This file is part of Octave. ##
--- a/scripts/sparse/svds.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/svds.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 David Bateman +## Copyright (C) 2006-2012 David Bateman ## ## This file is part of Octave. ## @@ -258,7 +258,7 @@ %! opts.v0 = rand (2*n,1); % Initialize eigs ARPACK starting vector %! % to guarantee reproducible results %! -%!test +%!testif HAVE_ARPACK %! [u2,s2,v2,flag] = svds (A,k); %! s2 = diag (s2); %! assert (flag, !1); @@ -279,13 +279,13 @@ %! assert (flag, !1); %! assert (s2, s((idx+floor(k/2)):-1:(idx-floor(k/2))), 1e-10); %! -%!test +%!testif HAVE_ARPACK %! [u2,s2,v2,flag] = svds (zeros (10), k); %! assert (u2, eye (10, k)); %! assert (s2, zeros (k)); %! assert (v2, eye (10, 7)); %! -%!test +%!testif HAVE_ARPACK %! s = svds (speye (10)); %! assert (s, ones (6, 1), 2*eps);
--- a/scripts/sparse/treelayout.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/treelayout.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ivana Varekova & Radek Salac +## Copyright (C) 2008-2012 Ivana Varekova & Radek Salac ## ## This file is part of Octave. ##
--- a/scripts/sparse/treeplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/sparse/treeplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Ivana Varekova +## Copyright (C) 2005-2012 Ivana Varekova ## ## This file is part of Octave. ##
--- a/scripts/specfun/bessel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/bessel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/specfun/beta.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/beta.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/specfun/betaln.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/betaln.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1998-2011 Nicol N. Schraudolph +## Copyright (C) 1998-2012 Nicol N. Schraudolph ## ## This file is part of Octave. ##
--- a/scripts/specfun/factor.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/factor.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/specfun/factorial.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/factorial.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/specfun/isprime.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/isprime.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/specfun/lcm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/lcm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/specfun/legendre.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/legendre.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Kai Habel +## Copyright (C) 2000-2012 Kai Habel ## Copyright (C) 2008 Marco Caliari ## ## This file is part of Octave.
--- a/scripts/specfun/nchoosek.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/nchoosek.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Rolf Fabian and Paul Kienzle +## Copyright (C) 2001-2012 Rolf Fabian and Paul Kienzle ## Copyright (C) 2008 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/specfun/nthroot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/nthroot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## Copyright (C) 2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/specfun/perms.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/perms.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2001-2011 Paul Kienzle +## Copyright (C) 2001-2012 Paul Kienzle ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/specfun/pow2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/pow2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/specfun/primes.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/primes.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/specfun/reallog.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/reallog.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/specfun/realpow.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/realpow.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/specfun/realsqrt.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/specfun/realsqrt.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/hadamard.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/hadamard.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 Paul Kienzle +## Copyright (C) 1993-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/hankel.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/hankel.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/hilb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/hilb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/invhilb.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/invhilb.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 Dirk Laurie +## Copyright (C) 1993-2012 Dirk Laurie ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/magic.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/magic.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Paul Kienzle +## Copyright (C) 1999-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/pascal.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/pascal.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Peter Ekberg +## Copyright (C) 1999-2012 Peter Ekberg ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/special-matrix/rosser.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/rosser.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Peter Ekberg +## Copyright (C) 1999-2012 Peter Ekberg ## ## This file is part of Octave. ##
--- a/scripts/special-matrix/toeplitz.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/toeplitz.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/special-matrix/vander.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/vander.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1993-2011 John W. Eaton +## Copyright (C) 1993-2012 John W. Eaton ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/special-matrix/wilkinson.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/special-matrix/wilkinson.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1999-2011 Peter Ekberg +## Copyright (C) 1999-2012 Peter Ekberg ## ## This file is part of Octave. ##
--- a/scripts/startup/__finish__.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/startup/__finish__.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott +## Copyright (C) 2008-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/center.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/center.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/statistics/base/cloglog.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/cloglog.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/corr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/corr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/cov.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/cov.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/gls.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/gls.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/histc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/histc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Søren Hauberg +## Copyright (C) 2009-2012 Søren Hauberg ## Copyright (C) 2009 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/statistics/base/iqr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/iqr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/kendall.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/kendall.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/kurtosis.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/kurtosis.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/logit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/logit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/mahalanobis.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/mahalanobis.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/mean.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/mean.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/meansq.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/meansq.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/statistics/base/median.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/median.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## Copyright (C) 2009-2010 VZLU Prague ## ## This file is part of Octave.
--- a/scripts/statistics/base/mode.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/mode.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/moment.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/moment.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/ols.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/ols.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/ppplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/ppplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/prctile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/prctile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott +## Copyright (C) 2008-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/probit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/probit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/qqplot.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/qqplot.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/quantile.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/quantile.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Ben Abbott and Jaroslav Hajek +## Copyright (C) 2008-2012 Ben Abbott and Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/range.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/range.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/statistics/base/ranks.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/ranks.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/run_count.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/run_count.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/runlength.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/runlength.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Paul Kienzle +## Copyright (C) 2005-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/skewness.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/skewness.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/spearman.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/spearman.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/statistics.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/statistics.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/std.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/std.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/table.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/table.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/var.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/var.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/base/zscore.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/base/zscore.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/betacdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/betacdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/betainv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/betainv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/betapdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/betapdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## Copyright (C) 2010 Christos Dimitrakakis ## ## This file is part of Octave.
--- a/scripts/statistics/distributions/betarnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/betarnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/binocdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/binocdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/binoinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/binoinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/binopdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/binopdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/binornd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/binornd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/cauchy_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/cauchy_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/cauchy_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/cauchy_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/cauchy_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/cauchy_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/cauchy_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/cauchy_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/chi2cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/chi2cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/chi2inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/chi2inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/chi2pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/chi2pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/chi2rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/chi2rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/discrete_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/discrete_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 2010-2011 David Bateman +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 2010-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/discrete_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/discrete_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/discrete_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/discrete_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/discrete_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/discrete_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/empirical_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/empirical_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/empirical_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/empirical_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/empirical_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/empirical_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/empirical_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/empirical_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/expcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/expcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/expinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/expinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/exppdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/exppdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/exprnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/exprnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/fcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/fcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/finv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/finv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/fpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/fpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/frnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/frnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/gamcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/gamcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/gaminv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/gaminv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/gampdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/gampdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/gamrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/gamrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/geocdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/geocdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/geoinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/geoinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/geopdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/geopdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/geornd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/geornd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/hygecdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/hygecdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1997-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1997-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/hygeinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/hygeinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1997-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1997-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/hygepdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/hygepdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/hygernd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/hygernd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1997-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1997-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/laplace_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/laplace_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/laplace_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/laplace_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/laplace_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/laplace_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/laplace_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/laplace_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logistic_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logistic_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logistic_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logistic_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logistic_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logistic_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logistic_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logistic_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logncdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logncdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/logninv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/logninv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/lognpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/lognpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/lognrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/lognrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/nbincdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/nbincdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/nbininv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/nbininv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/nbinpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/nbinpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/nbinrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/nbinrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/normcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/normcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/norminv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/norminv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/normpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/normpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/normrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/normrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/poisscdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/poisscdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/poissinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/poissinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/poisspdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/poisspdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/poissrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/poissrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/stdnormal_cdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/stdnormal_cdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/stdnormal_inv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/stdnormal_inv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/stdnormal_pdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/stdnormal_pdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/stdnormal_rnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/stdnormal_rnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/tcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/tcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/tinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/tinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/tpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/tpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/trnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/trnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unidcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unidcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unidinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unidinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unidpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unidpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 2007-2011 David Bateman +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 2007-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unidrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unidrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 2005-2011 John W. Eaton +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 2005-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unifcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unifcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unifinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unifinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unifpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unifpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/unifrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/unifrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/wblcdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/wblcdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/wblinv.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/wblinv.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/wblpdf.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/wblpdf.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/wblrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/wblrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,5 +1,5 @@ -## Copyright (C) 2011 Rik Wehbring -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 2012 Rik Wehbring +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/distributions/wienrnd.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/distributions/wienrnd.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/statistics/models/logistic_regression.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/models/logistic_regression.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/models/private/logistic_regression_derivatives.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/models/private/logistic_regression_derivatives.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/models/private/logistic_regression_likelihood.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/models/private/logistic_regression_likelihood.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/anova.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/anova.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/bartlett_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/bartlett_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/chisquare_test_homogeneity.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/chisquare_test_homogeneity.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/chisquare_test_independence.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/chisquare_test_independence.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/cor_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/cor_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/f_test_regression.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/f_test_regression.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/hotelling_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/hotelling_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/hotelling_test_2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/hotelling_test_2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/kolmogorov_smirnov_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/kruskal_wallis_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/kruskal_wallis_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/manova.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/manova.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/mcnemar_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/mcnemar_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/prop_test_2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/prop_test_2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/run_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/run_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Friedrich Leisch +## Copyright (C) 1995-2012 Friedrich Leisch ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/sign_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/sign_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/t_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/t_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/t_test_2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/t_test_2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/t_test_regression.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/t_test_regression.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/u_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/u_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/var_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/var_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/welch_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/welch_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/wilcoxon_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/wilcoxon_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/z_test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/z_test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/statistics/tests/z_test_2.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/statistics/tests/z_test_2.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 Kurt Hornik +## Copyright (C) 1995-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/base2dec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/base2dec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Daniel Calvelo +## Copyright (C) 2000-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/bin2dec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/bin2dec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Daniel Calvelo +## Copyright (C) 1996-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/blanks.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/blanks.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/cstrcat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/cstrcat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/strings/deblank.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/deblank.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/dec2base.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/dec2base.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Daniel Calvelo +## Copyright (C) 2000-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/dec2bin.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/dec2bin.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Daniel Calvelo +## Copyright (C) 1996-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/dec2hex.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/dec2hex.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Daniel Calvelo +## Copyright (C) 1996-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/findstr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/findstr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/hex2dec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/hex2dec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Daniel Calvelo +## Copyright (C) 1996-2012 Daniel Calvelo ## ## This file is part of Octave. ##
--- a/scripts/strings/index.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/index.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/isletter.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/isletter.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1998-2011 John W. Eaton +## Copyright (C) 1998-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/strings/isstrprop.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/isstrprop.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 John W. Eaton +## Copyright (C) 2008-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/strings/mat2str.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/mat2str.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2002-2011 Rolf Fabian +## Copyright (C) 2002-2012 Rolf Fabian ## ## This file is part of Octave. ##
--- a/scripts/strings/regexptranslate.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/regexptranslate.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/strings/rindex.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/rindex.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/str2num.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/str2num.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/strcat.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strcat.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1994-2011 John W. Eaton +## Copyright (C) 1994-2012 John W. Eaton ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/strings/strchr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strchr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek +## Copyright (C) 2008-2012 Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/strings/strjust.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strjust.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2009 Jaroslav Hajek ## ## This file is part of Octave.
--- a/scripts/strings/strmatch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strmatch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## Copyright (C) 2003 Alois Schloegl ## Copyright (C) 2010 VZLU Prague ##
--- a/scripts/strings/strsplit.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strsplit.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Jaroslav Hajek +## Copyright (C) 2009-2012 Jaroslav Hajek ## ## This file is part of Octave. ##
--- a/scripts/strings/strtok.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strtok.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/strings/strtrim.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strtrim.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/strtrunc.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/strtrunc.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 William Poetra Yoga Hadisoeseno +## Copyright (C) 2006-2012 William Poetra Yoga Hadisoeseno ## ## This file is part of Octave. ##
--- a/scripts/strings/substr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/substr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 Kurt Hornik +## Copyright (C) 1996-2012 Kurt Hornik ## ## This file is part of Octave. ##
--- a/scripts/strings/untabify.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/untabify.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 Ben Abbott +## Copyright (C) 2010-2012 Ben Abbott ## ## This file is part of Octave. ##
--- a/scripts/strings/validatestring.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/strings/validatestring.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/testfun/assert.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/assert.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/testfun/demo.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/demo.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/testfun/example.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/example.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/testfun/fail.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/fail.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Paul Kienzle +## Copyright (C) 2005-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/testfun/rundemos.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/rundemos.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 John W. Eaton +## Copyright (C) 2008-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/testfun/runtests.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/runtests.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/testfun/speed.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/speed.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/testfun/test.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/testfun/test.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 Paul Kienzle +## Copyright (C) 2005-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/addtodate.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/addtodate.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Bill Denney +## Copyright (C) 2008-2012 Bill Denney ## ## This file is part of Octave. ##
--- a/scripts/time/asctime.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/asctime.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/calendar.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/calendar.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/clock.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/clock.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/ctime.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/ctime.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/date.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/date.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2011 John W. Eaton +## Copyright (C) 1995-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/datenum.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/datenum.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 Paul Kienzle +## Copyright (C) 2006-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/datestr.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/datestr.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/datetick.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/datetick.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ##
--- a/scripts/time/datevec.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/datevec.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/eomday.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/eomday.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2004-2011 Paul Kienzle +## Copyright (C) 2004-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/etime.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/etime.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/is_leap_year.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/is_leap_year.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/scripts/time/now.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/now.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/scripts/time/weekday.m Sat Dec 24 23:15:29 2011 +0000 +++ b/scripts/time/weekday.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2000-2011 Paul Kienzle +## Copyright (C) 2000-2012 Paul Kienzle ## ## This file is part of Octave. ##
--- a/src/Cell.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/Cell.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/Cell.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/Cell.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__contourc__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__contourc__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* Contour lines for function evaluated on a grid. -Copyright (C) 2007-2011 Kai Habel +Copyright (C) 2007-2012 Kai Habel Copyright (C) 2004, 2007 Shai Ayal Adapted to an oct file from the stand alone contourl by Victro Munoz
--- a/src/DLD-FUNCTIONS/__delaunayn__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__delaunayn__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 Kai Habel +Copyright (C) 2000-2012 Kai Habel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__dispatch__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__dispatch__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 John W. Eaton and Paul Kienzle +Copyright (C) 2001-2012 John W. Eaton and Paul Kienzle This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__dsearchn__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__dsearchn__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 Kai Habel +Copyright (C) 2010-2012 Kai Habel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__glpk__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__glpk__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 Nicolo' Giorgetti +Copyright (C) 2005-2012 Nicolo' Giorgetti This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__init_fltk__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 Shai Ayal +Copyright (C) 2007-2012 Shai Ayal This file is part of Octave. @@ -35,6 +35,9 @@ #include <config.h> #endif +#include "defun-dld.h" +#include "error.h" + #if defined (HAVE_FLTK) #include <map> @@ -69,8 +72,6 @@ #include "cmd-edit.h" #include "lo-ieee.h" -#include "defun-dld.h" -#include "error.h" #include "file-ops.h" #include "gl-render.h" #include "gl2ps-renderer.h" @@ -2004,6 +2005,8 @@ return retval; } +#endif + // FIXME -- This function should be abstracted and made potentially // available to all graphics toolkits. This suggests putting it in // graphics.cc as is done for drawnow() and having the master @@ -2021,6 +2024,7 @@ @seealso{gui_mode}\n\ @end deftypefn") { +#if defined (HAVE_FLTK) octave_value retval = wheel_zoom_speed; if (args.length () == 1) @@ -2032,6 +2036,10 @@ } return retval; +#else + error ("mouse_wheel_zoom: not available without OpenGL and FLTK libraries"); + return octave_value (); +#endif } DEFUN_DLD (gui_mode, args, , @@ -2055,6 +2063,7 @@ @seealso{mouse_wheel_zoom}\n\ @end deftypefn") { +#if defined (HAVE_FLTK) caseless_str mode_str; if (gui_mode == pan_zoom) @@ -2089,6 +2098,9 @@ error ("MODE must be one of the strings: \"2D\", \"3D\", or \"none\""); return octave_value (mode_str); +#else + error ("mouse_wheel_zoom: not available without OpenGL and FLTK libraries"); + return octave_value (); +#endif } -#endif
--- a/src/DLD-FUNCTIONS/__init_gnuplot__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__init_gnuplot__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__lin_interpn__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__lin_interpn__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 Alexander Barth +Copyright (C) 2007-2012 Alexander Barth This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__magick_read__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__magick_read__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 Andy Adler +Copyright (C) 2002-2012 Andy Adler Copyright (C) 2008 Thomas L. Scofield Copyright (C) 2010 David Grundberg @@ -212,7 +212,8 @@ idim(3) = nframes; Magick::ImageType type = imvec[0].type (); - const int divisor = (((1 << QuantumDepth) - 1) / ((1 << depth) - 1)); + const int divisor = ((uint64_t (1) << QuantumDepth) - 1) / + ((uint64_t (1) << depth) - 1); switch (type) {
--- a/src/DLD-FUNCTIONS/__pchip_deriv__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__pchip_deriv__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 Kai Habel +Copyright (C) 2002-2012 Kai Habel Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__qp__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__qp__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 Gabriele Pannocchia +Copyright (C) 2000-2012 Gabriele Pannocchia This file is part of Octave.
--- a/src/DLD-FUNCTIONS/__voronoi__.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/__voronoi__.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 Kai Habel +Copyright (C) 2000-2012 Kai Habel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/amd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/amd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 David Bateman +Copyright (C) 2008-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/balance.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/balance.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek This file is part of Octave.
--- a/src/DLD-FUNCTIONS/besselj.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/besselj.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 John W. Eaton +Copyright (C) 1997-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/betainc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/betainc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 John W. Eaton +Copyright (C) 1997-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/bsxfun.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/bsxfun.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman Copyright (C) 2009 VZLU Prague This file is part of Octave. @@ -312,8 +312,8 @@ DEFUN_DLD (bsxfun, args, , "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {} bsxfun (@var{f}, @var{A}, @var{B})\n\ -The binary singleton expansion function applier does what its name\n\ -suggests: applies a binary function @var{f} element-by-element to two\n\ +The binary singleton expansion function applier performs broadcasting,\n\ +that is, applies a binary function @var{f} element-by-element to two\n\ array arguments @var{A} and @var{B}, and expands as necessary\n\ singleton dimensions in either input argument. @var{f} is a function\n\ handle, inline function, or string containing the name of the function\n\
--- a/src/DLD-FUNCTIONS/ccolamd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/ccolamd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/cellfun.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/cellfun.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 2005-2011 Mohamed Kamoun -Copyright (C) 2006-2011 Bill Denney +Copyright (C) 2005-2012 Mohamed Kamoun +Copyright (C) 2006-2012 Bill Denney Copyright (C) 2009 Jaroslav Hajek Copyright (C) 2010 VZLU Prague @@ -365,6 +365,21 @@ @end group\n\ @end example\n\ \n\ +Use @code{cellfun} intelligently. The @code{cellfun} function is a\n\ +useful tool for avoiding loops. It is often used with anonymous\n\ +function handles; however, calling an anonymous function involves an\n\ +overhead quite comparable to the overhead of an m-file function.\n\ +Passing a handle to a built-in function is faster, because the\n\ +interpreter is not involved in the internal loop. For example:\n\ +\n\ +@example\n\ +@group\n\ +a = @{@dots{}@}\n\ +v = cellfun (@@(x) det(x), a); # compute determinants\n\ +v = cellfun (@@det, a); # faster\n\ +@end group\n\ +@end example\n\ +\n\ @seealso{arrayfun, structfun, spfun}\n\ @end deftypefn") {
--- a/src/DLD-FUNCTIONS/chol.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/chol.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2008-2009 VZLU Prague
--- a/src/DLD-FUNCTIONS/colamd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/colamd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/DLD-FUNCTIONS/colloc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/colloc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/conv2.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/conv2.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 Andy Adler +Copyright (C) 1999-2012 Andy Adler Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/convhulln.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/convhulln.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 Kai Habel +Copyright (C) 2000-2012 Kai Habel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/daspk.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/daspk.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/dasrt.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/dasrt.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/dassl.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/dassl.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/det.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/det.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/dlmread.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/dlmread.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jonathan Stickel +Copyright (C) 2008-2012 Jonathan Stickel Copyright (C) 2010 Jaroslav Hajek This file is part of Octave.
--- a/src/DLD-FUNCTIONS/dmperm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/dmperm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/src/DLD-FUNCTIONS/dot.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/dot.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 VZLU Prague +Copyright (C) 2009-2012 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/eig.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/eig.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/eigs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/eigs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave. @@ -304,7 +304,7 @@ @end deftypefn") { octave_value_list retval; - +#ifdef HAVE_ARPACK int nargin = args.length (); std::string fcn_name; octave_idx_type n = 0; @@ -759,6 +759,9 @@ if (! fcn_name.empty ()) clear_function (fcn_name); +#else + error ("eigs: not available in this version of Octave"); +#endif return retval; } @@ -777,28 +780,28 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (d1, d0(end:-1:(end-k)),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); %!testif HAVE_UMFPACK %! d1 = eigs (A, k, 'sm'); %! assert (d1, d0(k:-1:1), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'la'); %! assert (d1, d2(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sa'); %! assert (d1, d2(1:k), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'be'); %! assert (d1, d2([1:floor(k/2), (end - ceil(k/2) + 1):end]), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k+1, 'be'); %! assert (d1, d2([1:floor((k+1)/2), (end - ceil((k+1)/2) + 1):end]), 1e-11); %!testif HAVE_UMFPACK @@ -811,11 +814,11 @@ %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); %!testif HAVE_UMFPACK %! assert (eigs(A,k,4.1), eigs(A,speye(n),k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, speye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; @@ -833,12 +836,12 @@ %! assert (abs(d1), eigs(A,k,4.1), 1e-11); %!testif HAVE_UMFPACK %! assert (eigs(A,k,4.1), eigs(A,speye(n),k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'sm', opts); @@ -848,12 +851,12 @@ %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (d1, eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! AA = speye (10); %! fn = @(x) AA * x; %! opts.issym = 1; opts.isreal = 1; %! assert (eigs (fn, 10, AA, 3, 'lm', opts), [1; 1; 1],10*eps); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k @@ -865,19 +868,19 @@ %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'la'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sa'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'be'); %! d1 = diag(d1); %! for i=1:k @@ -897,34 +900,34 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (abs(d1), abs(d0(end:-1:(end-k))),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); %!testif HAVE_UMFPACK %! d1 = eigs (A, k, 'sm'); %! assert (abs(d1), abs(d0(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lr'); %! [~, idx] = sort (real(d0)); %! d2 = d0(idx); %! assert (real(d1), real(d2(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'li'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(end:-1:(end-k+1)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'si'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); @@ -938,11 +941,11 @@ %!testif HAVE_CHOLMOD %! d1 = eigs(A, speye(n), k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, speye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; @@ -962,12 +965,12 @@ %! assert (abs(eigs(A,k,4.1)), abs(eigs(A,speye(n),k,4.1)), 1e-11); %!testif HAVE_UMFPACK %! assert (sort(imag(eigs(A,k,4.1))), sort(imag(eigs(A,speye(n),k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'sm', opts); @@ -977,7 +980,7 @@ %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k @@ -989,25 +992,25 @@ %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'li'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'si'); %! d1 = diag(d1); %! for i=1:k @@ -1027,34 +1030,34 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (abs(d1), abs(d0(end:-1:(end-k))),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); %!testif HAVE_UMFPACK %! d1 = eigs (A, k, 'sm'); %! assert (abs(d1), abs(d0(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'li'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(end:-1:(end-k+1)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'si'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); @@ -1068,11 +1071,11 @@ %!testif HAVE_CHOLMOD %! d1 = eigs(A, speye(n), k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, speye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; @@ -1094,12 +1097,12 @@ %! assert (abs(eigs(A,k,4.1)), abs(eigs(A,speye(n),k,4.1)), 1e-11); %!testif HAVE_UMFPACK %! assert (sort(imag(eigs(A,k,4.1))), sort(imag(eigs(A,speye(n),k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 'sm', opts); @@ -1109,7 +1112,7 @@ %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k @@ -1121,25 +1124,25 @@ %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'li'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*speye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'si'); %! d1 = diag(d1); %! for i=1:k @@ -1162,102 +1165,102 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (d1, d0(end:-1:(end-k)),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sm'); %! assert (d1, d0(k:-1:1), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'la'); %! assert (d1, d2(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sa'); %! assert (d1, d2(1:k), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'be'); %! assert (d1, d2([1:floor(k/2), (end - ceil(k/2) + 1):end]), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k+1, 'be'); %! assert (d1, d2([1:floor((k+1)/2), (end - ceil((k+1)/2) + 1):end]), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 4.1); %! [~,idx0] = sort (abs(d0 - 4.1)); %! [~,idx1] = sort (abs(d1 - 4.1)); %! assert (d1(idx1), d0(idx0(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs(A, eye(n), k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (eigs(A,k,4.1), eigs(A,eye(n),k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (eigs(A,k,4.1), eigs(A,eye(n),k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (d1, d0(end:-1:(end-k+1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'sm', opts); %! assert (d1, d0(k:-1:1), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) (A - 4.1 * eye(n)) \ x; %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (d1, eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'la'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sa'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'be'); %! d1 = diag(d1); %! for i=1:k @@ -1277,117 +1280,117 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (abs(d1), abs(d0(end:-1:(end-k))),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sm'); %! assert (abs(d1), abs(d0(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lr'); %! [~, idx] = sort (real(d0)); %! d2 = d0(idx); %! assert (real(d1), real(d2(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'li'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(end:-1:(end-k+1)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'si'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(1:k))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 4.1); %! [~,idx0] = sort (abs(d0 - 4.1)); %! [~,idx1] = sort (abs(d1 - 4.1)); %! assert (abs(d1(idx1)), abs(d0(idx0(1:k))), 1e-11); %! assert (sort(imag(d1(idx1))), sort(imag(d0(idx0(1:k)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs(A, eye(n), k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (abs(eigs(A,k,4.1)), abs(eigs(A,eye(n),k,4.1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (sort(imag(eigs(A,k,4.1))), sort(imag(eigs(A,eye(n),k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 'sm', opts); %! assert (abs(d1), d0(1:k), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) (A - 4.1 * eye(n)) \ x; %! opts.issym = 0; opts.isreal = 1; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'li'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'si'); %! d1 = diag(d1); %! for i=1:k @@ -1407,119 +1410,119 @@ %! [~, idx] = sort (abs(d0)); %! d0 = d0(idx); %! rand("state", 42); % initialize generator to make eigs behavior reproducible -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A,k+1); %! assert (abs(d1), abs(d0(end:-1:(end-k))),1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sm'); %! assert (abs(d1), abs(d0(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'lr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'sr'); %! [~, idx] = sort (real(abs(d0))); %! d2 = d0(idx); %! assert (real(d1), real(d2(1:k)), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'li'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(end:-1:(end-k+1)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 'si'); %! [~, idx] = sort (imag(abs(d0))); %! d2 = d0(idx); %! assert (sort(imag(d1)), sort(imag(d2(1:k))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs (A, k, 4.1); %! [~,idx0] = sort (abs(d0 - 4.1)); %! [~,idx1] = sort (abs(d1 - 4.1)); %! assert (abs(d1(idx1)), abs(d0(idx0(1:k))), 1e-11); %! assert (sort(imag(d1(idx1))), sort(imag(d0(idx0(1:k)))), 1e-11); -%!test +%!testif HAVE_ARPACK %! d1 = eigs(A, eye(n), k, 'lm'); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! d1 = eigs(A, eye(n), k, 4.1, opts); %! assert (abs(abs(d1)), abs(eigs(A,k,4.1)), 1e-11); %! assert (sort(imag(abs(d1))), sort(imag(eigs(A,k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! opts.cholB=true; %! q = [2:n,1]; %! opts.permB=q; %! d1 = eigs(A, eye(n)(q,q), k, 4.1, opts); %! assert (abs(abs(d1)), abs(eigs(A,k,4.1)), 1e-11); %! assert (sort(imag(abs(d1))), sort(imag(eigs(A,k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (abs(eigs(A,k,4.1)), abs(eigs(A,eye(n),k,4.1)), 1e-11); -%!test +%!testif HAVE_ARPACK %! assert (sort(imag(eigs(A,k,4.1))), sort(imag(eigs(A,eye(n),k,4.1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A * x; %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 'lm', opts); %! assert (abs(d1), abs(d0(end:-1:(end-k+1))), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) A \ x; %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 'sm', opts); %! assert (abs(d1), d0(1:k), 1e-11); -%!test +%!testif HAVE_ARPACK %! fn = @(x) (A - 4.1 * eye(n)) \ x; %! opts.issym = 0; opts.isreal = 0; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (abs(d1), eigs(A,k,4.1), 1e-11); -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sm'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'lr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'sr'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'li'); %! d1 = diag(d1); %! for i=1:k %! assert(max(abs((A - d1(i)*eye(n))*v1(:,i))),0.,1e-11) %! endfor -%!test +%!testif HAVE_ARPACK %! [v1,d1] = eigs(A, k, 'si'); %! d1 = diag(d1); %! for i=1:k
--- a/src/DLD-FUNCTIONS/fft.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/fft.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 David Bateman +Copyright (C) 1997-2012 David Bateman Copyright (C) 1996-1997 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/fft2.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/fft2.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 David Bateman +Copyright (C) 1997-2012 David Bateman Copyright (C) 1996-1997 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/fftn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/fftn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/fftw.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/fftw.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 David Bateman +Copyright (C) 2006-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/filter.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/filter.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/find.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/find.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/gammainc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/gammainc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 John W. Eaton +Copyright (C) 1997-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/gcd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/gcd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 2010 Jaroslav Hajek, Jordi Gutiérrez Hermoso This file is part of Octave.
--- a/src/DLD-FUNCTIONS/getgrent.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/getgrent.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/getpwent.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/getpwent.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/getrusage.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/getrusage.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/givens.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/givens.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/hess.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/hess.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/hex2num.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/hex2num.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 David Bateman +Copyright (C) 2008-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/inv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/inv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/kron.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/kron.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/lookup.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/lookup.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 VZLU Prague a.s., Czech Republic +Copyright (C) 2008-2012 VZLU Prague a.s., Czech Republic This file is part of Octave.
--- a/src/DLD-FUNCTIONS/lsode.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/lsode.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/lu.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/lu.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/luinc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/luinc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/matrix_type.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/matrix_type.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/max.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/max.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/md5sum.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/md5sum.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/mgorth.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/mgorth.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Carlo de Falco +Copyright (C) 2009-2012 Carlo de Falco Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/module-files Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/module-files Mon Jan 09 15:19:21 2012 -0500 @@ -32,7 +32,7 @@ dmperm.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) dot.cc eig.cc -eigs.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) +eigs.cc|$(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)|$(ARPACK_LDFLAGS) $(SPARSE_XLDFLAGS)|$(ARPACK_LIBS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) fft.cc|$(FFTW_XCPPFLAGS)|$(FFTW_XLDFLAGS)|$(FFTW_XLIBS) fft2.cc|$(FFTW_XCPPFLAGS)|$(FFTW_XLDFLAGS)|$(FFTW_XLIBS) fftn.cc|$(FFTW_XCPPFLAGS)|$(FFTW_XLDFLAGS)|$(FFTW_XLIBS)
--- a/src/DLD-FUNCTIONS/nproc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/nproc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Iain Murray +Copyright (C) 2012 Iain Murray This file is part of Octave.
--- a/src/DLD-FUNCTIONS/oct-qhull.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/oct-qhull.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 John W. Eaton +Copyright (C) 2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/pinv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/pinv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -174,18 +174,19 @@ %!shared a, b, tol, hitol, d, u, x, y %! a = reshape (rand*[1:16], 4, 4); ## Rank 2 matrix %! b = pinv (a); -%! tol = 1e-14; -%! hitol = 15*sqrt(eps); +%! tol = 4e-14; +%! hitol = 40*sqrt (eps); %! d = diag ([rand, rand, hitol, hitol]); %! u = rand (4); ## Could be singular by freak accident %! x = inv (u)*d*u; -%! y = pinv (x, sqrt(eps)); -%!assert(a*b*a, a, tol); -%!assert(b*a*b, b, tol); -%!assert((b*a)', b*a, tol); -%!assert((a*b)', a*b, tol); -%!assert(x*y*x, x, -hitol); -%!assert(y*x*y, y, -hitol); -%!assert((x*y)', x*y, hitol); -%!assert((y*x)', y*x, hitol); +%! y = pinv (x, sqrt (eps)); +%! +%!assert (a*b*a, a, tol) +%!assert (b*a*b, b, tol) +%!assert ((b*a)', b*a, tol) +%!assert ((a*b)', a*b, tol) +%!assert (x*y*x, x, -hitol) +%!assert (y*x*y, y, -hitol) +%!assert ((x*y)', x*y, hitol) +%!assert ((y*x)', y*x, hitol) */
--- a/src/DLD-FUNCTIONS/qr.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/qr.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2008-2009 Jaroslav Hajek Copyright (C) 2008-2009 VZLU Prague
--- a/src/DLD-FUNCTIONS/quad.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/quad.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/quadcc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/quadcc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 Pedro Gonnet +Copyright (C) 2010-2012 Pedro Gonnet This file is part of Octave. @@ -31,11 +31,6 @@ #include "parse.h" #include "ov-fcn-handle.h" -#if ! defined (HAVE_COPYSIGN) && defined (HAVE__COPYSIGN) -#define copysign _copysign -#define HAVE_COPYSIGN 1 -#endif - /* Define the size of the interval heap. */ #define cquad_heapsize 200 @@ -1655,7 +1650,7 @@ wrap = true; for (i = 0; i <= nivals; i++) if (xisinf (iivals[i])) - iivals[i] = copysign (1.0, iivals[i]); + iivals[i] = gnulib::copysign (1.0, iivals[i]); else iivals[i] = 2.0 * atan (iivals[i]) / M_PI; } @@ -2020,7 +2015,7 @@ && ivl->c[0] / iv->c[0] > 2); if (ivl->ndiv > ndiv_max && 2 * ivl->ndiv > ivl->rdepth) { - igral = copysign (octave_Inf, igral); + igral = gnulib::copysign (octave_Inf, igral); warning ("quadcc: divergent integral detected"); break; } @@ -2116,7 +2111,7 @@ && ivr->c[0] / iv->c[0] > 2); if (ivr->ndiv > ndiv_max && 2 * ivr->ndiv > ivr->rdepth) { - igral = copysign (octave_Inf, igral); + igral = gnulib::copysign (octave_Inf, igral); warning ("quadcc: divergent integral detected"); break; }
--- a/src/DLD-FUNCTIONS/qz.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/qz.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1998-2011 A. S. Hodel +Copyright (C) 1998-2012 A. S. Hodel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/rand.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/rand.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/rcond.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/rcond.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 David Bateman +Copyright (C) 2008-2012 David Bateman This file is part of Octave.
--- a/src/DLD-FUNCTIONS/regexp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/regexp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 2002-2005 Paul Kienzle This file is part of Octave.
--- a/src/DLD-FUNCTIONS/schur.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/schur.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/spparms.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/spparms.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/DLD-FUNCTIONS/sqrtm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/sqrtm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Ross Lippert and Paul Kienzle +Copyright (C) 2001-2012 Ross Lippert and Paul Kienzle Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/str2double.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/str2double.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 Jaroslav Hajek +Copyright (C) 2010-2012 Jaroslav Hajek Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/strfind.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/strfind.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jaroslav Hajek +Copyright (C) 2009-2012 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/sub2ind.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/sub2ind.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 VZLU Prague +Copyright (C) 2009-2012 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/svd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/svd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/syl.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/syl.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/symbfact.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/symbfact.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 David Bateman +Copyright (C) 2005-2012 David Bateman Copyright (C) 1998-2005 Andy Adler This file is part of Octave.
--- a/src/DLD-FUNCTIONS/symrcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/symrcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 Michael Weitzel +Copyright (C) 2007-2012 Michael Weitzel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/time.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/time.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/DLD-FUNCTIONS/tril.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/tril.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/tsearch.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/tsearch.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 Andreas Stahel +Copyright (C) 2002-2012 Andreas Stahel This file is part of Octave.
--- a/src/DLD-FUNCTIONS/typecast.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/typecast.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 David Bateman +Copyright (C) 2007-2012 David Bateman Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/DLD-FUNCTIONS/urlwrite.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/DLD-FUNCTIONS/urlwrite.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // urlwrite and urlread, a curl front-end for octave /* -Copyright (C) 2006-2011 Alexander Barth +Copyright (C) 2006-2012 Alexander Barth Copyright (C) 2009 David Bateman This file is part of Octave.
--- a/src/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/src/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's src directory # -# Copyright (C) 1993-2011 John W. Eaton +# Copyright (C) 1993-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/OPERATORS/op-b-b.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-b-b.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-b-bm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-b-bm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-b-sbm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-b-sbm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-bm-b.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-bm-b.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Cai Jianming +Copyright (C) 2001-2012 Cai Jianming This file is part of Octave.
--- a/src/OPERATORS/op-bm-bm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-bm-bm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-bm-sbm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-bm-sbm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-cdm-cdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-cdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cdm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cdm-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cdm-dm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-dm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cdm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cdm-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cdm-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cell.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cell.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-chm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-chm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-class.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-class.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cm-cdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-cdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cm-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cm-dm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-dm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cm-pm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-pm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-cm-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cm-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-cm-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cm-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-cs-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cs-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cs-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cs-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-cs-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-cs-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-cs-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-dm-cdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-cdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-dm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-dm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jason Riedy, Jaroslav Hajek +Copyright (C) 2009-2012 Jason Riedy, Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jason Riedy, Jaroslav Hajek +Copyright (C) 2009-2012 Jason Riedy, Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dm-template.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dm-template.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-dms-template.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-dms-template.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-double-conv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-double-conv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fcdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fcdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcdm-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcdm-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fcdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fcdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcm-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcm-pm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcm-pm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fcn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/src/OPERATORS/op-fcs-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcs-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcs-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcs-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcs-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcs-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fcs-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fcs-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fcdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fcdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fdm-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fdm-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-float-conv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-float-conv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fm-fcdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fcdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fm-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fm-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fm-fdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fm-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fm-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fm-pm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fm-pm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-fs-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fs-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fs-fcs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fs-fcs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fs-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fs-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-fs-fs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-fs-fs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-i16-i16.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-i16-i16.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-i32-i32.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-i32-i32.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-i64-i64.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-i64-i64.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-i8-i8.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-i8-i8.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-int-concat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-int-concat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-int-conv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-int-conv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-int.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-int.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-m-cdm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-cdm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-m-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-m-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-m-dm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-dm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-m-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-m-pm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-pm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-m-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-m-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-m-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-m-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-pm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-pm-fcm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-fcm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-pm-fm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-fm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-pm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-pm-pm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-pm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-pm-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jason Riedy +Copyright (C) 2009-2012 Jason Riedy This file is part of Octave.
--- a/src/OPERATORS/op-pm-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Jason Riedy +Copyright (C) 2009-2012 Jason Riedy This file is part of Octave.
--- a/src/OPERATORS/op-pm-template.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-pm-template.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/OPERATORS/op-range.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-range.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-s-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-s-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-s-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-s-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-s-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-s-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-s-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sbm-b.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sbm-b.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sbm-bm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sbm-bm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sbm-sbm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sbm-sbm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-scm-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-scm-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-cm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-cm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-cs.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-cs.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-scm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-scm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-sm-sm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-sm-sm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/OPERATORS/op-str-m.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-str-m.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-str-s.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-str-s.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-str-str.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-str-str.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-struct.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-struct.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-ui16-ui16.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-ui16-ui16.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-ui32-ui32.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-ui32-ui32.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-ui64-ui64.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-ui64-ui64.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/OPERATORS/op-ui8-ui8.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/OPERATORS/op-ui8-ui8.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/TEMPLATE-INST/Array-os.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/TEMPLATE-INST/Array-os.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/TEMPLATE-INST/Array-sym.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/TEMPLATE-INST/Array-sym.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/TEMPLATE-INST/Array-tc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/TEMPLATE-INST/Array-tc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/bitfcns.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/bitfcns.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/builtins.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/builtins.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/c-file-ptr-stream.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/c-file-ptr-stream.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/c-file-ptr-stream.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/c-file-ptr-stream.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/comment-list.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/comment-list.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/comment-list.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/comment-list.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/cutils.c Sat Dec 24 23:15:29 2011 +0000 +++ b/src/cutils.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/src/cutils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/cutils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 John W. Eaton +Copyright (C) 2012 John W. Eaton This file is part of Octave.
--- a/src/data.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/data.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague @@ -3927,6 +3927,9 @@ DEFUN (Inf, args, , "-*- texinfo -*-\n\ +@c List other form of function in documentation index\n\ +@findex inf\n\ +\n\ @deftypefn {Built-in Function} {} Inf\n\ @deftypefnx {Built-in Function} {} Inf (@var{n})\n\ @deftypefnx {Built-in Function} {} Inf (@var{n}, @var{m})\n\ @@ -3984,6 +3987,9 @@ DEFUN (NaN, args, , "-*- texinfo -*-\n\ +@c List other form of function in documentation index\n\ +@findex nan\n\ +\n\ @deftypefn {Built-in Function} {} NaN\n\ @deftypefnx {Built-in Function} {} NaN (@var{n})\n\ @deftypefnx {Built-in Function} {} NaN (@var{n}, @var{m})\n\ @@ -5599,9 +5605,13 @@ "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} power (@var{x}, @var{y})\n\ Return the element-by-element operation of @var{x} raised to the\n\ -@var{y} power.\n\ +@var{y} power. If several complex results are possible,\n\ +returns the one with smallest non-negative argument (angle). Use\n\ +@code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a\n\ +real result is preferred.\n\ +\n\ This function and @w{@xcode{x .^ y}} are equivalent.\n\ -@seealso{mpower}\n\ +@seealso{mpower, realpow, realsqrt, cbrt, nthroot}\n\ @end deftypefn") { return binary_op_defun_body (octave_value::op_el_pow, args); @@ -6636,9 +6646,10 @@ if (n < 0) n = idx.extent (0); else if (idx.extent (n) > n) - error ("accumarray: index out of range"); - - dim_vector rdv = vals.dims (); + error ("accumdim: index out of range"); + + dim_vector vals_dim = vals.dims (), rdv = vals_dim; + if (dim < 0) dim = vals.dims ().first_non_singleton (); else if (dim >= rdv.length ()) @@ -6648,7 +6659,11 @@ NDT retval (rdv, T()); + if (idx.length () != vals_dim(dim)) + error ("accumdim: dimension mismatch"); + retval.idx_add_nd (idx, vals, dim); + return retval; }
--- a/src/data.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/data.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 John W. Eaton +Copyright (C) 2012 John W. Eaton This file is part of Octave.
--- a/src/debug.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/debug.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Ben Sapp +Copyright (C) 2001-2012 Ben Sapp Copyright (C) 2007-2009 John Swensen This file is part of Octave.
--- a/src/debug.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/debug.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Ben Sapp +Copyright (C) 2001-2012 Ben Sapp This file is part of Octave.
--- a/src/defaults.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defaults.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/defaults.h.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defaults.h.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // defaults.h.in /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/defun-dld.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defun-dld.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/defun-int.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defun-int.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/defun.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defun.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/defun.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/defun.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/dirfns.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/dirfns.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/dirfns.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/dirfns.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/display.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/display.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/display.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/display.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/dynamic-ld.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/dynamic-ld.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/dynamic-ld.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/dynamic-ld.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/error.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/error.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/error.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/error.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/file-io.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/file-io.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -1879,6 +1879,9 @@ DEFUNX ("tmpnam", Ftmpnam, args, , "-*- texinfo -*-\n\ +@c List other forms of function in documentation index\n\ +@findex octave_tmp_file_name\n\ +\n\ @deftypefn {Built-in Function} {} tmpnam ()\n\ @deftypefnx {Built-in Function} {} tmpnam (@var{dir})\n\ @deftypefnx {Built-in Function} {} tmpnam (@var{dir}, @var{prefix})\n\ @@ -2178,7 +2181,7 @@ @deftypefn {Built-in Function} {} SEEK_SET ()\n\ @deftypefnx {Built-in Function} {} SEEK_CUR ()\n\ @deftypefnx {Built-in Function} {} SEEK_END ()\n\ -Return the value required to request that @code{fseek} perform\n\ +Return the numerical value to pass to @code{fseek} to perform\n\ one of the following actions:\n\ @table @code\n\ @item SEEK_SET\n\ @@ -2190,6 +2193,7 @@ @item SEEK_END\n\ Position file relative to the end.\n\ @end table\n\ +@seealso{fseek}\n\ @end deftypefn") { return const_value ("SEEK_SET", args, -1); @@ -2198,7 +2202,9 @@ DEFUNX ("SEEK_CUR", FSEEK_CUR, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} SEEK_CUR ()\n\ -See SEEK_SET.\n\ +Return the numerical value to pass to @code{fseek} to\n\ +position the file pointer relative to the current position.\n\ +@seealso{SEEK_SET, SEEK_END}.\n\ @end deftypefn") { return const_value ("SEEK_CUR", args, 0); @@ -2207,7 +2213,9 @@ DEFUNX ("SEEK_END", FSEEK_END, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} SEEK_END ()\n\ -See SEEK_SET.\n\ +Return the numerical value to pass to @code{fseek} to\n\ +position the file pointer relative to the end of the file.\n\ +@seealso{SEEK_SET, SEEK_CUR}.\n\ @end deftypefn") { return const_value ("SEEK_END", args, 1);
--- a/src/file-io.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/file-io.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/genprops.awk Sat Dec 24 23:15:29 2011 +0000 +++ b/src/genprops.awk Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/src/gl-render.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gl-render.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/src/gl-render.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gl-render.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/src/gl2ps-renderer.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gl2ps-renderer.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Shai Ayal +Copyright (C) 2009-2012 Shai Ayal This file is part of Octave.
--- a/src/gl2ps-renderer.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gl2ps-renderer.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Shai Ayal +Copyright (C) 2009-2012 Shai Ayal This file is part of Octave.
--- a/src/graphics.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/graphics.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton This file is part of Octave. @@ -8997,6 +8997,7 @@ "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} available_graphics_toolkits ()\n\ Return a cell array of registered graphics toolkits.\n\ +@seealso{graphics_toolkit, register_graphics_toolkit}\n\ @end deftypefn") { gh_manager::auto_lock guard; @@ -9008,6 +9009,7 @@ "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} register_graphics_toolkit (@var{toolkit})\n\ List @var{toolkit} as an available graphics toolkit.\n\ +@seealso{available_graphics_toolkits}\n\ @end deftypefn") { octave_value retval; @@ -9033,6 +9035,7 @@ "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} loaded_graphics_toolkits ()\n\ Return a cell array of the currently loaded graphics toolkits.\n\ +@seealso{available_graphics_toolkits}\n\ @end deftypefn") { gh_manager::auto_lock guard;
--- a/src/graphics.h.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/graphics.h.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton This file is part of Octave.
--- a/src/gripes.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gripes.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/gripes.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/gripes.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/help.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/help.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -239,15 +239,19 @@ pair_type ("**", "-*- texinfo -*-\n\ @deftypefn {Operator} {} **\n\ -Power operator.\n\ -@seealso{power, ^, .**, .^}\n\ +Power operator. This may return complex results for real inputs. Use\n\ +@code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\ +real results when possible.\n\ +@seealso{power, ^, .**, .^, realpow, realsqrt, cbrt, nthroot}\n\ @end deftypefn"), pair_type ("^", "-*- texinfo -*-\n\ @deftypefn {Operator} {} ^\n\ -Power operator.\n\ -@seealso{power, **, .^, .**}\n\ +Power operator. This may return complex results for real inputs. Use\n\ +@code{realsqrt}, @code{cbrt}, @code{nthroot}, or @code{realroot} to obtain\n\ +real results when possible.\n\ +@seealso{power, **, .^, .**, realpow, realsqrt, cbrt, nthroot}\n\ @end deftypefn"), pair_type ("+", @@ -304,15 +308,21 @@ pair_type (".**", "-*- texinfo -*-\n\ @deftypefn {Operator} {} .*\n\ -Element by element power operator.\n\ -@seealso{**, ^, .^, power}\n\ +Element by element power operator. If several complex results are possible,\n\ +returns the one with smallest non-negative argument (angle). Use\n\ +@code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a\n\ +real result is preferred.\n\ +@seealso{**, ^, .^, power, realpow, realsqrt, cbrt, nthroot}\n\ @end deftypefn"), pair_type (".^", "-*- texinfo -*-\n\ @deftypefn {Operator} {} .^\n\ -Element by element power operator.\n\ -@seealso{.**, ^, **, power}\n\ +Element by element power operator. If several complex results are possible,\n\ +returns the one with smallest non-negative argument (angle). Use\n\ +@code{realpow}, @code{realsqrt}, @code{cbrt}, or @code{nthroot} if a\n\ +real result is preferred.\n\ +@seealso{.**, ^, **, power, realpow, realsqrt, cbrt, nthroot}\n\ @end deftypefn"), pair_type ("./", @@ -617,7 +627,7 @@ pair_type ("parfor", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} for @var{i} = @var{range}\n\ +@deftypefn {Keyword} {} for @var{i} = @var{range}\n\ @deftypefnx {Keyword} {} for (@var{i} = @var{range}, @var{maxproc})\n\ Begin a for loop that may execute in parallel.\n\ \n\
--- a/src/help.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/help.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/input.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/input.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/input.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/input.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/lex.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/lex.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/lex.ll Sat Dec 24 23:15:29 2011 +0000 +++ b/src/lex.ll Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -83,6 +83,7 @@ // via the gnulib namespace. #define fprintf GNULIB_NAMESPACE::fprintf #define fwrite GNULIB_NAMESPACE::fwrite +#define isatty GNULIB_NAMESPACE::isatty #define malloc GNULIB_NAMESPACE::malloc #define realloc GNULIB_NAMESPACE::realloc #endif
--- a/src/load-path.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/load-path.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/load-path.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/load-path.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/load-save.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/load-save.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/load-save.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/load-save.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-ascii-helper.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-ascii-helper.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Benjamin Lindner +Copyright (C) 2009-2012 Benjamin Lindner This file is part of Octave.
--- a/src/ls-ascii-helper.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-ascii-helper.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Benjamin Lindner +Copyright (C) 2009-2012 Benjamin Lindner This file is part of Octave.
--- a/src/ls-hdf5.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-hdf5.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-hdf5.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-hdf5.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat-ascii.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat-ascii.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat-ascii.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat-ascii.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat4.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat4.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat4.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat4.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat5.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat5.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-mat5.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-mat5.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-oct-ascii.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-oct-ascii.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-oct-ascii.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-oct-ascii.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-oct-binary.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-oct-binary.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-oct-binary.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-oct-binary.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-utils.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-utils.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/ls-utils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ls-utils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/main.c Sat Dec 24 23:15:29 2011 +0000 +++ b/src/main.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/mappers.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mappers.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/matherr.c Sat Dec 24 23:15:29 2011 +0000 +++ b/src/matherr.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1997-2011 John W. Eaton +Copyright (C) 1997-2012 John W. Eaton This file is part of Octave.
--- a/src/mex.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mex.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 John W. Eaton +Copyright (C) 2006-2012 John W. Eaton This file is part of Octave.
--- a/src/mex.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mex.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Paul Kienzle +Copyright (C) 2001-2012 Paul Kienzle This file is part of Octave.
--- a/src/mexproto.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mexproto.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2006-2011 Paul Kienzle +Copyright (C) 2006-2012 Paul Kienzle This file is part of Octave.
--- a/src/mk-errno-list Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mk-errno-list Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2005-2011 John W. Eaton +# Copyright (C) 2005-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mk-pkg-add Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mk-pkg-add Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh -e # -# Copyright (C) 2005-2011 John W. Eaton +# Copyright (C) 2005-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mkbuiltins Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkbuiltins Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1996-2011 John W. Eaton +# Copyright (C) 1996-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mkdefs Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkdefs Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1996-2011 John W. Eaton +# Copyright (C) 1996-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mkdocs Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkdocs Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1999-2011 John W. Eaton +# Copyright (C) 1999-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mkgendoc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkgendoc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1999-2011 John W. Eaton +# Copyright (C) 1999-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mkoctfile.cc.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkoctfile.cc.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/src/mkoctfile.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkoctfile.in Mon Jan 09 15:19:21 2012 -0500 @@ -3,7 +3,7 @@ ## mkoctfile -- create a .oct file suitable for dynamic linking by ## Octave. ## -## Copyright (C) 1996-2011 John W. Eaton +## Copyright (C) 1996-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/src/mkops Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mkops Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 1997-2011 John W. Eaton +# Copyright (C) 1997-2012 John W. Eaton # # This file is part of Octave. #
--- a/src/mxarray.h.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/mxarray.h.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Paul Kienzle +Copyright (C) 2001-2012 Paul Kienzle This file is part of Octave.
--- a/src/oct-conf.h.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-conf.h.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // oct-conf.h.in /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -60,6 +60,18 @@ #define OCTAVE_CONF_AR %OCTAVE_CONF_AR% #endif +#ifndef OCTAVE_CONF_ARPACK_CPPFLAGS +#define OCTAVE_CONF_ARPACK_CPPFLAGS %OCTAVE_CONF_ARPACK_CPPFLAGS% +#endif + +#ifndef OCTAVE_CONF_ARPACK_LDFLAGS +#define OCTAVE_CONF_ARPACK_LDFLAGS %OCTAVE_CONF_ARPACK_LDFLAGS% +#endif + +#ifndef OCTAVE_CONF_ARPACK_LIBS +#define OCTAVE_CONF_ARPACK_LIBS %OCTAVE_CONF_ARPACK_LIBS% +#endif + #ifndef OCTAVE_CONF_BLAS_LIBS #define OCTAVE_CONF_BLAS_LIBS %OCTAVE_CONF_BLAS_LIBS% #endif
--- a/src/oct-errno.cc.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-errno.cc.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // oct-errno.cc.in /* -Copyright (C) 2005-2011 John W. Eaton +Copyright (C) 2005-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-errno.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-errno.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ // oct-errno.h.in /* -Copyright (C) 2005-2011 John W. Eaton +Copyright (C) 2005-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-fstrm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-fstrm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-fstrm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-fstrm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-hdf5.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-hdf5.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-hist.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-hist.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-hist.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-hist.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-iostrm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-iostrm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-iostrm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-iostrm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-lvalue.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-lvalue.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-lvalue.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-lvalue.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-map.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-map.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/oct-map.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-map.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/oct-obj.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-obj.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/oct-obj.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-obj.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/oct-parse.yy Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-parse.yy Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 David Grundberg Copyright (C) 2009-2010 VZLU Prague @@ -3612,7 +3612,7 @@ { symbol_found = true; - FILE *fptr = fopen (file.c_str (), "r"); + FILE *fptr = gnulib::fopen (file.c_str (), "r"); if (fptr) { @@ -4448,7 +4448,8 @@ DEFUN (eval, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} eval (@var{try}, @var{catch})\n\ +@deftypefn {Built-in Function} {} eval (@var{try})\n\ +@deftypefnx {Built-in Function} {} eval (@var{try}, @var{catch})\n\ Parse the string @var{try} and evaluate it as if it were an Octave\n\ program. If that fails, evaluate the optional string @var{catch}.\n\ The string @var{try} is evaluated in the current context,\n\ @@ -4472,6 +4473,11 @@ This is a bad example\n\ @end group\n\ @end example\n\ +\n\ +Consider using try/catch blocks instead if you are only using @code{eval}\n\ +as an error-capturing mechanism rather than for the execution of arbitrary\n\ +code strings.\n\ +@seealso{evalin}\n\ @end deftypefn") { octave_value_list retval; @@ -4554,6 +4560,7 @@ @deftypefn {Built-in Function} {} assignin (@var{context}, @var{varname}, @var{value})\n\ Assign @var{value} to @var{varname} in context @var{context}, which\n\ may be either @code{\"base\"} or @code{\"caller\"}.\n\ +@seealso{evalin}\n\ @end deftypefn") { octave_value_list retval; @@ -4603,10 +4610,12 @@ DEFUN (evalin, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\ +@deftypefn {Built-in Function} {} evalin (@var{context}, @var{try})\n\ +@deftypefnx {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\ Like @code{eval}, except that the expressions are evaluated in the\n\ context @var{context}, which may be either @code{\"caller\"} or\n\ @code{\"base\"}.\n\ +@seealso{eval, assignin}\n\ @end deftypefn") { octave_value_list retval;
--- a/src/oct-prcstrm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-prcstrm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-prcstrm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-prcstrm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-procbuf.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-procbuf.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-procbuf.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-procbuf.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-stdstrm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-stdstrm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-stream.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-stream.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-stream.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-stream.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-strstrm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-strstrm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct-strstrm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct-strstrm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/oct.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/oct.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/octave-config.cc.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/octave-config.cc.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Michael Goffioul +Copyright (C) 2008-2012 Michael Goffioul This file is part of Octave.
--- a/src/octave-config.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/octave-config.in Mon Jan 09 15:19:21 2012 -0500 @@ -2,7 +2,7 @@ ## ## octave-config - reports some configuration values for Octave ## -## Copyright (C) 2001-2011 John W. Eaton +## Copyright (C) 2001-2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/src/octave.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/octave.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -834,9 +834,10 @@ // If stdin is not a tty, then we are reading commands from a pipe or // a redirected file. - stdin_is_tty = isatty (fileno (stdin)); + stdin_is_tty = gnulib::isatty (fileno (stdin)); - interactive = (! embedded && stdin_is_tty && isatty (fileno (stdout))); + interactive = (! embedded && stdin_is_tty + && gnulib::isatty (fileno (stdout))); if (! interactive && ! forced_line_editing) line_editing = false;
--- a/src/octave.gperf Sat Dec 24 23:15:29 2011 +0000 +++ b/src/octave.gperf Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ %{ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave.
--- a/src/octave.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/octave.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/ops.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ops.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/src/ov-base-diag.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-diag.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-base-diag.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-diag.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-base-int.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-int.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-base-int.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-int.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-base-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-base-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1998-2011 John W. Eaton +Copyright (C) 1998-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-base-scalar.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-scalar.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-base-scalar.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-scalar.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-base-sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/src/ov-base-sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base-sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-base.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-base.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-base.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-bool-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-bool-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-bool-sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool-sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-bool-sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool-sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-bool.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-bool.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-bool.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-builtin.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-builtin.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-builtin.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-builtin.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-cell.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cell.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-cell.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cell.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-ch-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-ch-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-ch-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-ch-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-class.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-class.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/ov-class.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-class.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007-2011 John W. Eaton +Copyright (C) 2007-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/ov-colon.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-colon.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-colon.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-colon.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-complex.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-complex.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-complex.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-complex.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. @@ -79,6 +79,15 @@ octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); + // Use this to give a more specific error message + idx_vector index_vector (void) const + { + error ( + "attempted to use a complex scalar as an index\n" + " (forgot to initialize i or j?)"); + return idx_vector (); + } + octave_value any (int = 0) const { return (scalar != Complex (0, 0)
--- a/src/ov-cs-list.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cs-list.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-cs-list.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cs-list.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2002-2011 John W. Eaton +Copyright (C) 2002-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-cx-diag.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-diag.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-cx-diag.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-diag.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-cx-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-cx-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-cx-sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-cx-sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-cx-sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-dld-fcn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-dld-fcn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-dld-fcn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-dld-fcn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-fcn-handle.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn-handle.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. Copyright (C) 2010 Jaroslav Hajek @@ -1776,6 +1776,38 @@ */ +DEFUN (is_function_handle, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} {} is_function_handle (@var{x})\n\ +Return true if @var{x} is a function handle.\n\ +@seealso{isa, typeinfo, class}\n\ +@end deftypefn") +{ + octave_value retval; + + int nargin = args.length (); + + if (nargin == 1) + retval = args(0).is_function_handle (); + else + print_usage (); + + return retval; +} + +/* +%!shared fh +%! fh = @(x) x; + +%!assert (is_function_handle (fh)) +%!assert (! is_function_handle ({fh})) +%!assert (! is_function_handle (1)) +%!error is_function_handle (); +%!error is_function_handle (1, 2); + +*/ + + octave_fcn_binder::octave_fcn_binder (const octave_value& f, const octave_value& root, const octave_value_list& templ,
--- a/src/ov-fcn-handle.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn-handle.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/ov-fcn-inline.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn-inline.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman This file is part of Octave. @@ -742,7 +742,7 @@ tmp_arg != "NaN" && tmp_arg != "nan" && tmp_arg != "Inf" && tmp_arg != "inf" && tmp_arg != "NA" && tmp_arg != "pi" && - tmp_arg != "eps") + tmp_arg != "e" && tmp_arg != "eps") fargs.append (tmp_arg); tmp_arg = std::string ();
--- a/src/ov-fcn-inline.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn-inline.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman This file is part of Octave.
--- a/src/ov-fcn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-fcn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-fcn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-float.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-float.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-float.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-float.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-flt-complex.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-complex.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-flt-complex.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-complex.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-flt-cx-diag.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-cx-diag.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-flt-cx-diag.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-cx-diag.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-flt-cx-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-cx-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-flt-cx-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-cx-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-flt-re-diag.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-re-diag.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-flt-re-diag.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-re-diag.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-flt-re-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-re-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-flt-re-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-flt-re-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-int-traits.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int-traits.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int16.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int16.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int16.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int16.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int32.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int32.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int32.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int32.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int64.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int64.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int64.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int64.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int8.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int8.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-int8.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-int8.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-intx.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-intx.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/ov-lazy-idx.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-lazy-idx.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/src/ov-lazy-idx.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-lazy-idx.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/src/ov-mex-fcn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-mex-fcn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-mex-fcn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-mex-fcn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-null-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-null-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-null-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-null-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-oncleanup.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-oncleanup.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/src/ov-oncleanup.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-oncleanup.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2010-2011 VZLU Prague +Copyright (C) 2010-2012 VZLU Prague This file is part of Octave.
--- a/src/ov-perm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-perm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-perm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-perm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-range.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-range.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-range.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-range.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-re-diag.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-diag.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-re-diag.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-diag.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/ov-re-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-re-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-re-sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-re-sparse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-re-sparse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/ov-scalar.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-scalar.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-scalar.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-scalar.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-str-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-str-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-str-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-str-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov-struct.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-struct.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-struct.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-struct.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-type-conv.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-type-conv.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-typeinfo.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-typeinfo.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-typeinfo.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-typeinfo.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint16.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint16.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint16.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint16.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint32.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint32.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint32.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint32.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint64.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint64.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint64.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint64.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint8.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint8.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-uint8.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-uint8.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 John W. Eaton +Copyright (C) 2004-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-usr-fcn.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-usr-fcn.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov-usr-fcn.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov-usr-fcn.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/ov.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/ov.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/ov.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/pager.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pager.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/pager.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pager.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/parse.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/parse.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/pr-output.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pr-output.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/pr-output.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pr-output.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/procstream.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/procstream.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/procstream.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/procstream.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/profiler.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/profiler.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Daniel Kraft +Copyright (C) 2012 Daniel Kraft This file is part of Octave.
--- a/src/profiler.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/profiler.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2011 Daniel Kraft +Copyright (C) 2012 Daniel Kraft This file is part of Octave.
--- a/src/pt-all.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-all.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-arg-list.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-arg-list.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-arg-list.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-arg-list.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-assign.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-assign.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-assign.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-assign.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-binop.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-binop.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-binop.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-binop.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-bp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-bp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Ben Sapp +Copyright (C) 2001-2012 Ben Sapp This file is part of Octave.
--- a/src/pt-bp.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-bp.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2001-2011 Ben Sapp +Copyright (C) 2001-2012 Ben Sapp This file is part of Octave.
--- a/src/pt-cbinop.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cbinop.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/pt-cbinop.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cbinop.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 Jaroslav Hajek +Copyright (C) 2008-2012 Jaroslav Hajek This file is part of Octave.
--- a/src/pt-cell.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cell.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-cell.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cell.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1999-2011 John W. Eaton +Copyright (C) 1999-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-check.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-check.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-check.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-check.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-cmd.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cmd.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-cmd.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-cmd.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-colon.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-colon.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-colon.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-colon.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-const.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-const.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-const.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-const.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-decl.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-decl.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-decl.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-decl.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-eval.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-eval.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-eval.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-eval.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-except.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-except.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-except.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-except.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-exp.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-exp.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-exp.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-exp.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-fcn-handle.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-fcn-handle.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-fcn-handle.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-fcn-handle.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003-2011 John W. Eaton +Copyright (C) 2003-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-id.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-id.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-id.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-id.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-idx.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-idx.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-idx.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-idx.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-jump.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-jump.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-jump.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-jump.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-loop.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-loop.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-loop.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-loop.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-mat.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-mat.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-mat.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-mat.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-misc.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-misc.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-misc.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-misc.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-pr-code.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-pr-code.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-pr-code.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-pr-code.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-select.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-select.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-select.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-select.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-stmt.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-stmt.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-stmt.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-stmt.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-unop.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-unop.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-unop.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-unop.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt-walk.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt-walk.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/pt.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/pt.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton This file is part of Octave.
--- a/src/sighandlers.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sighandlers.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -185,15 +185,8 @@ { octave_set_signal_handler (sig_number, SIG_DFL); -#if defined (HAVE_RAISE) - raise (sig_number); -#elif defined (HAVE_KILL) - kill (getpid (), sig_number); -#else - exit (1); -#endif + gnulib::raise (sig_number); } - } }
--- a/src/sighandlers.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sighandlers.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/siglist.c Sat Dec 24 23:15:29 2011 +0000 +++ b/src/siglist.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/siglist.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/siglist.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2000-2011 John W. Eaton +Copyright (C) 2000-2012 John W. Eaton This file is part of Octave.
--- a/src/sparse-xdiv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sparse-xdiv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/sparse-xdiv.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sparse-xdiv.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/sparse-xpow.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sparse-xpow.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/sparse-xpow.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sparse-xpow.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler This file is part of Octave.
--- a/src/sparse.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sparse.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004-2011 David Bateman +Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler Copyright (C) 2010 VZLU Prague
--- a/src/strfns.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/strfns.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1994-2011 John W. Eaton +Copyright (C) 1994-2012 John W. Eaton This file is part of Octave.
--- a/src/symtab.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/symtab.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave.
--- a/src/symtab.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/symtab.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/syscalls.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/syscalls.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996-2011 John W. Eaton +Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave. @@ -1643,72 +1643,86 @@ #define O_NONBLOCK O_NDELAY #endif -#if defined (F_DUPFD) DEFUNX ("F_DUPFD", FF_DUPFD, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} F_DUPFD ()\n\ -Return the value required to request that @code{fcntl} return a\n\ +Return the numerical value to pass to @code{fcntl} to return a\n\ duplicate file descriptor.\n\ @seealso{fcntl, F_GETFD, F_GETFL, F_SETFD, F_SETFL}\n\ @end deftypefn") { +#if defined (F_DUPFD) return const_value (args, F_DUPFD); -} +#else + error ("F_DUPFD: not available on this system"); + return octave_value (); #endif +} -#if defined (F_GETFD) DEFUNX ("F_GETFD", FF_GETFD, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} F_GETFD ()\n\ -Return the value required to request that @code{fcntl} to return the\n\ +Return the numerical value to pass to @code{fcntl} to return the\n\ file descriptor flags.\n\ @seealso{fcntl, F_DUPFD, F_GETFL, F_SETFD, F_SETFL}\n\ @end deftypefn") { +#if defined (F_GETFD) return const_value (args, F_GETFD); -} +#else + error ("F_GETFD: not available on this system"); + return octave_value (); #endif +} -#if defined (F_GETFL) DEFUNX ("F_GETFL", FF_GETFL, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} F_GETFL ()\n\ -Return the value required to request that @code{fcntl} to return the\n\ +Return the numerical value to pass to @code{fcntl} to return the\n\ file status flags.\n\ @seealso{fcntl, F_DUPFD, F_GETFD, F_SETFD, F_SETFL}\n\ @end deftypefn") { +#if defined (F_GETFL) return const_value (args, F_GETFL); -} +#else + error ("F_GETFL: not available on this system"); + return octave_value (); #endif +} -#if defined (F_SETFD) DEFUNX ("F_SETFD", FF_SETFD, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} F_SETFD ()\n\ -Return the value required to request that @code{fcntl} to set the file\n\ +Return the numerical value to pass to @code{fcntl} to set the file\n\ descriptor flags.\n\ @seealso{fcntl, F_DUPFD, F_GETFD, F_GETFL, F_SETFL}\n\ @end deftypefn") { +#if defined (F_SETFD) return const_value (args, F_SETFD); -} +#else + error ("F_SETFD: not available on this system"); + return octave_value (); #endif +} -#if defined (F_SETFL) DEFUNX ("F_SETFL", FF_SETFL, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} F_SETFL ()\n\ -Return the value required to request that @code{fcntl} to set the file\n\ +Return the numerical value to pass to @code{fcntl} to set the file\n\ status flags.\n\ @seealso{fcntl, F_DUPFD, F_GETFD, F_GETFL, F_SETFD}\n\ @end deftypefn") { +#if defined (F_SETFL) return const_value (args, F_SETFL); -} +#else + error ("F_SETFL: not available on this system"); + return octave_value (); #endif +} -#if defined (O_APPEND) DEFUNX ("O_APPEND", FO_APPEND, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_APPEND ()\n\ @@ -1718,11 +1732,14 @@ @seealso{fcntl, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_APPEND) return const_value (args, O_APPEND); -} +#else + error ("O_APPEND: not available on this system"); + return octave_value (); #endif +} -#if defined (O_ASYNC) DEFUNX ("O_ASYNC", FO_ASYNC, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_ASYNC ()\n\ @@ -1731,11 +1748,14 @@ @seealso{fcntl, O_APPEND, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_ASYNC) return const_value (args, O_ASYNC); -} +#else + error ("O_ASYNC: not available on this system"); + return octave_value (); #endif +} -#if defined (O_CREAT) DEFUNX ("O_CREAT", FO_CREAT, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_CREAT ()\n\ @@ -1745,11 +1765,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_CREAT) return const_value (args, O_CREAT); -} +#else + error ("O_CREAT: not available on this system"); + return octave_value (); #endif +} -#if defined (O_EXCL) DEFUNX ("O_EXCL", FO_EXCL, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_EXCL ()\n\ @@ -1758,11 +1781,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_EXCL) return const_value (args, O_EXCL); -} +#else + error ("O_EXCL: not available on this system"); + return octave_value (); #endif +} -#if defined (O_NONBLOCK) DEFUNX ("O_NONBLOCK", FO_NONBLOCK, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_NONBLOCK ()\n\ @@ -1772,11 +1798,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_NONBLOCK) return const_value (args, O_NONBLOCK); -} +#else + error ("O_NONBLOCK: not available on this system"); + return octave_value (); #endif +} -#if defined (O_RDONLY) DEFUNX ("O_RDONLY", FO_RDONLY, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_RDONLY ()\n\ @@ -1786,11 +1815,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDWR, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_RDONLY) return const_value (args, O_RDONLY); -} +#else + error ("O_RDONLY: not available on this system"); + return octave_value (); #endif +} -#if defined (O_RDWR) DEFUNX ("O_RDWR", FO_RDWR, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_RDWR ()\n\ @@ -1800,11 +1832,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_SYNC, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_RDWR) return const_value (args, O_RDWR); -} +#else + error ("O_RDWR: not available on this system"); + return octave_value (); #endif +} -#if defined (O_SYNC) DEFUNX ("O_SYNC", FO_SYNC, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_SYNC ()\n\ @@ -1814,11 +1849,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_SYNC) return const_value (args, O_SYNC); -} +#else + error ("O_SYNC: not available on this system"); + return octave_value (); #endif +} -#if defined (O_TRUNC) DEFUNX ("O_TRUNC", FO_TRUNC, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} O_TRUNC ()\n\ @@ -1828,11 +1866,14 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_WRONLY}\n\ @end deftypefn") { +#if defined (O_TRUNC) return const_value (args, O_TRUNC); -} +#else + error ("O_TRUNC: not available on this system"); + return octave_value (); #endif +} -#if defined (O_WRONLY) DEFUNX ("O_WRONLY", FO_WRONLY, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} O_WRONLY ()\n\ @@ -1842,9 +1883,13 @@ @seealso{fcntl, O_APPEND, O_ASYNC, O_CREAT, O_EXCL, O_NONBLOCK, O_RDONLY, O_RDWR, O_SYNC, O_TRUNC}\n\ @end deftypefn") { +#if defined (O_WRONLY) return const_value (args, O_WRONLY); +#else + error ("O_WRONLY: not available on this system"); + return octave_value (); +#endif } -#endif #if !defined (WNOHANG) #define WNOHANG 0
--- a/src/sysdep.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sysdep.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. @@ -288,7 +288,7 @@ static bool curr_on = false; int tty_fd = STDIN_FILENO; - if (! isatty (tty_fd)) + if (! gnulib::isatty (tty_fd)) { if (interactive) error ("stdin is not a tty!");
--- a/src/sysdep.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/sysdep.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/token.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/token.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/token.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/token.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/toplev.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/toplev.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1995-2011 John W. Eaton +Copyright (C) 1995-2012 John W. Eaton This file is part of Octave. @@ -1082,7 +1082,17 @@ OCTAVE_SAFE_CALL (flush_octave_stdout, ()); } - OCTAVE_SAFE_CALL (singleton_cleanup_list::cleanup, ()); + // Don't call singleton_cleanup_list::cleanup until we have the + // problems with registering/unregistering types worked out. For + // example, uncomment the following line, then use the make_int + // function from the examples directory to create an integer + // object and then exit Octave. Octave should crash with a + // segfault when cleaning up the typinfo singleton. We need some + // way to force new octave_value_X types that are created in + // .oct files to be unregistered when the .oct file shared library + // is unloaded. + // + // OCTAVE_SAFE_CALL (singleton_cleanup_list::cleanup, ()); OCTAVE_SAFE_CALL (octave_chunk_buffer::clear, ()); } @@ -1235,6 +1245,9 @@ { false, "AMD_LIBS", OCTAVE_CONF_AMD_LIBS }, { false, "AR", OCTAVE_CONF_AR }, { false, "ARFLAGS", OCTAVE_CONF_ARFLAGS }, + { false, "ARPACK_CPPFLAGS", OCTAVE_CONF_ARPACK_CPPFLAGS }, + { false, "ARPACK_LDFLAGS", OCTAVE_CONF_ARPACK_LDFLAGS }, + { false, "ARPACK_LIBS", OCTAVE_CONF_ARPACK_LIBS }, { false, "BLAS_LIBS", OCTAVE_CONF_BLAS_LIBS }, { false, "CARBON_LIBS", OCTAVE_CONF_CARBON_LIBS }, { false, "CAMD_CPPFLAGS", OCTAVE_CONF_CAMD_CPPFLAGS },
--- a/src/toplev.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/toplev.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/txt-eng-ft.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/txt-eng-ft.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Michael Goffioul +Copyright (C) 2009-2012 Michael Goffioul This file is part of Octave.
--- a/src/txt-eng-ft.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/txt-eng-ft.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Michael Goffioul +Copyright (C) 2009-2012 Michael Goffioul This file is part of Octave.
--- a/src/txt-eng.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/txt-eng.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 Michael Goffioul +Copyright (C) 2009-2012 Michael Goffioul This file is part of Octave.
--- a/src/unwind-prot.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/unwind-prot.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave.
--- a/src/unwind-prot.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/unwind-prot.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/utils.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/utils.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave.
--- a/src/utils.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/utils.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/variables.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/variables.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/variables.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/variables.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/version.h.in Sat Dec 24 23:15:29 2011 +0000 +++ b/src/version.h.in Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1992-2011 John W. Eaton +Copyright (C) 1992-2012 John W. Eaton This file is part of Octave. @@ -88,5 +88,4 @@ X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \ (" For details, type `warranty'.") "\n\n" \ "For information about changes from previous versions, type `news'." - #endif
--- a/src/xdiv.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xdiv.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek Copyright (C) 2009-2010 VZLU Prague
--- a/src/xdiv.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xdiv.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave.
--- a/src/xgl2ps.c Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xgl2ps.c Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2009-2011 John W. Eaton +Copyright (C) 2009-2012 John W. Eaton This file is part of Octave.
--- a/src/xnorm.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xnorm.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 VZLU Prague, a.s. +Copyright (C) 2008-2012 VZLU Prague, a.s. This file is part of Octave.
--- a/src/xnorm.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xnorm.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2008-2011 VZLU Prague, a.s. +Copyright (C) 2008-2012 VZLU Prague, a.s. This file is part of Octave.
--- a/src/xpow.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xpow.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave.
--- a/src/xpow.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/xpow.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1993-2011 John W. Eaton +Copyright (C) 1993-2012 John W. Eaton This file is part of Octave.
--- a/src/zfstream.cc Sat Dec 24 23:15:29 2011 +0000 +++ b/src/zfstream.cc Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 Ludwig Schwardt, Kevin Ruland +Copyright (C) 2005-2012 Ludwig Schwardt, Kevin Ruland This file is part of Octave.
--- a/src/zfstream.h Sat Dec 24 23:15:29 2011 +0000 +++ b/src/zfstream.h Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2005-2011 Ludwig Schwardt, Kevin Ruland +Copyright (C) 2005-2012 Ludwig Schwardt, Kevin Ruland This file is part of Octave.
--- a/test/Makefile.am Sat Dec 24 23:15:29 2011 +0000 +++ b/test/Makefile.am Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ # Makefile for octave's test directory # -# Copyright (C) 1994-2011 John W. Eaton +# Copyright (C) 1994-2012 John W. Eaton # # This file is part of Octave. # @@ -23,7 +23,6 @@ FCN_FILES = \ fntests.m \ test_args.m \ - test_contin.m \ test_diag_perm.m \ test_error.m \ test_eval-catch.m \ @@ -31,11 +30,10 @@ test_func.m \ test_global.m \ test_if.m \ - test_index-wfi-f.m \ - test_index-wfi-t.m \ + test_index.m \ test_io.m \ - test_logical-wfi-f.m \ - test_logical-wfi-t.m \ + test_line_continue.m \ + test_logical_index.m \ test_null_assign.m \ test_parser.m \ test_prefer.m \
--- a/test/build_bc_overload_tests.sh Sat Dec 24 23:15:29 2011 +0000 +++ b/test/build_bc_overload_tests.sh Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010-2011 VZLU Prague +# Copyright (C) 2010-2012 VZLU Prague # # This file is part of Octave. # @@ -47,14 +47,16 @@ DIR="@$class" test -d $DIR || mkdir $DIR || { echo "error: could not create $DIR"; exit; } cat > $DIR/tbcover.m << EOF -% DO NOT EDIT - generated automatically +% !!! DO NOT EDIT !!! +% generated automatically by build_bc_overload_tests.sh function s = tbcover (x, y) s = '$class'; EOF done cat > tbcover.m << EOF -% DO NOT EDIT - generated automatically +% !!! DO NOT EDIT !!! +% generated automatically by build_bc_overload_tests.sh function s = tbcover (x, y) s = 'none'; EOF @@ -64,8 +66,9 @@ fi cat > test_bc_overloads.m << EOF -## THIS IS AN AUTOMATICALLY GENERATED FILE --- DO NOT EDIT --- -## instead modify build_bc_overload_tests.sh to generate the tests that you want. +## !!! DO NOT EDIT !!! +## THIS IS AN AUTOMATICALLY GENERATED FILE +## modify build_bc_overload_tests.sh to generate the tests you need. %!shared ex %! ex.double = 1;
--- a/test/build_bc_overloads_expected.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/build_bc_overloads_expected.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,7 +1,7 @@ % this script is intended to be Matlab compatible % first, run the script % -% ./build_bc_overloads_tests.sh overloads_onely +% ./build_bc_overloads_tests.sh overloads_only % % to generate the overloaded functions. %
--- a/test/build_sparse_tests.sh Sat Dec 24 23:15:29 2011 +0000 +++ b/test/build_sparse_tests.sh Mon Jan 09 15:19:21 2012 -0500 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2006-2011 David Bateman +# Copyright (C) 2006-2012 David Bateman # # This file is part of Octave. # @@ -121,8 +121,9 @@ # create initial file cat >$TESTS <<EOF -## THIS IS AN AUTOMATICALLY GENERATED FILE --- DO NOT EDIT --- -## instead modify build_sparse_tests.sh to generate the tests that you want. +## !!! DO NOT EDIT !!! +## THIS IS AN AUTOMATICALLY GENERATED FILE +## modify build_sparse_tests.sh to generate the tests you need. EOF @@ -150,21 +151,21 @@ gen_eat_zeros() { cat >>$TESTS <<EOF %% Make sure newly introduced zeros get eaten -%!assert(nnz(sparse([bf,bf,1]).^realmax),1); -%!assert(nnz(sparse([1,bf,bf]).^realmax),1); -%!assert(nnz(sparse([bf,bf,bf]).^realmax),0); +%!assert (nnz (sparse ([bf,bf,1]).^realmax), 1) +%!assert (nnz (sparse ([1,bf,bf]).^realmax), 1) +%!assert (nnz (sparse ([bf,bf,bf]).^realmax), 0) -%!assert(nnz(sparse([bf;bf;1]).^realmax),1); -%!assert(nnz(sparse([1;bf;bf]).^realmax),1); -%!assert(nnz(sparse([0.5;bf;bf]).^realmax),0); +%!assert (nnz (sparse ([bf;bf;1]).^realmax), 1) +%!assert (nnz (sparse ([1;bf;bf]).^realmax), 1) +%!assert (nnz (sparse ([0.5;bf;bf]).^realmax), 0) -%!assert(nnz(sparse([bf,bf,1])*realmin),1); -%!assert(nnz(sparse([1,bf,bf])*realmin),1); -%!assert(nnz(sparse([bf,bf,bf])*realmin),0); +%!assert (nnz (sparse ([bf,bf,1])*realmin), 1) +%!assert (nnz (sparse ([1,bf,bf])*realmin), 1) +%!assert (nnz (sparse ([bf,bf,bf])*realmin), 0) -%!assert(nnz(sparse([bf;bf;1])*realmin),1); -%!assert(nnz(sparse([1;bf;bf])*realmin),1); -%!assert(nnz(sparse([bf;bf;bf])*realmin),0); +%!assert (nnz (sparse ([bf;bf;1])*realmin), 1) +%!assert (nnz (sparse ([1;bf;bf])*realmin), 1) +%!assert (nnz (sparse ([bf;bf;bf])*realmin), 0) EOF } @@ -174,25 +175,25 @@ %!test # segfault test from edd@debian.org %! n = 510; -%! sparse(kron((1:n)', ones(n,1)), kron(ones(n,1), (1:n)'), ones(n)); +%! sparse (kron ((1:n)', ones(n,1)), kron (ones(n,1), (1:n)'), ones (n)); %% segfault tests from Fabian@isas-berlin.de %% Note that the last four do not fail, but rather give a warning %% of a singular matrix, which is consistent with the full matrix -%% behaviour. They are therefore disabled.. +%% behaviour. They are therefore disabled. %!testif HAVE_UMFPACK -%! assert(inv(sparse([1,1;1,1+i])),sparse([1-1i,1i;1i,-1i]),10*eps); -% !error inv( sparse( [1,1;1,1] ) ); -% !error inv( sparse( [0,0;0,1] ) ); -% !error inv( sparse( [0,0;0,1+i] ) ); -% !error inv( sparse( [0,0;0,0] ) ); +%! assert (inv (sparse ([1,1;1,1+i])), sparse([1-1i,1i;1i,-1i]), 10*eps); +%#!error inv ( sparse ([1,1;1,1] ) ); +%#!error inv ( sparse ([0,0;0,1] ) ); +%#!error inv ( sparse ([0,0;0,1+i]) ); +%#!error inv ( sparse ([0,0;0,0] ) ); %% error handling in constructor -%!error sparse(1,[2,3],[1,2,3]); -%!error sparse([1,1],[1,1],[1,2],3,3,"bogus"); -%!error sparse([1,3],[1,-4],[3,5],2,2); -%!error sparse([1,3],[1,-4],[3,5i],2,2); -%!error sparse(-1,-1,1); +%!error sparse (1,[2,3],[1,2,3]) +%!error sparse ([1,1],[1,1],[1,2],3,3,"bogus") +%!error sparse ([1,3],[1,-4],[3,5],2,2) +%!error sparse ([1,3],[1,-4],[3,5i],2,2) +%!error sparse (-1,-1,1) EOF } @@ -207,17 +208,18 @@ echo '%!test bf=realmin+realmin*1i;' >> $TESTS gen_eat_zeros cat >>$TESTS <<EOF -%!assert(nnz(sparse([-1,realmin,realmin]).^1.5),1); -%!assert(nnz(sparse([-1,realmin,realmin,1]).^1.5),2); +%!assert (nnz (sparse ([-1,realmin,realmin]).^1.5), 1) +%!assert (nnz (sparse ([-1,realmin,realmin,1]).^1.5), 2) -%!assert(nnz(sparse(1,1,0)),0); # Make sure scalar v==0 doesn't confuse matters -%!assert(nnz(sparse(eye(3))*0),0); -%!assert(nnz(sparse(eye(3))-sparse(eye(3))),0); +## Make sure scalar v==0 doesn't confuse matters +%!assert (nnz (sparse (1,1,0)), 0) +%!assert (nnz (sparse (eye (3))*0), 0) +%!assert (nnz (sparse (eye (3))-sparse (eye (3))), 0) %!test %! wdbz = warning ("query", "Octave:divide-by-zero"); %! warning ("off", "Octave:divide-by-zero"); -%! assert(full(sparse(eye(3))/0),full(eye(3)/0)); +%! assert (full (sparse (eye (3))/0), full (eye (3)/0)); %! warning (wdbz.state, "Octave:divide-by-zero"); EOF @@ -234,9 +236,9 @@ ## test_sparse ## ## run preset sparse tests. All should pass. -function [passes,tests] = test_sparse - disp("writing test output to sptest.log"); - test("test_sparse","normal","sptest.log"); +function [passes, tests] = test_sparse + disp ("writing test output to sptest.log"); + test ("test_sparse", "normal", "sptest.log"); endfunction EOF @@ -253,12 +255,12 @@ ## end ## The test log is appended to sprandomtest.log function [passes,total] = test_sprandom - warning("untested --- fix the source in build_sparse_tests.sh"); - disp("appending test output to sprandomtest.log"); - fid = fopen("sprandomtest.log","at"); - test("test_sprandom","normal",fid); + warning ("untested --- fix the source in build_sparse_tests.sh"); + disp ("appending test output to sprandomtest.log"); + fid = fopen ("sprandomtest.log", "at"); + test ("test_sprandom", "normal", fid); ##[passes, total] = test("sprandomtest","normal",fid); - fclose(fid); + fclose (fid); endfunction EOF @@ -274,27 +276,27 @@ gen_ordering_tests() { cat >>$TESTS <<EOF %% real values can be ordered (uses as,af) -%!assert(as<=bf,sparse(af<=bf)) -%!assert(bf<=as,sparse(bf<=af)) +%!assert (as<=bf, sparse (af<=bf)) +%!assert (bf<=as, sparse (bf<=af)) -%!assert(as>=bf,sparse(af>=bf)) -%!assert(bf>=as,sparse(bf>=af)) +%!assert (as>=bf, sparse (af>=bf)) +%!assert (bf>=as, sparse (bf>=af)) -%!assert(as<bf,sparse(af<bf)) -%!assert(bf<as,sparse(bf<af)) +%!assert (as<bf, sparse (af<bf)) +%!assert (bf<as, sparse (bf<af)) -%!assert(as>bf,sparse(af>bf)) -%!assert(bf>as,sparse(bf>af)) +%!assert (as>bf, sparse (af>bf)) +%!assert (bf>as, sparse (bf>af)) EOF } gen_sparsesparse_ordering_tests() { cat >>$TESTS <<EOF -%!assert(as<=bs,sparse(af<=bf)) -%!assert(as>=bs,sparse(af>=bf)) -%!assert(as<bs,sparse(af<bf)) -%!assert(as>bs,sparse(af>bf)) +%!assert (as<=bs, sparse (af<=bf)) +%!assert (as>=bs, sparse (af>=bf)) +%!assert (as<bs, sparse (af<bf)) +%!assert (as>bs, sparse (af>bf)) EOF } @@ -302,46 +304,46 @@ gen_elementop_tests() { cat >>$TESTS <<EOF %% Elementwise binary tests (uses as,af,bs,bf,scalar) -%!assert(as==bs,sparse(af==bf)) -%!assert(bf==as,sparse(bf==af)) +%!assert (as==bs, sparse (af==bf)) +%!assert (bf==as, sparse (bf==af)) -%!assert(as!=bf,sparse(af!=bf)) -%!assert(bf!=as,sparse(bf!=af)) +%!assert (as!=bf, sparse (af!=bf)) +%!assert (bf!=as, sparse (bf!=af)) -%!assert(as+bf,af+bf) -%!assert(bf+as,bf+af) +%!assert (as+bf, af+bf) +%!assert (bf+as, bf+af) -%!assert(as-bf,af-bf) -%!assert(bf-as,bf-af) +%!assert (as-bf, af-bf) +%!assert (bf-as, bf-af) -%!assert(as.*bf,sparse(af.*bf)) -%!assert(bf.*as,sparse(bf.*af)) +%!assert (as.*bf, sparse (af.*bf)) +%!assert (bf.*as, sparse (bf.*af)) -%!assert(as./bf,sparse(af./bf),100*eps) -%!assert(bf.\as,sparse(bf.\af),100*eps) +%!assert (as./bf, sparse (af./bf), 100*eps) +%!assert (bf.\as, sparse (bf.\af), 100*eps) %!test %! sv = as.^bf; %! fv = af.^bf; -%! idx = find(af~=0); -%! assert(sv(:)(idx),sparse(fv(:)(idx)),100*eps) +%! idx = find (af~=0); +%! assert (sv(:)(idx), sparse (fv(:)(idx)), 100*eps) EOF } gen_sparsesparse_elementop_tests() { cat >>$TESTS <<EOF -%!assert(as==bs,sparse(af==bf)) -%!assert(as!=bs,sparse(af!=bf)) -%!assert(as+bs,sparse(af+bf)) -%!assert(as-bs,sparse(af-bf)) -%!assert(as.*bs,sparse(af.*bf)) -%!xtest assert(as./bs,sparse(af./bf),100*eps); +%!assert (as==bs, sparse (af==bf)) +%!assert (as!=bs, sparse (af!=bf)) +%!assert (as+bs, sparse (af+bf)) +%!assert (as-bs, sparse (af-bf)) +%!assert (as.*bs, sparse (af.*bf)) +%!xtest assert (as./bs, sparse (af./bf), 100*eps) %!test %! sv = as.^bs; %! fv = af.^bf; -%! idx = find(af~=0); -%! assert(sv(:)(idx),sparse(fv(:)(idx)),100*eps) +%! idx = find (af~=0); +%! assert(sv(:)(idx), sparse (fv(:)(idx)), 100*eps) EOF } @@ -350,12 +352,12 @@ gen_divop_tests() { cat >>$TESTS <<EOF %% Matrix-matrix operators (uses af,as,bs,bf) -%!assert(as/bf,af/bf,100*eps) -%!assert(af/bs,af/bf,100*eps) -%!assert(as/bs,sparse(af/bf),100*eps) -%!assert(bs\af',bf\af',100*eps) -%!assert(bf\as',bf\af',100*eps) -%!assert(bs\as',sparse(bf\af'),100*eps) +%!assert (as/bf, af/bf, 100*eps) +%!assert (af/bs, af/bf, 100*eps) +%!assert (as/bs, sparse (af/bf), 100*eps) +%!assert (bs\af', bf\af', 100*eps) +%!assert (bf\as', bf\af', 100*eps) +%!assert (bs\as', sparse (bf\af'), 100*eps) EOF } @@ -364,12 +366,12 @@ gen_square_divop_tests() { cat >>$TESTS <<EOF %% Matrix-matrix operators (uses af,as,bs,bf) -%!assert(as/bf,af/bf,100*eps) -%!assert(af/bs,af/bf,100*eps) -%!assert(as/bs,sparse(af/bf),100*eps) -%!assert(bs\af',bf\af',100*eps) -%!assert(bf\as',bf\af',100*eps) -%!assert(bs\as',sparse(bf\af'),100*eps) +%!assert (as/bf, af/bf, 100*eps) +%!assert (af/bs, af/bf, 100*eps) +%!assert (as/bs, sparse (af/bf), 100*eps) +%!assert (bs\af', bf\af', 100*eps) +%!assert (bf\as', bf\af', 100*eps) +%!assert (bs\as', sparse (bf\af'), 100*eps) EOF } @@ -378,9 +380,9 @@ gen_matrixop_tests() { cat >>$TESTS <<EOF %% Matrix-matrix operators (uses af,as,bs,bf) -%!assert(as*bf',af*bf') -%!assert(af*bs',af*bf') -%!assert(as*bs',sparse(af*bf')) +%!assert (as*bf', af*bf') +%!assert (af*bs', af*bf') +%!assert (as*bs', sparse (af*bf')) EOF } @@ -389,22 +391,23 @@ gen_matrixdiag_tests() { cat >>$TESTS <<EOF %% Matrix diagonal tests (uses af,as,bf,bs) -%!assert(diag(as),sparse(diag(af))) -%!assert(diag(bs),sparse(diag(bf))) -%!assert(diag(as,1),sparse(diag(af,1))) -%!assert(diag(bs,1),sparse(diag(bf,1))) -%!assert(diag(as,-1),sparse(diag(af,-1))) -%!assert(diag(bs,-1),sparse(diag(bf,-1))) -%!assert(diag(as(:)),sparse(diag(af(:)))) -%!assert(diag(as(:),1),sparse(diag(af(:),1))) -%!assert(diag(as(:),-1),sparse(diag(af(:),-1))) -%!assert(diag(as(:)'),sparse(diag(af(:)'))) -%!assert(diag(as(:)',1),sparse(diag(af(:)',1))) -%!assert(diag(as(:)',-1),sparse(diag(af(:)',-1))) -%!assert(spdiags(as,[0,1]),[diag(af,0),diag(af,1)]) -%!test [tb,tc]=spdiags(as); -%! assert(spdiags(tb,tc,sparse(zeros(size(as)))),as) -%! assert(spdiags(tb,tc,size(as,1),size(as,2)),as) +%!assert (diag (as), sparse (diag (af))) +%!assert (diag (bs), sparse (diag (bf))) +%!assert (diag (as,1), sparse (diag (af,1))) +%!assert (diag (bs,1), sparse (diag (bf,1))) +%!assert (diag (as,-1), sparse (diag (af,-1))) +%!assert (diag (bs,-1), sparse (diag (bf,-1))) +%!assert (diag (as(:)), sparse (diag (af(:)))) +%!assert (diag (as(:),1), sparse (diag (af(:),1))) +%!assert (diag (as(:),-1), sparse (diag (af(:),-1))) +%!assert (diag (as(:)'), sparse (diag (af(:)'))) +%!assert (diag (as(:)',1), sparse (diag (af(:)',1))) +%!assert (diag (as(:)',-1), sparse (diag (af(:)',-1))) +%!assert (spdiags (as,[0,1]), [diag(af,0), diag(af,1)]) +%!test +%! [tb,tc]=spdiags(as); +%! assert (spdiags (tb,tc,sparse (zeros (size (as)))), as); +%! assert (spdiags (tb,tc,size (as,1),size (as,2)), as); EOF } @@ -425,7 +428,7 @@ # test mapper matrix operations: uses as,af print_mapper_test() { -echo "%!assert($1(as),sparse($1(af)))" >>$TESTS +echo "%!assert ($1(as), sparse ($1(af)))" >>$TESTS } print_real_mapper_test() { @@ -433,11 +436,11 @@ %!test %! wn2s = warning ("query", "Octave:num-to-str"); %! warning ("off", "Octave:num-to-str"); -%! if isreal(af) +%! if (isreal (af)) %! if ($2) -%! assert($1(as),sparse($1(af))) +%! assert ($1(as), sparse ($1(af))); %! else -%! assert($1(as),$1(af)) +%! assert ($1(as), $1(af)); %! endif %! endif %! warning (wn2s.state, "Octave:num-to-str"); @@ -481,9 +484,9 @@ # Specific tests for certain mapper functions cat >>$TESTS <<EOF -%!assert(issparse(abs(as))&&isreal(abs(as))) -%!assert(issparse(real(as))&&isreal(real(as))) -%!assert(issparse(imag(as))&&isreal(imag(as))) +%!assert (issparse (abs (as)) && isreal (abs (as))) +%!assert (issparse (real (as)) && isreal (real (as))) +%!assert (issparse (imag (as)) && isreal (imag (as))) EOF } @@ -514,10 +517,10 @@ %!test %! wn2s = warning ("query", "Octave:num-to-str"); %! warning ("off", "Octave:num-to-str"); -%! if isreal(af) -%! assert(toascii(as),toascii(af)) -%! assert(tolower(as),tolower(af)) -%! assert(toupper(as),toupper(af)) +%! if (isreal (af)) +%! assert (toascii (as), toascii (af)); +%! assert (tolower (as), tolower (af)); +%! assert (toupper (as), toupper (af)); %! endif %! warning (wn2s.state, "Octave:num-to-str"); @@ -528,99 +531,99 @@ gen_unaryop_tests() { cat >>$TESTS <<EOF %% Unary matrix tests (uses af,as) -%!assert(issparse(as)) -%!assert(!issparse(af)) -%!assert(!(issparse(af)&&iscomplex(af))) -%!assert(!(issparse(af)&&isreal(af))) -%!assert(sum(as),sparse(sum(af))) -%!assert(sum(as,1),sparse(sum(af,1))) -%!assert(sum(as,2),sparse(sum(af,2))) -%!assert(cumsum(as),sparse(cumsum(af))) -%!assert(cumsum(as,1),sparse(cumsum(af,1))) -%!assert(cumsum(as,2),sparse(cumsum(af,2))) -%!assert(sumsq(as),sparse(sumsq(af))) -%!assert(sumsq(as,1),sparse(sumsq(af,1))) -%!assert(sumsq(as,2),sparse(sumsq(af,2))) -%!assert(prod(as),sparse(prod(af))) -%!assert(prod(as,1),sparse(prod(af,1))) -%!assert(prod(as,2),sparse(prod(af,2))) -%!assert(cumprod(as),sparse(cumprod(af))) -%!assert(cumprod(as,1),sparse(cumprod(af,1))) -%!assert(cumprod(as,2),sparse(cumprod(af,2))) +%!assert (issparse (as)) +%!assert (!issparse (af)) +%!assert (! (issparse (af) && iscomplex (af))) +%!assert (! (issparse (af) && isreal (af))) +%!assert (sum (as), sparse (sum (af))) +%!assert (sum (as,1), sparse (sum (af,1))) +%!assert (sum (as,2), sparse (sum (af,2))) +%!assert (cumsum (as), sparse (cumsum (af))) +%!assert (cumsum (as,1), sparse (cumsum (af,1))) +%!assert (cumsum (as,2), sparse (cumsum (af,2))) +%!assert (sumsq (as), sparse (sumsq (af))) +%!assert (sumsq (as,1), sparse (sumsq (af,1))) +%!assert (sumsq (as,2), sparse (sumsq (af,2))) +%!assert (prod (as), sparse (prod (af))) +%!assert (prod (as,1), sparse (prod (af,1))) +%!assert (prod (as,2), sparse (prod (af,2))) +%!assert (cumprod (as), sparse (cumprod (af))) +%!assert (cumprod (as,1), sparse (cumprod (af,1))) +%!assert (cumprod (as,2), sparse (cumprod (af,2))) -%!assert(min(as),sparse(min(af))) -%!assert(full(min(as(:))),min(af(:))) -%!assert(min(as,[],1),sparse(min(af,[],1))) -%!assert(min(as,[],2),sparse(min(af,[],2))) -%!assert(min(as,[],1),sparse(min(af,[],1))) -%!assert(min(as,0),sparse(min(af,0))) -%!assert(min(as,bs),sparse(min(af,bf))) -%!assert(max(as),sparse(max(af))) -%!assert(full(max(as(:))),max(af(:))) -%!assert(max(as,[],1),sparse(max(af,[],1))) -%!assert(max(as,[],2),sparse(max(af,[],2))) -%!assert(max(as,[],1),sparse(max(af,[],1))) -%!assert(max(as,0),sparse(max(af,0))) -%!assert(max(as,bs),sparse(max(af,bf))) +%!assert (min (as), sparse (min (af))) +%!assert (full (min (as(:))),min (af(:))) +%!assert (min (as,[],1), sparse (min (af,[],1))) +%!assert (min (as,[],2), sparse (min (af,[],2))) +%!assert (min (as,[],1), sparse (min (af,[],1))) +%!assert (min (as,0), sparse (min (af,0))) +%!assert (min (as,bs), sparse (min (af,bf))) +%!assert (max (as), sparse (max (af))) +%!assert (full (max (as(:))), max (af(:))) +%!assert (max (as,[],1), sparse (max (af,[],1))) +%!assert (max (as,[],2), sparse (max (af,[],2))) +%!assert (max (as,[],1), sparse (max (af,[],1))) +%!assert (max (as,0), sparse (max (af,0))) +%!assert (max (as,bs), sparse (max (af,bf))) -%!assert(as==as) -%!assert(as==af) -%!assert(af==as) +%!assert (as==as) +%!assert (as==af) +%!assert (af==as) %!test -%! [ii,jj,vv,nr,nc] = find(as); -%! assert(af,full(sparse(ii,jj,vv,nr,nc))); -%!assert(nnz(as),sum(af(:)!=0)) -%!assert(nnz(as),nnz(af)) -%!assert(issparse(as.')) -%!assert(issparse(as')) -%!assert(issparse(-as)) -%!assert(~as,sparse(~af)) -%!assert(as.', sparse(af.')); -%!assert(as', sparse(af')); -%!assert(-as, sparse(-af)); -%!assert(~as, sparse(~af)); -%!error [i,j]=size(af);as(i-1,j+1); -%!error [i,j]=size(af);as(i+1,j-1); +%! [ii,jj,vv,nr,nc] = find (as); +%! assert (af, full (sparse (ii,jj,vv,nr,nc))); +%!assert (nnz (as), sum (af(:)!=0)) +%!assert (nnz (as), nnz (af)) +%!assert (issparse (as.')) +%!assert (issparse (as')) +%!assert (issparse (-as)) +%!assert (~as, sparse (~af)) +%!assert (as.', sparse (af.')); +%!assert (as', sparse (af')); +%!assert (-as, sparse (-af)); +%!assert (~as, sparse (~af)); +%!error [i,j]=size (af);as(i-1,j+1); +%!error [i,j]=size (af);as(i+1,j-1); %!test -%! [Is,Js,Vs] = find(as); -%! [If,Jf,Vf] = find(af); -%! assert(Is,If); -%! assert(Js,Jf); -%! assert(Vs,Vf); +%! [Is,Js,Vs] = find (as); +%! [If,Jf,Vf] = find (af); +%! assert (Is, If); +%! assert (Js, Jf); +%! assert (Vs, Vf); %!error as(0,1); %!error as(1,0); -%!assert(find(as),find(af)) +%!assert (find (as), find (af)) %!test -%! [i,j,v] = find(as); -%! [m,n] = size(as); -%! x = sparse(i,j,v,m,n); -%! assert(x,as); +%! [i,j,v] = find (as); +%! [m,n] = size (as); +%! x = sparse (i,j,v,m,n); +%! assert (x, as); %!test -%! [i,j,v,m,n] = find(as); -%! x = sparse(i,j,v,m,n); -%! assert(x,as); -%!assert(issparse(horzcat(as,as))); -%!assert(issparse(vertcat(as,as))); -%!assert(issparse(cat(1,as,as))); -%!assert(issparse(cat(2,as,as))); -%!assert(issparse([as,as])); -%!assert(issparse([as;as])); -%!assert(horzcat(as,as), sparse([af,af])); -%!assert(vertcat(as,as), sparse([af;af])); -%!assert(horzcat(as,as,as), sparse([af,af,af])); -%!assert(vertcat(as,as,as), sparse([af;af;af])); -%!assert([as,as], sparse([af,af])); -%!assert([as;as], sparse([af;af])); -%!assert([as,as,as], sparse([af,af,af])); -%!assert([as;as;as], sparse([af;af;af])); -%!assert(cat(2,as,as), sparse([af,af])); -%!assert(cat(1,as,as), sparse([af;af])); -%!assert(cat(2,as,as,as), sparse([af,af,af])); -%!assert(cat(1,as,as,as), sparse([af;af;af])); -%!assert(issparse([as,af])); -%!assert(issparse([af,as])); -%!assert([as,af], sparse([af,af])); -%!assert([as;af], sparse([af;af])); +%! [i,j,v,m,n] = find (as); +%! x = sparse (i,j,v,m,n); +%! assert (x, as); +%!assert (issparse (horzcat (as,as))); +%!assert (issparse (vertcat (as,as))); +%!assert (issparse (cat (1,as,as))); +%!assert (issparse (cat (2,as,as))); +%!assert (issparse ([as,as])); +%!assert (issparse ([as;as])); +%!assert (horzcat (as,as), sparse ([af,af])); +%!assert (vertcat (as,as), sparse ([af;af])); +%!assert (horzcat (as,as,as), sparse ([af,af,af])); +%!assert (vertcat (as,as,as), sparse ([af;af;af])); +%!assert ([as,as], sparse ([af,af])); +%!assert ([as;as], sparse ([af;af])); +%!assert ([as,as,as], sparse ([af,af,af])); +%!assert ([as;as;as], sparse ([af;af;af])); +%!assert (cat (2,as,as), sparse ([af,af])); +%!assert (cat (1,as,as), sparse ([af;af])); +%!assert (cat (2,as,as,as), sparse ([af,af,af])); +%!assert (cat (1,as,as,as), sparse ([af;af;af])); +%!assert (issparse ([as,af])); +%!assert (issparse ([af,as])); +%!assert ([as,af], sparse ([af,af])); +%!assert ([as;af], sparse ([af;af])); EOF } @@ -635,60 +638,60 @@ %! assert(det(bs+speye(size(bs))),det(bf+eye(size(bf))),100*eps*abs(det(bf+eye(size(bf))))) %!testif HAVE_UMFPACK -%! [l,u]=lu(sparse([1,1;1,1])); -%! assert(l*u,[1,1;1,1],10*eps); +%! [l,u] = lu (sparse ([1,1;1,1])); +%! assert (l*u, [1,1;1,1], 10*eps); %!testif HAVE_UMFPACK -%! [l,u]=lu(sparse([1,1;1,1+i])); -%! assert(l,sparse([1,2,2],[1,1,2],1),10*eps); -%! assert(u,sparse([1,1,2],[1,2,2],[1,1,1i]),10*eps); +%! [l,u] = lu (sparse ([1,1;1,1+i])); +%! assert (l, sparse ([1,2,2],[1,1,2],1), 10*eps); +%! assert (u, sparse ([1,1,2],[1,2,2],[1,1,1i]), 10*eps); %!testif HAVE_UMFPACK ;# permuted LU -%! [L,U] = lu(bs); -%! assert(L*U,bs,1e-10); +%! [L,U] = lu (bs); +%! assert (L*U, bs, 1e-10); %!testif HAVE_UMFPACK ;# simple LU + row permutations -%! [L,U,P] = lu(bs); -%! assert(P'*L*U,bs,1e-10); +%! [L,U,P] = lu (bs); +%! assert (P'*L*U, bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# simple LU + row/col permutations -%! [L,U,P,Q] = lu(bs); -%! assert(P'*L*U*Q',bs,1e-10); +%! [L,U,P,Q] = lu (bs); +%! assert (P'*L*U*Q', bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# LU with vector permutations -%! [L,U,P,Q] = lu(bs,'vector'); -%! assert(L(P,:)*U(:,Q),bs,1e-10); +%! [L,U,P,Q] = lu (bs,'vector'); +%! assert (L(P,:)*U(:,Q), bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# LU with scaling -%! [L,U,P,Q,R] = lu(bs); -%! assert(R*P'*L*U*Q',bs,1e-10); +%! [L,U,P,Q,R] = lu (bs); +%! assert (R*P'*L*U*Q', bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# inverse -%! assert(inv(bs)*bs,sparse(eye(rows(bs))),1e-10); +%! assert (inv (bs)*bs, sparse (eye (rows (bs))), 1e-10); -%!assert(bf\as',bf\af',100*eps); -%!assert(bs\af',bf\af',100*eps); -%!assert(bs\as',sparse(bf\af'),100*eps); +%!assert (bf\as', bf\af', 100*eps); +%!assert (bs\af', bf\af', 100*eps); +%!assert (bs\as', sparse (bf\af'), 100*eps); EOF } @@ -697,27 +700,27 @@ gen_cholesky_tests() { cat >>$TESTS <<EOF %!testif HAVE_CHOLMOD -%! assert(chol(bs)'*chol(bs),bs,1e-10); +%! assert (chol (bs)'*chol (bs), bs, 1e-10); %!testif HAVE_CHOLMOD -%! assert(chol(bs,'lower')*chol(bs,'lower')',bs,1e-10); +%! assert (chol (bs,'lower')*chol (bs,'lower')', bs, 1e-10); %!testif HAVE_CHOLMOD -%! assert(chol(bs,'lower'),chol(bs)',1e-10); +%! assert (chol (bs,'lower'), chol (bs)', 1e-10); %!testif HAVE_CHOLMOD ;# Return Partial Cholesky factorization -%! [RS,PS] = chol(bs); -%! assert(RS'*RS,bs,1e-10); -%! assert(PS,0); -%! [LS,PS] = chol(bs,'lower'); -%! assert(LS*LS',bs,1e-10); -%! assert(PS,0); +%! [RS,PS] = chol (bs); +%! assert (RS'*RS, bs, 1e-10); +%! assert (PS, 0); +%! [LS,PS] = chol (bs,'lower'); +%! assert (LS*LS', bs, 1e-10); +%! assert (PS, 0); %!testif HAVE_CHOLMOD ;# Permuted Cholesky factorization -%! [RS,PS,QS] = chol(bs); -%! assert(RS'*RS,QS*bs*QS',1e-10); -%! assert(PS,0); -%! [LS,PS,QS] = chol(bs,'lower'); -%! assert(LS*LS',QS*bs*QS',1e-10); -%! assert(PS,0); +%! [RS,PS,QS] = chol (bs); +%! assert (RS'*RS, QS*bs*QS', 1e-10); +%! assert (PS, 0); +%! [LS,PS,QS] = chol (bs,'lower'); +%! assert (LS*LS', QS*bs*QS', 1e-10); +%! assert (PS, 0); EOF } @@ -748,44 +751,44 @@ gen_matrixreshape_tests cat >>$TESTS <<EOF %!testif HAVE_UMFPACK ;# permuted LU -%! [L,U] = lu(bs); -%! assert(L*U,bs,1e-10); +%! [L,U] = lu (bs); +%! assert (L*U, bs, 1e-10); %!testif HAVE_UMFPACK ;# simple LU + row permutations -%! [L,U,P] = lu(bs); -%! assert(P'*L*U,bs,1e-10); +%! [L,U,P] = lu (bs); +%! assert (P'*L*U, bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# simple LU + row/col permutations -%! [L,U,P,Q] = lu(bs); -%! assert(P'*L*U*Q',bs,1e-10); +%! [L,U,P,Q] = lu (bs); +%! assert (P'*L*U*Q', bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# LU with vector permutations -%! [L,U,P,Q] = lu(bs,'vector'); -%! assert(L(P,:)*U(:,Q),bs,1e-10); +%! [L,U,P,Q] = lu (bs,'vector'); +%! assert (L (P,:)*U (:,Q), bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); %!testif HAVE_UMFPACK ;# LU with scaling -%! [L,U,P,Q,R] = lu(bs); -%! assert(R*P'*L*U*Q',bs,1e-10); +%! [L,U,P,Q,R] = lu (bs); +%! assert (R*P'*L*U*Q', bs, 1e-10); %! # triangularity -%! [i,j,v]=find(L); -%! assert(i-j>=0); -%! [i,j,v]=find(U); -%! assert(j-i>=0); +%! [i,j,v] = find (L); +%! assert (i-j>=0); +%! [i,j,v] = find (U); +%! assert (j-i>=0); EOF } @@ -798,33 +801,35 @@ cat >>$TESTS <<EOF %%Assembly tests %!test -%! m=max([m;r(:)]); -%! n=max([n;c(:)]); -%! funiq=fsum=zeros(m,n); -%! funiq(r(:) + m*(c(:)-1) ) = ones(size(r(:))); -%! funiq = sparse(funiq); -%! for k=1:length(r), fsum(r(k),c(k)) += 1; end -%! fsum = sparse(fsum); -%!assert(sparse(r,c,1),sparse(fsum(1:max(r),1:max(c)))); -%!assert(sparse(r,c,1,"sum"),sparse(fsum(1:max(r),1:max(c)))); -%!assert(sparse(r,c,1,"unique"),sparse(funiq(1:max(r),1:max(c)))); -%!assert(sparse(r,c,1,m,n),sparse(fsum)); -%!assert(sparse(r,c,1,m,n,"sum"),sparse(fsum)); -%!assert(sparse(r,c,1,m,n,"unique"),sparse(funiq)); +%! m = max ([m;r(:)]); +%! n = max ([n;c(:)]); +%! funiq = fsum = zeros (m,n); +%! funiq(r(:) + m*(c(:)-1) ) = ones (size (r(:))); +%! funiq = sparse (funiq); +%! for k=1:length(r) +%! fsum(r(k),c(k)) += 1; +%! endfor +%! fsum = sparse (fsum); +%!assert (sparse (r,c,1), sparse (fsum(1:max(r), 1:max(c)))) +%!assert (sparse (r,c,1,"sum"), sparse (fsum(1:max (r),1:max (c)))) +%!assert (sparse (r,c,1,"unique"), sparse (funiq(1:max (r),1:max (c)))) +%!assert (sparse (r,c,1,m,n), sparse (fsum)) +%!assert (sparse (r,c,1,m,n,"sum"), sparse (fsum)) +%!assert (sparse (r,c,1,m,n,"unique"), sparse (funiq)) -%!assert(sparse(r,c,1i),sparse(fsum(1:max(r),1:max(c))*1i)); -%!assert(sparse(r,c,1i,"sum"),sparse(fsum(1:max(r),1:max(c))*1i)); -%!assert(sparse(r,c,1i,"unique"),sparse(funiq(1:max(r),1:max(c))*1i)); -%!assert(sparse(r,c,1i,m,n),sparse(fsum*1i)); -%!assert(sparse(r,c,1i,m,n,"sum"),sparse(fsum*1i)); -%!assert(sparse(r,c,1i,m,n,"unique"),sparse(funiq*1i)); +%!assert (sparse (r,c,1i), sparse (fsum(1:max (r),1:max (c))*1i)) +%!assert (sparse (r,c,1i,"sum"), sparse (fsum(1:max (r),1:max (c))*1i)) +%!assert (sparse (r,c,1i,"unique"), sparse (funiq(1:max (r),1:max (c))*1i)) +%!assert (sparse (r,c,1i,m,n), sparse (fsum*1i)) +%!assert (sparse (r,c,1i,m,n,"sum"), sparse (fsum*1i)) +%!assert (sparse (r,c,1i,m,n,"unique"), sparse (funiq*1i)) %!test -%! if (issparse(funiq)) -%! assert(sparse(full(1i*funiq)),sparse(1i*funiq)); +%! if (issparse (funiq)) +%! assert (sparse (full (1i*funiq)), sparse (1i*funiq)); %! endif -%!assert(sparse(full(funiq)),funiq); +%!assert (sparse (full (funiq)), funiq) EOF @@ -835,8 +840,8 @@ gen_scalar_select_tests () { cat >>$TESTS <<EOF -%!assert (sparse(42)([1,1]),sparse([42,42])) -%!assert (sparse(42*1i)([1,1]),sparse([42,42].*1i)) +%!assert (sparse (42)([1,1]), sparse ([42,42])) +%!assert (sparse (42*1i)([1,1]), sparse ([42,42].*1i)) EOF } @@ -845,61 +850,62 @@ %!test as=sparse(af); %% Point tests -%!test idx=ridx(:)+rows(as)*(cidx(:)-1); -%!assert(sparse(as(idx)),sparse(af(idx))); -%!assert(as(idx),sparse(af(idx))); -%!assert(as(idx'),sparse(af(idx'))); -%!assert(as(flipud(idx(:))),sparse(af(flipud(idx(:))))) -%!assert(as([idx,idx]),sparse(af([idx,idx]))); -%!error(as(reshape([idx;idx],[1,length(idx),2]))); +%!test idx = ridx(:) + rows (as) * (cidx (:)-1); +%!assert (sparse (as(idx)), sparse (af(idx))) +%!assert (as(idx), sparse (af(idx))); +%!assert (as(idx'), sparse (af(idx'))); +%!assert (as(flipud (idx(:))), sparse (af(flipud (idx(:))))) +%!assert (as([idx,idx]), sparse (af([idx,idx]))) +%!error (as(reshape ([idx;idx], [1,length(idx),2]))) %% Slice tests -%!assert(as(ridx,cidx), sparse(af(ridx,cidx))) -%!assert(as(ridx,:), sparse(af(ridx,:))) -%!assert(as(:,cidx), sparse(af(:,cidx))) -%!assert(as(:,:), sparse(af(:,:))) -%!assert(as((size(as,1):-1:1),:),sparse(af((size(af,1):-1:1),:))) -%!assert(as(:,(size(as,2):-1:1)),sparse(af(:,(size(af,2):-1:1)))) +%!assert (as(ridx,cidx), sparse (af(ridx,cidx))) +%!assert (as(ridx,:), sparse (af(ridx,:))) +%!assert (as(:,cidx), sparse (af(:,cidx))) +%!assert (as(:,:), sparse (af(:,:))) +%!assert (as((size (as,1):-1:1),:), sparse (af((size (af,1):-1:1),:))) +%!assert (as(:,(size (as,2):-1:1)), sparse (af(:, (size (af,2):-1:1)))) %% Indexing tests -%!assert(full(as([1,1],:)), af([1,1],:)) -%!assert(full(as(:,[1,1])), af(:,[1,1])) +%!assert (full (as([1,1],:)), af([1,1],:)) +%!assert (full (as(:,[1,1])), af(:,[1,1])) %!test %! [i,j,v] = find (as); -%! assert (as(i(1),j(1))([1,1]), sparse([v(1),v(1)])) +%! assert (as(i(1),j(1))([1,1]), sparse ([v(1), v(1)])) %% Assignment test %!test -%! ts=as;ts(:,:)=ts(fliplr(1:size(as,1)),:); -%! tf=af;tf(:,:)=tf(fliplr(1:size(af,1)),:); -%! assert(ts,sparse(tf)); +%! ts=as; ts(:,:) = ts(fliplr (1:size (as,1)),:); +%! tf=af; tf(:,:) = tf(fliplr (1:size (af,1)),:); +%! assert (ts, sparse (tf)); +%!test +%! ts=as; ts(fliplr (1:size (as,1)),:) = ts; +%! tf=af; tf(fliplr (1:size (af,1)),:) = tf; +%! assert (ts, sparse (tf)); %!test -%! ts=as;ts(fliplr(1:size(as,1)),:)=ts; -%! tf=af;tf(fliplr(1:size(af,1)),:)=tf; -%! assert(ts,sparse(tf)); +%! ts=as; ts(:,fliplr (1:size (as,2))) = ts; +%! tf=af; tf(:,fliplr (1:size (af,2))) = tf; +%! assert (ts, sparse (tf)); %!test -%! ts=as;ts(:,fliplr(1:size(as,2)))=ts; -%! tf=af;tf(:,fliplr(1:size(af,2)))=tf; -%! assert(ts,sparse(tf)); -%!test -%! ts(fliplr(1:size(as,1)))=as(:,1);tf(fliplr(1:size(af,1)))=af(:,1); -%! assert(ts,sparse(tf)); +%! ts(fliplr (1:size (as,1))) = as(:,1); +%! tf(fliplr (1:size (af,1))) = af(:,1); +%! assert (ts, sparse (tf)); %% Deletion tests %!test -%! ts=as;ts(1,:)=[];tf=af;tf(1,:)=[]; -%! assert(ts,sparse(tf)); +%! ts=as; ts(1,:)=[]; tf=af; tf(1,:)=[]; +%! assert (ts, sparse (tf)); %!test -%! ts=as;ts(:,1)=[];tf=af;tf(:,1)=[]; -%! assert(ts,sparse(tf)); +%! ts=as; ts(:,1)=[]; tf=af; tf(:,1)=[]; +%! assert (ts, sparse (tf)); -%% Test 'end' keyword -%!assert(full(as(end)), af(end)) -%!assert(full(as(1,end)), af(1,end)) -%!assert(full(as(end,1)), af(end,1)) -%!assert(full(as(end,end)), af(end,end)) -%!assert(as(2:end,2:end), sparse(af(2:end,2:end))) -%!assert(as(1:end-1,1:end-1), sparse(af(1:end-1,1:end-1))) +%% Test "end" keyword +%!assert (full (as(end)), af(end)) +%!assert (full (as(1,end)), af(1,end)) +%!assert (full (as(end,1)), af(end,1)) +%!assert (full (as(end,end)), af(end,end)) +%!assert (as(2:end,2:end), sparse (af(2:end,2:end))) +%!assert (as(1:end-1,1:end-1), sparse (af(1:end-1,1:end-1))) EOF } @@ -909,36 +915,40 @@ gen_save_tests() { cat >>$TESTS <<EOF %!test # save ascii -%! savefile= tmpnam(); -%! as_save=as; save("-text",savefile,"bf","as_save","af"); +%! savefile = tmpnam (); +%! as_save = as; +%! save ("-text", savefile, "bf", "as_save", "af"); %! clear as_save; -%! load(savefile,"as_save"); -%! unlink(savefile); -%! assert(as_save,sparse(af)); +%! load (savefile, "as_save"); +%! unlink (savefile); +%! assert (as_save, sparse(af)); %!test # save binary -%! savefile= tmpnam(); -%! as_save=as; save("-binary",savefile,"bf","as_save","af"); +%! savefile = tmpnam (); +%! as_save = as; +%! save ("-binary", savefile, "bf", "as_save", "af"); %! clear as_save; -%! load(savefile,"as_save"); -%! unlink(savefile); -%! assert(as_save,sparse(af)); +%! load (savefile, "as_save"); +%! unlink (savefile); +%! assert (as_save, sparse(af)); %!testif HAVE_HDF5 # save hdf5 -%! savefile= tmpnam(); -%! as_save=as; save("-hdf5",savefile,"bf","as_save","af"); +%! savefile = tmpnam (); +%! as_save = as; +%! save ("-hdf5", savefile, "bf", "as_save", "af"); %! clear as_save; -%! load(savefile,"as_save"); -%! unlink(savefile); -%! assert(as_save,sparse(af)); -## FIXME -- we should skip (or mark as an expected failure) the test for +%! load (savefile, "as_save"); +%! unlink (savefile); +%! assert (as_save, sparse(af)); +## FIXME: We should skip (or mark as an expected failure) the test for ## saving sparse matrices to MAT files when using 64-bit indexing since ## that is not implemented yet. %!test # save matlab -%! savefile= tmpnam(); -%! as_save=as; save("-mat",savefile,"bf","as_save","af"); +%! savefile = tmpnam (); +%! as_save = as; +%! save ("-mat", savefile, "bf", "as_save", "af"); %! clear as_save; -%! load(savefile,"as_save"); -%! unlink(savefile); -%! assert(as_save,sparse(af)); +%! load (savefile, "as_save"); +%! unlink (savefile); +%! assert (as_save, sparse(af)); EOF } @@ -950,59 +960,64 @@ if $preset; then cat >>$TESTS <<EOF %! n=8; -%! lf=diag(1:n);lf(n-1,1)=0.5*alpha;lf(n,2)=0.25*alpha;ls=sparse(lf); -%! uf=diag(1:n);uf(1,n-1)=2*alpha;uf(2,n)=alpha;us=sparse(uf); -%! ts=spdiags(ones(n,3),-1:1,n,n)+diag(1:n); tf = full(ts); +%! lf=diag (1:n); lf(n-1,1)=0.5*alpha; lf(n,2)=0.25*alpha; ls=sparse (lf); +%! uf=diag (1:n); uf(1,n-1)=2*alpha; uf(2,n)=alpha; us=sparse (uf); +%! ts=spdiags (ones (n,3),-1:1,n,n) + diag (1:n); tf = full (ts); EOF else cat >>$TESTS <<EOF -%! n=floor(lognrnd(8,2)+1)' -%! ls = tril(sprandn(8,8,0.2),-1).*alpha + n*speye(8); lf = full(ls); -%! us = triu(sprandn(8,8,0.2),1).*alpha + n*speye(8); uf = full(us); -%! ts = spdiags(randn(8,3),-1:1,8,8).*alpha; tf = full(ts); +%! n = floor (lognrnd (8,2)+1)'; +%! ls = tril (sprandn (8,8,0.2),-1).*alpha + n*speye (8); lf = full (ls); +%! us = triu (sprandn (8,8,0.2),1).*alpha + n*speye (8); uf = full (us); +%! ts = spdiags (randn (8,3),-1:1,8,8).*alpha; tf = full (ts); EOF fi cat >>$TESTS <<EOF -%! df = diag(1:n).* alpha; ds = sparse(df); -%! pdf = df(randperm(n),randperm(n)); pds = sparse(pdf); -%! plf = lf(randperm(n),randperm(n)); pls = sparse(plf); -%! puf = uf(randperm(n),randperm(n)); pus = sparse(puf); -%! bs = spdiags(repmat([1:n]',1,4),-2:1,n,n).*alpha; bf = full(bs); -%! cf = lf + lf'; cs = sparse(cf); -%! bcf = bf + bf'; bcs = sparse(bcf); -%! tcf = tf + tf'; tcs = sparse(tcf); -%! xf = diag(1:n) + fliplr(diag(1:n)).*beta; xs = sparse(xf); -%!assert(ds\xf,df\xf,1e-10); -%!assert(ds\xs,sparse(df\xf),1e-10); -%!assert(pds\xf,pdf\xf,1e-10); -%!assert(pds\xs,sparse(pdf\xf),1e-10); -%!assert(ls\xf,lf\xf,1e-10); -%!assert(sparse(ls\xs),sparse(lf\xf),1e-10); -%!testif HAVE_UMFPACK -%! assert(pls\xf,plf\xf,1e-10); +%! df = diag (1:n).* alpha; ds = sparse (df); +%! pdf = df(randperm (n),randperm (n)); +%! pds = sparse (pdf); +%! plf = lf(randperm (n),randperm (n)); +%! pls = sparse (plf); +%! puf = uf(randperm (n),randperm (n)); +%! pus = sparse (puf); +%! bs = spdiags (repmat ([1:n]',1,4),-2:1,n,n).*alpha; +%! bf = full (bs); +%! cf = lf + lf'; cs = sparse (cf); +%! bcf = bf + bf'; bcs = sparse (bcf); +%! tcf = tf + tf'; tcs = sparse (tcf); +%! xf = diag (1:n) + fliplr (diag (1:n)).*beta; +%! xs = sparse (xf); +%!assert (ds\xf, df\xf, 1e-10); +%!assert (ds\xs, sparse (df\xf), 1e-10); +%!assert (pds\xf, pdf\xf, 1e-10); +%!assert (pds\xs, sparse (pdf\xf), 1e-10); +%!assert (ls\xf, lf\xf, 1e-10); +%!assert (sparse (ls\xs), sparse (lf\xf), 1e-10); %!testif HAVE_UMFPACK -%! assert(sparse(pls\xs),sparse(plf\xf),1e-10); -%!assert(us\xf,uf\xf,1e-10); -%!assert(sparse(us\xs),sparse(uf\xf),1e-10); +%! assert (pls\xf, plf\xf, 1e-10); +%!testif HAVE_UMFPACK +%! assert (sparse (pls\xs), sparse (plf\xf), 1e-10); +%!assert (us\xf, uf\xf, 1e-10); +%!assert (sparse (us\xs), sparse (uf\xf), 1e-10); %!testif HAVE_UMFPACK -%! assert(pus\xf,puf\xf,1e-10); +%! assert (pus\xf, puf\xf, 1e-10); %!testif HAVE_UMFPACK -%! assert(sparse(pus\xs),sparse(puf\xf),1e-10); -%!assert(bs\xf,bf\xf,1e-10); -%!assert(sparse(bs\xs),sparse(bf\xf),1e-10); +%! assert (sparse (pus\xs), sparse (puf\xf), 1e-10); +%!assert (bs\xf, bf\xf, 1e-10); +%!assert (sparse (bs\xs), sparse (bf\xf), 1e-10); %!testif HAVE_UMFPACK -%! assert(cs\xf,cf\xf,1e-10); +%! assert (cs\xf, cf\xf, 1e-10); %!testif HAVE_UMFPACK -%! assert(sparse(cs\xs),sparse(cf\xf),1e-10); +%! assert (sparse (cs\xs), sparse (cf\xf), 1e-10); %!testif HAVE_UMFPACK -%! assert(bcs\xf,bcf\xf,1e-10); +%! assert (bcs\xf, bcf\xf, 1e-10); %!testif HAVE_UMFPACK -%! assert(sparse(bcs\xs),sparse(bcf\xf),1e-10); -%!assert(ts\xf,tf\xf,1e-10); -%!assert(sparse(ts\xs),sparse(tf\xf),1e-10); -%!assert(tcs\xf,tcf\xf,1e-10); -%!assert(sparse(tcs\xs),sparse(tcf\xf),1e-10); +%! assert (sparse (bcs\xs), sparse (bcf\xf), 1e-10); +%!assert (ts\xf, tf\xf, 1e-10); +%!assert (sparse (ts\xs), sparse (tf\xf), 1e-10); +%!assert (tcs\xf, tcf\xf, 1e-10); +%!assert (sparse (tcs\xs), sparse (tcf\xf), 1e-10); EOF @@ -1010,109 +1025,116 @@ %% QR solver tests %!function f(a, sz, feps) -%! b = randn(sz); x = a \b; +%! b = randn (sz); +%! x = a \ b; %! assert (a * x, b, feps); -%! b = randn(sz)+1i*randn(sz); x = a \ b; +%! b = randn (sz) + 1i*randn (sz); +%! x = a \ b; %! assert (a * x, b, feps); -%! b = sprandn(sz(1),sz(2),0.2); x = a \b; -%! assert (sparse(a * x), b, feps); -%! b = sprandn(sz(1),sz(2),0.2)+1i*sprandn(sz(1),sz(2),0.2); x = a \b; -%! assert (sparse(a * x), b, feps); +%! b = sprandn (sz(1),sz(2),0.2); +%! x = a \ b; +%! assert (sparse (a * x), b, feps); +%! b = sprandn (sz(1),sz(2),0.2) + 1i*sprandn (sz(1),sz(2),0.2); +%! x = a \ b; +%! assert (sparse (a * x), b, feps); +%!endfunction %!testif HAVE_UMFPACK -%! a = alpha*sprandn(10,11,0.2)+speye(10,11); f(a,[10,2],1e-10); +%! a = alpha*sprandn (10,11,0.2) + speye (10,11); +%! f(a,[10,2],1e-10); %! ## Test this by forcing matrix_type, as can't get a certain %! ## result for over-determined systems. -%! a = alpha*sprandn(10,10,0.2)+speye(10,10); matrix_type(a, "Singular"); +%! a = alpha*sprandn(10,10,0.2) + speye(10,10); +%! matrix_type (a, "Singular"); %! f(a,[10,2],1e-10); %% Rectanguar solver tests that don't use QR %!test -%! ds = alpha * spdiags([1:11]',0,10,11); -%! df = full(ds); -%! xf = beta * ones(10,2); -%! xs = speye(10,10); -%!assert(ds\xf,df\xf,100*eps) -%!assert(ds\xs,sparse(df\xs),100*eps) +%! ds = alpha * spdiags ([1:11]',0,10,11); +%! df = full (ds); +%! xf = beta * ones (10,2); +%! xs = speye (10,10); +%!assert (ds\xf, df\xf, 100*eps) +%!assert (ds\xs, sparse (df\xs), 100*eps) %!test %! pds = ds([2,1,3:10],:); -%! pdf = full(pds); -%!assert(pds\xf,pdf\xf,100*eps) -%!assert(pds\xs,sparse(pdf\xs),100*eps) +%! pdf = full (pds); +%!assert (pds\xf, pdf\xf, 100*eps) +%!assert (pds\xs, sparse (pdf\xs), 100*eps) %!test -%! ds = alpha * spdiags([1:11]',0,11,10); -%! df = full(ds); -%! xf = beta * ones(11,2); -%! xs = speye(11,11); -%!assert(ds\xf,df\xf,100*eps) -%!assert(ds\xs,sparse(df\xs),100*eps) +%! ds = alpha * spdiags ([1:11]',0,11,10); +%! df = full (ds); +%! xf = beta * ones (11,2); +%! xs = speye (11,11); +%!assert (ds\xf, df\xf, 100*eps) +%!assert (ds\xs, sparse (df\xs), 100*eps) %!test %! pds = ds([2,1,3:11],:); -%! pdf = full(pds); -%!assert(pds\xf,pdf\xf,100*eps) -%!assert(pds\xs,sparse(pdf\xs),100*eps) +%! pdf = full (pds); +%!assert (pds\xf, pdf\xf, 100*eps) +%!assert (pds\xs, sparse (pdf\xs), 100*eps) %!test %! us = alpha*[[speye(10,10);sparse(1,10)],[[1,1];sparse(9,2);[1,1]]]; %!testif HAVE_UMFPACK -%! assert(us*(us\xf),xf,100*eps) +%! assert (us*(us\xf), xf, 100*eps) %!testif HAVE_UMFPACK -%! assert(us*(us\xs),xs,100*eps) +%! assert (us*(us\xs), xs, 100*eps) %!test %! pus = us(:,[2,1,3:12]); %!testif HAVE_UMFPACK -%! assert(pus*(pus\xf),xf,100*eps) +%! assert (pus*(pus\xf), xf, 100*eps) %!testif HAVE_UMFPACK -%! assert(pus*(pus\xs),xs,100*eps) +%! assert (pus*(pus\xs), xs, 100*eps) %!test %! us = alpha*[speye(11,9),[1;sparse(8,1);1;0]]; %!testif HAVE_CXSPARSE %! [c,r] = qr (us, xf); -%! assert(us\xf,r\c,100*eps) +%! assert (us\xf, r\c, 100*eps) %!testif HAVE_UMFPACK %! [c,r] = qr (us, xs); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(us\xs,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (us\xs, r\c, 100*eps) %!test %! pus = us(:,[1:8,10,9]); %!testif HAVE_UMFPACK %! [c,r] = qr (pus, xf); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(pus\xf,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (pus\xf, r\c, 100*eps) %!testif HAVE_UMFPACK %! [c,r] = qr (pus, xs); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(pus\xs,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (pus\xs, r\c, 100*eps) %!test -%! ls = alpha*[speye(9,11);[1,sparse(1,8),1,0]]; -%! xf = beta * ones(10,2); -%! xs = speye(10,10); -%!assert(ls*(ls\xf),xf,100*eps) -%!assert(ls*(ls\xs),xs,100*eps) +%! ls = alpha*[speye(9,11);[1, sparse(1,8),1,0]]; +%! xf = beta * ones (10,2); +%! xs = speye (10,10); +%!assert (ls*(ls\xf), xf, 100*eps) +%!assert (ls*(ls\xs), xs, 100*eps) %!test %! pls = ls([1:8,10,9],:); -%!assert(pls*(pls\xf),xf,100*eps) -%!assert(pls*(pls\xs),xs,100*eps) +%!assert (pls*(pls\xf), xf, 100*eps) +%!assert (pls*(pls\xs), xs, 100*eps) %!test -%! ls = alpha*[speye(10,10),sparse(10,1);[1;1],sparse(2,9),[1;1]]; -%! xf = beta * ones(12,2); -%! xs = speye(12,12); +%! ls = alpha*[speye(10,10), sparse(10,1);[1;1], sparse(2,9),[1;1]]; +%! xf = beta * ones (12,2); +%! xs = speye (12,12); %!testif HAVE_UMFPACK %! [c,r] = qr (ls, xf); -%! assert(ls\xf,r\c,100*eps) +%! assert (ls\xf, r\c, 100*eps) %!testif HAVE_UMFPACK %! [c,r] = qr (ls, xs); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(ls\xs,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (ls\xs, r\c, 100*eps) %!testif HAVE_CXSPARSE %! pls = ls(:,[1:8,10,9]); %!testif HAVE_UMFPACK %! [c,r] = qr (pls, xf); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(pls\xf,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (pls\xf, r\c, 100*eps) %!testif HAVE_UMFPACK %! [c,r] = qr (pls, xs); -%! r = matrix_type(r,"Singular"); ## Force Matrix Type -%! assert(pls\xs,r\c,100*eps) +%! r = matrix_type (r, "Singular"); ## Force Matrix Type +%! assert (pls\xs, r\c, 100*eps) EOF } @@ -1141,9 +1163,10 @@ cat >>$TESTS <<EOF %!test %! % generate m,n from 1 to <5000 -%! m=floor(lognrnd(8,2)+1); -%! n=floor(lognrnd(8,2)+1); -%! as=sprandn(m,n,0.3); af = full(as+1i*sprandn(as)); +%! m = floor (lognrnd (8,2)+1); +%! n = floor (lognrnd (8,2)+1); +%! as = sprandn (m,n,0.3); +%! af = full (as + 1i*sprandn (as)); %! bf = randn; EOF fi @@ -1158,10 +1181,12 @@ else cat >>$TESTS <<EOF %!test -%! m=floor(lognrnd(8,2)+1); -%! n=floor(lognrnd(8,2)+1); -%! as=sprandn(m,n,0.3); af = full(as+1i*sprandn(as)); -%! bs=sprandn(m,n,0.3); bf = full(bs+1i*sprandn(bs)); +%! m = floor (lognrnd (8,2)+1); +%! n = floor (lognrnd (8,2)+1); +%! as = sprandn (m,n,0.3); +%! af = full (as + 1i*sprandn (as)); +%! bs = sprandn (m,n,0.3); +%! bf = full (bs + 1i*sprandn (bs)); EOF fi @@ -1191,17 +1216,19 @@ else cat >>$TESTS <<EOF %!test -%! m=floor(lognrnd(8,2)+1); -%! n=floor(lognrnd(8,2)+1); -%! as=sprandn(m,n,0.3); af = full(as+1i*sprandn(as)); -%! bs=sprandn(m,n,0.3); bf = full(bs+1i*sprandn(bs)); +%! m = floor (lognrnd (8,2)+1); +%! n = floor (lognrnd (8,2)+1); +%! as = sprandn (m,n,0.3); +%! af = full (as + 1i*sprandn (as)); +%! bs = sprandn (m,n,0.3); +%! bf = full (bs + 1i*sprandn (bs)); EOF fi cat >>$TESTS <<EOF %!test ;# invertible matrix -%! bf=af'*bf+max(abs([af(:);bf(:)]))*sparse(eye(columns(as))); -%! bs=sparse(bf); +%! bf = af'*bf+max (abs ([af(:);bf(:)]))*sparse (eye (columns (as))); +%! bs = sparse (bf); EOF @@ -1226,8 +1253,9 @@ echo '%! bs=sparse(bf);' >> $TESTS else echo '# This has a small chance of failing to create a positive definite matrix' >> $TESTS - echo '%!test n=floor(lognrnd(8,2)+1)' >> $TESTS - echo '%! bs = n*speye(n,n) + sprandn(n,n,0.3); bf = full(bs);' >> $TESTS + echo '%!test n=floor (lognrnd (8,2)+1)' >> $TESTS + echo '%! bs = n*speye (n,n) + sprandn (n,n,0.3);' >> $TESTS + echo '%! bf = full (bs);' >> $TESTS fi gen_cholesky_tests @@ -1242,19 +1270,19 @@ if $use_preset; then cat >>$TESTS <<EOF %!test -%! r=[1,1,2,1,2,3]; -%! c=[2,1,1,1,2,1]; -%! m=n=0; +%! r = [1,1,2,1,2,3]; +%! c = [2,1,1,1,2,1]; +%! m = n = 0; EOF else cat >>$TESTS <<EOF %!test %! % generate m,n from 1 to <5000 -%! m=floor(lognrnd(8,2)+1); -%! n=floor(lognrnd(8,2)+1); -%! nz=ceil((m+n)/2); -%! r=floor(rand(5,nz)*n)+1; -%! c=floor(rand(5,nn)*m)+1; +%! m = floor (lognrnd (8,2)+1); +%! n = floor (lognrnd (8,2)+1); +%! nz = ceil ((m+n)/2); +%! r = floor (rand (5,nz)*n)+1; +%! c = floor (rand (5,nn)*m)+1; EOF fi gen_assembly_tests #includes real and complex tests @@ -1265,18 +1293,20 @@ if $use_preset; then cat >>$TESTS <<EOF %!test -%! af=[1+1i,2-1i,0,0;0,0,0,3+2i;0,0,0,4]; -%! ridx=[1,3]; cidx=[2,3]; +%! af = [1+1i,2-1i,0,0;0,0,0,3+2i;0,0,0,4]; +%! ridx = [1,3]; +%! cidx = [2,3]; EOF else cat >>$TESTS <<EOF %!test %! % generate m,n from 1 to <5000 -%! m=floor(lognrnd(8,2)+1); -%! n=floor(lognrnd(8,2)+1); -%! as=sprandn(m,n,0.3); af = full(as+1i*sprandn(as)); -%! ridx = ceil(m*rand(1,ceil(rand*m)) -%! cidx = ceil(n*rand(1,ceil(rand*n)) +%! m = floor (lognrnd (8,2)+1); +%! n = floor (lognrnd (8,2)+1); +%! as = sprandn (m,n,0.3); +%! af = full (as + 1i*sprandn (as)); +%! ridx = ceil (m*rand (1,ceil (rand*m)); +%! cidx = ceil (n*rand (1,ceil (rand*n)); EOF fi gen_scalar_select_tests
--- a/test/classes/test_classes.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/classes/test_classes.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 Robert T. Short +## Copyright (C) 2009-2012 Robert T. Short ## ## This file is part of Octave. ##
--- a/test/ctor-vs-method/test_ctor_vs_method.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/ctor-vs-method/test_ctor_vs_method.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/test/fcn-handle-derived-resolution/test_fcn_handle_derived_resolution.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/fcn-handle-derived-resolution/test_fcn_handle_derived_resolution.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2011 John W. Eaton +## Copyright (C) 2012 John W. Eaton ## ## This file is part of Octave. ##
--- a/test/fntests.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/fntests.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2011 David Bateman +## Copyright (C) 2005-2012 David Bateman ## ## This file is part of Octave. ##
--- a/test/test_args.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_args.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -23,6 +23,7 @@ %!function f () %! assert (nargin, 0); %! assert (nargout, 0); +%!endfunction %!test %! f; @@ -30,6 +31,7 @@ %!function f (x, y) %! assert (nargin, 1); %! assert (nargout, 0); +%!endfunction %!test %! f (1); @@ -38,6 +40,7 @@ %! assert (nargin, 0); %! assert (nargout, 1); %! x = 2; +%!endfunction %!test %! assert (f (), 2); @@ -46,6 +49,7 @@ %! assert (nargin, 1); %! assert (nargout, 1); %! x = a; +%!endfunction %!test %! assert (f (1), 1); @@ -56,6 +60,7 @@ %!function [varargout] = f (varargin) %! assert (nargin, 0); %! assert (nargout, 0); +%!endfunction %!test %! f; @@ -63,6 +68,7 @@ %!function [varargout] = f (x, varargin) %! assert (nargin, 1); %! assert (nargout, 0); +%!endfunction %!test %! f (1); @@ -71,6 +77,7 @@ %! assert (nargin, 0); %! assert (nargout, 1); %! x = 2; +%!endfunction %!test %! assert (f (), 2); @@ -79,6 +86,7 @@ %! assert (nargin, 1); %! assert (nargout, 1); %! varargout{1} = varargin{1}; +%!endfunction %!test %! assert (f (1), 1); @@ -91,9 +99,10 @@ %! assert (nargout, 2); %! x = a; %! y = b; +%!endfunction %!test %! [s, t] = f (1, 2, 3, 4); -%! assert([s t], [1 2]); +%! assert ([s t], [1 2]); ## Fully used varargin and varargout %!function [varargout] = f (varargin) @@ -103,92 +112,107 @@ %! varargout{2} = varargin{2}; %! varargout{3} = varargin{3}; %! varargout{4} = 4; +%!endfunction %!test %! [s, t, u, v] = f (1, 2, 3); -%! assert([s t u v], [1 2 3 4]); +%! assert ([s t u v], [1 2 3 4]); ## Test default arguments ## numeric %!function f (x = 0) -%! assert (x, 0) +%! assert (x, 0); +%!endfunction %!test %! f() ## numeric vector (spaces) %!function f (x = [0 1 2]) -%! assert (x, [0 1 2]) +%! assert (x, [0 1 2]); +%!endfunction %!test %! f() ## numeric vector (range) %!function f (x = 1:3) -%! assert (x, 1:3) +%! assert (x, 1:3); +%!endfunction %!test %! f() ## numeric vector (commas) %!function f (x = [0,1,2]) -%! assert (x, [0 1 2]) +%! assert (x, [0 1 2]); +%!endfunction %!test %! f() ## numeric vector (commas and spaces) %!function f (x = [0, 1, 2]) -%! assert (x, [0 1 2]) +%! assert (x, [0 1 2]); +%!endfunction %!test %! f() ## numeric matrix %!function f (x = [0, 1, 2;3, 4, 5]) -%! assert (x, [0 1 2;3 4 5]) +%! assert (x, [0 1 2;3 4 5]); +%!endfunction %!test %! f() ## empty cell %!function f (x = {}) -%! assert (x, {}) +%! assert (x, {}); +%!endfunction %!test %! f() ## full cell %!function f (x = {1}) -%! assert (x, {1}) +%! assert (x, {1}); +%!endfunction %!test %! f() ## many cells %!function f (x = {1 'a' "b" 2.0 struct("a", 3)}) -%! assert (x, {1 'a' "b" 2.0 struct("a", 3)}) +%! assert (x, {1 'a' "b" 2.0 struct("a", 3)}); +%!endfunction %!test %! f() ## struct %!function f (x = struct("a", 3)) -%! assert (x, struct ("a", 3)) +%! assert (x, struct ("a", 3)); +%!endfunction %!test %! f() ## char (double quotes) %!function f (x = "a") -%! assert (x, "a") +%! assert (x, "a"); +%!endfunction %!test %! f() ## char (single quotes) %!function f (x = 'a') -%! assert (x, "a") +%! assert (x, "a"); +%!endfunction %!test %! f() ## char (string, double quotes) %!function f (x = "abc123") -%! assert (x, "abc123") +%! assert (x, "abc123"); +%!endfunction %!test %! f() ## char (string, double quotes, punctuation) %!function f (x = "abc123`1234567890-=~!@#$%^&*()_+[]{}|;':\",./<>?\\") -%! assert (x, "abc123`1234567890-=~!@#$%^&*()_+[]{}|;':\",./<>?\\") +%! assert (x, "abc123`1234567890-=~!@#$%^&*()_+[]{}|;':\",./<>?\\"); +%!endfunction %!test %! f() @@ -197,6 +221,7 @@ %! finfo = functions (x); %! fname = finfo.function; %! assert (isa (x, "function_handle") && strcmp (fname, "sin")); +%!endfunction %!test %! f() @@ -205,5 +230,7 @@ %! finfo = functions (x); %! ftype = finfo.type; %! assert (isa (x, "function_handle") && strcmp (ftype, "anonymous")); +%!endfunction %!test %! f() +
--- a/test/test_contin.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ -## Copyright (C) 2006-2011 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -%% test/octave.test/contin/contin-1.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-2.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-3.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-4.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments ok here -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-5.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-6.m -%!test -%! x = [1,2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-7.m -%!test -%! x = [1;2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! ;\ -%! -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-8.m -%!test -%! x = [1;2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! ;\ -%! -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-9.m -%!test -%! x = [1;2]; -%! a = 1; -%! b = 2; -%! y = [a... # comments here ok -%! ;\ -%! -%! b]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-10.m -%!assert(1 + ... -%! 2 - \# comments here ok -%! 3 / ... # comments here ok -%! -1,6); - -%% test/octave.test/contin/contin-11.m -%!function y = f (a,... -%! b, ... -%! c, ... % comments ok -%! x, # continuation characters not required in parens -%! y, \# but they should work too. -%! z) -%! -%! y = 1; -%!test -%! assert(f (),1); - -%% test/octave.test/contin/contin-12.m -%!test -%!assert(1 == 1 -%! && 2 == 2 -%! || 3 == 5); - -%% test/octave.test/contin/contin-13.m -%!test -%! x = [1, ... -%! -%! ... -%! -%! 2]; -%! y = [1;2]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-14.m -%!test -%! x = [1, ... -%! -%! ... -%! -%! 2]; -%! y = [1;2]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-15.m -%!test -%! x = [1,... -%! 2]; -%! y = [1,2]; -%! assert(all (y == x)); - -%% test/octave.test/contin/contin-16.m -%!test -%! x = [ 1 , ... -%! 2]; -%! y = [1,2]; -%! assert(all (y == x)); -
--- a/test/test_diag_perm.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_diag_perm.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 E. Jason Riedy +## Copyright (C) 2009-2012 E. Jason Riedy ## ## This file is part of Octave. ## @@ -219,7 +219,7 @@ %! A = sprand (n, n, .5); %! scalefact = rand (n-2, 1); %! Dr = diag (scalefact, n, n-2); -%! assert (full (Dr \ A), Dr \ full(A)) +%! assert (full (Dr \ A), Dr \ full(A)); ## sparse inverse column scaling with a zero factor %!test @@ -229,7 +229,7 @@ %! Dc = diag (scalefact); %! scalefact(n-1) = Inf; %! Dc(n-1, n-1) = 0; -%! assert (full (A / Dc), full(A) / Dc) +%! assert (full (A / Dc), full(A) / Dc); ## short sparse inverse column scaling %!test @@ -237,29 +237,29 @@ %! A = sprand (n, n, .5); %! scalefact = rand (1, n-2) + I () * rand(1, n-2); %! Dc = diag (scalefact, n-2, n); -%! assert (full (A / Dc), full(A) / Dc) +%! assert (full (A / Dc), full(A) / Dc); ## adding sparse and diagonal stays sparse %!test %! n = 9; %! A = sprand (n, n, .5); %! D = 2 * eye (n); -%! assert (typeinfo (A + D), "sparse matrix") -%! assert (typeinfo (A - D), "sparse matrix") +%! assert (typeinfo (A + D), "sparse matrix"); +%! assert (typeinfo (A - D), "sparse matrix"); %! D = D * I () + D; -%! assert (typeinfo (A - D), "sparse complex matrix") +%! assert (typeinfo (A - D), "sparse complex matrix"); %! A = A * I () + A; -%! assert (typeinfo (D - A), "sparse complex matrix") +%! assert (typeinfo (D - A), "sparse complex matrix"); ## adding sparse and diagonal stays sparse %!test %! n = 9; %! A = sprand (n, n, .5); %! D = 2 * eye (n); -%! assert (full (A + D), full (A) + D) -%! assert (full (A - D), full (A) - D) +%! assert (full (A + D), full (A) + D); +%! assert (full (A - D), full (A) - D); %! D = D * I () + D; -%! assert (full (D + A), D + full (A)) +%! assert (full (D + A), D + full (A)); %! A = A * I () + A; %! A(6, 4) = nan (); -%! assert (full (D - A), D - full (A)) +%! assert (full (D - A), D - full (A));
--- a/test/test_error.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_error.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -16,68 +16,78 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. +## Test %!error usage + %% test/octave.test/error/error-1.m %!function g () -%! error ("foo"); +%! error ("foo"); +%!endfunction %!function f () -%! g (); -%!error <foo> f (); +%! g (); +%!endfunction +%!error <foo> f () %% test/octave.test/error/error-2.m %!function g () -%! error ("foo\n"); +%! error ("foo\n"); +%!endfunction %!function f () -%! g -%!error <foo> f (); +%! g +%!endfunction +%!error <foo> f () %% test/octave.test/error/error-3.m -%!error error (); +%!error error () %% test/octave.test/error/error-4.m -%!error <foo> error ("foo\n"); +%!error <foo> error ("foo\n") -%% FIXME Why can't I use %!warning <foo> f; +## Test %!warning usage + %% test/octave.test/error/warning-1.m %!function g () -%! warning ("foo"); +%! warning ("foo"); +%!endfunction %!function f () -%! g; -%!test -%! fail("f","warning","foo"); +%! g; +%!endfunction +%!warning <foo> f () %% test/octave.test/error/warning-2.m %!test %! st.identifier = "backtrace"; -%! ws = warning ("query","backtrace"); -%! warning ("on","backtrace"); +%! ws = warning ("query", "backtrace"); +%! warning ("on", "backtrace"); %! st.state = "on"; -%! assert(warning ("query","backtrace"),st); -%! warning ("off","backtrace"); +%! assert(warning ("query", "backtrace"), st); +%! warning ("off", "backtrace"); %! st.state = "off"; -%! assert(warning ("query","backtrace"),st); -%! warning (ws.state,"backtrace"); +%! assert(warning ("query", "backtrace"), st); +%! warning (ws.state, "backtrace"); -%% FIXME This test no longer makes sense with new warning syntax -%% test/octave.test/error/warning-3.m -%!#warning <foo> warning ("foo", 1); +## Test usage() function %% test/octave.test/error/usage-1.m %!function g () -%! usage ("foo"); +%! usage ("foo"); +%!endfunction %!function f () -%! g (); -%!error <foo> f (); +%! g (); +%!endfunction +%!error <foo> f () %% test/octave.test/error/usage-2.m %!function g () -%! usage ("foo"); +%! usage ("foo"); +%!endfunction %!function f () -%! g -%!error <foo> f (); +%! g +%!endfunction +%!error <foo> f () %% test/octave.test/error/usage-3.m -%!error usage (); +%!error usage () %% test/octave.test/error/usage-4.m -%!error <foo> usage ("foo\n"); +%!error <foo> usage ("foo\n")
--- a/test/test_eval-catch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_eval-catch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -22,53 +22,52 @@ %% test/octave.test/eval-catch/eval-catch-2.m %!test -%! eval ("", "error('Shouldn't get here');"); +%! eval ("", "error ('Should not get here');"); %% test/octave.test/eval-catch/eval-catch-3.m %!test %! eval ("clear a; a; x = 0;", "x = 1;"); %! assert (x, 1); -%% FIXME This is redundant with the changes to the above -%% test/octave.test/eval-catch/eval-catch-4.m - %% test/octave.test/eval-catch/eval-catch-5.m %!test %! eval ("clear a; a; str = '';", "str=lasterr;"); -%! assert(lasterr()(1:13),"`a' undefined"); -%! assert(str(1:13),"`a' undefined"); +%! assert (lasterr()(1:13), "`a' undefined"); +%! assert (str(1:13), "`a' undefined"); %% test/octave.test/eval-catch/eval-catch-6.m %!test -%! eval ("error (\"user-defined error\"); str = '';", "str = lasterr;"); -%! assert(lasterr()(1:18),"user-defined error"); -%! assert(str(1:18),"user-defined error"); +%! eval ("error ('user-defined error'); str = '';", "str = lasterr;"); +%! assert (lasterr()(1:18), "user-defined error"); +%! assert (str(1:18), "user-defined error"); %% test/octave.test/eval-catch/eval-catch-7.m %!function ms = mangle (s) %! ## Wrap angle brackets around S. %! ms = cstrcat ("<", s, ">"); +%!endfunction %!test %! eval ("clear a; a; str='';", "str = mangle (lasterr);"); -%! assert(mangle(lasterr)(1:14),"<`a' undefined"); -%! assert(str(1:14),"<`a' undefined"); +%! assert (mangle(lasterr)(1:14), "<`a' undefined"); +%! assert (str(1:14), "<`a' undefined"); %% test/octave.test/eval-catch/eval-catch-8.m %!test %! eval ("eval (\"clear a; a;str1='';\", \"str1=lasterr;\"); clear b; b; str2='';", %! "str2 = lasterr;"); -%! assert(str1(1:13),"`a' undefined"); -%! assert(str2(1:13),"`b' undefined"); +%! assert (str1(1:13), "`a' undefined"); +%! assert (str2(1:13), "`b' undefined"); %% test/octave.test/eval-catch/eval-catch-9.m %!test %! eval ("clear a; a; str1='';", %! "eval (\"clear b; b; str2='';\", \"str2=lasterr;\"); str1=lasterr;"); -%! assert(str1(1:13),"`b' undefined"); -%! assert(str2(1:13),"`b' undefined"); +%! assert (str1(1:13), "`b' undefined"); +%! assert (str2(1:13), "`b' undefined"); %% test/octave.test/eval-catch/eval-catch-10.m %!test %! eval ("eval (\"clear a; a; str='';\",\"error (cstrcat (\\\"rethrow: \\\", lasterr));str='';\");", %! "str=lasterr;"); -%! assert(str(1:22),"rethrow: `a' undefined"); +%! assert (str(1:22), "rethrow: `a' undefined"); +
--- a/test/test_for.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_for.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -19,82 +19,82 @@ %% test/octave.test/for/for-1.m %!test %! for i = 1 -%! printf_assert ("%d", i); +%! printf_assert ("%d", i); %! end %! printf_assert ("\n"); -%! assert(prog_output_assert("1")); +%! assert (prog_output_assert ("1")); %% test/octave.test/for/for-2.m %!test %! for i = 1:4 -%! printf_assert ("%d", i); +%! printf_assert ("%d", i); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1234")); +%! assert (prog_output_assert ("1234")); %% test/octave.test/for/for-3.m %!test %! for i = [1,2,3,4] -%! printf_assert ("%d", i); +%! printf_assert ("%d", i); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1234")); +%! assert (prog_output_assert ("1234")); %% test/octave.test/for/for-4.m %!test %! for i = [1,2;3,4] -%! printf_assert ("%d", i(1,1)); -%! printf_assert ("%d", i(2,1)); +%! printf_assert ("%d", i(1,1)); +%! printf_assert ("%d", i(2,1)); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1324")); +%! assert (prog_output_assert ("1324")); %% test/octave.test/for/for-5.m %!test %! for i = I -%! printf_assert ("%d", imag (i)); +%! printf_assert ("%d", imag (i)); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1")); +%! assert (prog_output_assert ("1")); %% test/octave.test/for/for-6.m %!test %! for i = [1,2,3,4]*I -%! printf_assert ("%d", imag (i)); +%! printf_assert ("%d", imag (i)); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1234")); +%! assert (prog_output_assert ("1234")); %% test/octave.test/for/for-7.m %!test %! for i = [1,2;3,4]*I -%! printf_assert ("%d", imag (i(1,1))); -%! printf_assert ("%d", imag (i(2,1))); +%! printf_assert ("%d", imag (i(1,1))); +%! printf_assert ("%d", imag (i(2,1))); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("1324")); +%! assert (prog_output_assert ("1324")); %% test/octave.test/for/for-8.m %!test %! for i = [1,2,3,4] -%! if (i > 2) -%! break; -%! endif -%! printf_assert ("%d", i); +%! if (i > 2) +%! break; +%! endif +%! printf_assert ("%d", i); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("12")); +%! assert (prog_output_assert ("12")); %% test/octave.test/for/for-9.m %!test %! for i = [1,2,3,4] -%! if (i < 3) -%! continue; -%! endif -%! printf_assert ("%d", i); +%! if (i < 3) +%! continue; +%! endif +%! printf_assert ("%d", i); %! endfor %! printf_assert ("\n"); -%! assert(prog_output_assert("34")); +%! assert (prog_output_assert ("34")); %!test %! a = [1,3;2,4]; @@ -106,6 +106,6 @@ %!test %! a = {1,3;2,4}; %! j = 0; -%! for i = cat (3, a, cellfun(@(x) 4 + x, a, 'UniformOutput', 0)) +%! for i = cat (3, a, cellfun(@(x) 4 + x, a, "UniformOutput", 0)) %! assert (i, {1 + 2*j; 2 + 2*j++}) %! endfor
--- a/test/test_func.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_func.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 David Bateman +## Copyright (C) 2008-2012 David Bateman ## ## This file is part of Octave. ## @@ -23,10 +23,10 @@ ## just that the results are consistent for all types. %!function __fntestfunc__ (fn, mn, varargin) -%! typ = {'double', 'complex', 'logical', 'sparse', 'complex sparse', ... -%! 'logical sparse', 'int8', 'int16', 'int32', 'int64', 'uint8', ... -%! 'uint16', 'uint32', 'uint64', 'char', 'cell', 'struct', ... -%! 'single', 'single complex'}; +%! typ = {"double", "complex", "logical", "sparse", "complex sparse", ... +%! "logical sparse", "int8", "int16", "int32", "int64", "uint8", ... +%! "uint16", "uint32", "uint64", "char", "cell", "struct", ... +%! "single", "single complex"}; %! %! cmplx = [2, 5, 18]; %! nlogical = [3, 6]; @@ -39,7 +39,7 @@ %! varargin(1) = []; %! endif %! -%! for i = 1 : length(typ) +%! for i = 1 : length (typ) %! if (any (strcmp (skip, typ {i}))) %! continue; %! endif @@ -48,7 +48,7 @@ %! if (any (nsparse == i)) %! if (ndims (m) > 2) %! sz = size (m); -%! m = reshape (m, [sz(1), prod(sz (2:end))]); +%! m = reshape (m, [sz(1), prod(sz(2:end))]); %! endif %! if (any (cmplx == i)) %! m = sparse ((1 + 1i) * m); @@ -61,30 +61,30 @@ %! endif %! endif %! if (any (nlogical == i)) -%! m = cast (m, 'logical'); +%! m = cast (m, "logical"); %! endif %! if (any (ninteger == i)) %! m = cast (m, typ{i}); %! endif -%! if (strcmp (typ{i}, 'cell')) +%! if (strcmp (typ{i}, "cell")) %! m = num2cell (m); -%! elseif (strcmp (typ{i}, 'struct')) -%! m = struct ('fld', num2cell (m)); +%! elseif (strcmp (typ{i}, "struct")) +%! m = struct ("fld", num2cell (m)); %! endif %! %! y = feval (fn, m, varargin{:}); %! y2 = feval (fn, reshape (mn, size (m)), varargin{:}); %! if (!strcmp (class (y), class (m)) || %! issparse (y) != issparse (m) || !size_equal (y, y2)) -%! error ('failed for type %s\n', typ{i}); +%! error ("failed for type %s\n", typ{i}); %! endif -%! if (!(strcmp (typ{i}, 'cell') || strcmp (typ{i}, 'struct')) && -%! any (vec (cast (real (y), 'double')) != -%! vec (feval (fn , cast (real (m), 'double'), varargin{:})))) -%! error ('failed for type %s\n', typ{i}); +%! if (!(strcmp (typ{i}, "cell") || strcmp (typ{i}, "struct")) && +%! any (vec (cast (real (y), "double")) != +%! vec (feval (fn , cast (real (m), "double"), varargin{:})))) +%! error ("failed for type %s\n", typ{i}); %! endif %! endfor -%! endfunction +%!endfunction %!shared m0, m1, m2, m3 %! m0 = [1:5]; @@ -93,100 +93,100 @@ %! m3 = []; %!test -%! __fntestfunc__('triu', m1, {'struct'}); +%! __fntestfunc__("triu", m1, {"struct"}); %!test -%! __fntestfunc__ ('triu', m1, {'struct'}, -1); +%! __fntestfunc__ ("triu", m1, {"struct"}, -1); %!test -%! __fntestfunc__ ('triu', m1, {'struct'}, 1); +%! __fntestfunc__ ("triu", m1, {"struct"}, 1); %!test -%! __fntestfunc__('triu', m3, {'struct'}); +%! __fntestfunc__("triu", m3, {"struct"}); %!test -%! __fntestfunc__ ('tril', m1, {'struct'}); +%! __fntestfunc__ ("tril", m1, {"struct"}); %!test -%! __fntestfunc__ ('tril', m1, {'struct'}, -1); +%! __fntestfunc__ ("tril", m1, {"struct"}, -1); %!test -%! __fntestfunc__ ('tril', m1, {'struct'}, 1); +%! __fntestfunc__ ("tril", m1, {"struct"}, 1); %!test -%! __fntestfunc__('tril', m3, {'struct'}); +%! __fntestfunc__("tril", m3, {"struct"}); %!test -%! __fntestfunc__ ('squeeze', m2); +%! __fntestfunc__ ("squeeze", m2); %!test -%! __fntestfunc__ ('squeeze', m3); +%! __fntestfunc__ ("squeeze", m3); %!test -%! __fntestfunc__ ('permute', m1, [2, 1]); +%! __fntestfunc__ ("permute", m1, [2, 1]); %!test -%! __fntestfunc__ ('permute', m2, {'sparse', 'logical sparse', 'complex sparse'}, [3, 1, 2]); +%! __fntestfunc__ ("permute", m2, {"sparse", "logical sparse", "complex sparse"}, [3, 1, 2]); %!test -%! __fntestfunc__ ('permute', m3, [2, 1]); +%! __fntestfunc__ ("permute", m3, [2, 1]); %!test -%! __fntestfunc__ ('ipermute', m1, [2, 1]); +%! __fntestfunc__ ("ipermute", m1, [2, 1]); %!test -%! __fntestfunc__ ('ipermute', m2, {'sparse', 'logical sparse', 'complex sparse'}, [3, 1, 2]); +%! __fntestfunc__ ("ipermute", m2, {"sparse", "logical sparse", "complex sparse"}, [3, 1, 2]); %!test -%! __fntestfunc__ ('ipermute', m3, [2, 1]); +%! __fntestfunc__ ("ipermute", m3, [2, 1]); %!test -%! __fntestfunc__ ('shiftdim', m2, 1); +%! __fntestfunc__ ("shiftdim", m2, 1); %!test -%! __fntestfunc__ ('shiftdim', m2, {'sparse', 'logical sparse', 'complex sparse'}, -1); +%! __fntestfunc__ ("shiftdim", m2, {"sparse", "logical sparse", "complex sparse"}, -1); %!test -%! __fntestfunc__ ('shiftdim', m3, 1); +%! __fntestfunc__ ("shiftdim", m3, 1); %!test -%! __fntestfunc__ ('circshift', m2, 1); +%! __fntestfunc__ ("circshift", m2, 1); %!test -%! __fntestfunc__ ('circshift', m2, [1, -1]); +%! __fntestfunc__ ("circshift", m2, [1, -1]); %!test -%! __fntestfunc__ ('circshift', m3, 1); +%! __fntestfunc__ ("circshift", m3, 1); %!test -%! __fntestfunc__ ('reshape', m2, [6, 5]); +%! __fntestfunc__ ("reshape", m2, [6, 5]); %!test -%! __fntestfunc__ ('reshape', m3, [1, 0]); +%! __fntestfunc__ ("reshape", m3, [1, 0]); %!test -%! __fntestfunc__ ('diag', m0, {'struct'}); +%! __fntestfunc__ ("diag", m0, {"struct"}); %!test -%! __fntestfunc__ ('diag', m0, {'struct'}, 1); +%! __fntestfunc__ ("diag", m0, {"struct"}, 1); %!test -%! __fntestfunc__ ('diag', m0, {'struct'}, -1); +%! __fntestfunc__ ("diag", m0, {"struct"}, -1); %!test -%! __fntestfunc__ ('diag', m1, {'struct'}); +%! __fntestfunc__ ("diag", m1, {"struct"}); %!test -%! __fntestfunc__ ('diag', m1, {'struct'}, 1); +%! __fntestfunc__ ("diag", m1, {"struct"}, 1); %!test -%! __fntestfunc__ ('diag', m1, {'struct'}, -1); +%! __fntestfunc__ ("diag", m1, {"struct"}, -1); %!test -%! __fntestfunc__ ('diag', m3, {'struct'}); +%! __fntestfunc__ ("diag", m3, {"struct"}); %!test -%! __fntestfunc__ ('fliplr', m1); +%! __fntestfunc__ ("fliplr", m1); %!test -%! __fntestfunc__ ('fliplr', m3); +%! __fntestfunc__ ("fliplr", m3); %!test -%! __fntestfunc__ ('flipud', m1); +%! __fntestfunc__ ("flipud", m1); %!test -%! __fntestfunc__ ('flipud', m3); +%! __fntestfunc__ ("flipud", m3); %!test -%! __fntestfunc__ ('flipdim', m1, 2); +%! __fntestfunc__ ("flipdim", m1, 2); %!test -%! __fntestfunc__ ('flipdim', m3, 2); +%! __fntestfunc__ ("flipdim", m3, 2); %!test -%! __fntestfunc__ ('transpose', m1); +%! __fntestfunc__ ("transpose", m1); %!test -%! __fntestfunc__ ('transpose', m3); +%! __fntestfunc__ ("transpose", m3); %!test -%! __fntestfunc__ ('ctranspose', m1); +%! __fntestfunc__ ("ctranspose", m1); %!test -%! __fntestfunc__ ('ctranspose', m3); +%! __fntestfunc__ ("ctranspose", m3); %!test -%! __fntestfunc__ ('rot90', m1); +%! __fntestfunc__ ("rot90", m1); %!test -%! __fntestfunc__ ('rot90', m1, 2); +%! __fntestfunc__ ("rot90", m1, 2); %!test -%! __fntestfunc__ ('rot90', m1, -1); +%! __fntestfunc__ ("rot90", m1, -1); %!test -%! __fntestfunc__ ('rot90', m3); +%! __fntestfunc__ ("rot90", m3); %!test -%! __fntestfunc__ ('rotdim', m2, 1, [1, 2]); +%! __fntestfunc__ ("rotdim", m2, 1, [1, 2]); %!test -%! __fntestfunc__ ('rotdim', m2, 2, [1, 2]); +%! __fntestfunc__ ("rotdim", m2, 2, [1, 2]); %!test -%! __fntestfunc__ ('rotdim', m2, -1, [1, 2]); +%! __fntestfunc__ ("rotdim", m2, -1, [1, 2]); %!test -%! __fntestfunc__ ('rotdim', m3, 1, [1, 2]); +%! __fntestfunc__ ("rotdim", m3, 1, [1, 2]);
--- a/test/test_global.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_global.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -19,19 +19,21 @@ %% test/octave.test/global/global-1.m %!test %! global G = 1; -%! assert(G,1) +%! assert (G,1); %% test/octave.test/global/global-2.m %!function f () %! global G; -%! assert(G,1); +%! assert (G,1); +%!endfunction %!test %! global G = 1; %! f; %% test/octave.test/global/global-3.m %!function f () -%! fail("G"); +%! fail ("G"); +%!endfunction %!test %! global G = 1; %! f(); @@ -39,25 +41,29 @@ %% test/octave.test/global/global-4.m %!function f () %! global H = 1; +%!endfunction %!test %! f; -%! fail("H"); +%! fail ("H"); %% test/octave.test/global/global-5.m %!function f () %! global H = 1; +%!endfunction %!test %!function g () -%! fail("H"); +%! fail ("H"); %!test %! g(); %% test/octave.test/global/global-6.m %!function f () %! global H = 1; +%!endfunction %!function g () %! global H; -%! assert(H,1); +%! assert (H,1); +%!endfunction %!test %! f(); %! g(); @@ -66,17 +72,20 @@ %!test %!function f () %! global H = 1; +%!endfunction %!test -%! fail("H"); +%! fail ("H"); %% test/octave.test/global/global-8.m %!function f () %! global H = 1; +%!endfunction %!function g () %! global H; -%! assert(H,1) +%! assert (H,1); +%!endfunction %!test %! f; -%! clear H +%! clear H; %! g;
--- a/test/test_if.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_if.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -20,68 +20,68 @@ %!test %! i = 0; %! if (i == 0) -%! i++; -%! printf_assert ("%d\n", i); +%! i++; +%! printf_assert ("%d\n", i); %! endif -%! assert(prog_output_assert("1")); +%! assert (prog_output_assert ("1")); %% test/octave.test/if/if-2.m %!test %! if (eye (2)) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! else -%! printf_assert ("pass\n"); +%! printf_assert ("pass\n"); %! end -%! assert(prog_output_assert("pass")); +%! assert (prog_output_assert ("pass")); %% test/octave.test/if/if-3.m %!test %! x = 2; %! if (eye (2)) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (x) -%! printf_assert ("pass\n"); +%! printf_assert ("pass\n"); %! endif -%! assert(prog_output_assert("pass")); +%! assert (prog_output_assert ("pass")); %% test/octave.test/if/if-4.m %!test %! x = 0; %! y = -2; %! if (eye (2)) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (x) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (y) -%! printf_assert ("pass\n"); +%! printf_assert ("pass\n"); %! end -%! assert(prog_output_assert("pass")); +%! assert (prog_output_assert ("pass")); %% test/octave.test/if/if-5.m %!test %! x = 0; %! y = -2; %! if (eye (2)) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (x) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (x) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! else -%! printf_assert ("pass\n"); +%! printf_assert ("pass\n"); %! endif -%! assert(prog_output_assert("pass")); +%! assert (prog_output_assert ("pass")); %% test/octave.test/if/if-6.m %!test %! x = 0; %! y = -2; %! if (y) -%! printf_assert ("pass\n"); +%! printf_assert ("pass\n"); %! elseif (x) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! elseif (x) -%! printf_assert ("fail\n"); +%! printf_assert ("fail\n"); %! end -%! assert(prog_output_assert("pass")); +%! assert (prog_output_assert ("pass"));
--- a/test/test_index-wfi-f.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,390 +0,0 @@ -## Copyright (C) 2006-2011 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -%% test/octave.test/index-wfi-f/s-1.m -%!test -%! a = []; -%! assert(isempty (a)); - -%% test/octave.test/index-wfi-f/s-2.m -%!test -%! a = 1; -%! assert(a(1),1); - -%% test/octave.test/index-wfi-f/s-3.m -%!test -%! a = 1; -%! assert(a(:),1); - -%% test/octave.test/index-wfi-f/s-4.m -%!test -%! a = 1; -%! assert(a(:,:),1); - -%% test/octave.test/index-wfi-f/s-5.m -%!test -%! a = 1; -%! assert(a(1,:),1); - -%% test/octave.test/index-wfi-f/s-6.m -%!test -%! a = 1; -%! assert(a(:,1),1); - -%% test/octave.test/index-wfi-f/s-7.m -%!test -%! a = 1; -%! assert(isempty (a(logical (0)))); - -%% test/octave.test/index-wfi-f/s-8.m -%!test -%! a = 1; -%! fail("a(-1)"); - -%% test/octave.test/index-wfi-f/s-9.m -%!test -%! a = 1; -%! fail("a(2);"); - -%% test/octave.test/index-wfi-f/s-10.m -%!test -%! a = 1; -%! fail("a(2,:);"); - -%% test/octave.test/index-wfi-f/s-11.m -%!test -%! a = 1; -%! fail("a(:,2);"); - -%% test/octave.test/index-wfi-f/s-12.m -%!test -%! a = 1; -%! fail("a(-1,:);"); - -%% test/octave.test/index-wfi-f/s-13.m -%!test -%! a = 1; -%! fail("a(:,-1);"); - -%% test/octave.test/index-wfi-f/s-14.m -%!test -%! a = 1; -%! fail("a([1,2,3]);"); - -%% test/octave.test/index-wfi-f/s-15.m -%!test -%! a = 1; -%! fail("a([1;2;3]);"); - -%% test/octave.test/index-wfi-f/s-16.m -%!test -%! a = 1; -%! fail("a([1,2;3,4]);"); - -%% test/octave.test/index-wfi-f/s-17.m -%!test -%! a = 1; -%! fail("a([0,1]);"); - -%% test/octave.test/index-wfi-f/s-18.m -%!test -%! a = 1; -%! fail("a([0;1]);"); - -%% test/octave.test/index-wfi-f/s-19.m -%!test -%! a = 1; -%! fail("a([-1,0]);"); - -%% test/octave.test/index-wfi-f/s-20.m -%!test -%! a = 1; -%! fail("a([-1;0]);"); - -%% test/octave.test/index-wfi-f/v-1.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(1),4); - -%% test/octave.test/index-wfi-f/v-2.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(2),3); - -%% test/octave.test/index-wfi-f/v-3.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(:) == a_prime)); - -%% test/octave.test/index-wfi-f/v-4.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(1,:) == a)); - -%% test/octave.test/index-wfi-f/v-5.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(:,3),2); - -%% test/octave.test/index-wfi-f/v-6.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(:,:) == a)); - -%% test/octave.test/index-wfi-f/v-7.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(logical ([0,1,1,0])) == mid_a)); - -%% test/octave.test/index-wfi-f/v-8.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(0);"); - -%% test/octave.test/index-wfi-f/v-9.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(5);"); - -%% test/octave.test/index-wfi-f/v-10.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(0,1);"); - -%% test/octave.test/index-wfi-f/v-11.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a(logical (0),:))); - -%% test/octave.test/index-wfi-f/v-12.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(:,0);"); - -%% test/octave.test/index-wfi-f/v-13.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a([]))); - -%% test/octave.test/index-wfi-f/v-14.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a([],:))); - -%% test/octave.test/index-wfi-f/v-15.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a(:,[]))); - -%% test/octave.test/index-wfi-f/m-1.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! assert(all (all (a(:,:) == a))); - -%% test/octave.test/index-wfi-f/m-2.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! assert(all (a(:) == a_fvec)); - -%% test/octave.test/index-wfi-f/m-3.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! fail("a(0);"); - -%% test/octave.test/index-wfi-f/m-4.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! assert(a(2),3); - -%% Additional tests -%!shared a, b -%! a = [1,2;3,4]; -%! b = a; -%! b(:,:,2) = [5,6;7,8]; - -%!assert (a(:), [1;3;2;4]); -%!assert (a(1:2), [1,3]); -%!assert (a(:,:), [1,2;3,4]); -%!assert (a(:,1), [1;3]); -%!assert (a(1,1), 1); -%!assert (a(1:2,1), [1;3]); -%!assert (a(:,:,1), [1,2;3,4]); - -%!test -%! c(:,:,1) = [1,2;3,4]; -%! c(:,:,2) = [1,2;3,4]; -%! assert (a(:,:,[1,1]),c) - -%!test -%! c(:,:,1,1) = [1,2;3,4]; -%! c(:,:,1,2) = [1,2;3,4]; -%! assert (a(:,:,1,[1,1]),c) - -%!test -%! c(:,:,1,1) = [1,2;3,4]; -%! c(:,:,2,1) = [1,2;3,4]; -%! c(:,:,1,2) = [1,2;3,4]; -%! c(:,:,2,2) = [1,2;3,4]; -%! assert (a(:,:,[1,1],[1,1]),c) - -%!assert (a(1,[]), zeros(1,0)); -%!assert (a(1,[],[1,1]), zeros(1,0,2)); -%!assert (a(1,1,[]), zeros(1,1,0)); - -%!test -%! c (1:10,1) = 1:10; -%! assert (c, [1:10]'); - -%!assert (b(:), [1; 3; 2; 4; 5; 7; 6; 8]); -%!assert (b(:,:), [1, 2, 5, 6; 3, 4, 7, 8]); -%!assert (b(:,1), [1;3]); -%!assert (b(:,:,:), reshape ([1,3,2,4,5,7,6,8],[2,2,2])); -%!assert (b(:,1,1), [1;3]); -%!assert (b(:,1,1,[1,1]),reshape([1,3,1,3],[2,1,1,2])); -%!assert (b(1,3), 5); -%!assert (b(1,[3,4]), [5,6]); -%!assert (b(1,1:4), [1,2,5,6]); -%!assert (b(1,[],:), zeros (1,0,2)); -%!assert (b(1,[]), zeros(1,0)); -%!assert (b(:,3), [5;7]) -%!assert (b([1,2],3), [5;7]) -%!assert (b(true(2,1),3), [5;7]) -%!assert (b(false(2,1),3), zeros(0,1)) -%!assert (b([],3), zeros(0,1)); - -%!shared x -%! # Dummy shared block to clear any previous definitions -%! x = 1; - -%!test -%! a(1,:) = [1,3]; -%! assert (a, [1,3]); - -%!test -%! a(1,:) = [1;3]; -%! assert (a, [1,3]); - -%!test -%! a(:,1) = [1;3]; -%! assert (a, [1;3]); - -%!test -%! a = [1,2;3,4]; -%! b (1,:,:) = a; -%! assert (b, reshape (a, [1,2,2])); - -%!test -%! a(1,1:4,2) = reshape (1:4, [1,1,4]); -%! b(:,:,2) = 1:4; -%! assert (a, b); - -%!test -%! a(:,:,:) = 1:4; -%! assert (a, [1:4]); - -%!test -%! a(:,:,1) = 1:4;; -%! assert (a, [1:4]); - -%!test -%! a(:,:,1) = [1:4]'; -%! assert (a, [1:4]'); - -%!test -%! a(:,:,1) = reshape(1:4,[1,1,4]); -%! assert (a, [1:4]'); - -%!test -%! a(:,1,:) = 1:4; -%! assert (a, reshape (1:4,[1,1,4])); - -%!test -%! a(:,1,:) = [1:4]'; -%! assert (a, [1:4]'); - -%!test -%! a(:,1,:) = reshape(1:4,[1,1,4]);; -%! assert (a, [1:4]'); - -%!test -%! a(1,:,:) = 1:4; -%! assert (a, reshape (1:4,[1,1,4])); - -%!test -%! a(1,:,:) = [1:4]'; -%! assert (a, [1:4]); - -%!test -%! a(1,:,:) = reshape(1:4,[1,1,4]); -%! assert (a, [1:4]); - -%!test -%! a(1,:,:,:) = reshape(1:4,[1,1,4]); -%! assert (a, reshape (1:4,[1,1,1,4])); - -%!error (a(1:2,1:2) = 1:4)
--- a/test/test_index-wfi-t.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,262 +0,0 @@ -## Copyright (C) 2006-2011 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -%% test/octave.test/index-wfi-t/s-1.m -%!test -%! a = []; -%! assert(isempty (a)); - -%% test/octave.test/index-wfi-t/s-2.m -%!test -%! a = 1; -%! assert(a(1),1); - -%% test/octave.test/index-wfi-t/s-3.m -%!test -%! a = 1; -%! assert(a(:),1); - -%% test/octave.test/index-wfi-t/s-4.m -%!test -%! a = 1; -%! assert(a(:,:),1); - -%% test/octave.test/index-wfi-t/s-5.m -%!test -%! a = 1; -%! assert(a(1,:),1); - -%% test/octave.test/index-wfi-t/s-6.m -%!test -%! a = 1; -%! assert(a(:,1),1); - -%% test/octave.test/index-wfi-t/s-7.m -%!test -%! a = 1; -%! assert(isempty (a(logical (0)))); - -%% test/octave.test/index-wfi-t/s-8.m -%!test -%! a = 1; -%! fail("a(-1);"); - -%% test/octave.test/index-wfi-t/s-9.m -%!test -%! a = 1; -%! fail("a(2);"); - -%% test/octave.test/index-wfi-t/s-10.m -%!test -%! a = 1; -%! fail("a(2,:);"); - -%% test/octave.test/index-wfi-t/s-11.m -%!test -%! a = 1; -%! fail("a(:,2);"); - -%% test/octave.test/index-wfi-t/s-12.m -%!test -%! a = 1; -%! fail("a(-1,:);"); - -%% test/octave.test/index-wfi-t/s-13.m -%!test -%! a = 1; -%! fail("a(:,-1);"); - -%% test/octave.test/index-wfi-t/s-14.m -%!test -%! a = 1; -%! fail("a([1,2,3]);"); - -%% test/octave.test/index-wfi-t/s-15.m -%!test -%! a = 1; -%! fail("a([1;2;3]);"); - -%% test/octave.test/index-wfi-t/s-16.m -%!test -%! a = 1; -%! fail("a([1,2;3,4]);"); - -%% test/octave.test/index-wfi-t/s-17.m -%!test -%! a = 1; -%! fail("a([0,1]);"); - -%% test/octave.test/index-wfi-t/s-18.m -%!test -%! a = 1; -%! fail("a([0;1]);"); - -%% test/octave.test/index-wfi-t/s-19.m -%!test -%! a = 1; -%! fail("a([-1,0]);"); - -%% test/octave.test/index-wfi-t/s-20.m -%!test -%! a = 1; -%! fail("a([-1;0]);"); - -%% test/octave.test/index-wfi-t/v-1.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(1),4); - -%% test/octave.test/index-wfi-t/v-2.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(2),3); - -%% test/octave.test/index-wfi-t/v-3.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(:) == a_prime)); - -%% test/octave.test/index-wfi-t/v-4.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(1,:) == a)); - -%% test/octave.test/index-wfi-t/v-5.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(a(:,3),2); - -%% test/octave.test/index-wfi-t/v-6.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(:,:) == a)); - -%% test/octave.test/index-wfi-t/v-7.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(all (a(logical ([0,1,1,0])) == mid_a)); - -%% test/octave.test/index-wfi-t/v-8.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(0);"); - -%% test/octave.test/index-wfi-t/v-9.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(5);"); - -%% test/octave.test/index-wfi-t/v-10.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(0,1);"); - -%% test/octave.test/index-wfi-t/v-11.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a(logical (0),:))); - -%% test/octave.test/index-wfi-t/v-12.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! fail("a(:,0);"); - -%% test/octave.test/index-wfi-t/v-13.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a([]))); - -%% test/octave.test/index-wfi-t/v-14.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a([],:))); - -%% test/octave.test/index-wfi-t/v-15.m -%!test -%! a = [4,3,2,1]; -%! a_prime = [4;3;2;1]; -%! mid_a = [3,2]; -%! assert(isempty (a(:,[]))); - -%% test/octave.test/index-wfi-t/m-1.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! assert(all (all (a(:,:) == a))); - -%% test/octave.test/index-wfi-t/m-2.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! assert(all (a(:) == a_fvec)); - -%% test/octave.test/index-wfi-t/m-3.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! fail("a(0);"); - -%% test/octave.test/index-wfi-t/m-4.m -%!test -%! a = [1,2;3,4]; -%! a_fvec = [1;3;2;4]; -%! a_col_1 = [1;3]; -%! a_col_2 = [2;4]; -%! a_row_1 = [1,2]; -%! a_row_2 = [3,4]; -%! fail("a(2);","warning");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/test_index.m Mon Jan 09 15:19:21 2012 -0500 @@ -0,0 +1,212 @@ +## Copyright (C) 2006-2012 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +%!test +%! a = []; +%! assert (isempty (a)); + +%!shared a +%! a = 1; +%!assert (a(1), 1) +%!assert (a(:), 1) +%!assert (a(:,:), 1) +%!assert (a(1,:), 1) +%!assert (a(:,1),1) +%!assert (isempty (a(logical (0)))) +%!error a(-1) +%!error a(2) +%!error a(2,:) +%!error a(:,2) +%!error a(-1,:) +%!error a(:,-1) +%!error a([1,2,3]) +%!error a([1;2;3]) +%!error a([1,2;3,4]) +%!error a([0,1]) +%!error a([0;1]) +%!error a([-1,0]) +%!error a([-1;0]) + +%!shared a, a_prime, mid_a +%! a = [4,3,2,1]; +%! a_prime = [4;3;2;1]; +%! mid_a = [3,2]; + +%!assert (a(1),4) +%!assert (a(2),3) +%!assert (all (a(:) == a_prime)) +%!assert (all (a(1,:) == a)) +%!assert (a(:,3),2) +%!assert (all (a(:,:) == a)) +%!assert (all (a(logical ([0,1,1,0])) == mid_a)) +%!error a(0) +%!error a(5) +%!error a(0,1) +%!assert (isempty (a(logical (0),:))) +%!error a(:,0) +%!assert (isempty (a([]))) +%!assert (isempty (a([],:))) +%!assert (isempty (a(:,[]))) + +%!shared a, a_fvec, a_col_1, a_col_2, a_row_1, a_row_2 +%! a = [1,2;3,4]; +%! a_fvec = [1;3;2;4]; +%! a_col_1 = [1;3]; +%! a_col_2 = [2;4]; +%! a_row_1 = [1,2]; +%! a_row_2 = [3,4]; + +%!assert (all (all (a(:,:) == a))) +%!assert (all (a(:) == a_fvec)) +%!error a(0) +%!assert (a(2), 3) + +%% Additional tests + +%!shared a, b +%! a = [1,2;3,4]; +%! b = a; +%! b(:,:,2) = [5,6;7,8]; + +%!assert (a(:), [1;3;2;4]) +%!assert (a(1:2), [1,3]) +%!assert (a(:,:), [1,2;3,4]) +%!assert (a(:,1), [1;3]) +%!assert (a(1,1), 1) +%!assert (a(1:2,1), [1;3]) +%!assert (a(:,:,1), [1,2;3,4]) + +%!test +%! c(:,:,1) = [1,2;3,4]; +%! c(:,:,2) = [1,2;3,4]; +%! assert (a(:,:,[1,1]), c) + +%!test +%! c(:,:,1,1) = [1,2;3,4]; +%! c(:,:,1,2) = [1,2;3,4]; +%! assert (a(:,:,1,[1,1]), c) + +%!test +%! c(:,:,1,1) = [1,2;3,4]; +%! c(:,:,2,1) = [1,2;3,4]; +%! c(:,:,1,2) = [1,2;3,4]; +%! c(:,:,2,2) = [1,2;3,4]; +%! assert (a(:,:,[1,1],[1,1]), c) + +%!assert (a(1,[]), zeros (1,0)) +%!assert (a(1,[],[1,1]), zeros (1,0,2)) +%!assert (a(1,1,[]), zeros (1,1,0)) + +%!test +%! c (1:10,1) = 1:10; +%! assert (c, [1:10]'); + +%!assert (b(:), [1; 3; 2; 4; 5; 7; 6; 8]) +%!assert (b(:,:), [1, 2, 5, 6; 3, 4, 7, 8]) +%!assert (b(:,1), [1;3]) +%!assert (b(:,:,:), reshape ([1,3,2,4,5,7,6,8],[2,2,2])) +%!assert (b(:,1,1), [1;3]) +%!assert (b(:,1,1,[1,1]),reshape ([1,3,1,3],[2,1,1,2])) +%!assert (b(1,3), 5) +%!assert (b(1,[3,4]), [5,6]) +%!assert (b(1,1:4), [1,2,5,6]) +%!assert (b(1,[],:), zeros (1,0,2)) +%!assert (b(1,[]), zeros(1,0)) +%!assert (b(:,3), [5;7]) +%!assert (b([1,2],3), [5;7]) +%!assert (b(true(2,1),3), [5;7]) +%!assert (b(false(2,1),3), zeros(0,1)) +%!assert (b([],3), zeros(0,1)) + +%!shared x +%! # Dummy shared block to clear any previous definitions +%! x = 1; + +%!test +%! a(1,:) = [1,3]; +%! assert (a, [1,3]); + +%!test +%! a(1,:) = [1;3]; +%! assert (a, [1,3]); + +%!test +%! a(:,1) = [1;3]; +%! assert (a, [1;3]); + +%!test +%! a = [1,2;3,4]; +%! b (1,:,:) = a; +%! assert (b, reshape (a, [1,2,2])); + +%!test +%! a(1,1:4,2) = reshape (1:4, [1,1,4]); +%! b(:,:,2) = 1:4; +%! assert (a, b); + +%!test +%! a(:,:,:) = 1:4; +%! assert (a, [1:4]); + +%!test +%! a(:,:,1) = 1:4;; +%! assert (a, [1:4]); + +%!test +%! a(:,:,1) = [1:4]'; +%! assert (a, [1:4]'); + +%!test +%! a(:,:,1) = reshape (1:4,[1,1,4]); +%! assert (a, [1:4]'); + +%!test +%! a(:,1,:) = 1:4; +%! assert (a, reshape (1:4,[1,1,4])); + +%!test +%! a(:,1,:) = [1:4]'; +%! assert (a, [1:4]'); + +%!test +%! a(:,1,:) = reshape (1:4,[1,1,4]);; +%! assert (a, [1:4]'); + +%!test +%! a(1,:,:) = 1:4; +%! assert (a, reshape (1:4,[1,1,4])); + +%!test +%! a(1,:,:) = [1:4]'; +%! assert (a, [1:4]); + +%!test +%! a(1,:,:) = reshape (1:4,[1,1,4]); +%! assert (a, [1:4]); + +%!test +%! a(1,:,:,:) = reshape (1:4,[1,1,4]); +%! assert (a, reshape (1:4,[1,1,1,4])); + +%!error (a(1:2,1:2) = 1:4) + +%!shared x +%! x = 1:5; +%!error <attempted to use a complex scalar as an index> x(i) +%!error <attempted to use a complex scalar as an index> x(j) +%!error <attempted to use a complex scalar as an index> x(1+i)
--- a/test/test_io.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_io.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -43,7 +43,7 @@ %! ## bool %! persistent a5 = (1 == 1); %! ## bool matrix -%! persistent a6 = ([ones(1,5), zeros(1,5)] == ones(1,10)); +%! persistent a6 = ([ones(1,5), zeros(1,5)] == ones (1,10)); %! ## range %! persistent a7 = 1:10; %! ## structure @@ -53,25 +53,25 @@ %! ## string %! persistent a10 = ["test"; "strings"]; %! ## int8 array -%! persistent a11 = int8(floor(256*rand(2,2))); +%! persistent a11 = int8 (floor (256*rand (2,2))); %! ## int16 array -%! persistent a12 = int16(floor(65536*rand(2,2))); +%! persistent a12 = int16 (floor (65536*rand (2,2))); %! ## int32 array -%! persistent a13 = int32(floor(1e6*rand(2,2))); +%! persistent a13 = int32 (floor (1e6*rand (2,2))); %! ## int64 array -%! persistent a14 = int64(floor(10*rand(2,2))); +%! persistent a14 = int64 (floor (10*rand (2,2))); %! ## uint8 array -%! persistent a15 = uint8(floor(256*rand(2,2))); +%! persistent a15 = uint8 (floor (256*rand (2,2))); %! ## uint16 array -%! persistent a16 = uint16(floor(65536*rand(2,2))); +%! persistent a16 = uint16 (floor (65536*rand (2,2))); %! ## int32 array -%! persistent a17 = uint32(floor(1e6*rand(2,2))); +%! persistent a17 = uint32 (floor (1e6*rand (2,2))); %! ## uint64 array -%! persistent a18 = uint64(floor(10*rand(2,2))); +%! persistent a18 = uint64 (floor (10*rand (2,2))); %! ## sparse -%! persistent a19 = sprandn(100,100,0.01); +%! persistent a19 = sprandn (100,100,0.01); %! ## complex sparse -%! persistent a20 = sprandn(100,100,0.01) + 1i * sprandn(100,100,0.01); +%! persistent a20 = sprandn (100,100,0.01) + 1i * sprandn (100,100,0.01); %! %! ret = 0; %! @@ -177,7 +177,8 @@ %! endif %! %! ret = 1; -%! +%!endfunction + %!test %! %! [save_status, save_files] = testls (0); @@ -187,8 +188,8 @@ %! unlink (f{1}); %! endfor %! -%! assert(save_status && load_status); -%! +%! assert (save_status && load_status); + %!test %! %! STR.scalar_fld = 1; @@ -200,52 +201,52 @@ %! save struct.dat -struct STR; %! STR = load ("struct.dat"); %! -%! assert(STR.scalar_fld == 1 && ... -%! STR.matrix_fld == [1.1,2;3,4] && ... -%! STR.string_fld == "Octave" && ... -%! STR.struct_fld.x == 0 && ... -%! STR.struct_fld.y == 1 ); +%! assert (STR.scalar_fld == 1 && ... +%! STR.matrix_fld == [1.1,2;3,4] && ... +%! STR.string_fld == "Octave" && ... +%! STR.struct_fld.x == 0 && ... +%! STR.struct_fld.y == 1 ); %! %! %! save -binary struct.dat -struct STR matrix_fld str*_fld; %! STR = load ("struct.dat"); %! -%! assert(!isfield(STR,"scalar_fld") && ... -%! STR.matrix_fld == [1.1,2;3,4] && ... -%! STR.string_fld == "Octave" && ... -%! STR.struct_fld.x == 0 && ... -%! STR.struct_fld.y == 1); +%! assert (!isfield(STR,"scalar_fld") && ... +%! STR.matrix_fld == [1.1,2;3,4] && ... +%! STR.string_fld == "Octave" && ... +%! STR.struct_fld.x == 0 && ... +%! STR.struct_fld.y == 1); %! %! delete struct.dat; -%! + %!test -%! matrix1 = rand(100, 2); +%! matrix1 = rand (100, 2); %! save -ascii matrix.ascii matrix1 %! matrix2 = load ("matrix.ascii"); %! assert (matrix1, matrix2, 1e-9) %! %! delete matrix.ascii; -%% FIXME Disable this test as it writes to stdout and there is no easy -%% way to recover output. Need to spawn new octave process and pipe stdout -%% somewhere to treat this case +%% FIXME: This test is disabled as it writes to stdout and there is no easy +%% way to recover output. Need to spawn new octave process and pipe stdout +%% somewhere to treat this case. %% test/octave.test/io/puts-1.m %!#test %! puts ("foo\n"); %% test/octave.test/io/puts-2.m -%!assert(puts (1),-1); +%!assert (puts (1),-1) %% test/octave.test/io/puts-3.m -%!error <Invalid call to puts> puts (); +%!error <Invalid call to puts> puts () %% test/octave.test/io/puts-4.m -%!error <Invalid call to puts> puts (1, 2); +%!error <Invalid call to puts> puts (1, 2) %!assert (sscanf ('123456', '%10c'), '123456') %!assert (sscanf ('123456', '%10s'), '123456') -%!assert (sscanf (['ab'; 'cd'], '%s'), 'acbd'); +%!assert (sscanf (['ab'; 'cd'], '%s'), 'acbd') %!test %! [val, count, msg, pos] = sscanf ("3I2", "%f"); @@ -274,28 +275,28 @@ %! [v1, c1, m1] = sscanf ("1 2 3 4 5 6", "%d"); %! [v2, c2, m2] = sscanf ("1 2 bar 3 4 5 6", "%d"); %! -%! assert((a == 1.2 && b == 3 && c == "foo" +%! assert ((a == 1.2 && b == 3 && c == "foo" %! && v1 == [1; 2; 3; 4; 5; 6] && c1 == 6 && ischar (m1) %! && v2 == [1; 2] && c2 == 2 && ischar (m2))); %% test/octave.test/io/sscanf-2.m -%!error <Invalid call to sscanf> sscanf (); +%!error <Invalid call to sscanf> sscanf () %% test/octave.test/io/sscanf-3.m -%!error sscanf (1, 2); +%!error sscanf (1, 2) %% test/octave.test/io/sscanf-4.m -%!error <Invalid call to sscanf> sscanf ("foo", "bar", "C", 1); +%!error <Invalid call to sscanf> sscanf ("foo", "bar", "C", 1) %% test/octave.test/io/sscanf-5.m %!test -%! [x, n] = sscanf(" 0.024000 0.200 0.200 2.000 1987 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 2 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 4 5 1 2 2 5 5 8 2 8 12 6 15 18 28 26 47 88 118 162 192 130 88 56 27 23 14 9 6 3 4 1 0 2 3 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0.026000 0.250 0.250 2.100 3115 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1 1 0 1 1 1 0 1 0 1 3 2 0 5 15 25 44 66 145 179 193 172 104 57 17 11 12 2 1 0 1 1 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.028000 0.300 0.300 2.200 4929 3 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1 0 1 2 2 3 2 3 14 21 49 80 148 184 218 159 124 63 37 13 12 3 1 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.030000 0.350 0.350 2.300 7051 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 2 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 0 0 0 2 0 0 0 1 5 6 14 28 51 88 154 177 208 169 124 65 39 15 5 3 3 2 1 0 1 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.032000 0.400 0.400 2.400 9113 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 2 0 1 0 0 1 1 0 2 3 5 3 17 30 60 117 156 189 209 129 102 64 56 16 11 4 2 2 0 0 0 0 1 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0.034000 0.450 0.450 2.500 11811 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 5 5 15 21 57 99 149 190 195 159 130 69 41 16 10 2 5 3 0 1 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.036000 0.500 0.500 2.600 14985 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0 0 1 0 0 2 2 6 10 34 60 95 126 177 194 155 99 71 44 17 6 7 2 0 0 0 3 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.038000 0.550 0.550 2.700 18391 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 2 0 0 1 1 0 1 2 1 0 0 0 1 0 1 3 6 19 27 52 95 161 154 169 134 94 64 37 19 9 6 0 2 1 0 0 0 0 1 2 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 2 2 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.040000 0.600 0.600 2.800 22933 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 0 1 0 0 0 0 0 2 0 3 4 7 18 27 47 82 134 163 133 138 101 58 34 26 10 5 2 1 2 1 1 0 2 1 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.042000 0.650 0.650 2.900 27719 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 2 8 16 37 51 87 128 153 146 123 105 62 35 24 8 3 5 0 1 2 1 0 0 0 1 1 1 0 0 0 1 0 1 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.044000 0.700 0.700 3.000 32922 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 0 0 0 2 0 0 0 0 0 0 0 0 2 1 0 0 0 0 1 1 1 1 0 0 1 0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 1 0 1 1 1 1 0 0 0 1 4 3 5 5 15 35 54 88 132 168 149 105 92 62 30 16 17 4 5 1 0 0 1 0 1 1 0 1 1 0 0 0 1 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.046000 0.750 0.750 3.100 38973 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 4 3 5 20 37 56 94 110 135 149 124 84 58 36 17 14 7 1 0 2 0 1 0 0 1 1 0 0 0 0 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 0 0 0 0 1 1 0 0 1 0 0 0 0 1 0 0 0 1 1 0 1 0 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.048000 0.800 0.800 3.200 45376 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 1 0 0 2 1 1 2 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 3 18 34 55 82 104 135 116 99 79 60 51 29 10 4 3 1 1 1 0 0 1 0 0 0 1 0 0 3 1 2 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.050000 0.850 0.850 3.300 52060 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 1 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 2 2 1 3 12 24 40 39 107 121 127 138 100 86 68 44 23 15 7 3 1 1 0 1 1 0 0 2 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.052000 0.900 0.900 3.400 59454 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 1 0 0 2 0 2 1 0 0 0 1 0 0 1 0 0 0 0 0 3 3 6 21 32 68 90 132 111 122 107 73 57 47 24 11 7 4 2 2 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 2 0 1 1 0 0 1 0 0 0 0 0 3 0 1 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0.054000 0.950 0.950 3.500 67013 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 1 0 0 0 0 1 0 0 1 1 0 0 0 1 0 1 0 1 2 4 3 7 9 28 31 71 94 115 96 108 78 82 60 38 17 12 11 4 3 1 1 0 2 1 0 0 0 2 1 3 0 0 0 0 3 0 0 1 0 0 0 0 0 0 0 2 0 0 0 1 0 2 0 1 0 2 0 1 0 0 1 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0.056000 1.000 1.000 3.600 75475 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 3 0 0 1 1 2 0 1 4 0 1 8 6 7 17 41 56 71 109 113 84 103 72 54 35 22 6 9 1 7 5 4 0 0 1 0 0 0 0 0 0 1 0 0 2 1 0 0 0 0 2 0 0 1 0 0 1 0 0 0 0 0 0 1 0 2 0 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 3 0 0 0 1 0 0 0 0 0 0 1 1 0 0 2 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.058000 1.050 1.050 3.700 83558 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 1 2 0 0 2 0 0 1 0 3 2 3 6 15 27 41 77 73 94 94 92 76 61 56 42 23 13 11 6 2 1 2 0 1 2 0 0 1 0 1 0 0 1 0 0 1 1 1 0 0 0 1 0 0 0 1 0 0 0 0 1 1 0 0 0 0 2 0 0 0 0 0 1 2 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0.060000 1.100 1.100 3.800 93087 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 1 2 2 0 0 0 1 0 1 1 0 0 0 1 1 0 4 0 0 1 2 0 3 1 3 5 13 33 31 65 75 77 96 97 80 59 45 36 32 18 2 5 0 1 0 0 1 0 0 3 0 0 0 0 1 0 0 0 0 0 1 0 0 1 2 0 0 0 0 1 0 0 0 0 1 0 1 1 1 0 0 2 0 0 2 0 1 0 0 0 0 0 0 0 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.062000 1.150 1.150 3.900 102829 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 0 0 1 0 1 0 0 0 0 0 1 1 1 0 1 0 1 1 0 1 1 0 2 0 2 1 2 0 0 2 4 3 5 11 9 23 43 53 68 65 87 83 77 59 49 34 18 15 9 4 2 3 2 0 0 0 4 0 1 1 0 0 2 0 0 1 0 0 0 0 1 1 1 0 1 0 0 0 0 2 0 0 0 0 1 0 0 1 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0.064000 1.200 1.200 4.000 113442 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 1 1 1 0 1 1 1 1 1 0 0 0 1 2 0 0 0 2 0 4 5 11 13 29 39 61 68 61 75 76 74 73 44 37 29 19 6 3 3 2 0 1 2 1 0 0 0 0 1 1 1 0 1 1 0 0 0 1 0 1 1 0 1 2 0 2 1 1 1 0 0 0 0 1 0 0 1 1 1 1 1 0 0 0 0 0 0 0 1 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0.066000 1.250 1.250 4.100 126668 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 1 0 0 0 1 1 2 3 0 2 1 2 0 1 0 3 0 0 0 1 0 1 1 3 0 0 1 3 0 2 4 3 12 12 30 48 56 66 77 78 71 82 52 31 32 19 20 16 8 2 1 3 0 0 2 1 0 1 0 1 0 0 0 1 3 1 0 1 0 1 1 1 0 0 0 0 0 2 0 2 0 0 0 0 0 1 0 0 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 2 0 3 1 0 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.068000 1.300 1.300 4.200 138042 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 2 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1 0 0 0 0 3 0 0 1 0 0 1 2 0 0 0 3 0 1 0 0 3 0 1 0 1 1 3 1 4 7 11 14 27 36 44 68 72 70 71 45 44 46 29 13 16 11 5 2 0 3 0 0 0 0 1 1 2 0 0 1 1 2 1 1 0 1 0 0 0 0 0 0 0 0 0 0 1 0 1 1 0 1 2 0 0 1 1 0 1 1 1 0 0 1 0 0 1 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.070000 1.350 1.350 4.300 152335 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 2 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 2 0 0 0 0 1 1 1 0 1 1 0 1 1 1 1 0 2 0 0 0 0 0 2 0 1 7 14 19 34 35 54 72 68 72 68 58 48 36 37 27 25 17 1 4 1 0 0 0 1 2 2 0 0 1 1 1 2 1 0 3 1 0 1 0 2 1 0 0 0 1 1 1 2 0 0 0 0 1 1 0 1 1 0 2 1 1 1 1 0 0 0 1 1 0 0 2 0 0 1 0 0 0 1 1 0 2 1 1 0 0 0 0 2 0 0 0 0 0 0 0 1 1 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0.072000 1.400 1.400 4.400 166280 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 1 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 1 0 1 1 1 0 0 1 0 1 0 0 3 4 2 2 0 0 0 0 0 1 1 3 1 0 3 2 2 1 2 2 0 2 2 1 8 14 26 24 29 47 47 68 65 63 55 42 41 26 29 17 8 4 4 1 0 1 2 0 0 0 1 1 2 0 1 2 1 0 0 1 1 1 0 0 1 0 0 0 1 0 0 1 2 1 2 1 0 0 0 0 0 1 1 2 0 2 2 0 0 0 0 1 1 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.074000 1.450 1.450 4.500 179484 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 1 0 0 1 0 1 2 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 1 0 1 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 1 1 0 1 1 1 2 0 0 1 1 2 1 0 1 1 2 2 0 1 5 6 10 20 43 50 57 62 53 62 66 45 42 33 27 26 23 14 3 0 2 0 1 0 0 1 1 0 0 2 1 1 0 0 3 0 1 1 1 0 1 1 0 1 0 1 2 1 0 0 1 2 0 2 0 0 0 0 1 1 3 1 0 0 2 1 1 1 0 0 0 0 0 0 1 2 0 1 0 0 0 0 0 1 1 0 2 0 0 0 0 0 1 0 2 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.076000 1.500 1.500 4.600 197657 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 1 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 2 0 0 0 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 2 0 0 0 2 1 1 0 1 1 0 1 1 3 2 1 1 2 1 0 1 0 0 0 0 0 1 1 1 0 5 3 7 12 24 38 32 41 48 54 66 71 49 46 31 38 25 15 8 6 6 5 0 1 3 0 1 1 1 1 1 0 1 2 0 1 0 0 0 1 0 2 1 2 0 0 0 0 1 3 1 0 0 0 0 1 1 0 1 0 1 1 1 1 1 0 4 1 1 1 0 3 0 0 0 2 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0.078000 1.550 1.550 4.700 212054 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 0 0 1 0 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 2 0 0 0 1 0 0 1 0 1 1 0 1 3 1 0 0 1 2 0 0 0 1 0 0 0 0 0 2 1 2 1 1 1 0 0 1 5 1 1 2 3 5 7 9 11 22 31 37 48 50 52 54 57 37 38 38 33 24 11 19 11 3 1 2 0 3 3 2 1 0 1 3 0 1 1 1 1 1 2 0 0 0 1 1 2 0 1 1 3 0 1 1 0 0 1 0 2 0 1 0 0 1 3 0 2 0 1 0 1 2 0 1 1 1 1 1 0 3 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0 0 0 0 0 0.080000 1.600 1.600 4.800 231971 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 1 1 1 0 1 0 0 0 0 1 0 1 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 2 1 0 1 1 1 0 1 0 0 1 0 1 3 0 0 0 1 0 0 0 1 1 1 0 0 4 1 1 0 2 0 1 1 1 2 0 0 0 1 0 1 2 1 2 3 2 0 1 0 4 3 1 1 1 1 3 1 0 0 0 2 1 0 2 7 17 13 29 47 58 59 52 38 51 51 38 34 35 21 14 13 4 1 0 1 1 1 0 2 2 4 1 0 1 1 4 0 0 0 2 0 2 2 2 0 0 1 3 2 1 1 2 2 2 2 1 0 3 0 2 1 2 1 2 2 0 0 1 1 0 2 0 2 2 0 1 0 2 2 3 1 2 3 1 1 0 1 0 2 0 1 2 1 2 0 2 1 0 0 3 0 0 1 1 1 1 0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0.082000 1.650 1.650 4.900 252503 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 2 0 0 1 0 1 2 2 2 1 0 2 0 1 0 1 1 2 2 0 3 0 0 4 1 0 0 3 0 0 1 2 0 1 1 1 3 0 1 0 2 9 11 25 27 34 53 41 49 43 47 36 31 38 22 30 22 18 9 5 9 2 2 1 2 2 3 1 4 1 1 0 0 1 2 0 2 1 0 0 1 3 2 2 1 0 0 0 1 2 1 0 0 0 2 1 1 0 2 0 0 1 0 0 2 1 3 1 1 1 0 2 1 1 0 2 1 0 1 3 0 0 0 0 2 0 0 1 0 0 0 0 0 1 2 1 1 1 0 2 1 0 0 0 2 0 1 0 0 0 0 1 0 0 0 0 1 0 0 2 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0.084000 1.700 1.700 5.000 267889 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 0 1 1 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 1 0 3 0 1 1 1 0 1 2 1 0 2 0 2 4 0 1 0 0 0 1 1 0 1 3 2 0 2 0 4 0 0 2 0 1 4 2 4 3 3 6 10 14 28 37 54 36 40 52 40 50 46 40 32 26 29 12 18 5 2 0 2 4 1 2 1 0 2 1 2 2 1 0 1 0 2 1 2 4 1 1 5 1 0 2 0 1 2 3 2 2 1 2 1 0 2 1 2 1 1 4 1 2 1 4 0 2 2 0 0 3 1 0 2 0 0 1 1 1 0 0 2 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0.086000 1.750 1.750 5.100 290294 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 2 0 0 0 1 0 0 0 0 1 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 1 3 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 1 0 0 2 1 0 1 0 1 0 0 2 2 0 1 2 2 0 2 0 2 0 1 0 0 1 1 1 3 1 1 1 1 3 4 1 1 2 2 2 1 0 3 0 0 0 2 4 5 6 16 18 20 31 40 54 55 46 41 52 35 27 21 28 27 20 15 8 6 7 1 0 0 3 0 0 2 2 0 3 1 3 1 1 2 0 0 1 2 1 3 2 0 1 2 1 3 1 1 1 1 1 2 0 2 1 0 1 1 1 3 1 1 2 0 1 0 1 0 2 1 1 0 0 1 2 0 3 1 1 0 0 0 1 3 1 1 1 0 0 1 2 1 0 0 1 1 1 0 0 1 0 0 0 0 0 0 2 0 1 0 0 0 2 1 0 2 0 0 0 0 1 1 0 1 0 0 0 0 0 0 0 0.088000 1.800 1.800 5.200 312476 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 0 0 0 1 0 1 0 1 1 0 0 0 0 0 0 2 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 2 0 0 0 1 0 1 0 0 0 0 0 0 2 1 0 0 1 0 0 1 1 1 1 4 2 0 1 0 0 3 0 0 0 0 0 1 1 4 0 0 0 0 1 1 2 1 0 3 0 0 2 2 4 0 3 1 6 9 10 13 21 24 32 43 33 41 43 49 50 32 26 31 27 12 16 17 3 3 3 5 0 3 0 2 1 3 3 2 1 2 3 1 2 1 1 1 2 0 1 1 0 2 0 3 0 0 2 0 0 0 0 1 0 1 1 3 3 0 1 1 1 1 1 1 2 2 2 0 3 1 0 2 2 2 0 0 0 0 3 1 2 5 1 1 2 0 0 3 3 0 2 2 0 0 0 0 1 2 0 0 1 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0.090000 1.850 1.850 5.300 337348 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 2 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 2 0 1 1 0 0 0 1 0 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 2 0 0 0 1 3 2 0 0 2 2 3 3 2 2 2 0 0 1 1 3 1 3 0 0 0 0 0 0 1 2 1 2 1 2 2 2 0 1 1 0 4 2 2 7 6 15 22 21 39 37 50 31 51 30 33 34 34 26 21 14 13 10 9 4 3 3 4 2 2 0 1 2 3 3 0 1 3 2 5 3 2 2 4 0 2 3 0 4 2 1 2 2 2 4 2 1 3 1 3 2 1 3 1 2 4 1 1 1 1 2 4 1 3 3 3 1 0 4 1 0 1 1 1 1 2 3 0 3 0 0 4 1 1 1 0 2 2 2 1 2 2 0 1 1 0 0 0 2 0 1 0 1 0 0 1 0 0 0 1 3 0 0 1 0 0 1 1 1 0 0 1 0 0 0 0 0 0 0.092000 1.900 1.900 5.400 357303 3 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0 1 1 0 1 0 0 1 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 1 3 1 0 1 0 0 0 0 1 0 0 1 0 0 1 1 2 2 0 0 2 2 1 1 1 1 1 1 0 1 0 0 1 1 1 3 1 1 1 1 1 0 1 4 0 1 1 1 3 0 1 1 2 2 2 0 2 3 2 2 2 2 1 2 1 3 8 22 14 32 36 46 39 42 39 29 36 38 26 24 26 18 16 19 10 9 3 6 5 0 3 2 1 1 1 2 0 2 1 1 0 1 1 3 1 0 2 4 2 2 1 4 1 2 2 1 1 0 1 2 0 2 2 2 4 2 1 1 0 2 1 3 1 2 3 4 2 3 2 3 0 1 2 1 0 0 0 4 1 1 1 2 1 3 1 0 5 1 0 0 0 0 0 0 1 0 2 0 1 2 1 0 1 0 0 0 0 0 1 1 0 1 0 1 4 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0.094000 1.950 1.950 5.500 383138 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 2 1 0 1 1 1 0 0 0 0 0 0 1 1 0 1 0 0 1 1 0 1 0 0 0 0 0 0 0 2 1 1 1 1 2 1 0 2 0 1 0 3 2 1 3 0 1 3 1 1 0 5 0 1 0 1 2 0 0 1 1 2 0 0 6 1 0 3 2 2 3 4 5 0 4 2 1 5 4 11 15 22 27 28 57 38 38 40 38 39 38 27 26 30 18 14 10 10 4 4 4 3 3 2 2 2 2 1 1 1 1 2 2 3 4 1 2 3 1 2 1 2 2 2 1 3 2 1 5 0 1 1 1 3 2 2 2 1 3 1 1 0 3 2 2 0 0 2 2 2 0 0 0 2 0 1 3 1 2 3 2 1 1 0 1 1 1 0 3 2 2 1 0 0 1 3 1 1 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 3 1 0 0 0 0 1 0 1 1 0 0 0 1 0 0 0 0 0 0.096000 2.000 2.000 5.600 409868 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 1 0 1 0 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 2 0 1 0 0 2 0 2 0 0 0 0 1 0 0 2 1 2 2 2 1 2 1 1 1 1 1 2 0 0 1 1 0 1 0 2 1 2 0 2 0 3 1 2 1 3 1 5 0 2 2 1 2 4 1 2 0 3 1 4 7 5 9 13 22 19 31 27 28 41 34 39 37 22 23 21 22 17 23 15 8 9 3 8 0 3 1 2 2 2 3 1 0 4 2 4 2 2 2 2 4 2 1 1 0 2 0 3 0 3 2 2 1 2 2 1 4 1 2 2 1 1 5 2 1 2 1 2 2 1 0 2 4 3 2 1 2 2 3 2 3 1 2 1 1 1 1 2 1 1 2 2 1 2 3 2 1 1 0 2 2 4 0 1 1 1 1 1 0 0 1 1 3 0 0 0 0 0 1 0 0 2 0 1 2 0 1 1 1 0 1 0 1 0 0 0.098000 2.050 2.050 5.700 439102 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 1 1 0 0 1 0 1 0 1 0 0 0 0 1 1 0 1 0 0 1 1 0 0 1 1 0 0 1 1 0 1 0 0 0 0 0 0 0 1 2 0 0 1 1 1 1 2 0 1 1 0 0 0 0 1 1 1 0 4 0 0 0 2 1 1 0 3 4 0 1 2 2 1 0 3 0 3 2 0 0 2 0 1 0 0 1 0 1 3 1 3 5 0 2 2 3 5 2 2 2 0 3 2 3 6 5 16 21 19 23 28 29 35 42 42 44 39 33 23 30 18 25 24 15 13 5 4 2 2 0 3 3 0 0 1 3 0 1 1 3 2 4 3 4 2 1 1 1 3 1 0 0 2 2 4 2 2 1 4 2 4 2 2 2 1 2 2 1 2 0 4 2 2 3 1 2 1 1 2 2 1 2 4 2 1 4 1 2 2 2 2 0 2 0 3 0 1 0 2 1 0 4 2 1 3 2 1 0 2 1 1 1 1 0 1 1 2 1 1 1 2 0 1 0 2 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0.100000 2.100 2.100 5.800 467340 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 0 1 2 0 0 0 0 0 1 0 2 0 0 2 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0 0 1 1 0 0 1 0 0 1 0 0 0 1 1 0 0 0 0 0 1 0 1 0 0 0 0 1 2 0 2 2 4 1 0 1 1 2 3 4 1 4 1 5 1 2 1 0 2 2 2 1 5 4 1 5 4 0 1 2 4 2 2 0 2 1 2 5 4 1 1 1 2 5 7 9 16 23 31 15 22 36 36 44 42 29 31 28 28 18 35 12 10 13 8 4 3 2 2 5 1 2 3 3 1 3 3 5 2 0 3 4 1 2 2 3 0 0 5 2 3 6 2 1 2 5 3 4 3 1 1 1 1 2 2 4 0 2 3 1 2 1 2 4 5 4 3 5 2 1 2 0 5 0 2 2 4 1 0 4 1 0 2 1 2 0 0 1 3 2 4 3 0 2 3 3 3 4 2 2 0 0 0 0 1 1 0 3 2 0 1 2 0 4 2 1 1 1 2 0 0 0 0 0 0 0 0 0 0 0.102000 2.150 2.150 5.900 497495 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 0 2 1 0 0 0 0 1 0 1 0 0 0 0 1 2 0 0 0 0 0 2 0 0 1 0 1 0 0 0 0 1 1 0 0 0 1 1 1 1 2 0 0 1 0 0 0 1 0 2 2 1 0 0 0 2 0 2 1 1 1 6 3 2 0 3 2 2 2 1 1 3 4 1 0 1 2 4 2 3 3 1 1 1 1 3 3 1 4 1 3 4 3 2 3 1 2 2 5 11 11 14 26 27 28 28 28 36 39 42 29 33 24 20 29 18 13 17 13 6 10 4 3 3 6 1 0 1 0 2 1 3 2 3 1 2 3 1 2 1 2 0 2 2 3 1 3 1 1 2 4 4 1 4 3 2 2 3 5 5 3 0 2 5 3 5 1 4 1 1 3 4 2 2 2 2 1 3 0 1 1 2 2 4 2 1 3 2 0 1 2 1 0 2 3 1 2 0 0 0 2 0 0 1 3 0 0 1 2 0 3 1 0 3 1 2 2 1 1 2 0 0 0 0 2 0 0 1 0 0 0 0 0 0.104000 2.200 2.200 6.000 529288 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 3 0 2 0 2 0 0 3 2 2 0 4 0 3 2 2 1 3 1 7 3 1 1 0 4 3 2 1 0 0 3 2 3 5 2 1 4 1 5 1 0 3 2 3 0 1 2 4 7 3 7 8 12 15 20 24 34 39 34 35 27 36 34 23 22 26 15 24 12 12 14 5 3 0 7 1 1 3 5 1 2 2 2 4 3 1 2 5 2 2 3 1 1 4 2 1 3 0 4 5 4 6 4 5 3 3 3 3 1 1 5 0 6 1 2 4 2 3 2 1 3 2 0 0 0 1 3 3 0 1 4 0 3 2 3 0 3 3 0 2 3 4 3 1 1 1 2 5 3 1 2 1 1 2 4 1 0 2 4 1 3 0 0 3 0 1 3 0 1 0 0 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0.106000 2.250 2.250 6.100 560628 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 2 0 1 0 1 0 1 0 1 0 0 1 0 0 0 0 0 0 1 1 0 1 1 0 0 1 1 1 0 1 1 0 0 0 1 1 1 1 0 0 1 1 2 0 0 0 0 2 0 3 1 1 0 0 2 2 2 0 5 2 1 1 1 1 3 1 2 3 0 1 0 0 0 0 1 0 2 2 1 2 1 0 4 3 2 1 2 1 0 4 2 2 0 2 1 1 2 3 1 2 1 2 4 4 11 12 17 19 19 29 30 24 30 35 51 32 36 34 31 19 22 17 11 19 11 7 6 6 3 4 0 3 3 2 0 2 2 2 3 1 5 3 2 3 5 1 0 2 2 5 4 2 3 2 0 1 6 1 2 2 2 2 1 1 2 2 1 4 3 2 2 1 2 5 2 0 2 0 2 5 4 5 2 1 3 6 1 3 4 4 0 0 6 0 2 6 1 2 2 2 0 1 3 1 3 4 2 1 4 2 1 2 3 3 0 3 1 0 2 0 2 1 0 2 1 2 0 0 1 1 0 2 0 0 0 0 0 0 0 0.108000 2.300 2.300 6.200 593293 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 2 0 2 2 1 0 0 2 0 1 0 1 0 0 1 2 2 1 0 0 1 0 2 0 0 0 0 0 1 1 1 1 1 0 0 1 1 0 0 1 1 1 2 2 1 0 1 1 0 1 5 0 2 4 1 0 1 4 2 1 3 2 2 3 2 3 2 0 0 3 4 3 1 3 2 2 0 3 0 2 4 0 3 2 5 1 2 1 4 6 1 2 4 0 3 6 1 7 6 4 5 4 10 16 24 22 20 40 37 44 34 29 21 28 36 36 27 23 24 14 10 4 5 2 5 3 6 2 3 3 1 4 2 1 5 1 3 5 3 2 1 2 2 6 2 3 1 1 0 5 3 3 3 4 5 2 2 3 3 5 5 1 6 2 3 2 6 0 5 2 4 3 5 1 2 2 5 1 2 3 1 2 2 2 4 2 5 5 2 2 2 5 0 1 2 5 2 3 2 3 1 1 2 4 0 2 1 4 2 1 1 1 0 1 2 0 0 1 3 1 0 2 1 1 3 3 2 0 0 0 1 2 0 0 0 0 0.110000 2.350 2.350 6.300 636559 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 1 1 0 0 0 1 1 2 0 0 1 0 0 0 0 0 0 0 1 2 0 0 1 1 1 0 0 0 0 1 0 1 1 0 0 1 0 0 2 0 1 0 1 0 1 0 0 1 1 3 0 1 2 2 0 2 1 1 1 1 0 1 0 1 3 0 3 2 3 4 3 3 4 3 3 2 6 3 1 1 1 2 4 2 3 1 5 1 3 1 4 5 3 3 2 1 3 7 4 3 10 19 17 19 23 27 28 33 39 36 23 23 32 32 16 19 35 23 12 11 12 8 4 5 7 1 2 2 1 2 3 5 4 2 3 2 6 4 4 2 4 1 2 2 1 2 3 0 4 2 1 2 6 2 2 1 3 3 1 6 4 8 5 2 3 5 2 3 0 3 2 3 1 2 2 3 4 3 8 6 2 1 4 6 3 1 2 0 2 0 2 5 0 3 3 3 3 1 3 3 2 5 4 2 1 4 2 2 4 4 1 3 2 5 2 3 1 2 0 4 0 1 0 6 3 1 2 0 2 0 1 0 0 0 0 0.112000 2.400 2.400 6.400 670484 3 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1 1 0 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0 2 0 1 1 1 3 0 0 0 2 1 3 0 1 1 1 0 1 1 1 0 0 1 2 0 1 3 1 5 2 3 0 4 0 2 0 0 1 2 1 0 1 0 0 1 0 2 2 3 2 3 2 2 2 3 4 4 2 3 5 3 3 2 3 3 4 2 4 0 3 2 4 4 1 3 1 3 4 2 2 5 2 8 6 12 17 14 22 27 26 29 39 30 24 36 22 22 20 9 19 15 5 12 16 4 7 5 7 5 5 1 4 5 5 4 4 1 4 4 3 3 3 4 2 2 4 2 4 4 4 4 0 2 3 2 1 4 3 6 1 3 3 3 4 5 4 2 2 2 5 3 0 2 5 4 2 5 3 5 1 1 3 1 1 3 6 6 2 3 2 0 3 2 4 3 4 1 2 2 6 2 0 3 2 2 5 3 3 5 2 1 0 3 1 1 2 2 0 1 1 3 2 3 2 1 1 1 1 3 2 1 0 0 0 0 0 0 0 0.114000 2.450 2.450 6.500 711783 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 1 0 0 1 0 2 1 2 0 1 0 0 1 0 0 1 1 1 1 0 0 0 1 1 2 0 1 1 0 0 0 2 1 1 1 1 1 2 1 2 3 3 1 1 1 2 3 1 3 2 2 1 0 1 1 4 4 4 1 0 4 0 0 1 1 2 1 3 2 0 3 4 1 1 1 1 3 2 0 1 3 2 1 2 1 0 3 3 2 5 4 2 5 3 4 2 2 5 3 3 3 3 5 5 8 7 14 12 28 22 24 23 36 33 26 32 27 26 18 30 24 15 13 19 15 17 6 5 7 5 4 3 5 3 1 4 4 9 5 3 1 4 0 0 6 2 5 3 3 3 1 2 3 2 4 1 5 5 3 8 2 1 1 4 1 7 5 6 6 4 4 3 2 6 3 3 3 3 1 3 4 5 4 3 4 3 1 2 3 1 2 1 2 2 6 5 2 2 2 4 2 2 0 2 3 3 2 7 4 4 1 4 2 0 3 1 1 2 1 2 3 1 3 2 2 4 3 1 4 0 0 4 2 2 2 1 0 0 0 0 0.116000 2.500 2.500 6.600 745364 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 2 1 1 2 1 1 1 0 1 0 2 0 1 1 0 1 0 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 1 2 3 0 1 4 4 0 4 0 1 0 1 3 3 0 2 1 2 3 2 1 1 1 2 0 4 0 0 4 5 2 5 4 1 3 5 5 4 0 4 4 2 3 2 3 5 2 2 4 2 3 4 2 3 3 3 3 3 2 4 12 10 13 14 19 22 23 24 36 19 32 25 25 36 24 18 20 21 14 18 13 8 6 9 2 9 5 2 5 3 4 4 3 3 0 4 3 2 5 3 4 2 2 6 3 4 0 2 4 1 3 4 7 4 5 3 2 4 5 5 3 4 4 4 2 3 2 4 4 2 1 5 7 1 5 2 4 1 5 5 3 4 4 3 2 4 2 4 0 6 2 3 4 1 2 2 2 4 1 4 2 2 2 5 6 5 1 4 4 2 3 3 3 1 4 3 4 2 6 2 5 3 2 2 1 3 2 2 5 1 1 0 0 1 0 0 0 0.118000 2.550 2.550 6.700 791846 4 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 2 1 1 0 0 0 0 0 1 0 0 0 1 1 0 1 0 1 0 1 1 0 1 0 1 4 1 2 3 0 3 1 0 1 1 1 0 3 1 2 1 1 1 0 0 1 1 1 3 1 3 2 3 1 2 2 1 3 2 4 1 4 0 2 4 1 4 3 2 1 1 2 1 3 2 3 3 2 1 1 5 3 3 3 3 2 3 4 3 5 3 1 1 2 2 3 5 1 2 1 1 4 4 6 9 6 6 13 17 21 20 24 22 25 20 29 23 28 30 26 27 18 20 17 16 17 12 10 8 5 6 6 6 4 3 1 2 4 6 9 2 2 3 5 7 6 2 3 8 5 4 5 6 4 6 5 3 5 3 2 5 3 2 8 3 5 4 5 3 5 4 3 4 8 4 3 8 3 3 3 1 1 2 2 5 4 7 3 2 3 3 2 2 3 6 3 2 2 1 1 5 2 5 6 3 5 3 4 1 3 1 2 1 0 4 1 4 2 2 2 3 1 1 1 1 3 2 0 1 6 1 1 0 2 1 0 1 0 0 0 0 0.120000 2.600 2.600 6.800 833394 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 2 1 1 1 2 1 0 0 0 1 0 1 0 0 0 1 0 0 1 1 2 1 0 0 0 0 0 2 2 0 3 1 0 0 2 1 1 1 1 0 1 2 1 5 0 1 0 2 2 1 2 0 4 2 1 4 3 4 2 2 1 2 1 5 2 3 1 3 0 2 2 2 2 3 4 0 4 2 3 3 4 5 2 2 6 3 4 5 5 5 3 4 6 5 1 3 0 5 4 5 1 3 2 2 6 18 13 17 27 27 21 28 28 24 26 27 29 23 21 16 17 19 22 14 11 9 5 14 7 7 6 4 4 12 3 6 4 5 4 6 4 2 0 1 8 1 6 8 5 2 3 4 5 6 4 2 5 8 3 1 1 6 3 7 8 4 1 6 5 2 8 11 5 6 5 6 2 4 5 1 2 7 2 2 5 5 6 3 3 2 3 8 5 1 9 3 3 2 3 6 3 5 3 2 4 6 3 1 3 5 4 4 4 6 3 3 5 0 2 2 5 1 3 2 2 1 4 2 0 2 2 2 2 4 1 2 1 2 1 1 0 0.122000 2.650 2.650 6.900 876007 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 1 1 1 1 2 2 1 0 0 1 0 0 0 1 1 0 0 0 2 0 0 4 1 0 2 1 2 0 1 2 0 1 3 2 1 0 1 1 0 1 2 1 0 2 3 3 5 3 3 3 0 1 4 0 1 5 3 4 3 1 2 2 2 4 1 3 3 3 2 3 2 3 2 1 4 4 2 2 5 5 3 4 1 2 1 2 4 2 4 7 2 4 4 2 7 3 5 7 5 3 6 8 10 10 18 21 22 24 14 25 27 29 31 22 25 24 21 27 20 19 22 19 14 13 14 10 5 7 3 4 5 5 3 1 4 3 8 4 5 4 0 3 4 3 4 1 7 6 1 1 3 4 4 3 4 3 6 4 3 4 2 4 4 3 5 6 5 1 1 6 2 6 6 3 5 5 3 2 6 5 4 3 4 6 4 3 5 5 6 5 6 2 4 2 1 2 2 4 2 7 6 2 1 3 1 5 2 1 2 4 3 3 3 2 5 2 4 1 4 3 2 2 5 5 1 1 3 3 2 2 2 2 1 0 0 0 0 0 0.124000 2.700 2.700 7.000 925764 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 2 1 3 0 1 1 0 0 0 0 0 1 1 1 1 0 0 0 1 1 0 1 2 0 0 3 2 0 1 2 1 1 2 0 2 1 2 2 0 0 2 3 2 3 2 2 3 2 2 4 0 2 0 5 1 3 2 3 1 2 3 2 0 6 4 3 6 2 5 0 5 2 1 4 4 5 7 4 2 3 5 2 0 2 5 2 4 7 4 4 4 8 5 3 1 7 2 2 1 5 5 5 14 19 16 22 18 30 29 25 36 23 23 22 25 25 27 26 23 14 20 16 16 10 6 6 6 4 2 6 6 6 6 6 4 6 1 0 3 4 4 5 2 4 3 2 4 4 5 5 5 6 10 6 3 6 8 5 5 8 7 4 6 4 3 4 8 5 5 7 4 6 3 5 8 4 3 4 4 3 4 3 1 3 3 7 2 4 8 3 6 4 3 3 2 5 4 4 3 7 4 5 4 4 3 4 7 2 3 3 4 3 0 2 2 4 3 4 2 4 2 2 6 4 4 6 6 1 5 1 1 2 1 0 0 0 0 0 0.126000 2.750 2.750 7.100 969560 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 1 1 0 1 2 0 2 0 2 2 0 1 1 1 0 0 1 0 1 1 1 1 2 0 1 2 2 1 2 0 0 1 0 1 0 2 1 0 1 0 1 1 2 0 3 0 3 4 3 1 3 2 0 4 0 1 2 0 3 1 1 2 3 2 2 2 5 1 7 1 5 1 5 4 2 0 0 1 2 1 3 2 3 3 5 4 10 10 2 5 11 4 1 2 1 7 3 5 4 4 1 5 10 8 7 9 9 20 20 21 33 21 28 20 27 32 21 29 22 20 24 15 13 27 14 13 15 10 9 3 11 6 7 5 3 6 8 5 4 4 1 3 3 5 2 7 3 6 6 1 6 4 6 5 3 4 2 4 3 3 9 4 5 4 4 5 2 3 10 4 3 2 6 10 6 3 6 5 5 5 4 8 8 5 4 3 6 4 4 2 4 4 4 5 7 4 4 4 4 5 2 2 3 4 5 2 1 3 2 6 2 7 7 1 6 4 4 6 5 5 4 0 2 2 3 2 7 5 0 4 1 1 4 6 1 0 3 2 0 0 1 0.128000 2.800 2.800 7.200 1022713 5 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 1 0 1 1 0 0 1 1 1 0 0 0 2 1 0 0 4 0 0 1 2 3 1 1 0 1 0 1 0 3 1 1 1 2 2 1 1 1 3 1 0 2 4 2 1 2 1 2 0 3 1 3 2 1 5 2 1 3 1 2 1 5 3 2 1 2 5 3 8 2 3 2 5 5 4 3 6 4 4 4 3 2 3 8 4 3 4 5 4 5 4 7 6 5 3 3 3 5 2 9 10 7 9 12 11 13 17 15 22 19 33 24 28 30 26 21 24 22 27 20 26 16 10 10 9 20 10 7 4 5 7 7 2 7 5 3 5 1 6 1 5 7 5 6 3 1 5 1 1 3 4 8 6 3 9 5 5 3 6 7 4 6 7 6 4 2 4 6 2 3 6 5 6 7 6 4 4 9 6 8 6 9 7 1 2 6 2 7 5 4 4 4 4 5 5 4 4 3 6 3 5 3 6 4 3 6 6 2 5 2 8 4 5 3 6 5 4 5 8 4 3 5 6 5 5 2 8 1 2 2 5 4 1 3 0 0 0 0 0 0.130000 2.850 2.850 7.300 1081669 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 5 0 0 2 2 0 0 1 0 0 0 1 1 0 2 0 2 2 2 1 0 1 0 2 2 3 1 1 0 2 0 1 0 2 1 1 2 2 0 1 4 3 0 2 1 1 0 2 5 2 1 0 1 3 2 5 2 1 2 5 2 3 4 3 6 6 6 4 6 6 3 1 3 2 3 4 7 5 2 9 7 4 1 4 4 3 2 2 2 7 4 8 4 7 4 6 8 5 1 8 6 10 18 21 18 15 21 24 21 26 22 30 28 27 23 22 21 17 25 20 17 13 17 9 12 7 8 5 4 4 5 5 2 4 1 1 2 5 7 6 4 9 7 7 5 5 5 5 5 2 4 5 3 6 8 2 4 9 4 10 5 1 4 5 5 5 10 3 2 8 6 5 7 3 13 3 3 6 5 1 4 5 9 5 2 7 4 5 6 3 5 6 5 4 5 9 6 4 3 4 4 4 5 8 5 5 0 3 6 3 4 3 7 5 6 4 3 3 6 8 4 1 3 1 2 7 3 4 6 6 1 3 4 1 0 1 0 0 0.132000 2.900 2.900 7.400 1131887 3 0 0 0 0 0 0 0 0 0 1 0 0 1 2 1 1 0 0 0 1 2 2 1 1 0 2 1 1 0 1 1 1 0 2 2 3 1 0 1 0 1 0 2 0 2 0 1 4 0 1 2 2 0 0 0 2 3 0 1 2 3 0 1 2 3 5 6 2 2 3 1 4 4 8 4 3 3 3 7 2 2 5 7 4 1 2 4 8 1 5 2 7 3 4 2 9 6 5 5 6 2 2 3 6 2 5 6 7 7 2 8 3 3 3 3 6 6 5 3 10 15 15 17 19 13 29 20 23 22 34 28 28 33 20 20 22 17 22 18 15 19 14 11 9 13 6 6 13 4 2 9 8 8 7 6 5 6 4 4 9 6 2 8 9 7 2 6 3 7 3 6 3 7 4 4 5 4 5 6 4 7 5 4 10 2 6 6 8 3 6 6 9 5 8 8 7 6 4 8 5 7 5 5 7 3 5 5 5 10 7 3 8 7 5 7 2 4 4 6 4 10 7 6 4 4 4 4 3 2 4 2 6 5 9 7 3 2 6 2 5 1 5 6 2 2 1 9 2 5 2 5 1 0 0 0 1 1 0.134000 2.950 2.950 7.500 1185706 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 3 2 1 0 1 1 0 0 0 0 0 1 0 1 1 2 0 1 0 1 2 0 0 0 1 1 0 1 1 1 0 2 2 0 1 3 3 2 3 0 0 2 2 3 2 1 1 3 0 0 1 1 3 4 3 1 1 9 1 4 0 1 3 4 1 3 2 6 4 7 7 3 2 8 5 2 5 2 4 6 7 3 7 7 8 4 7 2 4 7 7 9 9 2 5 5 8 3 5 7 3 6 10 6 10 15 10 13 14 29 21 23 37 26 20 28 20 16 24 25 16 19 21 20 20 17 11 10 12 8 7 7 5 5 5 4 5 6 7 3 6 5 7 5 11 9 6 8 11 6 4 6 8 8 7 7 7 4 5 4 8 5 4 3 4 8 10 7 9 4 7 6 8 9 7 3 5 7 7 6 2 6 4 7 3 9 8 12 7 6 6 6 4 5 7 2 4 7 3 2 4 4 7 1 4 5 0 4 6 3 10 8 5 4 3 4 5 7 5 7 5 7 3 5 2 5 6 4 5 2 4 1 6 6 2 4 2 0 0 1 0 0.136000 3.000 3.000 7.600 1238426 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 2 4 0 2 0 2 2 0 1 1 1 0 2 1 1 2 1 0 1 1 0 3 1 0 0 1 0 1 0 0 2 1 1 0 4 0 2 6 3 3 4 0 3 1 2 4 0 4 4 0 1 5 2 2 5 1 3 4 3 3 5 2 4 4 6 2 5 3 4 5 4 5 6 7 5 6 2 8 3 4 7 2 4 4 3 7 6 5 1 4 8 3 7 10 3 3 6 1 5 3 8 11 5 7 15 11 15 17 21 23 21 24 28 16 21 29 15 22 27 28 20 13 19 13 7 15 10 11 9 6 8 8 4 7 5 4 6 5 10 6 7 8 9 3 5 5 9 5 9 4 4 4 3 5 7 4 10 6 8 4 9 8 4 6 7 9 11 6 8 3 5 8 12 3 6 9 7 11 9 6 7 4 7 7 7 2 5 4 5 0 2 9 5 5 5 10 7 5 6 3 9 4 4 13 2 7 5 7 4 7 2 0 4 5 4 4 6 8 1 2 5 6 4 7 3 11 4 3 3 5 5 4 4 3 1 4 2 2 1 1 0 0.138000 3.050 3.050 7.700 1299809 6 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 1 2 1 1 0 0 1 0 0 2 0 1 2 0 0 3 0 0 1 3 1 2 0 2 0 1 1 2 1 2 3 2 1 2 5 2 2 2 4 3 2 5 3 0 3 2 4 5 4 3 0 5 4 1 4 3 8 6 4 4 7 4 5 4 3 6 5 6 10 3 6 6 2 6 3 4 4 3 6 7 6 8 3 4 7 5 4 9 2 4 8 5 9 8 3 7 5 7 7 13 7 11 15 17 16 18 18 18 20 17 26 25 19 20 26 31 22 18 20 18 14 11 16 4 7 11 10 8 9 9 6 3 8 8 7 5 6 10 3 5 6 6 3 12 7 8 8 2 10 4 13 9 9 12 4 5 9 7 9 5 7 4 8 9 6 7 8 10 8 7 5 7 11 6 4 4 4 6 4 9 4 5 9 10 7 4 12 7 4 9 5 10 10 6 8 4 7 2 4 7 2 6 8 4 11 3 3 9 7 6 7 3 8 7 4 8 5 3 7 4 5 5 7 4 6 7 5 5 3 5 2 5 4 1 2 0 0 1 0.140000 3.100 3.100 7.800 1361810 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 3 2 1 0 0 0 1 1 1 2 0 0 0 0 1 0 2 2 2 1 0 0 3 3 0 2 0 6 2 3 1 0 3 3 1 2 2 5 3 5 3 3 2 2 7 3 2 2 3 4 2 3 4 4 1 3 7 4 5 4 2 3 5 4 2 1 3 6 3 4 3 8 7 6 5 3 5 11 5 5 3 3 7 3 6 4 4 2 4 4 4 1 5 5 9 6 6 9 3 10 8 6 8 3 10 8 16 16 13 18 23 29 25 19 19 20 27 19 22 27 24 21 15 18 11 20 21 17 12 5 18 6 12 7 9 11 7 12 11 4 8 8 4 8 7 7 2 6 4 4 9 6 9 3 4 7 7 7 4 10 4 11 5 8 8 8 5 4 4 8 6 4 9 8 12 12 8 5 8 3 10 8 7 5 3 5 6 8 5 6 10 7 2 11 2 5 5 6 8 10 2 7 5 5 14 2 7 3 9 3 5 2 8 2 3 4 4 7 9 5 4 7 6 7 5 6 3 5 4 7 6 7 7 9 3 0 2 1 1 1 0 0 0.142000 3.150 3.150 7.900 1429499 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3 1 2 1 1 0 0 0 3 0 2 2 1 0 3 0 2 1 3 0 0 1 1 3 1 2 4 1 5 3 5 1 0 7 1 3 2 3 2 2 2 3 0 0 1 3 6 3 2 2 4 4 4 6 4 3 6 4 10 3 7 2 5 4 7 4 5 8 4 7 4 1 7 11 5 2 10 2 11 3 7 8 10 9 6 3 5 3 6 3 10 11 5 5 9 7 10 8 9 5 15 11 9 18 18 15 24 17 23 17 19 25 17 24 18 37 16 17 21 17 14 20 17 15 15 9 4 11 7 3 8 10 8 8 6 8 3 4 5 8 4 6 3 9 9 6 2 10 4 4 3 8 4 9 1 7 5 9 7 10 9 10 4 6 5 8 6 6 10 10 6 5 7 6 6 10 5 7 8 8 8 7 7 11 12 8 3 10 6 9 13 11 4 6 7 6 3 10 5 8 4 7 7 7 5 8 4 9 5 5 7 6 6 7 11 11 7 8 5 3 5 7 7 10 3 3 6 5 7 9 2 3 7 1 0 0 0 0 1 0.144000 3.200 3.200 8.000 1493946 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 2 3 0 0 1 2 1 1 1 4 1 0 1 0 1 2 1 3 1 1 1 1 2 1 1 3 2 6 0 4 0 1 4 2 4 5 2 1 3 0 2 2 4 2 3 2 4 3 5 4 4 4 1 5 1 3 4 5 6 4 7 2 8 8 8 5 3 6 0 7 3 2 2 5 7 5 7 5 8 9 6 4 3 6 8 6 10 2 5 6 3 3 6 6 6 6 17 5 10 6 6 11 11 13 12 21 26 18 24 21 24 23 30 18 22 20 24 19 13 17 25 22 17 15 8 13 7 10 8 9 6 7 9 8 7 8 9 7 7 6 12 5 9 9 12 9 12 6 9 7 10 7 7 4 9 7 4 2 7 4 5 8 8 9 7 6 7 5 9 4 8 13 6 5 4 7 9 6 7 7 9 4 4 5 8 10 9 10 6 6 7 9 12 11 8 8 9 11 5 8 7 5 5 8 5 9 10 5 5 11 11 6 8 8 4 8 5 5 5 4 7 4 5 6 5 6 6 7 7 4 2 6 3 2 1 0 0 0 0 0 0.146000 3.250 3.250 8.100 1562352 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 2 0 1 2 1 1 0 0 1 0 1 2 0 0 0 3 1 2 0 4 4 2 0 0 2 3 2 0 1 3 3 4 0 1 4 3 3 4 5 5 4 2 1 4 2 5 3 2 7 6 3 5 6 5 5 5 1 5 2 7 4 8 7 4 6 5 7 5 3 5 8 1 6 4 6 8 7 6 7 6 3 4 6 3 5 8 4 10 3 3 11 6 5 3 9 6 4 3 17 9 11 11 24 13 15 14 25 26 26 21 17 32 32 22 18 25 29 29 27 24 21 12 23 14 12 11 9 17 7 9 11 3 7 6 5 5 12 3 6 8 7 4 7 11 10 8 9 5 8 2 10 9 8 10 10 7 7 4 7 5 7 7 9 10 8 7 7 16 6 8 10 5 6 6 12 12 7 11 11 8 9 7 8 12 10 7 8 7 11 8 9 7 7 4 9 4 7 14 9 8 8 13 9 8 7 13 5 9 5 7 4 9 5 7 8 7 8 7 3 10 9 3 4 4 4 5 2 6 6 3 5 10 4 4 2 3 0 1 0 0 0.148000 3.300 3.300 8.200 1630559 3 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 4 2 1 1 1 2 1 2 0 2 1 5 0 1 1 4 0 2 1 4 5 3 0 1 1 1 2 1 3 3 3 1 1 1 1 1 3 4 6 6 8 8 4 3 2 7 2 2 1 7 4 4 5 1 10 6 4 4 4 3 3 3 6 11 6 4 5 4 8 5 5 9 4 5 5 7 6 4 13 12 3 6 7 5 2 7 9 7 8 8 4 7 6 4 10 6 8 9 9 9 13 15 17 23 25 13 16 24 22 26 21 27 24 24 21 21 21 15 17 22 25 21 22 17 14 11 8 12 5 9 7 8 5 11 10 6 6 5 9 13 10 9 8 8 8 6 4 9 10 9 9 7 8 7 5 7 8 14 13 5 14 5 12 11 8 9 6 5 4 9 13 7 10 13 11 11 8 5 9 10 8 7 6 7 13 3 13 8 7 13 17 5 8 5 10 7 12 7 6 6 9 7 8 8 11 8 11 9 11 11 8 5 6 10 4 9 3 10 8 7 10 8 7 8 10 10 7 4 11 5 7 8 2 4 3 0 0 1 0 1 0.150000 3.350 3.350 8.300 1707576 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 1 2 1 0 2 0 2 3 1 3 2 2 2 2 0 2 1 4 3 2 2 3 1 2 1 0 2 2 4 2 5 3 3 5 2 8 4 5 4 2 3 6 7 6 1 0 7 4 7 7 6 5 4 3 4 6 6 7 6 2 7 4 4 2 5 5 6 9 3 3 3 6 6 5 3 5 7 8 8 6 8 8 6 8 3 9 6 6 8 8 6 4 8 6 6 10 4 11 6 11 15 23 16 8 17 20 21 19 24 15 14 19 21 30 25 21 15 19 16 18 21 21 15 14 12 16 8 10 12 7 10 9 8 10 10 7 9 8 10 12 6 6 9 11 6 5 9 12 6 7 12 7 5 6 8 5 9 4 11 9 8 8 10 7 6 10 7 11 13 7 4 13 11 8 11 9 16 6 12 11 10 10 19 2 9 11 8 7 8 8 6 13 6 10 12 12 9 12 9 9 8 7 7 9 6 12 8 4 9 9 8 5 7 8 9 5 12 5 7 5 9 10 9 10 3 6 6 8 7 11 3 5 5 4 2 0 0 0 0 0.152000 3.400 3.400 8.400 1777231 3 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 0 0 1 1 3 1 0 3 4 2 3 3 3 3 3 2 1 1 1 1 3 3 0 1 8 0 0 5 3 7 4 4 4 4 4 3 5 2 2 5 3 6 1 7 6 1 2 2 5 2 1 6 6 8 7 7 5 10 4 1 6 9 3 4 5 3 5 8 4 9 8 11 8 3 2 7 7 9 10 9 10 8 6 8 6 8 7 10 8 7 3 8 4 10 7 6 8 9 6 5 16 9 19 24 23 17 23 24 22 30 21 15 23 27 20 20 20 18 20 23 18 17 15 19 17 18 13 9 4 4 7 12 7 10 4 8 6 10 5 6 13 2 3 8 7 8 7 3 11 8 7 9 7 19 7 8 9 6 14 8 8 11 10 11 13 14 10 16 8 9 13 8 9 9 12 7 12 11 6 9 15 5 9 9 9 11 11 13 6 10 6 4 12 9 9 12 11 8 6 9 16 10 10 10 8 10 10 6 7 4 1 15 6 8 4 9 13 11 8 10 11 9 8 3 3 6 6 7 9 4 6 8 7 4 2 1 2 2 1 0 0.154000 3.450 3.450 8.500 1849489 6 0 0 0 0 0 0 0 0 0 0 0 1 1 3 0 1 2 2 0 1 4 1 1 0 1 0 2 1 0 0 1 1 1 1 6 3 6 1 3 1 3 3 0 6 0 4 2 7 4 6 4 4 3 7 4 5 7 5 5 2 3 9 9 2 5 5 3 9 4 2 7 6 2 8 2 5 7 12 6 5 4 5 10 4 12 10 6 4 14 7 9 10 11 7 7 7 7 3 9 7 4 3 8 7 5 7 9 6 8 9 6 8 8 12 6 5 11 12 13 11 13 21 26 19 23 25 18 23 22 23 23 18 27 20 15 20 25 24 19 18 12 14 13 15 8 15 10 11 7 9 13 11 12 13 11 11 7 11 13 6 5 10 6 6 10 8 14 5 14 11 8 5 9 7 10 10 8 7 15 13 3 13 12 18 15 7 10 9 10 8 15 9 6 8 9 10 10 9 5 7 7 5 10 11 13 12 12 12 10 6 17 10 11 9 4 8 7 6 6 9 12 8 16 18 7 5 10 8 12 10 15 6 13 11 6 10 16 10 11 16 8 9 5 11 10 14 11 5 2 5 7 3 1 1 0 1 0 0.156000 3.500 3.500 8.600 1920727 4 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0 2 1 2 0 3 0 1 1 0 1 0 3 0 4 4 1 3 1 2 3 3 4 3 1 2 3 9 5 2 3 7 3 3 6 5 2 6 1 4 3 2 3 6 5 1 8 3 8 5 3 7 6 13 11 9 5 8 7 7 5 8 7 4 8 6 4 10 4 6 5 6 9 9 12 6 7 10 9 9 8 8 3 8 9 8 8 2 12 11 13 8 13 7 8 6 6 9 6 8 16 13 14 16 16 22 20 21 21 17 20 18 19 22 20 11 20 22 21 14 19 15 23 17 15 12 14 19 16 10 11 14 11 9 11 9 12 8 16 14 9 6 18 10 11 7 10 11 17 10 13 8 10 12 9 12 7 7 10 10 11 11 9 8 8 14 10 10 9 14 9 14 13 9 19 16 17 4 11 8 12 11 10 21 6 10 8 9 12 9 7 7 12 7 16 14 10 13 6 13 8 9 10 6 10 8 7 10 4 6 11 19 12 6 7 5 8 11 10 12 13 9 6 10 5 11 11 4 14 10 7 2 6 5 1 2 5 1 1 0 0 0.158000 3.550 3.550 8.700 1999833 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 2 2 3 2 2 2 1 2 3 0 1 0 1 3 2 0 0 3 2 3 2 5 7 0 3 4 1 10 7 7 4 5 2 3 4 3 8 3 6 4 4 4 8 2 3 4 5 5 7 1 6 7 8 1 6 8 1 4 4 11 9 4 7 11 9 10 5 6 8 4 3 9 7 9 11 5 5 8 8 4 8 7 8 11 9 12 6 4 13 4 12 10 6 9 11 10 11 10 11 11 11 14 15 14 23 18 17 29 16 26 23 15 19 14 18 19 22 31 13 21 20 12 16 15 14 18 17 15 8 12 14 13 10 10 10 10 10 13 11 6 8 11 8 14 8 10 11 11 8 10 13 5 14 7 12 9 10 10 12 15 18 8 6 9 9 12 8 9 20 14 16 10 11 14 5 5 13 6 11 9 11 15 6 9 13 11 7 8 7 10 8 16 12 11 8 10 14 11 17 11 8 16 13 9 10 5 10 17 13 14 16 8 10 9 11 5 10 9 10 12 8 11 12 11 8 6 7 12 15 13 12 7 13 5 0 3 2 0 0 0 0 0.160000 3.600 3.600 8.800 2073149 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 2 1 2 1 2 2 1 0 2 2 1 0 3 6 4 5 5 2 2 2 5 5 3 6 4 6 4 5 2 4 4 3 2 4 6 3 3 6 5 7 4 5 7 5 3 5 6 13 5 3 10 5 9 7 4 5 6 5 10 6 5 5 6 6 4 14 7 6 11 6 9 10 9 8 5 3 8 10 10 6 6 8 9 5 6 14 7 11 10 9 9 11 13 8 4 5 10 12 6 16 8 8 7 19 20 23 10 16 27 25 23 19 26 21 16 20 21 24 18 25 8 11 13 16 18 13 22 18 9 16 4 16 10 12 13 9 7 9 8 17 11 10 13 10 14 4 9 12 16 8 9 16 17 13 11 14 8 8 13 9 11 15 10 11 14 8 6 4 9 11 18 9 9 8 9 15 11 11 11 9 6 13 13 10 7 8 10 15 14 9 7 4 10 12 17 10 14 13 10 10 12 20 9 7 6 11 15 11 10 8 9 6 10 13 17 6 8 9 6 13 13 16 10 15 5 11 14 11 12 6 5 12 9 4 9 2 4 1 1 0 0 0 0.162000 3.650 3.650 8.900 2156456 5 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 2 0 1 1 3 2 3 4 3 3 2 1 3 6 5 2 3 4 4 3 6 2 3 4 4 5 5 3 4 1 4 5 9 3 3 4 3 3 8 5 6 12 2 10 3 4 6 8 9 8 8 2 2 7 5 8 2 8 9 7 2 6 8 6 5 8 2 7 5 6 13 5 6 8 11 6 10 5 6 3 8 10 11 10 10 14 10 11 8 11 8 12 6 12 5 15 12 13 10 13 13 18 23 12 21 18 21 23 20 30 20 23 26 24 24 21 21 29 19 21 16 23 20 13 19 13 16 11 15 13 13 11 8 11 14 14 13 4 16 15 18 13 9 19 8 11 6 9 14 8 13 12 13 10 13 10 14 11 13 11 8 10 13 11 11 14 11 8 14 11 10 9 14 12 14 18 8 12 7 13 12 10 14 14 8 12 17 11 13 9 12 12 15 7 9 13 17 11 11 11 12 17 12 11 16 15 8 9 12 7 13 15 11 16 7 10 7 14 5 18 10 10 8 8 6 6 13 14 6 9 11 9 9 3 5 1 1 3 0 0 0.164000 3.700 3.700 9.000 2234753 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 4 1 4 2 1 3 1 1 3 2 3 3 1 3 6 2 4 4 3 3 3 6 5 2 6 4 1 3 3 7 1 4 4 6 12 4 5 2 6 4 9 3 1 8 11 5 2 7 6 3 8 4 7 3 8 3 9 6 7 8 9 2 7 6 9 6 15 6 9 5 9 4 9 17 15 10 2 10 6 8 12 12 11 12 10 9 7 11 8 7 5 11 10 14 16 7 7 7 13 15 10 16 17 21 19 14 18 24 19 27 27 24 20 22 24 21 20 14 24 17 17 18 32 15 12 13 15 12 8 14 11 11 19 11 14 15 18 10 5 12 11 11 9 15 9 7 9 16 12 9 12 10 15 9 18 7 11 12 14 7 20 8 10 13 14 11 6 6 9 11 8 10 16 8 17 13 17 9 16 11 10 9 13 20 17 14 12 10 13 11 9 9 17 20 10 16 8 14 13 14 18 15 15 8 10 12 11 22 12 13 9 12 9 11 14 19 12 12 8 8 12 11 19 11 11 12 15 11 15 13 9 9 10 9 4 9 4 2 1 0 0 0.166000 3.750 3.750 9.100 2327990 3 0 0 0 0 0 0 0 0 0 0 0 0 0 3 2 2 0 1 2 2 1 1 0 0 3 1 4 2 6 4 2 4 3 2 5 5 2 3 1 3 1 2 10 2 7 4 3 4 3 3 4 3 10 6 9 6 3 8 5 5 3 4 4 6 8 4 4 7 5 5 11 14 5 3 6 8 8 7 10 11 7 17 7 11 10 8 7 8 12 13 11 12 6 13 9 7 7 6 5 8 13 10 10 14 11 11 8 12 15 14 9 13 10 9 18 13 18 12 23 14 17 24 15 23 25 31 19 17 29 19 19 19 26 25 19 17 22 19 19 19 11 11 12 22 21 8 10 18 10 14 19 17 13 14 10 6 9 10 15 11 5 13 13 11 11 17 16 9 7 14 7 19 6 10 13 7 12 18 14 7 12 15 13 13 9 13 13 13 12 12 14 12 19 10 16 18 18 12 8 10 10 9 7 14 9 11 13 12 8 15 12 11 10 12 11 17 15 19 14 14 12 7 7 12 11 15 16 12 11 12 10 19 19 12 14 12 15 11 20 13 7 18 9 15 19 16 11 5 9 8 6 2 4 0 2 0 1 0.168000 3.800 3.800 9.200 2406866 3 0 0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 2 3 2 3 1 2 1 2 2 5 2 1 2 3 2 2 2 5 3 5 3 3 1 3 6 8 6 1 3 9 6 3 6 10 5 5 7 4 5 7 12 9 5 7 5 6 6 8 3 5 4 7 8 5 6 5 8 13 4 10 2 10 9 7 7 16 9 10 9 13 8 12 9 13 15 9 15 9 10 11 6 6 6 7 7 6 8 15 9 8 9 6 12 12 11 14 12 11 13 8 17 18 18 11 14 19 14 25 21 15 10 15 19 27 23 22 24 17 19 18 12 16 22 21 25 9 25 15 19 15 21 15 8 11 13 12 10 12 7 13 11 17 11 13 10 16 19 14 23 11 8 12 13 10 9 17 4 14 10 7 10 17 14 11 11 20 18 13 8 12 6 8 13 12 23 15 14 15 16 9 14 9 13 14 17 11 17 11 10 15 17 11 6 12 12 14 15 17 12 16 16 8 17 15 15 10 15 11 10 15 12 13 9 12 9 12 15 12 6 18 7 15 14 12 21 18 11 10 18 11 19 11 7 11 3 2 5 4 0 1 1 0.170000 3.850 3.850 9.300 2508471 7 0 0 0 0 0 0 0 0 0 0 0 0 0 1 3 1 2 1 4 3 3 1 2 7 0 3 2 2 2 2 5 2 3 2 3 3 4 3 7 3 5 3 4 4 6 2 3 10 4 11 3 13 7 7 5 6 3 8 10 6 6 4 10 11 4 12 7 8 9 7 7 8 4 6 7 9 9 5 9 11 5 14 9 10 7 9 8 8 5 6 11 13 14 10 10 10 10 8 9 9 9 9 14 14 13 11 8 18 9 10 9 16 12 13 15 13 10 17 16 20 14 22 20 26 29 29 27 24 20 37 21 24 13 18 13 28 24 22 25 21 13 14 15 9 11 18 8 16 17 16 13 12 16 11 11 17 15 11 15 10 11 12 13 12 12 20 15 14 15 16 12 17 15 15 12 10 14 14 17 15 19 15 13 13 11 12 16 14 17 16 8 16 12 8 14 13 13 10 10 9 12 11 19 20 13 11 4 15 11 14 11 20 18 18 13 20 12 20 21 15 15 12 13 18 18 11 16 9 14 9 18 11 10 11 20 11 13 17 13 13 12 14 16 10 12 12 23 12 11 12 8 8 1 0 1 2 0 0.172000 3.900 3.900 9.400 2591210 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 4 4 3 2 1 3 3 2 3 0 3 6 1 3 1 5 5 4 3 9 9 0 4 7 5 3 5 5 8 7 3 3 5 5 8 5 11 10 8 10 3 6 6 6 7 7 8 8 12 9 6 10 8 7 10 8 8 10 4 6 12 20 4 6 11 7 9 10 7 5 10 6 12 11 7 13 13 16 12 6 8 14 13 9 7 5 14 17 17 10 12 11 6 13 11 17 3 23 13 21 12 21 28 11 23 30 28 23 24 26 26 17 21 15 27 23 33 16 22 25 11 20 22 23 21 20 7 21 13 16 12 16 16 13 18 18 9 13 16 15 9 20 13 19 15 8 9 11 14 13 10 9 10 16 15 14 17 15 19 16 12 14 12 14 14 16 19 19 4 24 8 12 15 16 11 15 14 20 14 13 13 14 16 19 14 13 19 14 18 23 15 15 4 14 17 14 8 10 15 20 11 15 19 12 9 13 12 11 16 12 16 13 14 16 13 16 16 19 19 12 11 10 19 15 15 14 12 5 11 18 17 10 13 12 9 6 2 0 0 1 0 0.174000 3.950 3.950 9.500 2675515 3 0 0 0 0 0 0 0 0 0 0 0 2 0 1 1 0 2 1 2 3 3 1 3 1 3 7 5 3 6 4 3 9 4 5 2 5 3 3 3 6 9 5 5 2 6 8 5 8 4 8 5 6 5 6 4 6 3 7 11 6 9 9 3 6 6 7 6 8 7 9 12 18 6 9 8 11 11 8 14 15 15 11 15 13 9 19 10 15 14 9 4 18 5 8 10 8 10 13 9 12 11 8 8 12 6 15 8 9 9 18 7 17 21 9 13 18 14 21 24 18 22 17 26 15 21 23 25 19 26 23 20 27 17 27 20 26 15 22 15 19 15 16 24 12 15 24 13 13 17 11 7 10 21 15 15 16 13 20 22 12 16 12 16 15 14 18 11 12 14 14 24 10 13 16 19 8 11 18 19 15 15 23 16 16 11 12 18 11 13 14 16 10 14 13 18 12 15 15 14 8 11 17 12 22 13 12 14 15 10 11 15 19 15 12 17 8 21 23 13 19 11 8 12 15 11 14 15 19 15 10 17 9 16 14 18 14 16 14 14 23 14 14 13 16 12 14 15 14 9 14 7 5 2 3 1 1 1 0.176000 4.000 4.000 9.600 2779386 5 0 0 0 0 0 0 0 0 0 0 0 0 2 2 3 0 1 3 0 6 2 6 3 1 5 0 4 1 6 5 1 6 3 6 5 6 2 5 4 5 3 9 8 5 7 5 8 4 12 8 12 6 8 5 7 5 7 10 5 5 6 7 9 7 10 7 10 10 8 12 10 6 13 10 11 12 11 10 10 16 9 6 12 9 11 17 10 11 10 14 11 16 7 11 13 12 10 17 14 11 13 12 10 13 16 16 17 17 15 14 11 8 15 13 27 22 14 19 17 22 22 27 18 28 19 27 32 24 33 21 17 23 12 27 25 20 20 17 22 14 15 22 21 14 9 16 12 19 16 17 16 16 20 14 18 15 14 18 10 12 9 16 12 12 10 13 19 12 12 15 14 15 22 12 11 15 18 19 18 10 6 11 14 10 23 17 14 16 19 10 10 16 19 17 23 16 18 19 18 16 12 14 14 14 13 11 10 24 21 22 26 18 18 18 14 17 5 13 17 11 13 16 14 18 16 9 15 15 18 16 14 21 13 22 17 9 8 16 17 16 16 19 7 20 19 18 16 10 6 10 6 3 5 1 0 0 2 0.178000 4.050 4.050 9.700 2869617 3 0 0 0 0 0 0 0 0 0 0 0 2 2 2 0 1 4 1 3 2 2 1 2 3 2 2 4 4 7 5 6 5 3 6 6 5 7 8 1 5 2 3 5 5 8 10 7 6 10 9 6 8 9 7 8 10 15 4 10 5 8 8 6 11 8 8 11 7 5 8 14 5 11 7 13 10 9 7 8 9 14 12 10 9 11 6 14 15 14 13 11 9 18 18 10 14 14 10 12 16 12 9 8 14 15 6 11 11 12 10 14 12 11 18 13 13 27 16 23 23 20 21 32 20 18 25 22 24 32 25 34 19 23 21 25 22 25 19 23 19 21 16 19 16 18 9 18 6 13 12 13 18 12 8 19 14 14 11 16 13 15 14 21 11 14 14 13 11 20 14 14 26 10 22 16 18 15 20 24 18 19 19 16 14 14 14 21 13 19 18 20 13 17 11 17 14 22 17 15 15 20 8 21 15 16 16 23 17 13 19 21 20 12 15 18 15 19 15 18 17 20 15 13 14 24 18 15 15 14 18 20 19 17 19 20 21 21 15 19 19 17 11 16 16 11 23 10 20 13 10 5 10 2 3 1 1 0 0.180000 4.100 4.100 9.800 2975040 3 0 0 0 0 0 0 0 0 0 1 0 0 1 2 2 4 4 2 4 4 1 2 5 0 3 3 5 2 5 5 4 9 2 7 8 4 8 3 11 6 10 4 7 8 6 6 5 8 8 7 11 4 4 11 12 7 11 7 10 11 7 11 11 10 9 7 13 12 18 8 14 12 14 12 8 8 16 10 10 14 16 10 6 8 15 15 15 22 13 19 18 12 6 11 10 7 12 12 24 15 17 9 17 21 10 17 18 14 14 14 9 22 11 23 17 15 23 32 20 11 12 20 15 23 30 20 25 19 26 29 19 27 23 15 19 11 30 16 21 24 18 18 14 8 6 25 13 21 13 13 19 13 21 25 23 18 14 14 13 20 12 14 8 10 25 14 15 20 15 10 15 16 21 8 15 20 21 20 13 16 15 20 11 18 17 17 9 12 24 19 13 18 17 20 14 15 20 10 23 19 25 8 7 13 14 11 15 18 13 10 12 10 17 11 24 16 17 11 12 13 16 20 14 26 12 17 13 14 16 16 6 20 16 23 22 11 17 16 14 25 19 17 21 22 19 13 19 16 18 10 11 7 4 6 0 0 2 0.182000 4.150 4.150 9.900 3083416 6 0 0 0 0 0 0 0 0 0 0 0 2 1 1 4 1 3 4 3 5 6 2 1 4 2 3 5 6 6 7 2 4 1 11 7 5 2 6 6 8 9 8 12 7 11 9 6 12 7 8 9 6 6 8 11 6 6 8 11 8 11 12 11 13 9 10 7 9 6 11 9 13 12 12 8 14 15 8 9 8 8 11 22 16 6 11 16 15 9 13 12 12 13 11 15 9 9 16 14 14 12 21 12 12 12 16 19 10 15 18 8 16 14 16 16 21 30 22 9 25 19 19 26 23 33 25 22 21 19 21 20 20 21 20 26 20 29 27 25 25 21 20 25 21 21 18 14 19 15 6 20 18 16 20 16 13 13 15 15 15 15 22 16 15 15 11 21 19 11 19 13 14 15 17 21 12 18 12 22 18 21 18 13 23 15 18 9 21 11 14 23 18 21 25 18 22 15 21 23 15 15 16 19 21 18 19 21 17 13 24 23 22 19 14 20 22 15 14 14 20 20 23 13 18 15 18 20 20 24 9 12 17 21 21 12 16 17 16 16 21 26 19 15 21 22 24 15 11 13 13 6 8 1 4 0 1 0 0.184000 4.200 4.200 10.00 3174897 3 0 0 0 0 0 0 0 0 0 0 0 1 1 2 3 0 5 4 3 3 0 7 3 2 4 2 8 6 4 5 9 3 8 6 4 2 7 6 8 7 9 3 5 8 5 9 7 7 6 11 14 7 12 9 9 5 15 12 14 15 12 9 11 5 8 13 11 12 10 9 17 12 11 8 17 11 19 11 15 9 11 7 15 14 16 16 16 7 12 10 14 13 13 16 16 11 15 13 14 12 16 11 12 13 17 10 13 19 11 17 11 13 14 13 10 19 19 23 24 22 24 24 31 19 23 22 28 21 25 29 17 23 17 21 30 22 19 25 27 27 22 23 23 17 25 17 20 17 12 23 21 9 17 20 16 19 16 17 20 9 16 11 22 16 15 12 15 17 23 24 16 16 18 26 11 16 20 18 10 14 17 26 19 17 15 17 19 12 21 20 24 17 27 13 16 18 19 23 14 19 14 10 11 18 19 6 15 21 23 25 17 17 18 21 27 20 17 18 20 25 22 20 18 22 18 17 15 24 16 15 22 18 22 14 20 20 22 18 22 25 19 26 12 19 19 13 12 16 19 14 9 7 5 4 2 0 2 0.186000 4.250 4.250 10.10 3283256 3 0 0 0 0 0 0 0 0 1 0 0 1 1 4 1 5 2 5 5 3 4 6 3 2 4 7 8 2 6 6 4 10 7 8 7 5 4 4 9 8 18 10 7 6 6 13 12 10 13 10 7 15 4 7 10 13 12 8 8 13 5 14 6 9 14 9 10 16 12 13 11 8 12 11 10 13 9 11 15 17 23 18 13 10 12 11 12 14 14 14 10 12 12 16 13 15 13 13 14 18 10 13 17 14 14 14 12 12 8 18 14 23 20 16 19 16 16 16 27 18 21 19 20 19 37 22 21 22 28 24 26 18 21 28 21 22 21 21 22 16 15 13 22 22 27 22 11 13 20 10 17 16 19 20 30 18 25 8 7 22 18 17 14 23 16 17 11 16 24 19 18 22 15 15 23 16 13 15 22 14 8 12 18 13 15 22 17 15 15 17 27 21 19 21 24 17 10 12 14 19 17 22 18 19 17 28 19 15 14 16 28 17 20 15 11 22 18 19 16 21 17 24 19 22 22 20 10 20 18 18 18 21 18 23 18 32 26 21 21 22 20 22 16 17 20 22 21 17 13 13 11 9 5 0 1 1 1 0.188000 4.300 4.300 10.20 3396610 5 0 0 0 0 0 0 0 0 0 0 0 1 2 3 0 2 5 5 4 3 3 5 1 2 3 6 9 3 3 3 8 7 2 9 5 7 5 11 8 9 7 6 9 6 4 5 8 6 10 9 14 10 15 6 7 13 15 10 13 7 15 10 10 11 14 14 6 7 17 13 19 3 13 9 6 13 13 14 10 11 12 16 17 13 10 15 15 19 19 11 11 15 11 13 9 13 20 8 18 14 18 23 23 23 15 19 20 14 11 7 18 16 15 22 28 20 24 22 25 17 20 39 24 26 25 25 33 25 25 25 33 15 29 18 29 18 12 18 23 17 24 28 22 16 20 33 23 18 23 26 23 15 24 16 16 16 16 17 15 15 16 14 11 9 23 17 13 13 18 12 19 20 30 20 20 15 21 19 16 18 20 23 19 15 10 11 15 19 13 22 22 18 19 16 19 23 16 10 25 23 20 21 20 31 19 19 18 15 22 18 14 13 21 18 19 22 19 16 17 21 14 20 26 18 26 22 19 26 19 20 22 15 13 24 23 15 21 21 21 27 18 22 19 24 17 22 16 18 23 10 12 3 5 3 3 0 0 0.190000 4.350 4.350 10.30 3502025 3 0 0 0 0 0 0 0 0 0 0 0 0 3 0 3 2 3 4 4 3 4 5 10 7 6 6 4 5 12 10 6 6 13 10 6 7 14 9 6 13 10 12 16 3 9 9 7 5 6 13 11 10 8 11 19 12 14 13 16 13 14 9 12 14 13 14 16 10 14 7 16 18 16 9 15 11 20 15 10 14 14 11 14 17 10 6 16 10 15 12 17 17 20 15 7 12 23 15 8 13 12 8 16 15 20 16 16 20 14 11 20 24 23 20 16 18 27 25 31 27 27 25 21 31 27 20 23 24 32 17 21 34 27 17 19 19 25 30 27 21 24 28 30 19 26 21 14 16 21 23 27 8 17 21 17 11 23 15 22 15 18 10 17 20 23 18 18 17 19 22 15 22 21 19 23 18 18 26 17 18 26 18 24 15 22 23 23 19 23 25 23 24 26 10 21 16 32 23 18 19 24 21 28 26 22 19 19 14 30 21 24 23 22 21 13 27 20 27 24 15 20 22 22 13 25 14 19 32 21 18 18 23 22 22 14 18 20 24 14 19 20 18 17 24 29 27 20 12 18 17 11 9 2 3 2 1 0 0.192000 4.400 4.400 10.40 3593938 3 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 2 3 4 7 8 1 5 6 8 3 7 5 4 9 8 8 7 7 9 7 9 9 15 5 7 8 15 14 9 9 13 8 8 15 10 7 10 9 10 14 7 8 18 16 17 11 14 15 13 8 15 8 15 18 16 16 22 12 8 16 13 10 13 13 10 21 11 10 16 16 13 13 17 16 20 23 13 22 16 14 15 22 19 22 15 22 24 16 16 16 19 12 15 16 17 20 18 19 26 17 23 18 32 20 28 36 22 25 30 29 31 36 24 24 21 29 24 32 29 30 23 34 19 33 34 25 20 31 27 24 16 14 21 20 13 24 17 28 13 24 16 26 15 26 21 11 15 20 13 20 18 25 23 18 24 26 22 16 22 14 13 16 20 24 25 19 29 20 15 20 16 25 26 21 22 17 24 22 21 17 23 23 15 19 30 23 17 21 19 18 21 26 14 29 24 20 33 19 15 20 23 28 19 23 25 15 19 17 31 23 18 29 26 25 14 24 25 18 19 19 24 35 31 23 23 14 15 19 11 20 19 24 17 16 9 10 12 3 2 2 0 1 0.194000 4.450 4.450 10.50 3712573 7 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 5 3 5 4 3 11 3 10 4 6 7 8 5 5 5 8 9 12 7 7 11 8 6 7 9 10 13 10 6 13 9 9 9 11 14 14 12 13 10 6 13 13 15 12 13 19 8 14 13 16 11 13 14 15 9 15 16 13 16 17 17 17 23 18 16 19 10 13 18 16 10 9 21 11 22 14 20 14 18 13 15 12 13 14 16 14 15 20 29 17 14 18 8 15 21 15 19 15 22 20 17 15 23 26 16 26 24 23 23 23 23 30 24 29 28 26 35 33 31 22 23 22 20 37 22 27 33 26 27 26 17 16 18 27 22 21 24 18 18 18 17 15 18 14 19 24 22 15 20 21 15 19 25 15 16 26 19 22 29 20 16 13 15 16 32 24 23 13 33 17 22 18 18 23 24 22 21 20 26 21 16 22 18 18 16 15 26 26 17 22 21 13 25 24 13 23 18 18 25 32 20 24 21 17 19 24 24 23 33 19 19 21 32 18 22 23 19 23 32 18 31 22 25 23 23 31 29 21 16 20 20 15 22 14 12 5 10 9 2 1 0 1 0.196000 4.500 4.500 10.60 3829518 3 0 0 0 0 0 0 0 0 0 0 1 2 2 1 6 2 6 5 9 3 5 6 8 6 3 8 10 7 11 9 4 8 9 5 11 10 13 9 16 13 10 9 5 12 9 15 10 13 9 12 18 14 19 9 13 14 12 13 21 17 17 18 16 13 12 16 14 18 10 15 15 16 11 15 22 17 19 17 11 12 26 12 17 19 18 21 20 27 17 18 19 21 14 19 16 12 16 21 20 18 8 17 17 13 13 18 15 19 15 19 20 28 21 29 27 27 34 24 26 31 25 24 16 17 23 23 30 28 18 28 32 28 37 18 26 18 16 33 21 31 21 20 22 19 20 25 18 18 20 11 17 20 22 23 14 14 17 18 20 25 20 19 20 22 19 16 33 25 21 21 24 18 16 22 29 22 16 27 26 28 21 20 22 17 25 23 20 23 18 16 19 26 22 21 22 23 15 20 19 17 23 19 20 15 22 18 22 26 23 23 31 17 29 18 13 15 19 18 24 22 28 22 17 23 24 26 21 23 25 24 29 26 18 41 24 29 22 27 23 28 16 30 24 18 23 19 17 18 21 17 14 8 2 5 2 0 0 0.198000 4.550 4.550 10.70 3950740 3 0 0 0 0 0 0 0 0 0 1 1 1 2 1 3 7 5 6 7 7 7 4 5 6 4 1 8 9 10 9 8 10 8 12 6 10 8 10 8 11 9 10 15 7 11 8 13 11 13 15 15 17 12 10 8 17 12 9 14 12 14 11 14 21 14 15 20 18 16 8 15 22 24 14 10 18 14 15 16 12 10 16 21 16 25 17 20 17 17 20 15 24 15 17 22 25 17 13 22 18 20 19 11 21 22 21 16 21 24 16 22 17 21 17 24 22 24 35 27 24 28 24 32 37 34 25 24 29 37 37 25 28 21 23 24 22 21 20 25 22 32 19 21 22 24 20 21 20 22 18 27 17 14 20 22 22 22 14 19 20 20 21 23 22 14 20 21 23 20 18 23 20 25 31 24 18 22 14 23 22 21 23 27 27 20 21 18 22 23 24 23 21 18 22 17 22 21 35 15 24 24 12 27 30 27 28 22 31 24 24 19 27 24 28 23 25 26 35 27 22 29 21 24 18 19 26 33 29 31 23 25 19 24 26 21 10 23 24 26 28 20 27 26 17 29 22 18 14 22 8 10 11 4 4 1 2 0 0.200000 4.600 4.600 10.80 4068161 5 0 0 0 0 0 0 0 0 0 0 1 1 0 1 5 5 2 9 3 11 6 9 8 7 7 8 3 3 13 10 8 7 5 8 13 8 7 14 12 10 7 15 13 13 11 12 12 14 12 13 12 10 15 11 14 7 16 15 8 15 13 15 13 18 13 17 21 15 12 13 13 17 18 18 18 16 19 20 17 14 17 24 13 12 18 19 19 13 21 18 26 21 23 16 14 18 19 13 33 13 19 20 14 20 23 14 26 19 22 21 21 16 27 30 25 28 22 32 21 30 27 31 21 30 22 27 27 31 27 21 17 38 41 17 21 20 19 30 24 27 20 20 21 30 20 19 19 31 25 24 13 21 23 19 24 33 24 17 20 17 12 25 23 18 24 11 24 25 22 33 20 11 22 31 21 20 26 27 21 26 24 14 23 23 20 20 26 28 10 20 27 24 22 17 27 28 20 23 23 33 20 24 26 32 33 29 21 25 24 17 18 19 27 26 20 24 26 24 24 26 21 19 24 21 36 32 18 33 33 20 23 25 33 19 27 25 27 24 27 21 21 23 28 18 27 25 19 24 15 17 12 15 7 2 1 0 0 ", "%f ", Inf); -%! assert(rows (x) == n); +%! [x, n] = sscanf (" 0.024000 0.200 0.200 2.000 1987 5 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 2 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 4 5 1 2 2 5 5 8 2 8 12 6 15 18 28 26 47 88 118 162 192 130 88 56 27 23 14 9 6 3 4 1 0 2 3 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0.026000 0.250 0.250 2.100 3115 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1 1 0 1 1 1 0 1 0 1 3 2 0 5 15 25 44 66 145 179 193 172 104 57 17 11 12 2 1 0 1 1 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.028000 0.300 0.300 2.200 4929 3 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1 0 1 2 2 3 2 3 14 21 49 80 148 184 218 159 124 63 37 13 12 3 1 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.030000 0.350 0.350 2.300 7051 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 2 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 0 0 0 2 0 0 0 1 5 6 14 28 51 88 154 177 208 169 124 65 39 15 5 3 3 2 1 0 1 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.032000 0.400 0.400 2.400 9113 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 2 0 1 0 0 1 1 0 2 3 5 3 17 30 60 117 156 189 209 129 102 64 56 16 11 4 2 2 0 0 0 0 1 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0.034000 0.450 0.450 2.500 11811 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 5 5 15 21 57 99 149 190 195 159 130 69 41 16 10 2 5 3 0 1 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.036000 0.500 0.500 2.600 14985 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0 0 1 0 0 2 2 6 10 34 60 95 126 177 194 155 99 71 44 17 6 7 2 0 0 0 3 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.038000 0.550 0.550 2.700 18391 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 2 0 0 1 1 0 1 2 1 0 0 0 1 0 1 3 6 19 27 52 95 161 154 169 134 94 64 37 19 9 6 0 2 1 0 0 0 0 1 2 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 2 2 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.040000 0.600 0.600 2.800 22933 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 0 1 0 0 0 0 0 2 0 3 4 7 18 27 47 82 134 163 133 138 101 58 34 26 10 5 2 1 2 1 1 0 2 1 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.042000 0.650 0.650 2.900 27719 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 2 8 16 37 51 87 128 153 146 123 105 62 35 24 8 3 5 0 1 2 1 0 0 0 1 1 1 0 0 0 1 0 1 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.044000 0.700 0.700 3.000 32922 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 0 0 0 2 0 0 0 0 0 0 0 0 2 1 0 0 0 0 1 1 1 1 0 0 1 0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 1 0 1 1 1 1 0 0 0 1 4 3 5 5 15 35 54 88 132 168 149 105 92 62 30 16 17 4 5 1 0 0 1 0 1 1 0 1 1 0 0 0 1 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.046000 0.750 0.750 3.100 38973 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 4 3 5 20 37 56 94 110 135 149 124 84 58 36 17 14 7 1 0 2 0 1 0 0 1 1 0 0 0 0 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 0 0 0 0 1 1 0 0 1 0 0 0 0 1 0 0 0 1 1 0 1 0 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.048000 0.800 0.800 3.200 45376 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 1 0 0 2 1 1 2 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 3 18 34 55 82 104 135 116 99 79 60 51 29 10 4 3 1 1 1 0 0 1 0 0 0 1 0 0 3 1 2 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.050000 0.850 0.850 3.300 52060 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 1 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 2 2 1 3 12 24 40 39 107 121 127 138 100 86 68 44 23 15 7 3 1 1 0 1 1 0 0 2 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.052000 0.900 0.900 3.400 59454 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 1 0 0 2 0 2 1 0 0 0 1 0 0 1 0 0 0 0 0 3 3 6 21 32 68 90 132 111 122 107 73 57 47 24 11 7 4 2 2 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 2 0 1 1 0 0 1 0 0 0 0 0 3 0 1 0 0 0 0 1 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0.054000 0.950 0.950 3.500 67013 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 1 0 0 0 0 1 0 0 1 1 0 0 0 1 0 1 0 1 2 4 3 7 9 28 31 71 94 115 96 108 78 82 60 38 17 12 11 4 3 1 1 0 2 1 0 0 0 2 1 3 0 0 0 0 3 0 0 1 0 0 0 0 0 0 0 2 0 0 0 1 0 2 0 1 0 2 0 1 0 0 1 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0.056000 1.000 1.000 3.600 75475 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 3 0 0 1 1 2 0 1 4 0 1 8 6 7 17 41 56 71 109 113 84 103 72 54 35 22 6 9 1 7 5 4 0 0 1 0 0 0 0 0 0 1 0 0 2 1 0 0 0 0 2 0 0 1 0 0 1 0 0 0 0 0 0 1 0 2 0 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 3 0 0 0 1 0 0 0 0 0 0 1 1 0 0 2 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.058000 1.050 1.050 3.700 83558 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 1 2 0 0 2 0 0 1 0 3 2 3 6 15 27 41 77 73 94 94 92 76 61 56 42 23 13 11 6 2 1 2 0 1 2 0 0 1 0 1 0 0 1 0 0 1 1 1 0 0 0 1 0 0 0 1 0 0 0 0 1 1 0 0 0 0 2 0 0 0 0 0 1 2 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0.060000 1.100 1.100 3.800 93087 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 1 2 2 0 0 0 1 0 1 1 0 0 0 1 1 0 4 0 0 1 2 0 3 1 3 5 13 33 31 65 75 77 96 97 80 59 45 36 32 18 2 5 0 1 0 0 1 0 0 3 0 0 0 0 1 0 0 0 0 0 1 0 0 1 2 0 0 0 0 1 0 0 0 0 1 0 1 1 1 0 0 2 0 0 2 0 1 0 0 0 0 0 0 0 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.062000 1.150 1.150 3.900 102829 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 1 1 0 0 1 0 1 0 0 0 0 0 1 1 1 0 1 0 1 1 0 1 1 0 2 0 2 1 2 0 0 2 4 3 5 11 9 23 43 53 68 65 87 83 77 59 49 34 18 15 9 4 2 3 2 0 0 0 4 0 1 1 0 0 2 0 0 1 0 0 0 0 1 1 1 0 1 0 0 0 0 2 0 0 0 0 1 0 0 1 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0.064000 1.200 1.200 4.000 113442 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 1 1 1 0 1 1 1 1 1 0 0 0 1 2 0 0 0 2 0 4 5 11 13 29 39 61 68 61 75 76 74 73 44 37 29 19 6 3 3 2 0 1 2 1 0 0 0 0 1 1 1 0 1 1 0 0 0 1 0 1 1 0 1 2 0 2 1 1 1 0 0 0 0 1 0 0 1 1 1 1 1 0 0 0 0 0 0 0 1 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0.066000 1.250 1.250 4.100 126668 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 1 0 0 0 1 1 2 3 0 2 1 2 0 1 0 3 0 0 0 1 0 1 1 3 0 0 1 3 0 2 4 3 12 12 30 48 56 66 77 78 71 82 52 31 32 19 20 16 8 2 1 3 0 0 2 1 0 1 0 1 0 0 0 1 3 1 0 1 0 1 1 1 0 0 0 0 0 2 0 2 0 0 0 0 0 1 0 0 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 2 0 3 1 0 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.068000 1.300 1.300 4.200 138042 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 2 0 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1 0 0 0 0 3 0 0 1 0 0 1 2 0 0 0 3 0 1 0 0 3 0 1 0 1 1 3 1 4 7 11 14 27 36 44 68 72 70 71 45 44 46 29 13 16 11 5 2 0 3 0 0 0 0 1 1 2 0 0 1 1 2 1 1 0 1 0 0 0 0 0 0 0 0 0 0 1 0 1 1 0 1 2 0 0 1 1 0 1 1 1 0 0 1 0 0 1 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.070000 1.350 1.350 4.300 152335 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 2 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 2 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 2 0 0 0 0 1 1 1 0 1 1 0 1 1 1 1 0 2 0 0 0 0 0 2 0 1 7 14 19 34 35 54 72 68 72 68 58 48 36 37 27 25 17 1 4 1 0 0 0 1 2 2 0 0 1 1 1 2 1 0 3 1 0 1 0 2 1 0 0 0 1 1 1 2 0 0 0 0 1 1 0 1 1 0 2 1 1 1 1 0 0 0 1 1 0 0 2 0 0 1 0 0 0 1 1 0 2 1 1 0 0 0 0 2 0 0 0 0 0 0 0 1 1 0 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0.072000 1.400 1.400 4.400 166280 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 1 0 1 1 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 1 0 1 1 1 0 0 1 0 1 0 0 3 4 2 2 0 0 0 0 0 1 1 3 1 0 3 2 2 1 2 2 0 2 2 1 8 14 26 24 29 47 47 68 65 63 55 42 41 26 29 17 8 4 4 1 0 1 2 0 0 0 1 1 2 0 1 2 1 0 0 1 1 1 0 0 1 0 0 0 1 0 0 1 2 1 2 1 0 0 0 0 0 1 1 2 0 2 2 0 0 0 0 1 1 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0.074000 1.450 1.450 4.500 179484 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 1 0 0 1 0 1 2 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 1 0 1 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 1 1 0 1 1 1 2 0 0 1 1 2 1 0 1 1 2 2 0 1 5 6 10 20 43 50 57 62 53 62 66 45 42 33 27 26 23 14 3 0 2 0 1 0 0 1 1 0 0 2 1 1 0 0 3 0 1 1 1 0 1 1 0 1 0 1 2 1 0 0 1 2 0 2 0 0 0 0 1 1 3 1 0 0 2 1 1 1 0 0 0 0 0 0 1 2 0 1 0 0 0 0 0 1 1 0 2 0 0 0 0 0 1 0 2 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0.076000 1.500 1.500 4.600 197657 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 1 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 2 0 0 0 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 2 0 0 0 2 1 1 0 1 1 0 1 1 3 2 1 1 2 1 0 1 0 0 0 0 0 1 1 1 0 5 3 7 12 24 38 32 41 48 54 66 71 49 46 31 38 25 15 8 6 6 5 0 1 3 0 1 1 1 1 1 0 1 2 0 1 0 0 0 1 0 2 1 2 0 0 0 0 1 3 1 0 0 0 0 1 1 0 1 0 1 1 1 1 1 0 4 1 1 1 0 3 0 0 0 2 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0.078000 1.550 1.550 4.700 212054 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 0 0 1 0 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 2 0 0 0 1 0 0 1 0 1 1 0 1 3 1 0 0 1 2 0 0 0 1 0 0 0 0 0 2 1 2 1 1 1 0 0 1 5 1 1 2 3 5 7 9 11 22 31 37 48 50 52 54 57 37 38 38 33 24 11 19 11 3 1 2 0 3 3 2 1 0 1 3 0 1 1 1 1 1 2 0 0 0 1 1 2 0 1 1 3 0 1 1 0 0 1 0 2 0 1 0 0 1 3 0 2 0 1 0 1 2 0 1 1 1 1 1 0 3 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 0 0 0 0 0 0 0 0 0.080000 1.600 1.600 4.800 231971 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 2 0 0 0 1 1 1 0 1 0 0 0 0 1 0 1 1 0 0 0 0 2 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 2 1 0 1 1 1 0 1 0 0 1 0 1 3 0 0 0 1 0 0 0 1 1 1 0 0 4 1 1 0 2 0 1 1 1 2 0 0 0 1 0 1 2 1 2 3 2 0 1 0 4 3 1 1 1 1 3 1 0 0 0 2 1 0 2 7 17 13 29 47 58 59 52 38 51 51 38 34 35 21 14 13 4 1 0 1 1 1 0 2 2 4 1 0 1 1 4 0 0 0 2 0 2 2 2 0 0 1 3 2 1 1 2 2 2 2 1 0 3 0 2 1 2 1 2 2 0 0 1 1 0 2 0 2 2 0 1 0 2 2 3 1 2 3 1 1 0 1 0 2 0 1 2 1 2 0 2 1 0 0 3 0 0 1 1 1 1 0 0 1 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0.082000 1.650 1.650 4.900 252503 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 2 0 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 2 0 0 1 0 1 2 2 2 1 0 2 0 1 0 1 1 2 2 0 3 0 0 4 1 0 0 3 0 0 1 2 0 1 1 1 3 0 1 0 2 9 11 25 27 34 53 41 49 43 47 36 31 38 22 30 22 18 9 5 9 2 2 1 2 2 3 1 4 1 1 0 0 1 2 0 2 1 0 0 1 3 2 2 1 0 0 0 1 2 1 0 0 0 2 1 1 0 2 0 0 1 0 0 2 1 3 1 1 1 0 2 1 1 0 2 1 0 1 3 0 0 0 0 2 0 0 1 0 0 0 0 0 1 2 1 1 1 0 2 1 0 0 0 2 0 1 0 0 0 0 1 0 0 0 0 1 0 0 2 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0.084000 1.700 1.700 5.000 267889 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 0 1 1 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 1 0 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 1 0 1 1 0 3 0 1 1 1 0 1 2 1 0 2 0 2 4 0 1 0 0 0 1 1 0 1 3 2 0 2 0 4 0 0 2 0 1 4 2 4 3 3 6 10 14 28 37 54 36 40 52 40 50 46 40 32 26 29 12 18 5 2 0 2 4 1 2 1 0 2 1 2 2 1 0 1 0 2 1 2 4 1 1 5 1 0 2 0 1 2 3 2 2 1 2 1 0 2 1 2 1 1 4 1 2 1 4 0 2 2 0 0 3 1 0 2 0 0 1 1 1 0 0 2 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0.086000 1.750 1.750 5.100 290294 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 2 0 0 0 1 0 0 0 0 1 0 1 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 1 3 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 1 0 0 2 1 0 1 0 1 0 0 2 2 0 1 2 2 0 2 0 2 0 1 0 0 1 1 1 3 1 1 1 1 3 4 1 1 2 2 2 1 0 3 0 0 0 2 4 5 6 16 18 20 31 40 54 55 46 41 52 35 27 21 28 27 20 15 8 6 7 1 0 0 3 0 0 2 2 0 3 1 3 1 1 2 0 0 1 2 1 3 2 0 1 2 1 3 1 1 1 1 1 2 0 2 1 0 1 1 1 3 1 1 2 0 1 0 1 0 2 1 1 0 0 1 2 0 3 1 1 0 0 0 1 3 1 1 1 0 0 1 2 1 0 0 1 1 1 0 0 1 0 0 0 0 0 0 2 0 1 0 0 0 2 1 0 2 0 0 0 0 1 1 0 1 0 0 0 0 0 0 0 0.088000 1.800 1.800 5.200 312476 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 1 0 0 0 1 0 1 0 1 1 0 0 0 0 0 0 2 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 2 0 0 0 1 0 1 0 0 0 0 0 0 2 1 0 0 1 0 0 1 1 1 1 4 2 0 1 0 0 3 0 0 0 0 0 1 1 4 0 0 0 0 1 1 2 1 0 3 0 0 2 2 4 0 3 1 6 9 10 13 21 24 32 43 33 41 43 49 50 32 26 31 27 12 16 17 3 3 3 5 0 3 0 2 1 3 3 2 1 2 3 1 2 1 1 1 2 0 1 1 0 2 0 3 0 0 2 0 0 0 0 1 0 1 1 3 3 0 1 1 1 1 1 1 2 2 2 0 3 1 0 2 2 2 0 0 0 0 3 1 2 5 1 1 2 0 0 3 3 0 2 2 0 0 0 0 1 2 0 0 1 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0.090000 1.850 1.850 5.300 337348 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 1 2 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 2 0 1 1 0 0 0 1 0 1 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 2 0 0 0 1 3 2 0 0 2 2 3 3 2 2 2 0 0 1 1 3 1 3 0 0 0 0 0 0 1 2 1 2 1 2 2 2 0 1 1 0 4 2 2 7 6 15 22 21 39 37 50 31 51 30 33 34 34 26 21 14 13 10 9 4 3 3 4 2 2 0 1 2 3 3 0 1 3 2 5 3 2 2 4 0 2 3 0 4 2 1 2 2 2 4 2 1 3 1 3 2 1 3 1 2 4 1 1 1 1 2 4 1 3 3 3 1 0 4 1 0 1 1 1 1 2 3 0 3 0 0 4 1 1 1 0 2 2 2 1 2 2 0 1 1 0 0 0 2 0 1 0 1 0 0 1 0 0 0 1 3 0 0 1 0 0 1 1 1 0 0 1 0 0 0 0 0 0 0.092000 1.900 1.900 5.400 357303 3 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0 1 1 0 1 0 0 1 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 1 3 1 0 1 0 0 0 0 1 0 0 1 0 0 1 1 2 2 0 0 2 2 1 1 1 1 1 1 0 1 0 0 1 1 1 3 1 1 1 1 1 0 1 4 0 1 1 1 3 0 1 1 2 2 2 0 2 3 2 2 2 2 1 2 1 3 8 22 14 32 36 46 39 42 39 29 36 38 26 24 26 18 16 19 10 9 3 6 5 0 3 2 1 1 1 2 0 2 1 1 0 1 1 3 1 0 2 4 2 2 1 4 1 2 2 1 1 0 1 2 0 2 2 2 4 2 1 1 0 2 1 3 1 2 3 4 2 3 2 3 0 1 2 1 0 0 0 4 1 1 1 2 1 3 1 0 5 1 0 0 0 0 0 0 1 0 2 0 1 2 1 0 1 0 0 0 0 0 1 1 0 1 0 1 4 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0.094000 1.950 1.950 5.500 383138 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 2 1 0 1 1 1 0 0 0 0 0 0 1 1 0 1 0 0 1 1 0 1 0 0 0 0 0 0 0 2 1 1 1 1 2 1 0 2 0 1 0 3 2 1 3 0 1 3 1 1 0 5 0 1 0 1 2 0 0 1 1 2 0 0 6 1 0 3 2 2 3 4 5 0 4 2 1 5 4 11 15 22 27 28 57 38 38 40 38 39 38 27 26 30 18 14 10 10 4 4 4 3 3 2 2 2 2 1 1 1 1 2 2 3 4 1 2 3 1 2 1 2 2 2 1 3 2 1 5 0 1 1 1 3 2 2 2 1 3 1 1 0 3 2 2 0 0 2 2 2 0 0 0 2 0 1 3 1 2 3 2 1 1 0 1 1 1 0 3 2 2 1 0 0 1 3 1 1 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 3 1 0 0 0 0 1 0 1 1 0 0 0 1 0 0 0 0 0 0.096000 2.000 2.000 5.600 409868 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 1 0 1 0 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 2 0 1 0 0 2 0 2 0 0 0 0 1 0 0 2 1 2 2 2 1 2 1 1 1 1 1 2 0 0 1 1 0 1 0 2 1 2 0 2 0 3 1 2 1 3 1 5 0 2 2 1 2 4 1 2 0 3 1 4 7 5 9 13 22 19 31 27 28 41 34 39 37 22 23 21 22 17 23 15 8 9 3 8 0 3 1 2 2 2 3 1 0 4 2 4 2 2 2 2 4 2 1 1 0 2 0 3 0 3 2 2 1 2 2 1 4 1 2 2 1 1 5 2 1 2 1 2 2 1 0 2 4 3 2 1 2 2 3 2 3 1 2 1 1 1 1 2 1 1 2 2 1 2 3 2 1 1 0 2 2 4 0 1 1 1 1 1 0 0 1 1 3 0 0 0 0 0 1 0 0 2 0 1 2 0 1 1 1 0 1 0 1 0 0 0.098000 2.050 2.050 5.700 439102 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 1 1 0 0 1 0 1 0 1 0 0 0 0 1 1 0 1 0 0 1 1 0 0 1 1 0 0 1 1 0 1 0 0 0 0 0 0 0 1 2 0 0 1 1 1 1 2 0 1 1 0 0 0 0 1 1 1 0 4 0 0 0 2 1 1 0 3 4 0 1 2 2 1 0 3 0 3 2 0 0 2 0 1 0 0 1 0 1 3 1 3 5 0 2 2 3 5 2 2 2 0 3 2 3 6 5 16 21 19 23 28 29 35 42 42 44 39 33 23 30 18 25 24 15 13 5 4 2 2 0 3 3 0 0 1 3 0 1 1 3 2 4 3 4 2 1 1 1 3 1 0 0 2 2 4 2 2 1 4 2 4 2 2 2 1 2 2 1 2 0 4 2 2 3 1 2 1 1 2 2 1 2 4 2 1 4 1 2 2 2 2 0 2 0 3 0 1 0 2 1 0 4 2 1 3 2 1 0 2 1 1 1 1 0 1 1 2 1 1 1 2 0 1 0 2 1 1 0 0 1 0 0 1 0 0 0 0 0 0 0.100000 2.100 2.100 5.800 467340 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 0 0 1 2 0 0 0 0 0 1 0 2 0 0 2 0 0 1 1 0 0 0 1 0 0 1 1 0 0 0 0 1 1 0 0 1 0 0 1 0 0 0 1 1 0 0 0 0 0 1 0 1 0 0 0 0 1 2 0 2 2 4 1 0 1 1 2 3 4 1 4 1 5 1 2 1 0 2 2 2 1 5 4 1 5 4 0 1 2 4 2 2 0 2 1 2 5 4 1 1 1 2 5 7 9 16 23 31 15 22 36 36 44 42 29 31 28 28 18 35 12 10 13 8 4 3 2 2 5 1 2 3 3 1 3 3 5 2 0 3 4 1 2 2 3 0 0 5 2 3 6 2 1 2 5 3 4 3 1 1 1 1 2 2 4 0 2 3 1 2 1 2 4 5 4 3 5 2 1 2 0 5 0 2 2 4 1 0 4 1 0 2 1 2 0 0 1 3 2 4 3 0 2 3 3 3 4 2 2 0 0 0 0 1 1 0 3 2 0 1 2 0 4 2 1 1 1 2 0 0 0 0 0 0 0 0 0 0 0.102000 2.150 2.150 5.900 497495 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 0 2 1 0 0 0 0 1 0 1 0 0 0 0 1 2 0 0 0 0 0 2 0 0 1 0 1 0 0 0 0 1 1 0 0 0 1 1 1 1 2 0 0 1 0 0 0 1 0 2 2 1 0 0 0 2 0 2 1 1 1 6 3 2 0 3 2 2 2 1 1 3 4 1 0 1 2 4 2 3 3 1 1 1 1 3 3 1 4 1 3 4 3 2 3 1 2 2 5 11 11 14 26 27 28 28 28 36 39 42 29 33 24 20 29 18 13 17 13 6 10 4 3 3 6 1 0 1 0 2 1 3 2 3 1 2 3 1 2 1 2 0 2 2 3 1 3 1 1 2 4 4 1 4 3 2 2 3 5 5 3 0 2 5 3 5 1 4 1 1 3 4 2 2 2 2 1 3 0 1 1 2 2 4 2 1 3 2 0 1 2 1 0 2 3 1 2 0 0 0 2 0 0 1 3 0 0 1 2 0 3 1 0 3 1 2 2 1 1 2 0 0 0 0 2 0 0 1 0 0 0 0 0 0.104000 2.200 2.200 6.000 529288 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 2 1 0 0 1 3 0 2 0 2 0 0 3 2 2 0 4 0 3 2 2 1 3 1 7 3 1 1 0 4 3 2 1 0 0 3 2 3 5 2 1 4 1 5 1 0 3 2 3 0 1 2 4 7 3 7 8 12 15 20 24 34 39 34 35 27 36 34 23 22 26 15 24 12 12 14 5 3 0 7 1 1 3 5 1 2 2 2 4 3 1 2 5 2 2 3 1 1 4 2 1 3 0 4 5 4 6 4 5 3 3 3 3 1 1 5 0 6 1 2 4 2 3 2 1 3 2 0 0 0 1 3 3 0 1 4 0 3 2 3 0 3 3 0 2 3 4 3 1 1 1 2 5 3 1 2 1 1 2 4 1 0 2 4 1 3 0 0 3 0 1 3 0 1 0 0 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0.106000 2.250 2.250 6.100 560628 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 2 0 1 0 1 0 1 0 1 0 0 1 0 0 0 0 0 0 1 1 0 1 1 0 0 1 1 1 0 1 1 0 0 0 1 1 1 1 0 0 1 1 2 0 0 0 0 2 0 3 1 1 0 0 2 2 2 0 5 2 1 1 1 1 3 1 2 3 0 1 0 0 0 0 1 0 2 2 1 2 1 0 4 3 2 1 2 1 0 4 2 2 0 2 1 1 2 3 1 2 1 2 4 4 11 12 17 19 19 29 30 24 30 35 51 32 36 34 31 19 22 17 11 19 11 7 6 6 3 4 0 3 3 2 0 2 2 2 3 1 5 3 2 3 5 1 0 2 2 5 4 2 3 2 0 1 6 1 2 2 2 2 1 1 2 2 1 4 3 2 2 1 2 5 2 0 2 0 2 5 4 5 2 1 3 6 1 3 4 4 0 0 6 0 2 6 1 2 2 2 0 1 3 1 3 4 2 1 4 2 1 2 3 3 0 3 1 0 2 0 2 1 0 2 1 2 0 0 1 1 0 2 0 0 0 0 0 0 0 0.108000 2.300 2.300 6.200 593293 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 2 0 2 2 1 0 0 2 0 1 0 1 0 0 1 2 2 1 0 0 1 0 2 0 0 0 0 0 1 1 1 1 1 0 0 1 1 0 0 1 1 1 2 2 1 0 1 1 0 1 5 0 2 4 1 0 1 4 2 1 3 2 2 3 2 3 2 0 0 3 4 3 1 3 2 2 0 3 0 2 4 0 3 2 5 1 2 1 4 6 1 2 4 0 3 6 1 7 6 4 5 4 10 16 24 22 20 40 37 44 34 29 21 28 36 36 27 23 24 14 10 4 5 2 5 3 6 2 3 3 1 4 2 1 5 1 3 5 3 2 1 2 2 6 2 3 1 1 0 5 3 3 3 4 5 2 2 3 3 5 5 1 6 2 3 2 6 0 5 2 4 3 5 1 2 2 5 1 2 3 1 2 2 2 4 2 5 5 2 2 2 5 0 1 2 5 2 3 2 3 1 1 2 4 0 2 1 4 2 1 1 1 0 1 2 0 0 1 3 1 0 2 1 1 3 3 2 0 0 0 1 2 0 0 0 0 0.110000 2.350 2.350 6.300 636559 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 1 1 0 0 0 1 1 2 0 0 1 0 0 0 0 0 0 0 1 2 0 0 1 1 1 0 0 0 0 1 0 1 1 0 0 1 0 0 2 0 1 0 1 0 1 0 0 1 1 3 0 1 2 2 0 2 1 1 1 1 0 1 0 1 3 0 3 2 3 4 3 3 4 3 3 2 6 3 1 1 1 2 4 2 3 1 5 1 3 1 4 5 3 3 2 1 3 7 4 3 10 19 17 19 23 27 28 33 39 36 23 23 32 32 16 19 35 23 12 11 12 8 4 5 7 1 2 2 1 2 3 5 4 2 3 2 6 4 4 2 4 1 2 2 1 2 3 0 4 2 1 2 6 2 2 1 3 3 1 6 4 8 5 2 3 5 2 3 0 3 2 3 1 2 2 3 4 3 8 6 2 1 4 6 3 1 2 0 2 0 2 5 0 3 3 3 3 1 3 3 2 5 4 2 1 4 2 2 4 4 1 3 2 5 2 3 1 2 0 4 0 1 0 6 3 1 2 0 2 0 1 0 0 0 0 0.112000 2.400 2.400 6.400 670484 3 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1 1 0 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0 2 0 1 1 1 3 0 0 0 2 1 3 0 1 1 1 0 1 1 1 0 0 1 2 0 1 3 1 5 2 3 0 4 0 2 0 0 1 2 1 0 1 0 0 1 0 2 2 3 2 3 2 2 2 3 4 4 2 3 5 3 3 2 3 3 4 2 4 0 3 2 4 4 1 3 1 3 4 2 2 5 2 8 6 12 17 14 22 27 26 29 39 30 24 36 22 22 20 9 19 15 5 12 16 4 7 5 7 5 5 1 4 5 5 4 4 1 4 4 3 3 3 4 2 2 4 2 4 4 4 4 0 2 3 2 1 4 3 6 1 3 3 3 4 5 4 2 2 2 5 3 0 2 5 4 2 5 3 5 1 1 3 1 1 3 6 6 2 3 2 0 3 2 4 3 4 1 2 2 6 2 0 3 2 2 5 3 3 5 2 1 0 3 1 1 2 2 0 1 1 3 2 3 2 1 1 1 1 3 2 1 0 0 0 0 0 0 0 0.114000 2.450 2.450 6.500 711783 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 1 0 0 1 0 2 1 2 0 1 0 0 1 0 0 1 1 1 1 0 0 0 1 1 2 0 1 1 0 0 0 2 1 1 1 1 1 2 1 2 3 3 1 1 1 2 3 1 3 2 2 1 0 1 1 4 4 4 1 0 4 0 0 1 1 2 1 3 2 0 3 4 1 1 1 1 3 2 0 1 3 2 1 2 1 0 3 3 2 5 4 2 5 3 4 2 2 5 3 3 3 3 5 5 8 7 14 12 28 22 24 23 36 33 26 32 27 26 18 30 24 15 13 19 15 17 6 5 7 5 4 3 5 3 1 4 4 9 5 3 1 4 0 0 6 2 5 3 3 3 1 2 3 2 4 1 5 5 3 8 2 1 1 4 1 7 5 6 6 4 4 3 2 6 3 3 3 3 1 3 4 5 4 3 4 3 1 2 3 1 2 1 2 2 6 5 2 2 2 4 2 2 0 2 3 3 2 7 4 4 1 4 2 0 3 1 1 2 1 2 3 1 3 2 2 4 3 1 4 0 0 4 2 2 2 1 0 0 0 0 0.116000 2.500 2.500 6.600 745364 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 1 2 1 1 2 1 1 1 0 1 0 2 0 1 1 0 1 0 1 0 0 0 0 0 0 1 0 1 0 0 0 0 0 1 1 2 3 0 1 4 4 0 4 0 1 0 1 3 3 0 2 1 2 3 2 1 1 1 2 0 4 0 0 4 5 2 5 4 1 3 5 5 4 0 4 4 2 3 2 3 5 2 2 4 2 3 4 2 3 3 3 3 3 2 4 12 10 13 14 19 22 23 24 36 19 32 25 25 36 24 18 20 21 14 18 13 8 6 9 2 9 5 2 5 3 4 4 3 3 0 4 3 2 5 3 4 2 2 6 3 4 0 2 4 1 3 4 7 4 5 3 2 4 5 5 3 4 4 4 2 3 2 4 4 2 1 5 7 1 5 2 4 1 5 5 3 4 4 3 2 4 2 4 0 6 2 3 4 1 2 2 2 4 1 4 2 2 2 5 6 5 1 4 4 2 3 3 3 1 4 3 4 2 6 2 5 3 2 2 1 3 2 2 5 1 1 0 0 1 0 0 0 0.118000 2.550 2.550 6.700 791846 4 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 2 1 1 0 0 0 0 0 1 0 0 0 1 1 0 1 0 1 0 1 1 0 1 0 1 4 1 2 3 0 3 1 0 1 1 1 0 3 1 2 1 1 1 0 0 1 1 1 3 1 3 2 3 1 2 2 1 3 2 4 1 4 0 2 4 1 4 3 2 1 1 2 1 3 2 3 3 2 1 1 5 3 3 3 3 2 3 4 3 5 3 1 1 2 2 3 5 1 2 1 1 4 4 6 9 6 6 13 17 21 20 24 22 25 20 29 23 28 30 26 27 18 20 17 16 17 12 10 8 5 6 6 6 4 3 1 2 4 6 9 2 2 3 5 7 6 2 3 8 5 4 5 6 4 6 5 3 5 3 2 5 3 2 8 3 5 4 5 3 5 4 3 4 8 4 3 8 3 3 3 1 1 2 2 5 4 7 3 2 3 3 2 2 3 6 3 2 2 1 1 5 2 5 6 3 5 3 4 1 3 1 2 1 0 4 1 4 2 2 2 3 1 1 1 1 3 2 0 1 6 1 1 0 2 1 0 1 0 0 0 0 0.120000 2.600 2.600 6.800 833394 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 2 1 1 1 2 1 0 0 0 1 0 1 0 0 0 1 0 0 1 1 2 1 0 0 0 0 0 2 2 0 3 1 0 0 2 1 1 1 1 0 1 2 1 5 0 1 0 2 2 1 2 0 4 2 1 4 3 4 2 2 1 2 1 5 2 3 1 3 0 2 2 2 2 3 4 0 4 2 3 3 4 5 2 2 6 3 4 5 5 5 3 4 6 5 1 3 0 5 4 5 1 3 2 2 6 18 13 17 27 27 21 28 28 24 26 27 29 23 21 16 17 19 22 14 11 9 5 14 7 7 6 4 4 12 3 6 4 5 4 6 4 2 0 1 8 1 6 8 5 2 3 4 5 6 4 2 5 8 3 1 1 6 3 7 8 4 1 6 5 2 8 11 5 6 5 6 2 4 5 1 2 7 2 2 5 5 6 3 3 2 3 8 5 1 9 3 3 2 3 6 3 5 3 2 4 6 3 1 3 5 4 4 4 6 3 3 5 0 2 2 5 1 3 2 2 1 4 2 0 2 2 2 2 4 1 2 1 2 1 1 0 0.122000 2.650 2.650 6.900 876007 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 2 1 1 1 1 2 2 1 0 0 1 0 0 0 1 1 0 0 0 2 0 0 4 1 0 2 1 2 0 1 2 0 1 3 2 1 0 1 1 0 1 2 1 0 2 3 3 5 3 3 3 0 1 4 0 1 5 3 4 3 1 2 2 2 4 1 3 3 3 2 3 2 3 2 1 4 4 2 2 5 5 3 4 1 2 1 2 4 2 4 7 2 4 4 2 7 3 5 7 5 3 6 8 10 10 18 21 22 24 14 25 27 29 31 22 25 24 21 27 20 19 22 19 14 13 14 10 5 7 3 4 5 5 3 1 4 3 8 4 5 4 0 3 4 3 4 1 7 6 1 1 3 4 4 3 4 3 6 4 3 4 2 4 4 3 5 6 5 1 1 6 2 6 6 3 5 5 3 2 6 5 4 3 4 6 4 3 5 5 6 5 6 2 4 2 1 2 2 4 2 7 6 2 1 3 1 5 2 1 2 4 3 3 3 2 5 2 4 1 4 3 2 2 5 5 1 1 3 3 2 2 2 2 1 0 0 0 0 0 0.124000 2.700 2.700 7.000 925764 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 2 1 3 0 1 1 0 0 0 0 0 1 1 1 1 0 0 0 1 1 0 1 2 0 0 3 2 0 1 2 1 1 2 0 2 1 2 2 0 0 2 3 2 3 2 2 3 2 2 4 0 2 0 5 1 3 2 3 1 2 3 2 0 6 4 3 6 2 5 0 5 2 1 4 4 5 7 4 2 3 5 2 0 2 5 2 4 7 4 4 4 8 5 3 1 7 2 2 1 5 5 5 14 19 16 22 18 30 29 25 36 23 23 22 25 25 27 26 23 14 20 16 16 10 6 6 6 4 2 6 6 6 6 6 4 6 1 0 3 4 4 5 2 4 3 2 4 4 5 5 5 6 10 6 3 6 8 5 5 8 7 4 6 4 3 4 8 5 5 7 4 6 3 5 8 4 3 4 4 3 4 3 1 3 3 7 2 4 8 3 6 4 3 3 2 5 4 4 3 7 4 5 4 4 3 4 7 2 3 3 4 3 0 2 2 4 3 4 2 4 2 2 6 4 4 6 6 1 5 1 1 2 1 0 0 0 0 0 0.126000 2.750 2.750 7.100 969560 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1 1 1 0 1 2 0 2 0 2 2 0 1 1 1 0 0 1 0 1 1 1 1 2 0 1 2 2 1 2 0 0 1 0 1 0 2 1 0 1 0 1 1 2 0 3 0 3 4 3 1 3 2 0 4 0 1 2 0 3 1 1 2 3 2 2 2 5 1 7 1 5 1 5 4 2 0 0 1 2 1 3 2 3 3 5 4 10 10 2 5 11 4 1 2 1 7 3 5 4 4 1 5 10 8 7 9 9 20 20 21 33 21 28 20 27 32 21 29 22 20 24 15 13 27 14 13 15 10 9 3 11 6 7 5 3 6 8 5 4 4 1 3 3 5 2 7 3 6 6 1 6 4 6 5 3 4 2 4 3 3 9 4 5 4 4 5 2 3 10 4 3 2 6 10 6 3 6 5 5 5 4 8 8 5 4 3 6 4 4 2 4 4 4 5 7 4 4 4 4 5 2 2 3 4 5 2 1 3 2 6 2 7 7 1 6 4 4 6 5 5 4 0 2 2 3 2 7 5 0 4 1 1 4 6 1 0 3 2 0 0 1 0.128000 2.800 2.800 7.200 1022713 5 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 1 0 1 1 0 0 1 1 1 0 0 0 2 1 0 0 4 0 0 1 2 3 1 1 0 1 0 1 0 3 1 1 1 2 2 1 1 1 3 1 0 2 4 2 1 2 1 2 0 3 1 3 2 1 5 2 1 3 1 2 1 5 3 2 1 2 5 3 8 2 3 2 5 5 4 3 6 4 4 4 3 2 3 8 4 3 4 5 4 5 4 7 6 5 3 3 3 5 2 9 10 7 9 12 11 13 17 15 22 19 33 24 28 30 26 21 24 22 27 20 26 16 10 10 9 20 10 7 4 5 7 7 2 7 5 3 5 1 6 1 5 7 5 6 3 1 5 1 1 3 4 8 6 3 9 5 5 3 6 7 4 6 7 6 4 2 4 6 2 3 6 5 6 7 6 4 4 9 6 8 6 9 7 1 2 6 2 7 5 4 4 4 4 5 5 4 4 3 6 3 5 3 6 4 3 6 6 2 5 2 8 4 5 3 6 5 4 5 8 4 3 5 6 5 5 2 8 1 2 2 5 4 1 3 0 0 0 0 0 0.130000 2.850 2.850 7.300 1081669 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 5 0 0 2 2 0 0 1 0 0 0 1 1 0 2 0 2 2 2 1 0 1 0 2 2 3 1 1 0 2 0 1 0 2 1 1 2 2 0 1 4 3 0 2 1 1 0 2 5 2 1 0 1 3 2 5 2 1 2 5 2 3 4 3 6 6 6 4 6 6 3 1 3 2 3 4 7 5 2 9 7 4 1 4 4 3 2 2 2 7 4 8 4 7 4 6 8 5 1 8 6 10 18 21 18 15 21 24 21 26 22 30 28 27 23 22 21 17 25 20 17 13 17 9 12 7 8 5 4 4 5 5 2 4 1 1 2 5 7 6 4 9 7 7 5 5 5 5 5 2 4 5 3 6 8 2 4 9 4 10 5 1 4 5 5 5 10 3 2 8 6 5 7 3 13 3 3 6 5 1 4 5 9 5 2 7 4 5 6 3 5 6 5 4 5 9 6 4 3 4 4 4 5 8 5 5 0 3 6 3 4 3 7 5 6 4 3 3 6 8 4 1 3 1 2 7 3 4 6 6 1 3 4 1 0 1 0 0 0.132000 2.900 2.900 7.400 1131887 3 0 0 0 0 0 0 0 0 0 1 0 0 1 2 1 1 0 0 0 1 2 2 1 1 0 2 1 1 0 1 1 1 0 2 2 3 1 0 1 0 1 0 2 0 2 0 1 4 0 1 2 2 0 0 0 2 3 0 1 2 3 0 1 2 3 5 6 2 2 3 1 4 4 8 4 3 3 3 7 2 2 5 7 4 1 2 4 8 1 5 2 7 3 4 2 9 6 5 5 6 2 2 3 6 2 5 6 7 7 2 8 3 3 3 3 6 6 5 3 10 15 15 17 19 13 29 20 23 22 34 28 28 33 20 20 22 17 22 18 15 19 14 11 9 13 6 6 13 4 2 9 8 8 7 6 5 6 4 4 9 6 2 8 9 7 2 6 3 7 3 6 3 7 4 4 5 4 5 6 4 7 5 4 10 2 6 6 8 3 6 6 9 5 8 8 7 6 4 8 5 7 5 5 7 3 5 5 5 10 7 3 8 7 5 7 2 4 4 6 4 10 7 6 4 4 4 4 3 2 4 2 6 5 9 7 3 2 6 2 5 1 5 6 2 2 1 9 2 5 2 5 1 0 0 0 1 1 0.134000 2.950 2.950 7.500 1185706 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 3 2 1 0 1 1 0 0 0 0 0 1 0 1 1 2 0 1 0 1 2 0 0 0 1 1 0 1 1 1 0 2 2 0 1 3 3 2 3 0 0 2 2 3 2 1 1 3 0 0 1 1 3 4 3 1 1 9 1 4 0 1 3 4 1 3 2 6 4 7 7 3 2 8 5 2 5 2 4 6 7 3 7 7 8 4 7 2 4 7 7 9 9 2 5 5 8 3 5 7 3 6 10 6 10 15 10 13 14 29 21 23 37 26 20 28 20 16 24 25 16 19 21 20 20 17 11 10 12 8 7 7 5 5 5 4 5 6 7 3 6 5 7 5 11 9 6 8 11 6 4 6 8 8 7 7 7 4 5 4 8 5 4 3 4 8 10 7 9 4 7 6 8 9 7 3 5 7 7 6 2 6 4 7 3 9 8 12 7 6 6 6 4 5 7 2 4 7 3 2 4 4 7 1 4 5 0 4 6 3 10 8 5 4 3 4 5 7 5 7 5 7 3 5 2 5 6 4 5 2 4 1 6 6 2 4 2 0 0 1 0 0.136000 3.000 3.000 7.600 1238426 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 2 4 0 2 0 2 2 0 1 1 1 0 2 1 1 2 1 0 1 1 0 3 1 0 0 1 0 1 0 0 2 1 1 0 4 0 2 6 3 3 4 0 3 1 2 4 0 4 4 0 1 5 2 2 5 1 3 4 3 3 5 2 4 4 6 2 5 3 4 5 4 5 6 7 5 6 2 8 3 4 7 2 4 4 3 7 6 5 1 4 8 3 7 10 3 3 6 1 5 3 8 11 5 7 15 11 15 17 21 23 21 24 28 16 21 29 15 22 27 28 20 13 19 13 7 15 10 11 9 6 8 8 4 7 5 4 6 5 10 6 7 8 9 3 5 5 9 5 9 4 4 4 3 5 7 4 10 6 8 4 9 8 4 6 7 9 11 6 8 3 5 8 12 3 6 9 7 11 9 6 7 4 7 7 7 2 5 4 5 0 2 9 5 5 5 10 7 5 6 3 9 4 4 13 2 7 5 7 4 7 2 0 4 5 4 4 6 8 1 2 5 6 4 7 3 11 4 3 3 5 5 4 4 3 1 4 2 2 1 1 0 0.138000 3.050 3.050 7.700 1299809 6 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 1 2 1 1 0 0 1 0 0 2 0 1 2 0 0 3 0 0 1 3 1 2 0 2 0 1 1 2 1 2 3 2 1 2 5 2 2 2 4 3 2 5 3 0 3 2 4 5 4 3 0 5 4 1 4 3 8 6 4 4 7 4 5 4 3 6 5 6 10 3 6 6 2 6 3 4 4 3 6 7 6 8 3 4 7 5 4 9 2 4 8 5 9 8 3 7 5 7 7 13 7 11 15 17 16 18 18 18 20 17 26 25 19 20 26 31 22 18 20 18 14 11 16 4 7 11 10 8 9 9 6 3 8 8 7 5 6 10 3 5 6 6 3 12 7 8 8 2 10 4 13 9 9 12 4 5 9 7 9 5 7 4 8 9 6 7 8 10 8 7 5 7 11 6 4 4 4 6 4 9 4 5 9 10 7 4 12 7 4 9 5 10 10 6 8 4 7 2 4 7 2 6 8 4 11 3 3 9 7 6 7 3 8 7 4 8 5 3 7 4 5 5 7 4 6 7 5 5 3 5 2 5 4 1 2 0 0 1 0.140000 3.100 3.100 7.800 1361810 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 3 2 1 0 0 0 1 1 1 2 0 0 0 0 1 0 2 2 2 1 0 0 3 3 0 2 0 6 2 3 1 0 3 3 1 2 2 5 3 5 3 3 2 2 7 3 2 2 3 4 2 3 4 4 1 3 7 4 5 4 2 3 5 4 2 1 3 6 3 4 3 8 7 6 5 3 5 11 5 5 3 3 7 3 6 4 4 2 4 4 4 1 5 5 9 6 6 9 3 10 8 6 8 3 10 8 16 16 13 18 23 29 25 19 19 20 27 19 22 27 24 21 15 18 11 20 21 17 12 5 18 6 12 7 9 11 7 12 11 4 8 8 4 8 7 7 2 6 4 4 9 6 9 3 4 7 7 7 4 10 4 11 5 8 8 8 5 4 4 8 6 4 9 8 12 12 8 5 8 3 10 8 7 5 3 5 6 8 5 6 10 7 2 11 2 5 5 6 8 10 2 7 5 5 14 2 7 3 9 3 5 2 8 2 3 4 4 7 9 5 4 7 6 7 5 6 3 5 4 7 6 7 7 9 3 0 2 1 1 1 0 0 0.142000 3.150 3.150 7.900 1429499 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3 1 2 1 1 0 0 0 3 0 2 2 1 0 3 0 2 1 3 0 0 1 1 3 1 2 4 1 5 3 5 1 0 7 1 3 2 3 2 2 2 3 0 0 1 3 6 3 2 2 4 4 4 6 4 3 6 4 10 3 7 2 5 4 7 4 5 8 4 7 4 1 7 11 5 2 10 2 11 3 7 8 10 9 6 3 5 3 6 3 10 11 5 5 9 7 10 8 9 5 15 11 9 18 18 15 24 17 23 17 19 25 17 24 18 37 16 17 21 17 14 20 17 15 15 9 4 11 7 3 8 10 8 8 6 8 3 4 5 8 4 6 3 9 9 6 2 10 4 4 3 8 4 9 1 7 5 9 7 10 9 10 4 6 5 8 6 6 10 10 6 5 7 6 6 10 5 7 8 8 8 7 7 11 12 8 3 10 6 9 13 11 4 6 7 6 3 10 5 8 4 7 7 7 5 8 4 9 5 5 7 6 6 7 11 11 7 8 5 3 5 7 7 10 3 3 6 5 7 9 2 3 7 1 0 0 0 0 1 0.144000 3.200 3.200 8.000 1493946 3 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 2 3 0 0 1 2 1 1 1 4 1 0 1 0 1 2 1 3 1 1 1 1 2 1 1 3 2 6 0 4 0 1 4 2 4 5 2 1 3 0 2 2 4 2 3 2 4 3 5 4 4 4 1 5 1 3 4 5 6 4 7 2 8 8 8 5 3 6 0 7 3 2 2 5 7 5 7 5 8 9 6 4 3 6 8 6 10 2 5 6 3 3 6 6 6 6 17 5 10 6 6 11 11 13 12 21 26 18 24 21 24 23 30 18 22 20 24 19 13 17 25 22 17 15 8 13 7 10 8 9 6 7 9 8 7 8 9 7 7 6 12 5 9 9 12 9 12 6 9 7 10 7 7 4 9 7 4 2 7 4 5 8 8 9 7 6 7 5 9 4 8 13 6 5 4 7 9 6 7 7 9 4 4 5 8 10 9 10 6 6 7 9 12 11 8 8 9 11 5 8 7 5 5 8 5 9 10 5 5 11 11 6 8 8 4 8 5 5 5 4 7 4 5 6 5 6 6 7 7 4 2 6 3 2 1 0 0 0 0 0 0.146000 3.250 3.250 8.100 1562352 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 2 0 1 2 1 1 0 0 1 0 1 2 0 0 0 3 1 2 0 4 4 2 0 0 2 3 2 0 1 3 3 4 0 1 4 3 3 4 5 5 4 2 1 4 2 5 3 2 7 6 3 5 6 5 5 5 1 5 2 7 4 8 7 4 6 5 7 5 3 5 8 1 6 4 6 8 7 6 7 6 3 4 6 3 5 8 4 10 3 3 11 6 5 3 9 6 4 3 17 9 11 11 24 13 15 14 25 26 26 21 17 32 32 22 18 25 29 29 27 24 21 12 23 14 12 11 9 17 7 9 11 3 7 6 5 5 12 3 6 8 7 4 7 11 10 8 9 5 8 2 10 9 8 10 10 7 7 4 7 5 7 7 9 10 8 7 7 16 6 8 10 5 6 6 12 12 7 11 11 8 9 7 8 12 10 7 8 7 11 8 9 7 7 4 9 4 7 14 9 8 8 13 9 8 7 13 5 9 5 7 4 9 5 7 8 7 8 7 3 10 9 3 4 4 4 5 2 6 6 3 5 10 4 4 2 3 0 1 0 0 0.148000 3.300 3.300 8.200 1630559 3 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 0 4 2 1 1 1 2 1 2 0 2 1 5 0 1 1 4 0 2 1 4 5 3 0 1 1 1 2 1 3 3 3 1 1 1 1 1 3 4 6 6 8 8 4 3 2 7 2 2 1 7 4 4 5 1 10 6 4 4 4 3 3 3 6 11 6 4 5 4 8 5 5 9 4 5 5 7 6 4 13 12 3 6 7 5 2 7 9 7 8 8 4 7 6 4 10 6 8 9 9 9 13 15 17 23 25 13 16 24 22 26 21 27 24 24 21 21 21 15 17 22 25 21 22 17 14 11 8 12 5 9 7 8 5 11 10 6 6 5 9 13 10 9 8 8 8 6 4 9 10 9 9 7 8 7 5 7 8 14 13 5 14 5 12 11 8 9 6 5 4 9 13 7 10 13 11 11 8 5 9 10 8 7 6 7 13 3 13 8 7 13 17 5 8 5 10 7 12 7 6 6 9 7 8 8 11 8 11 9 11 11 8 5 6 10 4 9 3 10 8 7 10 8 7 8 10 10 7 4 11 5 7 8 2 4 3 0 0 1 0 1 0.150000 3.350 3.350 8.300 1707576 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 2 1 2 1 0 2 0 2 3 1 3 2 2 2 2 0 2 1 4 3 2 2 3 1 2 1 0 2 2 4 2 5 3 3 5 2 8 4 5 4 2 3 6 7 6 1 0 7 4 7 7 6 5 4 3 4 6 6 7 6 2 7 4 4 2 5 5 6 9 3 3 3 6 6 5 3 5 7 8 8 6 8 8 6 8 3 9 6 6 8 8 6 4 8 6 6 10 4 11 6 11 15 23 16 8 17 20 21 19 24 15 14 19 21 30 25 21 15 19 16 18 21 21 15 14 12 16 8 10 12 7 10 9 8 10 10 7 9 8 10 12 6 6 9 11 6 5 9 12 6 7 12 7 5 6 8 5 9 4 11 9 8 8 10 7 6 10 7 11 13 7 4 13 11 8 11 9 16 6 12 11 10 10 19 2 9 11 8 7 8 8 6 13 6 10 12 12 9 12 9 9 8 7 7 9 6 12 8 4 9 9 8 5 7 8 9 5 12 5 7 5 9 10 9 10 3 6 6 8 7 11 3 5 5 4 2 0 0 0 0 0.152000 3.400 3.400 8.400 1777231 3 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 0 0 1 1 3 1 0 3 4 2 3 3 3 3 3 2 1 1 1 1 3 3 0 1 8 0 0 5 3 7 4 4 4 4 4 3 5 2 2 5 3 6 1 7 6 1 2 2 5 2 1 6 6 8 7 7 5 10 4 1 6 9 3 4 5 3 5 8 4 9 8 11 8 3 2 7 7 9 10 9 10 8 6 8 6 8 7 10 8 7 3 8 4 10 7 6 8 9 6 5 16 9 19 24 23 17 23 24 22 30 21 15 23 27 20 20 20 18 20 23 18 17 15 19 17 18 13 9 4 4 7 12 7 10 4 8 6 10 5 6 13 2 3 8 7 8 7 3 11 8 7 9 7 19 7 8 9 6 14 8 8 11 10 11 13 14 10 16 8 9 13 8 9 9 12 7 12 11 6 9 15 5 9 9 9 11 11 13 6 10 6 4 12 9 9 12 11 8 6 9 16 10 10 10 8 10 10 6 7 4 1 15 6 8 4 9 13 11 8 10 11 9 8 3 3 6 6 7 9 4 6 8 7 4 2 1 2 2 1 0 0.154000 3.450 3.450 8.500 1849489 6 0 0 0 0 0 0 0 0 0 0 0 1 1 3 0 1 2 2 0 1 4 1 1 0 1 0 2 1 0 0 1 1 1 1 6 3 6 1 3 1 3 3 0 6 0 4 2 7 4 6 4 4 3 7 4 5 7 5 5 2 3 9 9 2 5 5 3 9 4 2 7 6 2 8 2 5 7 12 6 5 4 5 10 4 12 10 6 4 14 7 9 10 11 7 7 7 7 3 9 7 4 3 8 7 5 7 9 6 8 9 6 8 8 12 6 5 11 12 13 11 13 21 26 19 23 25 18 23 22 23 23 18 27 20 15 20 25 24 19 18 12 14 13 15 8 15 10 11 7 9 13 11 12 13 11 11 7 11 13 6 5 10 6 6 10 8 14 5 14 11 8 5 9 7 10 10 8 7 15 13 3 13 12 18 15 7 10 9 10 8 15 9 6 8 9 10 10 9 5 7 7 5 10 11 13 12 12 12 10 6 17 10 11 9 4 8 7 6 6 9 12 8 16 18 7 5 10 8 12 10 15 6 13 11 6 10 16 10 11 16 8 9 5 11 10 14 11 5 2 5 7 3 1 1 0 1 0 0.156000 3.500 3.500 8.600 1920727 4 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0 2 1 2 0 3 0 1 1 0 1 0 3 0 4 4 1 3 1 2 3 3 4 3 1 2 3 9 5 2 3 7 3 3 6 5 2 6 1 4 3 2 3 6 5 1 8 3 8 5 3 7 6 13 11 9 5 8 7 7 5 8 7 4 8 6 4 10 4 6 5 6 9 9 12 6 7 10 9 9 8 8 3 8 9 8 8 2 12 11 13 8 13 7 8 6 6 9 6 8 16 13 14 16 16 22 20 21 21 17 20 18 19 22 20 11 20 22 21 14 19 15 23 17 15 12 14 19 16 10 11 14 11 9 11 9 12 8 16 14 9 6 18 10 11 7 10 11 17 10 13 8 10 12 9 12 7 7 10 10 11 11 9 8 8 14 10 10 9 14 9 14 13 9 19 16 17 4 11 8 12 11 10 21 6 10 8 9 12 9 7 7 12 7 16 14 10 13 6 13 8 9 10 6 10 8 7 10 4 6 11 19 12 6 7 5 8 11 10 12 13 9 6 10 5 11 11 4 14 10 7 2 6 5 1 2 5 1 1 0 0 0.158000 3.550 3.550 8.700 1999833 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 2 2 3 2 2 2 1 2 3 0 1 0 1 3 2 0 0 3 2 3 2 5 7 0 3 4 1 10 7 7 4 5 2 3 4 3 8 3 6 4 4 4 8 2 3 4 5 5 7 1 6 7 8 1 6 8 1 4 4 11 9 4 7 11 9 10 5 6 8 4 3 9 7 9 11 5 5 8 8 4 8 7 8 11 9 12 6 4 13 4 12 10 6 9 11 10 11 10 11 11 11 14 15 14 23 18 17 29 16 26 23 15 19 14 18 19 22 31 13 21 20 12 16 15 14 18 17 15 8 12 14 13 10 10 10 10 10 13 11 6 8 11 8 14 8 10 11 11 8 10 13 5 14 7 12 9 10 10 12 15 18 8 6 9 9 12 8 9 20 14 16 10 11 14 5 5 13 6 11 9 11 15 6 9 13 11 7 8 7 10 8 16 12 11 8 10 14 11 17 11 8 16 13 9 10 5 10 17 13 14 16 8 10 9 11 5 10 9 10 12 8 11 12 11 8 6 7 12 15 13 12 7 13 5 0 3 2 0 0 0 0 0.160000 3.600 3.600 8.800 2073149 3 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 2 1 2 1 2 2 1 0 2 2 1 0 3 6 4 5 5 2 2 2 5 5 3 6 4 6 4 5 2 4 4 3 2 4 6 3 3 6 5 7 4 5 7 5 3 5 6 13 5 3 10 5 9 7 4 5 6 5 10 6 5 5 6 6 4 14 7 6 11 6 9 10 9 8 5 3 8 10 10 6 6 8 9 5 6 14 7 11 10 9 9 11 13 8 4 5 10 12 6 16 8 8 7 19 20 23 10 16 27 25 23 19 26 21 16 20 21 24 18 25 8 11 13 16 18 13 22 18 9 16 4 16 10 12 13 9 7 9 8 17 11 10 13 10 14 4 9 12 16 8 9 16 17 13 11 14 8 8 13 9 11 15 10 11 14 8 6 4 9 11 18 9 9 8 9 15 11 11 11 9 6 13 13 10 7 8 10 15 14 9 7 4 10 12 17 10 14 13 10 10 12 20 9 7 6 11 15 11 10 8 9 6 10 13 17 6 8 9 6 13 13 16 10 15 5 11 14 11 12 6 5 12 9 4 9 2 4 1 1 0 0 0 0.162000 3.650 3.650 8.900 2156456 5 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 2 0 1 1 3 2 3 4 3 3 2 1 3 6 5 2 3 4 4 3 6 2 3 4 4 5 5 3 4 1 4 5 9 3 3 4 3 3 8 5 6 12 2 10 3 4 6 8 9 8 8 2 2 7 5 8 2 8 9 7 2 6 8 6 5 8 2 7 5 6 13 5 6 8 11 6 10 5 6 3 8 10 11 10 10 14 10 11 8 11 8 12 6 12 5 15 12 13 10 13 13 18 23 12 21 18 21 23 20 30 20 23 26 24 24 21 21 29 19 21 16 23 20 13 19 13 16 11 15 13 13 11 8 11 14 14 13 4 16 15 18 13 9 19 8 11 6 9 14 8 13 12 13 10 13 10 14 11 13 11 8 10 13 11 11 14 11 8 14 11 10 9 14 12 14 18 8 12 7 13 12 10 14 14 8 12 17 11 13 9 12 12 15 7 9 13 17 11 11 11 12 17 12 11 16 15 8 9 12 7 13 15 11 16 7 10 7 14 5 18 10 10 8 8 6 6 13 14 6 9 11 9 9 3 5 1 1 3 0 0 0.164000 3.700 3.700 9.000 2234753 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 4 1 4 2 1 3 1 1 3 2 3 3 1 3 6 2 4 4 3 3 3 6 5 2 6 4 1 3 3 7 1 4 4 6 12 4 5 2 6 4 9 3 1 8 11 5 2 7 6 3 8 4 7 3 8 3 9 6 7 8 9 2 7 6 9 6 15 6 9 5 9 4 9 17 15 10 2 10 6 8 12 12 11 12 10 9 7 11 8 7 5 11 10 14 16 7 7 7 13 15 10 16 17 21 19 14 18 24 19 27 27 24 20 22 24 21 20 14 24 17 17 18 32 15 12 13 15 12 8 14 11 11 19 11 14 15 18 10 5 12 11 11 9 15 9 7 9 16 12 9 12 10 15 9 18 7 11 12 14 7 20 8 10 13 14 11 6 6 9 11 8 10 16 8 17 13 17 9 16 11 10 9 13 20 17 14 12 10 13 11 9 9 17 20 10 16 8 14 13 14 18 15 15 8 10 12 11 22 12 13 9 12 9 11 14 19 12 12 8 8 12 11 19 11 11 12 15 11 15 13 9 9 10 9 4 9 4 2 1 0 0 0.166000 3.750 3.750 9.100 2327990 3 0 0 0 0 0 0 0 0 0 0 0 0 0 3 2 2 0 1 2 2 1 1 0 0 3 1 4 2 6 4 2 4 3 2 5 5 2 3 1 3 1 2 10 2 7 4 3 4 3 3 4 3 10 6 9 6 3 8 5 5 3 4 4 6 8 4 4 7 5 5 11 14 5 3 6 8 8 7 10 11 7 17 7 11 10 8 7 8 12 13 11 12 6 13 9 7 7 6 5 8 13 10 10 14 11 11 8 12 15 14 9 13 10 9 18 13 18 12 23 14 17 24 15 23 25 31 19 17 29 19 19 19 26 25 19 17 22 19 19 19 11 11 12 22 21 8 10 18 10 14 19 17 13 14 10 6 9 10 15 11 5 13 13 11 11 17 16 9 7 14 7 19 6 10 13 7 12 18 14 7 12 15 13 13 9 13 13 13 12 12 14 12 19 10 16 18 18 12 8 10 10 9 7 14 9 11 13 12 8 15 12 11 10 12 11 17 15 19 14 14 12 7 7 12 11 15 16 12 11 12 10 19 19 12 14 12 15 11 20 13 7 18 9 15 19 16 11 5 9 8 6 2 4 0 2 0 1 0.168000 3.800 3.800 9.200 2406866 3 0 0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 2 3 2 3 1 2 1 2 2 5 2 1 2 3 2 2 2 5 3 5 3 3 1 3 6 8 6 1 3 9 6 3 6 10 5 5 7 4 5 7 12 9 5 7 5 6 6 8 3 5 4 7 8 5 6 5 8 13 4 10 2 10 9 7 7 16 9 10 9 13 8 12 9 13 15 9 15 9 10 11 6 6 6 7 7 6 8 15 9 8 9 6 12 12 11 14 12 11 13 8 17 18 18 11 14 19 14 25 21 15 10 15 19 27 23 22 24 17 19 18 12 16 22 21 25 9 25 15 19 15 21 15 8 11 13 12 10 12 7 13 11 17 11 13 10 16 19 14 23 11 8 12 13 10 9 17 4 14 10 7 10 17 14 11 11 20 18 13 8 12 6 8 13 12 23 15 14 15 16 9 14 9 13 14 17 11 17 11 10 15 17 11 6 12 12 14 15 17 12 16 16 8 17 15 15 10 15 11 10 15 12 13 9 12 9 12 15 12 6 18 7 15 14 12 21 18 11 10 18 11 19 11 7 11 3 2 5 4 0 1 1 0.170000 3.850 3.850 9.300 2508471 7 0 0 0 0 0 0 0 0 0 0 0 0 0 1 3 1 2 1 4 3 3 1 2 7 0 3 2 2 2 2 5 2 3 2 3 3 4 3 7 3 5 3 4 4 6 2 3 10 4 11 3 13 7 7 5 6 3 8 10 6 6 4 10 11 4 12 7 8 9 7 7 8 4 6 7 9 9 5 9 11 5 14 9 10 7 9 8 8 5 6 11 13 14 10 10 10 10 8 9 9 9 9 14 14 13 11 8 18 9 10 9 16 12 13 15 13 10 17 16 20 14 22 20 26 29 29 27 24 20 37 21 24 13 18 13 28 24 22 25 21 13 14 15 9 11 18 8 16 17 16 13 12 16 11 11 17 15 11 15 10 11 12 13 12 12 20 15 14 15 16 12 17 15 15 12 10 14 14 17 15 19 15 13 13 11 12 16 14 17 16 8 16 12 8 14 13 13 10 10 9 12 11 19 20 13 11 4 15 11 14 11 20 18 18 13 20 12 20 21 15 15 12 13 18 18 11 16 9 14 9 18 11 10 11 20 11 13 17 13 13 12 14 16 10 12 12 23 12 11 12 8 8 1 0 1 2 0 0.172000 3.900 3.900 9.400 2591210 3 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 4 4 3 2 1 3 3 2 3 0 3 6 1 3 1 5 5 4 3 9 9 0 4 7 5 3 5 5 8 7 3 3 5 5 8 5 11 10 8 10 3 6 6 6 7 7 8 8 12 9 6 10 8 7 10 8 8 10 4 6 12 20 4 6 11 7 9 10 7 5 10 6 12 11 7 13 13 16 12 6 8 14 13 9 7 5 14 17 17 10 12 11 6 13 11 17 3 23 13 21 12 21 28 11 23 30 28 23 24 26 26 17 21 15 27 23 33 16 22 25 11 20 22 23 21 20 7 21 13 16 12 16 16 13 18 18 9 13 16 15 9 20 13 19 15 8 9 11 14 13 10 9 10 16 15 14 17 15 19 16 12 14 12 14 14 16 19 19 4 24 8 12 15 16 11 15 14 20 14 13 13 14 16 19 14 13 19 14 18 23 15 15 4 14 17 14 8 10 15 20 11 15 19 12 9 13 12 11 16 12 16 13 14 16 13 16 16 19 19 12 11 10 19 15 15 14 12 5 11 18 17 10 13 12 9 6 2 0 0 1 0 0.174000 3.950 3.950 9.500 2675515 3 0 0 0 0 0 0 0 0 0 0 0 2 0 1 1 0 2 1 2 3 3 1 3 1 3 7 5 3 6 4 3 9 4 5 2 5 3 3 3 6 9 5 5 2 6 8 5 8 4 8 5 6 5 6 4 6 3 7 11 6 9 9 3 6 6 7 6 8 7 9 12 18 6 9 8 11 11 8 14 15 15 11 15 13 9 19 10 15 14 9 4 18 5 8 10 8 10 13 9 12 11 8 8 12 6 15 8 9 9 18 7 17 21 9 13 18 14 21 24 18 22 17 26 15 21 23 25 19 26 23 20 27 17 27 20 26 15 22 15 19 15 16 24 12 15 24 13 13 17 11 7 10 21 15 15 16 13 20 22 12 16 12 16 15 14 18 11 12 14 14 24 10 13 16 19 8 11 18 19 15 15 23 16 16 11 12 18 11 13 14 16 10 14 13 18 12 15 15 14 8 11 17 12 22 13 12 14 15 10 11 15 19 15 12 17 8 21 23 13 19 11 8 12 15 11 14 15 19 15 10 17 9 16 14 18 14 16 14 14 23 14 14 13 16 12 14 15 14 9 14 7 5 2 3 1 1 1 0.176000 4.000 4.000 9.600 2779386 5 0 0 0 0 0 0 0 0 0 0 0 0 2 2 3 0 1 3 0 6 2 6 3 1 5 0 4 1 6 5 1 6 3 6 5 6 2 5 4 5 3 9 8 5 7 5 8 4 12 8 12 6 8 5 7 5 7 10 5 5 6 7 9 7 10 7 10 10 8 12 10 6 13 10 11 12 11 10 10 16 9 6 12 9 11 17 10 11 10 14 11 16 7 11 13 12 10 17 14 11 13 12 10 13 16 16 17 17 15 14 11 8 15 13 27 22 14 19 17 22 22 27 18 28 19 27 32 24 33 21 17 23 12 27 25 20 20 17 22 14 15 22 21 14 9 16 12 19 16 17 16 16 20 14 18 15 14 18 10 12 9 16 12 12 10 13 19 12 12 15 14 15 22 12 11 15 18 19 18 10 6 11 14 10 23 17 14 16 19 10 10 16 19 17 23 16 18 19 18 16 12 14 14 14 13 11 10 24 21 22 26 18 18 18 14 17 5 13 17 11 13 16 14 18 16 9 15 15 18 16 14 21 13 22 17 9 8 16 17 16 16 19 7 20 19 18 16 10 6 10 6 3 5 1 0 0 2 0.178000 4.050 4.050 9.700 2869617 3 0 0 0 0 0 0 0 0 0 0 0 2 2 2 0 1 4 1 3 2 2 1 2 3 2 2 4 4 7 5 6 5 3 6 6 5 7 8 1 5 2 3 5 5 8 10 7 6 10 9 6 8 9 7 8 10 15 4 10 5 8 8 6 11 8 8 11 7 5 8 14 5 11 7 13 10 9 7 8 9 14 12 10 9 11 6 14 15 14 13 11 9 18 18 10 14 14 10 12 16 12 9 8 14 15 6 11 11 12 10 14 12 11 18 13 13 27 16 23 23 20 21 32 20 18 25 22 24 32 25 34 19 23 21 25 22 25 19 23 19 21 16 19 16 18 9 18 6 13 12 13 18 12 8 19 14 14 11 16 13 15 14 21 11 14 14 13 11 20 14 14 26 10 22 16 18 15 20 24 18 19 19 16 14 14 14 21 13 19 18 20 13 17 11 17 14 22 17 15 15 20 8 21 15 16 16 23 17 13 19 21 20 12 15 18 15 19 15 18 17 20 15 13 14 24 18 15 15 14 18 20 19 17 19 20 21 21 15 19 19 17 11 16 16 11 23 10 20 13 10 5 10 2 3 1 1 0 0.180000 4.100 4.100 9.800 2975040 3 0 0 0 0 0 0 0 0 0 1 0 0 1 2 2 4 4 2 4 4 1 2 5 0 3 3 5 2 5 5 4 9 2 7 8 4 8 3 11 6 10 4 7 8 6 6 5 8 8 7 11 4 4 11 12 7 11 7 10 11 7 11 11 10 9 7 13 12 18 8 14 12 14 12 8 8 16 10 10 14 16 10 6 8 15 15 15 22 13 19 18 12 6 11 10 7 12 12 24 15 17 9 17 21 10 17 18 14 14 14 9 22 11 23 17 15 23 32 20 11 12 20 15 23 30 20 25 19 26 29 19 27 23 15 19 11 30 16 21 24 18 18 14 8 6 25 13 21 13 13 19 13 21 25 23 18 14 14 13 20 12 14 8 10 25 14 15 20 15 10 15 16 21 8 15 20 21 20 13 16 15 20 11 18 17 17 9 12 24 19 13 18 17 20 14 15 20 10 23 19 25 8 7 13 14 11 15 18 13 10 12 10 17 11 24 16 17 11 12 13 16 20 14 26 12 17 13 14 16 16 6 20 16 23 22 11 17 16 14 25 19 17 21 22 19 13 19 16 18 10 11 7 4 6 0 0 2 0.182000 4.150 4.150 9.900 3083416 6 0 0 0 0 0 0 0 0 0 0 0 2 1 1 4 1 3 4 3 5 6 2 1 4 2 3 5 6 6 7 2 4 1 11 7 5 2 6 6 8 9 8 12 7 11 9 6 12 7 8 9 6 6 8 11 6 6 8 11 8 11 12 11 13 9 10 7 9 6 11 9 13 12 12 8 14 15 8 9 8 8 11 22 16 6 11 16 15 9 13 12 12 13 11 15 9 9 16 14 14 12 21 12 12 12 16 19 10 15 18 8 16 14 16 16 21 30 22 9 25 19 19 26 23 33 25 22 21 19 21 20 20 21 20 26 20 29 27 25 25 21 20 25 21 21 18 14 19 15 6 20 18 16 20 16 13 13 15 15 15 15 22 16 15 15 11 21 19 11 19 13 14 15 17 21 12 18 12 22 18 21 18 13 23 15 18 9 21 11 14 23 18 21 25 18 22 15 21 23 15 15 16 19 21 18 19 21 17 13 24 23 22 19 14 20 22 15 14 14 20 20 23 13 18 15 18 20 20 24 9 12 17 21 21 12 16 17 16 16 21 26 19 15 21 22 24 15 11 13 13 6 8 1 4 0 1 0 0.184000 4.200 4.200 10.00 3174897 3 0 0 0 0 0 0 0 0 0 0 0 1 1 2 3 0 5 4 3 3 0 7 3 2 4 2 8 6 4 5 9 3 8 6 4 2 7 6 8 7 9 3 5 8 5 9 7 7 6 11 14 7 12 9 9 5 15 12 14 15 12 9 11 5 8 13 11 12 10 9 17 12 11 8 17 11 19 11 15 9 11 7 15 14 16 16 16 7 12 10 14 13 13 16 16 11 15 13 14 12 16 11 12 13 17 10 13 19 11 17 11 13 14 13 10 19 19 23 24 22 24 24 31 19 23 22 28 21 25 29 17 23 17 21 30 22 19 25 27 27 22 23 23 17 25 17 20 17 12 23 21 9 17 20 16 19 16 17 20 9 16 11 22 16 15 12 15 17 23 24 16 16 18 26 11 16 20 18 10 14 17 26 19 17 15 17 19 12 21 20 24 17 27 13 16 18 19 23 14 19 14 10 11 18 19 6 15 21 23 25 17 17 18 21 27 20 17 18 20 25 22 20 18 22 18 17 15 24 16 15 22 18 22 14 20 20 22 18 22 25 19 26 12 19 19 13 12 16 19 14 9 7 5 4 2 0 2 0.186000 4.250 4.250 10.10 3283256 3 0 0 0 0 0 0 0 0 1 0 0 1 1 4 1 5 2 5 5 3 4 6 3 2 4 7 8 2 6 6 4 10 7 8 7 5 4 4 9 8 18 10 7 6 6 13 12 10 13 10 7 15 4 7 10 13 12 8 8 13 5 14 6 9 14 9 10 16 12 13 11 8 12 11 10 13 9 11 15 17 23 18 13 10 12 11 12 14 14 14 10 12 12 16 13 15 13 13 14 18 10 13 17 14 14 14 12 12 8 18 14 23 20 16 19 16 16 16 27 18 21 19 20 19 37 22 21 22 28 24 26 18 21 28 21 22 21 21 22 16 15 13 22 22 27 22 11 13 20 10 17 16 19 20 30 18 25 8 7 22 18 17 14 23 16 17 11 16 24 19 18 22 15 15 23 16 13 15 22 14 8 12 18 13 15 22 17 15 15 17 27 21 19 21 24 17 10 12 14 19 17 22 18 19 17 28 19 15 14 16 28 17 20 15 11 22 18 19 16 21 17 24 19 22 22 20 10 20 18 18 18 21 18 23 18 32 26 21 21 22 20 22 16 17 20 22 21 17 13 13 11 9 5 0 1 1 1 0.188000 4.300 4.300 10.20 3396610 5 0 0 0 0 0 0 0 0 0 0 0 1 2 3 0 2 5 5 4 3 3 5 1 2 3 6 9 3 3 3 8 7 2 9 5 7 5 11 8 9 7 6 9 6 4 5 8 6 10 9 14 10 15 6 7 13 15 10 13 7 15 10 10 11 14 14 6 7 17 13 19 3 13 9 6 13 13 14 10 11 12 16 17 13 10 15 15 19 19 11 11 15 11 13 9 13 20 8 18 14 18 23 23 23 15 19 20 14 11 7 18 16 15 22 28 20 24 22 25 17 20 39 24 26 25 25 33 25 25 25 33 15 29 18 29 18 12 18 23 17 24 28 22 16 20 33 23 18 23 26 23 15 24 16 16 16 16 17 15 15 16 14 11 9 23 17 13 13 18 12 19 20 30 20 20 15 21 19 16 18 20 23 19 15 10 11 15 19 13 22 22 18 19 16 19 23 16 10 25 23 20 21 20 31 19 19 18 15 22 18 14 13 21 18 19 22 19 16 17 21 14 20 26 18 26 22 19 26 19 20 22 15 13 24 23 15 21 21 21 27 18 22 19 24 17 22 16 18 23 10 12 3 5 3 3 0 0 0.190000 4.350 4.350 10.30 3502025 3 0 0 0 0 0 0 0 0 0 0 0 0 3 0 3 2 3 4 4 3 4 5 10 7 6 6 4 5 12 10 6 6 13 10 6 7 14 9 6 13 10 12 16 3 9 9 7 5 6 13 11 10 8 11 19 12 14 13 16 13 14 9 12 14 13 14 16 10 14 7 16 18 16 9 15 11 20 15 10 14 14 11 14 17 10 6 16 10 15 12 17 17 20 15 7 12 23 15 8 13 12 8 16 15 20 16 16 20 14 11 20 24 23 20 16 18 27 25 31 27 27 25 21 31 27 20 23 24 32 17 21 34 27 17 19 19 25 30 27 21 24 28 30 19 26 21 14 16 21 23 27 8 17 21 17 11 23 15 22 15 18 10 17 20 23 18 18 17 19 22 15 22 21 19 23 18 18 26 17 18 26 18 24 15 22 23 23 19 23 25 23 24 26 10 21 16 32 23 18 19 24 21 28 26 22 19 19 14 30 21 24 23 22 21 13 27 20 27 24 15 20 22 22 13 25 14 19 32 21 18 18 23 22 22 14 18 20 24 14 19 20 18 17 24 29 27 20 12 18 17 11 9 2 3 2 1 0 0.192000 4.400 4.400 10.40 3593938 3 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 2 3 4 7 8 1 5 6 8 3 7 5 4 9 8 8 7 7 9 7 9 9 15 5 7 8 15 14 9 9 13 8 8 15 10 7 10 9 10 14 7 8 18 16 17 11 14 15 13 8 15 8 15 18 16 16 22 12 8 16 13 10 13 13 10 21 11 10 16 16 13 13 17 16 20 23 13 22 16 14 15 22 19 22 15 22 24 16 16 16 19 12 15 16 17 20 18 19 26 17 23 18 32 20 28 36 22 25 30 29 31 36 24 24 21 29 24 32 29 30 23 34 19 33 34 25 20 31 27 24 16 14 21 20 13 24 17 28 13 24 16 26 15 26 21 11 15 20 13 20 18 25 23 18 24 26 22 16 22 14 13 16 20 24 25 19 29 20 15 20 16 25 26 21 22 17 24 22 21 17 23 23 15 19 30 23 17 21 19 18 21 26 14 29 24 20 33 19 15 20 23 28 19 23 25 15 19 17 31 23 18 29 26 25 14 24 25 18 19 19 24 35 31 23 23 14 15 19 11 20 19 24 17 16 9 10 12 3 2 2 0 1 0.194000 4.450 4.450 10.50 3712573 7 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 5 3 5 4 3 11 3 10 4 6 7 8 5 5 5 8 9 12 7 7 11 8 6 7 9 10 13 10 6 13 9 9 9 11 14 14 12 13 10 6 13 13 15 12 13 19 8 14 13 16 11 13 14 15 9 15 16 13 16 17 17 17 23 18 16 19 10 13 18 16 10 9 21 11 22 14 20 14 18 13 15 12 13 14 16 14 15 20 29 17 14 18 8 15 21 15 19 15 22 20 17 15 23 26 16 26 24 23 23 23 23 30 24 29 28 26 35 33 31 22 23 22 20 37 22 27 33 26 27 26 17 16 18 27 22 21 24 18 18 18 17 15 18 14 19 24 22 15 20 21 15 19 25 15 16 26 19 22 29 20 16 13 15 16 32 24 23 13 33 17 22 18 18 23 24 22 21 20 26 21 16 22 18 18 16 15 26 26 17 22 21 13 25 24 13 23 18 18 25 32 20 24 21 17 19 24 24 23 33 19 19 21 32 18 22 23 19 23 32 18 31 22 25 23 23 31 29 21 16 20 20 15 22 14 12 5 10 9 2 1 0 1 0.196000 4.500 4.500 10.60 3829518 3 0 0 0 0 0 0 0 0 0 0 1 2 2 1 6 2 6 5 9 3 5 6 8 6 3 8 10 7 11 9 4 8 9 5 11 10 13 9 16 13 10 9 5 12 9 15 10 13 9 12 18 14 19 9 13 14 12 13 21 17 17 18 16 13 12 16 14 18 10 15 15 16 11 15 22 17 19 17 11 12 26 12 17 19 18 21 20 27 17 18 19 21 14 19 16 12 16 21 20 18 8 17 17 13 13 18 15 19 15 19 20 28 21 29 27 27 34 24 26 31 25 24 16 17 23 23 30 28 18 28 32 28 37 18 26 18 16 33 21 31 21 20 22 19 20 25 18 18 20 11 17 20 22 23 14 14 17 18 20 25 20 19 20 22 19 16 33 25 21 21 24 18 16 22 29 22 16 27 26 28 21 20 22 17 25 23 20 23 18 16 19 26 22 21 22 23 15 20 19 17 23 19 20 15 22 18 22 26 23 23 31 17 29 18 13 15 19 18 24 22 28 22 17 23 24 26 21 23 25 24 29 26 18 41 24 29 22 27 23 28 16 30 24 18 23 19 17 18 21 17 14 8 2 5 2 0 0 0.198000 4.550 4.550 10.70 3950740 3 0 0 0 0 0 0 0 0 0 1 1 1 2 1 3 7 5 6 7 7 7 4 5 6 4 1 8 9 10 9 8 10 8 12 6 10 8 10 8 11 9 10 15 7 11 8 13 11 13 15 15 17 12 10 8 17 12 9 14 12 14 11 14 21 14 15 20 18 16 8 15 22 24 14 10 18 14 15 16 12 10 16 21 16 25 17 20 17 17 20 15 24 15 17 22 25 17 13 22 18 20 19 11 21 22 21 16 21 24 16 22 17 21 17 24 22 24 35 27 24 28 24 32 37 34 25 24 29 37 37 25 28 21 23 24 22 21 20 25 22 32 19 21 22 24 20 21 20 22 18 27 17 14 20 22 22 22 14 19 20 20 21 23 22 14 20 21 23 20 18 23 20 25 31 24 18 22 14 23 22 21 23 27 27 20 21 18 22 23 24 23 21 18 22 17 22 21 35 15 24 24 12 27 30 27 28 22 31 24 24 19 27 24 28 23 25 26 35 27 22 29 21 24 18 19 26 33 29 31 23 25 19 24 26 21 10 23 24 26 28 20 27 26 17 29 22 18 14 22 8 10 11 4 4 1 2 0 0.200000 4.600 4.600 10.80 4068161 5 0 0 0 0 0 0 0 0 0 0 1 1 0 1 5 5 2 9 3 11 6 9 8 7 7 8 3 3 13 10 8 7 5 8 13 8 7 14 12 10 7 15 13 13 11 12 12 14 12 13 12 10 15 11 14 7 16 15 8 15 13 15 13 18 13 17 21 15 12 13 13 17 18 18 18 16 19 20 17 14 17 24 13 12 18 19 19 13 21 18 26 21 23 16 14 18 19 13 33 13 19 20 14 20 23 14 26 19 22 21 21 16 27 30 25 28 22 32 21 30 27 31 21 30 22 27 27 31 27 21 17 38 41 17 21 20 19 30 24 27 20 20 21 30 20 19 19 31 25 24 13 21 23 19 24 33 24 17 20 17 12 25 23 18 24 11 24 25 22 33 20 11 22 31 21 20 26 27 21 26 24 14 23 23 20 20 26 28 10 20 27 24 22 17 27 28 20 23 23 33 20 24 26 32 33 29 21 25 24 17 18 19 27 26 20 24 26 24 24 26 21 19 24 21 36 32 18 33 33 20 23 25 33 19 27 25 27 24 27 21 21 23 28 18 27 25 19 24 15 17 12 15 7 2 1 0 0 ", "%f ", Inf); +%! assert (rows (x) == n); %% Note use fprintf so output not sent to stdout %% test/octave.test/io/printf-1.m %!test -%! nm = tmpnam(); +%! nm = tmpnam (); %! fid1 = fopen(nm,"w"); %! x = fprintf (fid1, "%s: %d\n", "test", 1); %! fclose(fid1); @@ -303,26 +304,26 @@ %! str = fscanf(fid2,"%s"); %! fclose(fid2); %! unlink(nm); -%! assert(x,8); -%! assert(str,"test:1"); +%! assert (x, 8); +%! assert (str, "test:1"); %% test/octave.test/io/printf-2.m -%!error printf (1); +%!error printf (1) %% test/octave.test/io/printf-3.m -%!error <Invalid call to printf> printf (); +%!error <Invalid call to printf> printf () %% test/octave.test/io/sprintf-1.m %!test %! [s, msg, status] = sprintf ("%s: %d\n", "test", 1); %! -%! assert(s == "test: 1\n" && ischar (msg) && status == 8); +%! assert (s == "test: 1\n" && ischar (msg) && status == 8); %% test/octave.test/io/sprintf-2.m -%!error sprintf (1); +%!error sprintf (1) %% test/octave.test/io/sprintf-3.m -%!error <Invalid call to sprintf> sprintf (); +%!error <Invalid call to sprintf> sprintf () %% test/octave.test/io/fopen-1.m %!test @@ -378,34 +379,34 @@ %! endif %! endfor %! -%! assert(status == 1); +%! assert (status == 1); %% test/octave.test/io/fopen-2.m %!test %! s.a = 1; -%! fail("fopen (s)"); +%! fail ("fopen (s)"); %% test/octave.test/io/fopen-3.m -%!error fopen ("foo", "x"); +%!error fopen ("foo", "x") %% test/octave.test/io/fopen-4.m %! fopen ("foo", "wb", "noodle"); -%! assert(prog_output_assert("error:.*")); +%! assert (prog_output_assert ("error:")); %% test/octave.test/io/fopen-5.m -%!error <Invalid call to fopen> fopen (); +%!error <Invalid call to fopen> fopen () %% test/octave.test/io/fopen-6.m -%!error <Invalid call to fopen> fopen ("foo", "wb", "native", 1); +%!error <Invalid call to fopen> fopen ("foo", "wb", "native", 1) %% test/octave.test/io/fclose-1.m -%!error fclose (0); +%!error fclose (0) %% test/octave.test/io/fclose-2.m -%!error <Invalid call to fclose> fclose (1, 2); +%!error <Invalid call to fclose> fclose (1, 2) %% test/octave.test/io/tmpnam-1.m -%!assert(ischar (tmpnam ())); +%!assert (ischar (tmpnam ())) %% test/octave.test/io/tmpnam-2.m %!warning tmpnam (1); @@ -414,7 +415,7 @@ %!warning tmpnam ("foo", 1); %% test/octave.test/io/tmpnam-4.m -%!error <Invalid call to tmpnam> tmpnam (1, 2, 3); +%!error <Invalid call to tmpnam> tmpnam (1, 2, 3) %% test/octave.test/io/binary-io-1.m %!test @@ -426,39 +427,30 @@ %! "real*8"; "int16"; "integer*2"; "int32"; "integer*4"]; %! %! n = rows (type_list); -%! %! nm = tmpnam (); -%! %! id = fopen (nm, "wb"); -%! %! if (id > 0) -%! -%! for i = 1:n -%! fwrite (id, i, deblank (type_list(i,:))); -%! endfor -%! -%! fclose (id); -%! -%! id = fopen (nm, "rb"); -%! -%! if (id > 0) -%! -%! x = zeros (1, n); -%! -%! for i = 1:n -%! x(i) = fread (id, [1, 1], deblank (type_list(i,:))); -%! endfor -%! -%! if (x == 1:n) -%! printf_assert ("ok\n"); -%! endif -%! -%! endif -%! +%! for i = 1:n +%! fwrite (id, i, deblank (type_list(i,:))); +%! endfor +%! +%! fclose (id); +%! +%! id = fopen (nm, "rb"); +%! if (id > 0) +%! x = zeros (1, n); +%! for i = 1:n +%! x(i) = fread (id, [1, 1], deblank (type_list(i,:))); +%! endfor +%! +%! if (x == 1:n) +%! printf_assert ("ok\n"); +%! endif +%! endif %! endif %! %! unlink (nm); -%! assert(prog_output_assert("ok")); +%! assert (prog_output_assert ("ok")); %% test/octave.test/io/file-pos-1.m %!test @@ -490,7 +482,7 @@ %! frewind (id); %! s_one_x = fgets (id); %! if (s_one != s_one_x) -%! error("bombed!!"); +%! error ("bombed!!"); %! endif %! endif %! endif @@ -499,122 +491,118 @@ %! unlink (nm); %% test/octave.test/io/fputs-1.m -%!error <Invalid call to fputs> fputs (); +%!error <Invalid call to fputs> fputs () %% test/octave.test/io/fputs-2.m -%!error <Invalid call to fputs> fputs (1, "foo", 1); +%!error <Invalid call to fputs> fputs (1, "foo", 1) %% test/octave.test/io/fputs-3.m -%!assert(fputs (1, 1),-1); +%!assert (fputs (1, 1),-1) %% test/octave.test/io/fgetl-1.m -%!error <Invalid call to fgetl> fgetl (); +%!error <Invalid call to fgetl> fgetl () %% test/octave.test/io/fgetl-2.m -%!error <Invalid call to fgetl> fgetl (1, 2, 3); +%!error <Invalid call to fgetl> fgetl (1, 2, 3) %% test/octave.test/io/fgetl-3.m -%!error fgetl ("foo", 1); +%!error fgetl ("foo", 1) %% test/octave.test/io/fgets-1.m -%!error <Invalid call to fgets> fgets (); +%!error <Invalid call to fgets> fgets () %% test/octave.test/io/fgets-2.m -%!error <Invalid call to fgets> fgets (1, 2, 3); +%!error <Invalid call to fgets> fgets (1, 2, 3) %% test/octave.test/io/fgets-3.m -%!error fgets ("foo", 1); +%!error fgets ("foo", 1) %% test/octave.test/io/fprintf-1.m -%!error <Invalid call to fprintf> fprintf (); +%!error <Invalid call to fprintf> fprintf () %% test/octave.test/io/fprintf-2.m -%!error <Invalid call to fprintf> fprintf (1); +%!error <Invalid call to fprintf> fprintf (1) %% test/octave.test/io/fprintf-3.m %!test %! s.a = 1; -%! fail("fprintf (s)","Invalid call to fprintf.*"); +%! fail ("fprintf (s)", "Invalid call to fprintf"); %% test/octave.test/io/fprintf-4.m -%!error fprintf (1, 1); +%!error fprintf (1, 1) %% test/octave.test/io/fprintf-5.m -%!error fprintf (-1, "foo"); +%!error fprintf (-1, "foo") %% test/octave.test/io/fscanf-1.m -%!error <Invalid call to fscanf> fscanf (); +%!error <Invalid call to fscanf> fscanf () %% test/octave.test/io/fscanf-2.m -%!error <Invalid call to fscanf> fscanf (1); +%!error <Invalid call to fscanf> fscanf (1) %% test/octave.test/io/fscanf-3.m -%!error fscanf ("foo", "bar"); +%!error fscanf ("foo", "bar") %% test/octave.test/io/fread-1.m -%!error <Invalid call to fread> fread (); +%!error <Invalid call to fread> fread () %% test/octave.test/io/fread-2.m -%!error <Invalid call to fread> fread (1, 2, "char", 1, "native", 2); +%!error <Invalid call to fread> fread (1, 2, "char", 1, "native", 2) %% test/octave.test/io/fread-3.m -%!error fread ("foo"); +%!error fread ("foo") %% test/octave.test/io/fwrite-1.m -%!error <Invalid call to fwrite> fwrite (); +%!error <Invalid call to fwrite> fwrite () %% test/octave.test/io/fwrite-2.m -%!error <Invalid call to fwrite> fwrite (1, rand (10), "char", 1, "native", 2); +%!error <Invalid call to fwrite> fwrite (1, rand (10), "char", 1, "native", 2) %% test/octave.test/io/fwrite-3.m -%!error fwrite ("foo", 1); +%!error fwrite ("foo", 1) %% test/octave.test/io/feof-1.m -%!error <Invalid call to feof> feof (); +%!error <Invalid call to feof> feof () %% test/octave.test/io/feof-2.m -%!error <Invalid call to feof> feof (1, 2); +%!error <Invalid call to feof> feof (1, 2) %% test/octave.test/io/feof-3.m -%!error feof ("foo"); +%!error feof ("foo") -%% FIXME trimerr in test.m finds and strips ".*ferror:"!! -%% So use fail for the next two tests instead. %% test/octave.test/io/ferror-1.m -%!test -%! fail("ferror ();","Invalid call to ferror.*"); +%!error <Invalid call to ferror> ferror () %% test/octave.test/io/ferror-2.m -%!test -%! fail("ferror (1, \"clear\", 2);","Invalid call to ferror.*"); +%!error <Invalid call to ferror> ferror (1, 'clear', 2) %% test/octave.test/io/ferror-3.m -%!error ferror ("foo"); +%!error ferror ("foo") %% test/octave.test/io/ftell-1.m -%!error <Invalid call to ftell> ftell (); +%!error <Invalid call to ftell> ftell () %% test/octave.test/io/ftell-2.m -%!error <Invalid call to ftell> ftell (1, 2); +%!error <Invalid call to ftell> ftell (1, 2) %% test/octave.test/io/ftell-3.m -%!error ftell ("foo"); +%!error ftell ("foo") %% test/octave.test/io/fseek-1.m -%!error <Invalid call to fseek> fseek (); +%!error <Invalid call to fseek> fseek () %% test/octave.test/io/fseek-2.m -%!error <Invalid call to fseek> fseek (1, 0, SEEK_SET, 1); +%!error <Invalid call to fseek> fseek (1, 0, SEEK_SET, 1) %% test/octave.test/io/fseek-3.m -%!error fseek ("foo", 0, SEEK_SET); +%!error fseek ("foo", 0, SEEK_SET) %% test/octave.test/io/frewind-1.m -%!error <Invalid call to frewind> frewind (); +%!error <Invalid call to frewind> frewind () %% test/octave.test/io/frewind-2.m -%!error <Invalid call to frewind> frewind (1, 2); +%!error <Invalid call to frewind> frewind (1, 2) %% test/octave.test/io/frewind-3.m -%!error frewind ("foo"); +%!error frewind ("foo")
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/test_line_continue.m Mon Jan 09 15:19:21 2012 -0500 @@ -0,0 +1,80 @@ +## Copyright (C) 2006-2012 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +%!shared x, a, b +%! x = [1,2]; +%! a = 1; +%! b = 2; + +%!test +%! y = [a... # comments here ok +%! b]; +%! assert (y, x); + +%!test +%! x = [1;2]; +%! y = [a... # comments here ok +%! ;\ +%! +%! b]; +%! assert (y, x); + +%!assert (1 + ... +%! 2 - \# comments here ok +%! 3 / ... # comments here ok +%! -1,6); + +%!function y = f (a,... +%! b, ... +%! c, ... % comments ok +%! x, # continuation characters not required in parens +%! y, \# but they should work too. +%! z) +%! +%! y = 1; +%!endfunction +%! +%!assert (f (), 1) + +%!test +%!assert (1 == 1 +%! && 2 == 2 +%! || 3 == 5); + +%!test +%! x = [1, ... +%! +%! ... +%! +%! 2]; +%! y = [1;2]; +%! assert (y, x); + +%!test +%! x = [1 ,... +%! 2]; +%! y = [1,2]; +%! assert (y, x); + +%% test/oc tave.test/contin/contin-16.m +%!test +%! x = [ 1 , ... +%! 2]; +%! y = [1,2]; +%! assert (y, x); +
--- a/test/test_logical-wfi-f.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ -## Copyright (C) 2006-2011 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -%% test/octave.test/logical-wfi-f/s-1.m -%!test -%! a = []; -%! fail("a(0);"); - -%% test/octave.test/logical-wfi-f/s-2.m -%!test -%! a = 2; -%! assert(a(1) == 2); - -%% test/octave.test/logical-wfi-f/s-3.m -%!test -%! a = 2; -%! assert(a(1) == 2); - -%% test/octave.test/logical-wfi-f/s-4.m -%!test -%!shared a -%! a = 2; -%!error id=Octave:index-out-of-bounds a(logical ([1,1])); - -%% test/octave.test/logical-wfi-f/v-1.m -%!test -%! a = [9,8,7,6]; -%! assert(isempty (a(logical ([0,0,0,0])))); - -%% test/octave.test/logical-wfi-f/v-2.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([1,1,1,1])) == [9,8,7,6])); - -%% test/octave.test/logical-wfi-f/v-3.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([0,1,1,0])) == [8,7])); - -%% test/octave.test/logical-wfi-f/v-4.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([1,1])) == [9,8])); - -%% test/octave.test/logical-wfi-f/m-1.m -%!test -%! a = [9,8;7,6]; -%! assert(isempty (a(logical ([0,0,0,0])))); - -%% test/octave.test/logical-wfi-f/m-2.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1,1,1])) == [9,7,8,6])); - -%% test/octave.test/logical-wfi-f/m-3.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1,1,0])) == [7,8])); - -%% test/octave.test/logical-wfi-f/m-4.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),logical (0:1)) == 6); - -%% test/octave.test/logical-wfi-f/m-5.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),2:-1:1) == [6,7])); - -%% test/octave.test/logical-wfi-f/m-6.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),logical ([0,1])) == 6); - -%% test/octave.test/logical-wfi-f/m-7.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),[2,1]) == [6,7])); - -%% test/octave.test/logical-wfi-f/m-8.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),:) == [7,6])); - -%% test/octave.test/logical-wfi-f/m-9.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),1) == 7); - -%% test/octave.test/logical-wfi-f/m-10.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),logical ([1,1])) == [7,6])); - -%% test/octave.test/logical-wfi-f/m-11.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(2:-1:1,logical (0:1)) == [6;8])); - -%% test/octave.test/logical-wfi-f/m-12.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(2:-1:1,logical ([0,1])) == [6;8])); - -%% test/octave.test/logical-wfi-f/m-13.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(2:-1:1,logical ([1,1])) == [7,6;9,8]))); - -%% test/octave.test/logical-wfi-f/m-14.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),logical (0:1)) == 6); - -%% test/octave.test/logical-wfi-f/m-15.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),2:-1:1) == [6,7])); - -%% test/octave.test/logical-wfi-f/m-16.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),logical ([0,1])) == 6); - -%% test/octave.test/logical-wfi-f/m-17.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),[2,1]) == [6,7])); - -%% test/octave.test/logical-wfi-f/m-18.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),:) == [7,6])); - -%% test/octave.test/logical-wfi-f/m-19.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),1) == 7); - -%% test/octave.test/logical-wfi-f/m-20.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),logical ([1,1])) == [7,6])); - -%% test/octave.test/logical-wfi-f/m-21.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a([2,1],logical (0:1)) == [6;8])); - -%% test/octave.test/logical-wfi-f/m-22.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a([2,1],logical ([0,1])) == [6;8])); - -%% test/octave.test/logical-wfi-f/m-23.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a([2,1],logical ([1,1])) == [7,6;9,8]))); - -%% test/octave.test/logical-wfi-f/m-24.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(:,logical (0:1)) == [8;6])); - -%% test/octave.test/logical-wfi-f/m-25.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(:,logical ([0,1])) == [8;6])); - -%% test/octave.test/logical-wfi-f/m-26.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(:,logical ([1,1])) == [9,8;7,6]))); - -%% test/octave.test/logical-wfi-f/m-27.m -%!test -%! a = [9,8;7,6]; -%! assert(a(1,logical (0:1)) == 8); - -%% test/octave.test/logical-wfi-f/m-28.m -%!test -%! a = [9,8;7,6]; -%! assert(a(1,logical ([0,1])) == 8); - -%% test/octave.test/logical-wfi-f/m-29.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(1,logical ([1,1])) == [9,8])); - -%% test/octave.test/logical-wfi-f/m-30.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),logical (0:1)) == [8;6])); - -%% test/octave.test/logical-wfi-f/m-31.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),2:-1:1) == [8,9;6,7]))); - -%% test/octave.test/logical-wfi-f/m-32.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),logical ([0,1])) == [8;6])); - -%% test/octave.test/logical-wfi-f/m-33.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),[2,1]) == [8,9;6,7]))); - -%% test/octave.test/logical-wfi-f/m-34.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),:) == [9,8;7,6]))); - -%% test/octave.test/logical-wfi-f/m-35.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),1) == [9;7])); - -%% test/octave.test/logical-wfi-f/m-36.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),logical ([1,1])) == [9,8;7,6]))); -
--- a/test/test_logical-wfi-t.m Sat Dec 24 23:15:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ -## Copyright (C) 2006-2011 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -%% test/octave.test/logical-wfi-t/s-1.m -%!test -%! a = []; -%! fail("a(0);"); - -%% test/octave.test/logical-wfi-t/s-2.m -%!test -%! a = 2; -%! assert(a(1) == 2); - -%% test/octave.test/logical-wfi-t/s-3.m -%!test -%! a = 2; -%! assert(a(1) == 2); - -%% test/octave.test/logical-wfi-t/s-4.m -%!test -%!shared a -%! a = 2; -%!error id=Octave:index-out-of-bounds a(logical ([1,1])); - -%% test/octave.test/logical-wfi-t/v-1.m -%!test -%! a = [9,8,7,6]; -%! assert(isempty (a(logical ([0,0,0,0])))); - -%% test/octave.test/logical-wfi-t/v-2.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([1,1,1,1])) == [9,8,7,6])); - -%% test/octave.test/logical-wfi-t/v-3.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([0,1,1,0])) == [8,7])); - -%% test/octave.test/logical-wfi-t/v-4.m -%!test -%! a = [9,8,7,6]; -%! assert(all (a(logical ([1,1])) == [9,8])); - -%% test/octave.test/logical-wfi-t/m-1.m -%!test -%! a = [9,8;7,6]; -%! isempty (a(logical ([0,0,0,0]))); - -%% test/octave.test/logical-wfi-t/m-2.m -%!test -%! a = [9,8;7,6]; -%! all (a(logical ([1,1,1,1])) == [9,7,8,6]); - -%% test/octave.test/logical-wfi-t/m-3.m -%!test -%! a = [9,8;7,6]; -%! all (a(logical ([0,1,1,0])) == [7,8]); - -%% test/octave.test/logical-wfi-t/m-4.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),logical (0:1)) == 6); - -%% test/octave.test/logical-wfi-t/m-5.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),2:-1:1) == [6,7])); - -%% test/octave.test/logical-wfi-t/m-6.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),logical ([0,1])) == 6); - -%% test/octave.test/logical-wfi-t/m-7.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),[2,1]) == [6,7])); - -%% test/octave.test/logical-wfi-t/m-8.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),:) == [7,6])); - -%% test/octave.test/logical-wfi-t/m-9.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical (0:1),1) == 7); - -%% test/octave.test/logical-wfi-t/m-10.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical (0:1),logical ([1,1])) == [7,6])); - -%% test/octave.test/logical-wfi-t/m-11.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(2:-1:1,logical (0:1)) == [6;8])); - -%% test/octave.test/logical-wfi-t/m-12.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(2:-1:1,logical ([0,1])) == [6;8])); - -%% test/octave.test/logical-wfi-t/m-13.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(2:-1:1,logical ([1,1])) == [7,6;9,8]))); - -%% test/octave.test/logical-wfi-t/m-14.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),logical (0:1)) == 6); - -%% test/octave.test/logical-wfi-t/m-15.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),2:-1:1) == [6,7])); - -%% test/octave.test/logical-wfi-t/m-16.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),logical ([0,1])) == 6); - -%% test/octave.test/logical-wfi-t/m-17.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),[2,1]) == [6,7])); - -%% test/octave.test/logical-wfi-t/m-18.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),:) == [7,6])); - -%% test/octave.test/logical-wfi-t/m-19.m -%!test -%! a = [9,8;7,6]; -%! assert(a(logical ([0,1]),1) == 7); - -%% test/octave.test/logical-wfi-t/m-20.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([0,1]),logical ([1,1])) == [7,6])); - -%% test/octave.test/logical-wfi-t/m-21.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a([2,1],logical (0:1)) == [6;8])); - -%% test/octave.test/logical-wfi-t/m-22.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a([2,1],logical ([0,1])) == [6;8])); - -%% test/octave.test/logical-wfi-t/m-23.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a([2,1],logical ([1,1])) == [7,6;9,8]))); - -%% test/octave.test/logical-wfi-t/m-24.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(:,logical (0:1)) == [8;6])); - -%% test/octave.test/logical-wfi-t/m-25.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(:,logical ([0,1])) == [8;6])); - -%% test/octave.test/logical-wfi-t/m-26.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(:,logical ([1,1])) == [9,8;7,6]))); - -%% test/octave.test/logical-wfi-t/m-27.m -%!test -%! a = [9,8;7,6]; -%! assert(a(1,logical (0:1)) == 8); - -%% test/octave.test/logical-wfi-t/m-28.m -%!test -%! a = [9,8;7,6]; -%! assert(a(1,logical ([0,1])) == 8); - -%% test/octave.test/logical-wfi-t/m-29.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(1,logical ([1,1])) == [9,8])); - -%% test/octave.test/logical-wfi-t/m-30.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),logical (0:1)) == [8;6])); - -%% test/octave.test/logical-wfi-t/m-31.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),2:-1:1) == [8,9;6,7]))); - -%% test/octave.test/logical-wfi-t/m-32.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),logical ([0,1])) == [8;6])); - -%% test/octave.test/logical-wfi-t/m-33.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),[2,1]) == [8,9;6,7]))); - -%% test/octave.test/logical-wfi-t/m-34.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),:) == [9,8;7,6]))); - -%% test/octave.test/logical-wfi-t/m-35.m -%!test -%! a = [9,8;7,6]; -%! assert(all (a(logical ([1,1]),1) == [9;7])); - -%% test/octave.test/logical-wfi-t/m-36.m -%!test -%! a = [9,8;7,6]; -%! assert(all (all (a(logical ([1,1]),logical ([1,1])) == [9,8;7,6]))); -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/test_logical_index.m Mon Jan 09 15:19:21 2012 -0500 @@ -0,0 +1,73 @@ +## Copyright (C) 2006-2012 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +%!test +%! a = []; +%! fail ("a(0);"); + +%!shared a +%! a = 2; +%!assert (a(1), 2); +%!error id=Octave:index-out-of-bounds a(logical ([1,1])) + +%!shared a +%! a = [9,8,7,6]; +%!assert (isempty (a(logical ([0,0,0,0])))) +%!assert (a(logical ([1,1,1,1])), [9,8,7,6]) +%!assert (a(logical ([0,1,1,0])), [8,7]) +%!assert (a(logical ([1,1])), [9,8]) + +%!shared a +%! a = [9,8;7,6]; +%!assert (isempty (a(logical ([0,0,0,0])))) +%!assert (a(logical ([1,1,1,1])), [9,7,8,6]) +%!assert (a(logical ([0,1,1,0])), [7,8]) +%!assert (a(logical (0:1),logical (0:1)), 6) +%!assert (a(logical (0:1),2:-1:1), [6,7]) +%!assert (a(logical (0:1),logical ([0,1])), 6) +%!assert (a(logical (0:1),[2,1]), [6,7]) +%!assert (a(logical (0:1),:), [7,6]) +%!assert (a(logical (0:1),1), 7) +%!assert (a(logical (0:1),logical ([1,1])), [7,6]) +%!assert (a(2:-1:1,logical (0:1)), [6;8]) +%!assert (a(2:-1:1,logical ([0,1])), [6;8]) +%!assert (a(2:-1:1,logical ([1,1])), [7,6;9,8]) +%!assert (a(logical ([0,1]),logical (0:1)), 6) +%!assert (a(logical ([0,1]),2:-1:1), [6,7]) +%!assert (a(logical ([0,1]),logical ([0,1])), 6) +%!assert (a(logical ([0,1]),[2,1]), [6,7]) +%!assert (a(logical ([0,1]),:), [7,6]) +%!assert (a(logical ([0,1]),1), 7) +%!assert (a(logical ([0,1]),logical ([1,1])), [7,6]) +%!assert (a([2,1],logical (0:1)), [6;8]) +%!assert (a([2,1],logical ([0,1])), [6;8]) +%!assert (a([2,1],logical ([1,1])), [7,6;9,8]) +%!assert (a(:,logical (0:1)), [8;6]) +%!assert (a(:,logical ([0,1])), [8;6]) +%!assert (a(:,logical ([1,1])), [9,8;7,6]) +%!assert (a(1,logical (0:1)), 8) +%!assert (a(1,logical ([0,1])), 8) +%!assert (a(1,logical ([1,1])), [9,8]) +%!assert (a(logical ([1,1]),logical (0:1)), [8;6]) +%!assert (a(logical ([1,1]),2:-1:1), [8,9;6,7]) +%!assert (a(logical ([1,1]),logical ([0,1])), [8;6]) +%!assert (a(logical ([1,1]),[2,1]), [8,9;6,7]) +%!assert (a(logical ([1,1]),:), [9,8;7,6]) +%!assert (a(logical ([1,1]),1), [9;7]) +%!assert (a(logical ([1,1]),logical ([1,1])), [9,8;7,6]) +
--- a/test/test_null_assign.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_null_assign.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2011 Jaroslav Hajek +## Copyright (C) 2008-2012 Jaroslav Hajek ## ## This file is part of Octave. ## @@ -33,7 +33,7 @@ %!test %! a = ones (3); fail ("a(1:3,1:3) = []", ".*"); -% null strings should delete. [,] and [;] should delete. +## null strings should delete. [,] and [;] should delete. %!test %! a = ones (3); a(1:2,:) = [,]; assert (size (a), [1,3]) %!test @@ -43,7 +43,7 @@ %!test %! a = ones (3); a(1:2,:) = ""; assert (size (a), [1,3]) -% null matrix stored anywhere should lose its special status +## null matrix stored anywhere should lose its special status %!test %! a = ones (3); b = []; fail ("a(:,1:3) = b", ".") %!test @@ -51,11 +51,11 @@ %!test %! a = ones (3); b.x = []; fail ("a(:,1:3) = b.x", ".") -% filtering a null matrix through a function should not delete +## filtering a null matrix through a function should not delete %!test %! a = ones (3); fail ("a(:,1:3) = double ([])") -% subsasgn should work the same way +## subsasgn should work the same way %!test %! a = ones (3); a = subsasgn (a, substruct ('()', {':',1:2}), []); assert (size (a), [3,1]) %!test
--- a/test/test_parser.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_parser.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2011 John W. Eaton +## Copyright (C) 2010-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -16,8 +16,8 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. -## Tests for parser problems belong in this file. We need many more -## tests here! +## Tests for parser problems belong in this file. +## We need many more tests here! %!assert ({1 2 {3 4}}, {1,2,{3,4}}) %!assert ({1, 2 {3 4}}, {1,2,{3,4}}) @@ -247,6 +247,8 @@ %! assert (a += b *= c += 1, 42) %! assert (b == 40 && c == 8) +## Test creation of anonymous functions + %!test %! af_in_cell = {@(x) [1 2]}; %! assert (af_in_cell{1}(), [1, 2]); @@ -254,3 +256,4 @@ %!test %! R = @(rot) [cos(rot) -sin(rot); sin(rot) cos(rot)]; %! assert (R(pi/2), [cos(pi/2), -sin(pi/2); sin(pi/2),cos(pi/2)]); +
--- a/test/test_prefer.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_prefer.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -19,81 +19,76 @@ %% test/octave.test/prefer/prefer-1.m %!test %! m = [3 2]; -%! assert(all (m == (3:-1:2))); +%! assert (all (m == (3:-1:2))); %% test/octave.test/prefer/prefer-2.m %!test %! m = [3, %! 2]; -%! assert(all (m == (3:-1:2)')); +%! assert (all (m == (3:-1:2)')); %% test/octave.test/prefer/prefer-3.m %!test %! a = 2; -%! assert([a - 1],1); +%! assert ([a - 1], 1); %% test/octave.test/prefer/prefer-4.m %!test %! m = [3,2]; -%! fail("[m ']"); +%! fail ("[m ']"); %% test/octave.test/prefer/prefer-5.m -%!assert(all ([3 2] == (3:-1:2))); +%!assert (all ([3 2] == (3:-1:2))); %% test/octave.test/prefer/prefer-6.m -%!assert(all ([3, 2] == (3:-1:2))); +%!assert (all ([3, 2] == (3:-1:2))); %% test/octave.test/prefer/prefer-7.m %!test %! m = [3,2]; -%! assert(all ([m (1)] == (3:-1:1))); +%! assert (all ([m (1)] == (3:-1:1))); %% test/octave.test/prefer/prefer-8.m %!test %! m = [3,2]; -%! assert([m(1)],3); - -%% test/octave.test/prefer/prefer-9.m -%!test -%! m = [3,2]; -%! assert(all ([m (1)] == (3:-1:1))); +%! assert ([m(1)],3); %% test/octave.test/prefer/prefer-10.m %!test %! a = 2; -%! assert([a- 1],1); +%! assert ([a- 1], 1); %% test/octave.test/prefer/prefer-11.m %!test %! a = 1; -%! assert(all ([a -1] == (1:-2:-1))); +%! assert (all ([a -1] == (1:-2:-1))); %% test/octave.test/prefer/prefer-12.m %!test %! wsn = warning ("query", "Octave:str-to-num"); %! warning ("off", "Octave:str-to-num"); -%! assert("d" + 0,100); +%! assert ("d" + 0, 100); %! warning (wsn.state, "Octave:str-to-num"); %% test/octave.test/prefer/prefer-13.m %!test %! wsn = warning ("query", "Octave:str-to-num"); %! warning ("on", "Octave:str-to-num"); -%! fail("'d' + 0","warning"); +%! fail ("'d' + 0", "warning"); %! warning (wsn.state, "Octave:str-to-num"); %% test/octave.test/prefer/prefer-14.m %!test %! wir = warning ("query", "Ocave:imag-to-real"); %! warning ("off", "Ocave:imag-to-real"); -%! assert(eye (1+i),1); +%! assert (eye (1+i), 1); %! warning (wir.state, "Ocave:imag-to-real"); %% test/octave.test/prefer/prefer-15.m %!test %! wir = warning ("query", "Ocave:imag-to-real"); %! warning ("on", "Ocave:imag-to-real"); -%! fail("eye (1+i)","warning"); +%! fail ("eye (1+i)", "warning"); %! warning (wir.state, "Ocave:imag-to-real"); %% test/octave.test/prefer/prefer-17.m @@ -102,30 +97,14 @@ %! warning ("off", "Octave:resize-on-range-error"); %! clear a; %! a(2) = 1; a(3) = 2; -%! assert(all (a == [0,1,2])); +%! assert (all (a == [0,1,2])); %! warning (wrre.state, "Octave:resize-on-range-error"); %% test/octave.test/prefer/prefer-18.m %!test %! clear a; %! a(1) = 1; a(2) = 2; -%! assert(all (a == [1,2])); - -%% FIXME How the hell do I test this one in test/assert -%% test/octave.test/prefer/prefer-19.m -%!#test -%! pid = print_answer_id_name (); -%! print_answer_id_name (0); -%! a = 1 -%! print_answer_id_name (pid); - -%% FIXME How the hell do I test this one in test/assert -%% test/octave.test/prefer/prefer-20.m -%!#test -%! pid = print_answer_id_name (); -%! print_answer_id_name (1); -%! a = 1 -%! print_answer_id_name (pid); +%! assert (all (a == [1,2])); %% test/octave.test/prefer/prefer-21.m %!test @@ -147,22 +126,22 @@ %! print_empty_dimensions (ped); %% test/octave.test/prefer/prefer-23.m -%!assert(all (size (inv ([])) == [0, 0])); +%!assert (all (size (inv ([])) == [0, 0])); %% test/octave.test/prefer/prefer-24.m -%!assert(all (svd ([]) == zeros (0, 1))); +%!assert (all (svd ([]) == zeros (0, 1))); %% test/octave.test/prefer/prefer-27.m %!test %! sp = save_precision (); %! save_precision (1); %! x = pi; -%! nm = tmpnam(); -%! save("-text",nm,"x"); +%! nm = tmpnam (); +%! save("-text", nm, "x"); %! clear x; -%! load(nm); -%! unlink(nm); -%! assert(x,3); +%! load (nm); +%! unlink (nm); +%! assert (x,3); %! save_precision (sp); %% test/octave.test/prefer/prefer-28.m @@ -170,48 +149,50 @@ %! sp = save_precision (); %! save_precision (5); %! x = pi; -%! nm = tmpnam(); -%! save("-text",nm,"x"); +%! nm = tmpnam (); +%! save("-text", nm, "x"); %! clear x; -%! load(nm); -%! unlink(nm); -%! assert(x,3.1416); +%! load (nm); +%! unlink (nm); +%! assert (x, 3.1416); %! save_precision (sp); -%% FIXME Same problem as above!!! +%% FIXME: How to capture standard output for comparison? %% test/octave.test/prefer/prefer-29.m %!function f () %! 1 +%!endfunction %!#test %! sf = silent_functions (); %! silent_functions (0); %! f -%! assert(??); +%! assert (??); %! silent_functions (sf); %% FIXME Same problem as above!!! %% test/octave.test/prefer/prefer-30.m %!function f () %! 1 +%!endfunction %!#test %! sf = silent_functions (); %! silent_functions (1); %! f -%! assert(??); +%! assert (??); %! silent_functions (sf); %% test/octave.test/prefer/prefer-32.m %!test %! wndz = warning ("query", "Octave:neg-dim-as-zero"); %! warning ("on", "Octave:neg-dim-as-zero"); -%! fail("eye (-1) == []","warning"); +%! fail ("eye (-1) == []", "warning"); %! warning (wndz.state, "Octave:neg-dim-as-zero"); %% test/octave.test/prefer/prefer-33.m %!test %! wndz = warning ("query", "Octave:neg-dim-as-zero"); %! warning ("off", "Octave:neg-dim-as-zero"); -%! assert(all (size (eye (-1)) == [0, 0])); +%! assert (all (size (eye (-1)) == [0, 0])); %! warning (wndz.state, "Octave:neg-dim-as-zero"); %% test/octave.test/prefer/prefer-34.m @@ -225,14 +206,14 @@ %!test %! watv = warning ("query", "Octave:assign-as-truth-value"); %! warning ("on", "Octave:assign-as-truth-value"); -%! fail("if (x = 1) 1; endif","warning"); +%! fail ("if (x = 1) 1; endif", "warning"); %! warning (watv.state, "Octave:assign-as-truth-value"); %% test/octave.test/prefer/prefer-38.m %!test %! wdbz = warning ("query", "Octave:divide-by-zero"); %! warning ("off", "Octave:divide-by-zero"); -%! assert(isinf (1/0)); +%! assert (isinf (1/0)); %! warning (wdbz.state, "Octave:divide-by-zero"); %% test/octave.test/prefer/prefer-39.m @@ -241,6 +222,6 @@ %! warning ("on", "Octave:divide-by-zero"); %! a = 1; %! b = 0; -%! fail("isinf (a/b);","warning") +%! fail ("isinf (a/b);", "warning") %! warning (wdbz.state, "Octave:divide-by-zero");
--- a/test/test_range.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_range.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -18,57 +18,57 @@ ## Test values of range -%!assert(full(1:9), [ 1 2 3 4 5 6 7 8 9 ]) -%!assert(full(1:0.4:3), [ 1.0 1.4 1.8 2.2 2.6 3.0 ]) -%!assert(full(9:1), zeros(1,0)) -%!assert(full(9:-1:1), [ 9 8 7 6 5 4 3 2 1 ]) -%!assert(full(1:-1:9), zeros(1,0)) - +%!assert (full (1:9), [ 1 2 3 4 5 6 7 8 9 ]) +%!assert (full (1:0.4:3), [ 1.0 1.4 1.8 2.2 2.6 3.0 ]) +%!assert (full (9:1), zeros (1,0)) +%!assert (full (9:-1:1), [ 9 8 7 6 5 4 3 2 1 ]) +%!assert (full (1:-1:9), zeros (1,0)) +%!assert (full (1:1:1), 1) +%!assert (full (i:2i:10i), zeros (1,0)) ## Test mixing integer range with other types %!shared expect, r, z %! expect = [ 1 2 3 4 5 6 7 8 9 %! 0 0 0 0 0 0 0 0 0 ]; -%! z = zeros(1,9); +%! z = zeros (1,9); %! r = 1:9; -%!assert([ r ; z ], expect) -%!assert([ r ; single(z) ], single (expect)) -%!assert([ r ; logical(z) ], expect) -%!assert([ r ; sparse(z) ], sparse (expect)) -%!assert([ r ; sparse(logical(z)) ], sparse (expect)) +%!assert ([ r ; z ], expect) +%!assert ([ r ; single(z) ], single (expect)) +%!assert ([ r ; logical(z) ], expect) +%!assert ([ r ; sparse(z) ], sparse (expect)) +%!assert ([ r ; sparse(logical(z)) ], sparse (expect)) -%!assert([ r ; int8(z) ], int8(expect)) -%!assert([ r ; int16(z) ], int16(expect)) -%!assert([ r ; int32(z) ], int32(expect)) -%!assert([ r ; int64(z) ], int64(expect)) -%!assert([ r ; uint8(z) ], uint8(expect)) -%!assert([ r ; uint16(z) ], uint16(expect)) -%!assert([ r ; uint32(z) ], uint32(expect)) -%!assert([ r ; uint64(z) ], uint64(expect)) +%!assert ([ r ; int8(z) ], int8(expect)) +%!assert ([ r ; int16(z) ], int16(expect)) +%!assert ([ r ; int32(z) ], int32(expect)) +%!assert ([ r ; int64(z) ], int64(expect)) +%!assert ([ r ; uint8(z) ], uint8(expect)) +%!assert ([ r ; uint16(z) ], uint16(expect)) +%!assert ([ r ; uint32(z) ], uint32(expect)) +%!assert ([ r ; uint64(z) ], uint64(expect)) - -## Test mixing non integer range with other types +## Test mixing non-integer range with other types %!shared expect, r, z %! expect = [ 1.0 1.4 1.8 2.2 2.6 3.0 %! 0 0 0 0 0 0 ]; -%! z = zeros(1,6); +%! z = zeros (1,6); %! r = 1:0.4:3; -%!assert([ r ; z ], expect) -%!assert([ r ; single(z) ], single (expect)) -%!assert([ r ; logical(z) ], expect) -%!assert([ r ; sparse(z) ], sparse (expect)) -%!assert([ r ; sparse(logical(z)) ], sparse (expect)) +%!assert ([ r ; z ], expect) +%!assert ([ r ; single(z) ], single (expect)) +%!assert ([ r ; logical(z) ], expect) +%!assert ([ r ; sparse(z) ], sparse (expect)) +%!assert ([ r ; sparse(logical(z)) ], sparse (expect)) -%!assert([ r ; int8(z) ], int8(expect)) -%!assert([ r ; int16(z) ], int16(expect)) -%!assert([ r ; int32(z) ], int32(expect)) -%!assert([ r ; int64(z) ], int64(expect)) -%!assert([ r ; uint8(z) ], uint8(expect)) -%!assert([ r ; uint16(z) ], uint16(expect)) -%!assert([ r ; uint32(z) ], uint32(expect)) -%!assert([ r ; uint64(z) ], uint64(expect)) +%!assert ([ r ; int8(z) ], int8(expect)) +%!assert ([ r ; int16(z) ], int16(expect)) +%!assert ([ r ; int32(z) ], int32(expect)) +%!assert ([ r ; int64(z) ], int64(expect)) +%!assert ([ r ; uint8(z) ], uint8(expect)) +%!assert ([ r ; uint16(z) ], uint16(expect)) +%!assert ([ r ; uint32(z) ], uint32(expect)) +%!assert ([ r ; uint64(z) ], uint64(expect))
--- a/test/test_recursion.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_recursion.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -24,8 +24,9 @@ %! else %! y = x * f (x-1); %! endif -%!test -%! assert(f (5),120); +%!endfunction +%! +%!assert(f (5), 120); %% test/octave.test/recursion/recursion-2.m %!function y = f (x) @@ -35,6 +36,8 @@ %! else %! y = f (x-1) * x; %! endif -%!test -%! assert(f (5),120); +%!endfunction +%! +%!assert(f (5), 120); +%%FIXME: Need test for maximum recursion depth
--- a/test/test_return.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_return.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -19,9 +19,11 @@ %% test/octave.test/return/return-1.m %!function y = f () %! y = 1; -%! return +%! return; %! y = 2; -%!assert(f(),1) +%!endfunction +%! +%!assert(f(), 1) %% test/octave.test/return/return-2.m %!test
--- a/test/test_slice.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_slice.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2007-2011 John W. Eaton +## Copyright (C) 2007-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -16,8 +16,8 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. -%!function x = set_slice(size, dim, slice) -%! x = ones(size); +%!function x = set_slice (size, dim, slice) +%! x = ones (size); %! switch dim %! case 11 %! x(slice) = 2; @@ -34,147 +34,147 @@ %! otherwise %! error("invalid dim, '%d'", dim); %! endswitch -%! endfunction +%!endfunction ## size = [2 0] -%!assert(set_slice([2 0], 11, []), zeros([2 0])); -%!error id=Octave:invalid-resize set_slice([2 0], 11, 1) -%!error id=Octave:invalid-resize set_slice([2 0], 11, 2) -%!error id=Octave:invalid-resize set_slice([2 0], 11, 3) -%!assert(set_slice([2 0], 21, []), zeros([2 0])); -%!assert(set_slice([2 0], 21, 1), zeros([2 0])); -%!assert(set_slice([2 0], 21, 2), zeros([2 0])); -%!assert(set_slice([2 0], 21, 3), zeros([3 0])); -%!assert(set_slice([2 0], 22, []), zeros([2 0])); -%!assert(set_slice([2 0], 22, 1), [2 2]'); -%!assert(set_slice([2 0], 22, 2), [0 0;2 2]'); -%!assert(set_slice([2 0], 22, 3), [0 0;0 0;2 2]'); -%!assert(set_slice([2 0], 31, []), zeros([2 0])); -%!assert(set_slice([2 0], 31, 1), zeros([2 0])); -%!assert(set_slice([2 0], 31, 2), zeros([2 0])); -%!assert(set_slice([2 0], 31, 3), zeros([3 0])); -%!assert(set_slice([2 0], 32, []), zeros([2 0])); -%!assert(set_slice([2 0], 32, 1), [2 2]'); -%!assert(set_slice([2 0], 32, 2), [0 0;2 2]'); -%!assert(set_slice([2 0], 32, 3), [0 0;0 0;2 2]'); -%!assert(set_slice([2 0], 33, []), zeros([2 0])); -%!assert(set_slice([2 0], 33, 1), zeros([2 0])); -%!assert(set_slice([2 0], 33, 2), zeros([2 0 2])); -%!assert(set_slice([2 0], 33, 3), zeros([2 0 3])); +%!assert (set_slice ([2 0], 11, []), zeros ([2 0])) +%!error id=Octave:invalid-resize set_slice ([2 0], 11, 1) +%!error id=Octave:invalid-resize set_slice ([2 0], 11, 2) +%!error id=Octave:invalid-resize set_slice ([2 0], 11, 3) +%!assert (set_slice ([2 0], 21, []), zeros ([2 0])) +%!assert (set_slice ([2 0], 21, 1), zeros ([2 0])) +%!assert (set_slice ([2 0], 21, 2), zeros ([2 0])) +%!assert (set_slice ([2 0], 21, 3), zeros ([3 0])) +%!assert (set_slice ([2 0], 22, []), zeros ([2 0])) +%!assert (set_slice ([2 0], 22, 1), [2 2]') +%!assert (set_slice ([2 0], 22, 2), [0 0;2 2]') +%!assert (set_slice ([2 0], 22, 3), [0 0;0 0;2 2]') +%!assert (set_slice ([2 0], 31, []), zeros ([2 0])) +%!assert (set_slice ([2 0], 31, 1), zeros ([2 0])) +%!assert (set_slice ([2 0], 31, 2), zeros ([2 0])) +%!assert (set_slice ([2 0], 31, 3), zeros ([3 0])) +%!assert (set_slice ([2 0], 32, []), zeros ([2 0])) +%!assert (set_slice ([2 0], 32, 1), [2 2]') +%!assert (set_slice ([2 0], 32, 2), [0 0;2 2]') +%!assert (set_slice ([2 0], 32, 3), [0 0;0 0;2 2]') +%!assert (set_slice ([2 0], 33, []), zeros ([2 0])) +%!assert (set_slice ([2 0], 33, 1), zeros ([2 0])) +%!assert (set_slice ([2 0], 33, 2), zeros ([2 0 2])) +%!assert (set_slice ([2 0], 33, 3), zeros ([2 0 3])) ## size = [0 2] -%!assert(set_slice([0 2], 11, []), zeros([0 2])); -%!assert(set_slice([0 2], 11, 1), 2); -%!assert(set_slice([0 2], 11, 2), [0, 2]); -%!assert(set_slice([0 2], 11, 3), [0, 0, 2]); -%!assert(set_slice([0 2], 21, []), zeros([0 2])); -%!assert(set_slice([0 2], 21, 1), [2 2]); -%!assert(set_slice([0 2], 21, 2), [0 0;2 2]); -%!assert(set_slice([0 2], 21, 3), [0 0;0 0;2 2]); -%!assert(set_slice([0 2], 22, []), zeros([0 2])); -%!assert(set_slice([0 2], 22, 1), zeros([0 2])); -%!assert(set_slice([0 2], 22, 2), zeros([0 2])); -%!assert(set_slice([0 2], 22, 3), zeros([0 3])); -%!assert(set_slice([0 2], 31, []), zeros([0 2])); -%!assert(set_slice([0 2], 31, 1), [2 2]); -%!assert(set_slice([0 2], 31, 2), [0 0;2 2]); -%!assert(set_slice([0 2], 31, 3), [0 0;0 0;2 2]); -%!assert(set_slice([0 2], 32, []), zeros([0 2])); -%!assert(set_slice([0 2], 32, 1), zeros([0 2])); -%!assert(set_slice([0 2], 32, 2), zeros([0 2])); -%!assert(set_slice([0 2], 32, 3), zeros([0 3])); -%!assert(set_slice([0 2], 33, []), zeros([0 2])); -%!assert(set_slice([0 2], 33, 1), zeros([0 2])); -%!assert(set_slice([0 2], 33, 2), zeros([0 2 2])); -%!assert(set_slice([0 2], 33, 3), zeros([0 2 3])); +%!assert (set_slice ([0 2], 11, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 11, 1), 2) +%!assert (set_slice ([0 2], 11, 2), [0, 2]) +%!assert (set_slice ([0 2], 11, 3), [0, 0, 2]) +%!assert (set_slice ([0 2], 21, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 21, 1), [2 2]) +%!assert (set_slice ([0 2], 21, 2), [0 0;2 2]) +%!assert (set_slice ([0 2], 21, 3), [0 0;0 0;2 2]) +%!assert (set_slice ([0 2], 22, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 22, 1), zeros ([0 2])) +%!assert (set_slice ([0 2], 22, 2), zeros ([0 2])) +%!assert (set_slice ([0 2], 22, 3), zeros ([0 3])) +%!assert (set_slice ([0 2], 31, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 31, 1), [2 2]) +%!assert (set_slice ([0 2], 31, 2), [0 0;2 2]) +%!assert (set_slice ([0 2], 31, 3), [0 0;0 0;2 2]) +%!assert (set_slice ([0 2], 32, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 32, 1), zeros ([0 2])) +%!assert (set_slice ([0 2], 32, 2), zeros ([0 2])) +%!assert (set_slice ([0 2], 32, 3), zeros ([0 3])) +%!assert (set_slice ([0 2], 33, []), zeros ([0 2])) +%!assert (set_slice ([0 2], 33, 1), zeros ([0 2])) +%!assert (set_slice ([0 2], 33, 2), zeros ([0 2 2])) +%!assert (set_slice ([0 2], 33, 3), zeros ([0 2 3])) ## size = [2 1] -%!assert(set_slice([2 1], 11, []), ones([2 1])); -%!assert(set_slice([2 1], 11, 1), [2 1]'); -%!assert(set_slice([2 1], 11, 2), [1 2]'); -%!assert(set_slice([2 1], 11, 3), [1 1 2]'); -%!assert(set_slice([2 1], 11, 4), [1 1 0 2]'); -%!assert(set_slice([2 1], 21, []), ones([2 1])); -%!assert(set_slice([2 1], 21, 1), [2 1]'); -%!assert(set_slice([2 1], 21, 2), [1 2]'); -%!assert(set_slice([2 1], 21, 3), [1 1 2]'); -%!assert(set_slice([2 1], 21, 4), [1 1 0 2]'); -%!assert(set_slice([2 1], 22, []), ones([2 1])); -%!assert(set_slice([2 1], 22, 1), [2 2]'); -%!assert(set_slice([2 1], 22, 2), [1 1;2 2]'); -%!assert(set_slice([2 1], 22, 3), [1 1;0 0;2 2]'); -%!assert(set_slice([2 1], 31, []), ones([2 1])); -%!assert(set_slice([2 1], 31, 1), [2 1]'); -%!assert(set_slice([2 1], 31, 2), [1 2]'); -%!assert(set_slice([2 1], 31, 3), [1 1 2]'); -%!assert(set_slice([2 1], 31, 4), [1 1 0 2]'); -%!assert(set_slice([2 1], 32, []), ones([2 1])); -%!assert(set_slice([2 1], 32, 1), [2 2]'); -%!assert(set_slice([2 1], 32, 2), [1 1;2 2]'); -%!assert(set_slice([2 1], 32, 3), [1 1;0 0;2 2]'); -%!assert(set_slice([2 1], 33, []), ones([2 1])); -%!assert(set_slice([2 1], 33, 1), [2 2]'); -%!assert(set_slice([2 1], 33, 2), reshape([1 1 2 2],[2 1 2])); -%!assert(set_slice([2 1], 33, 3), reshape([1 1 0 0 2 2],[2 1 3])); +%!assert (set_slice ([2 1], 11, []), ones ([2 1])) +%!assert (set_slice ([2 1], 11, 1), [2 1]') +%!assert (set_slice ([2 1], 11, 2), [1 2]') +%!assert (set_slice ([2 1], 11, 3), [1 1 2]') +%!assert (set_slice ([2 1], 11, 4), [1 1 0 2]') +%!assert (set_slice ([2 1], 21, []), ones ([2 1])) +%!assert (set_slice ([2 1], 21, 1), [2 1]') +%!assert (set_slice ([2 1], 21, 2), [1 2]') +%!assert (set_slice ([2 1], 21, 3), [1 1 2]') +%!assert (set_slice ([2 1], 21, 4), [1 1 0 2]') +%!assert (set_slice ([2 1], 22, []), ones ([2 1])) +%!assert (set_slice ([2 1], 22, 1), [2 2]') +%!assert (set_slice ([2 1], 22, 2), [1 1;2 2]') +%!assert (set_slice ([2 1], 22, 3), [1 1;0 0;2 2]') +%!assert (set_slice ([2 1], 31, []), ones ([2 1])) +%!assert (set_slice ([2 1], 31, 1), [2 1]') +%!assert (set_slice ([2 1], 31, 2), [1 2]') +%!assert (set_slice ([2 1], 31, 3), [1 1 2]') +%!assert (set_slice ([2 1], 31, 4), [1 1 0 2]') +%!assert (set_slice ([2 1], 32, []), ones ([2 1])) +%!assert (set_slice ([2 1], 32, 1), [2 2]') +%!assert (set_slice ([2 1], 32, 2), [1 1;2 2]') +%!assert (set_slice ([2 1], 32, 3), [1 1;0 0;2 2]') +%!assert (set_slice ([2 1], 33, []), ones ([2 1])) +%!assert (set_slice ([2 1], 33, 1), [2 2]') +%!assert (set_slice ([2 1], 33, 2), reshape ([1 1 2 2],[2 1 2])) +%!assert (set_slice ([2 1], 33, 3), reshape ([1 1 0 0 2 2],[2 1 3])) ## size = [1 2] -%!assert(set_slice([1 2], 11, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 11, 1), [2 1]); -%!assert(set_slice([1 2], 11, 2), [1 2]); -%!assert(set_slice([1 2], 11, 3), [1 1 2]); -%!assert(set_slice([1 2], 11, 4), [1 1 0 2]); -%!assert(set_slice([1 2], 21, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 21, 1), [2 2]); -%!assert(set_slice([1 2], 21, 2), [1 1;2 2]); -%!assert(set_slice([1 2], 21, 3), [1 1;0 0;2 2]); -%!assert(set_slice([1 2], 22, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 22, 1), [2 1]); -%!assert(set_slice([1 2], 22, 2), [1 2]); -%!assert(set_slice([1 2], 22, 3), [1 1 2]); -%!assert(set_slice([1 2], 22, 4), [1 1 0 2]); -%!assert(set_slice([1 2], 31, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 31, 1), [2 2]); -%!assert(set_slice([1 2], 31, 2), [1 1;2 2]); -%!assert(set_slice([1 2], 31, 3), [1 1;0 0;2 2]); -%!assert(set_slice([1 2], 32, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 32, 1), [2 1]); -%!assert(set_slice([1 2], 32, 2), [1 2]); -%!assert(set_slice([1 2], 32, 3), [1 1 2]); -%!assert(set_slice([1 2], 32, 4), [1 1 0 2]); -%!assert(set_slice([1 2], 33, []), full(ones([1 2]))); -%!assert(set_slice([1 2], 33, 1), [2 2]); -%!assert(set_slice([1 2], 33, 2), reshape([1 1 2 2],[1 2 2])); -%!assert(set_slice([1 2], 33, 3), reshape([1 1 0 0 2 2],[1 2 3])); +%!assert (set_slice ([1 2], 11, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 11, 1), [2 1]) +%!assert (set_slice ([1 2], 11, 2), [1 2]) +%!assert (set_slice ([1 2], 11, 3), [1 1 2]) +%!assert (set_slice ([1 2], 11, 4), [1 1 0 2]) +%!assert (set_slice ([1 2], 21, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 21, 1), [2 2]) +%!assert (set_slice ([1 2], 21, 2), [1 1;2 2]) +%!assert (set_slice ([1 2], 21, 3), [1 1;0 0;2 2]) +%!assert (set_slice ([1 2], 22, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 22, 1), [2 1]) +%!assert (set_slice ([1 2], 22, 2), [1 2]) +%!assert (set_slice ([1 2], 22, 3), [1 1 2]) +%!assert (set_slice ([1 2], 22, 4), [1 1 0 2]) +%!assert (set_slice ([1 2], 31, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 31, 1), [2 2]) +%!assert (set_slice ([1 2], 31, 2), [1 1;2 2]) +%!assert (set_slice ([1 2], 31, 3), [1 1;0 0;2 2]) +%!assert (set_slice ([1 2], 32, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 32, 1), [2 1]) +%!assert (set_slice ([1 2], 32, 2), [1 2]) +%!assert (set_slice ([1 2], 32, 3), [1 1 2]) +%!assert (set_slice ([1 2], 32, 4), [1 1 0 2]) +%!assert (set_slice ([1 2], 33, []), full (ones ([1 2]))) +%!assert (set_slice ([1 2], 33, 1), [2 2]) +%!assert (set_slice ([1 2], 33, 2), reshape ([1 1 2 2],[1 2 2])) +%!assert (set_slice ([1 2], 33, 3), reshape ([1 1 0 0 2 2],[1 2 3])) ## size = [2 2] -%!assert(set_slice([2 2], 11, []), ones([2 2])); -%!assert(set_slice([2 2], 11, 1), [2 1;1 1]); -%!assert(set_slice([2 2], 11, 2), [1 1;2 1]); -%!assert(set_slice([2 2], 11, 3), [1 2;1 1]); -%!assert(set_slice([2 2], 11, 4), [1 1;1 2]); -%!error id=Octave:invalid-resize set_slice([2 2], 11, 5) -%!error id=Octave:invalid-resize set_slice([2 2], 11, 6) -%!assert(set_slice([2 2], 21, []), ones([2 2])); -%!assert(set_slice([2 2], 21, 1), [2 2;1 1]); -%!assert(set_slice([2 2], 21, 2), [1 1;2 2]); -%!assert(set_slice([2 2], 21, 3), [1 1;1 1;2 2]); -%!assert(set_slice([2 2], 21, 4), [1 1;1 1;0 0;2 2]); -%!assert(set_slice([2 2], 22, []), ones([2 2])); -%!assert(set_slice([2 2], 22, 1), [2 2;1 1]'); -%!assert(set_slice([2 2], 22, 2), [1 1;2 2]'); -%!assert(set_slice([2 2], 22, 3), [1 1;1 1;2 2]'); -%!assert(set_slice([2 2], 22, 4), [1 1;1 1;0 0;2 2]'); -%!assert(set_slice([2 2], 31, []), ones([2 2])); -%!assert(set_slice([2 2], 31, 1), [2 2;1 1]); -%!assert(set_slice([2 2], 31, 2), [1 1;2 2]); -%!assert(set_slice([2 2], 31, 3), [1 1;1 1;2 2]); -%!assert(set_slice([2 2], 31, 4), [1 1;1 1;0 0;2 2]); -%!assert(set_slice([2 2], 32, []), ones([2 2])); -%!assert(set_slice([2 2], 32, 1), [2 2;1 1]'); -%!assert(set_slice([2 2], 32, 2), [1 1;2 2]'); -%!assert(set_slice([2 2], 32, 3), [1 1;1 1;2 2]'); -%!assert(set_slice([2 2], 32, 4), [1 1;1 1;0 0;2 2]'); -%!assert(set_slice([2 2], 33, []), ones([2 2])); -%!assert(set_slice([2 2], 33, 1), [2 2;2 2]); -%!assert(set_slice([2 2], 33, 2), reshape([1 1 1 1 2 2 2 2],[2 2 2])); -%!assert(set_slice([2 2], 33, 3), reshape([1 1 1 1 0 0 0 0 2 2 2 2],[2 2 3])); +%!assert (set_slice ([2 2], 11, []), ones ([2 2])) +%!assert (set_slice ([2 2], 11, 1), [2 1;1 1]) +%!assert (set_slice ([2 2], 11, 2), [1 1;2 1]) +%!assert (set_slice ([2 2], 11, 3), [1 2;1 1]) +%!assert (set_slice ([2 2], 11, 4), [1 1;1 2]) +%!error id=Octave:invalid-resize set_slice ([2 2], 11, 5) +%!error id=Octave:invalid-resize set_slice ([2 2], 11, 6) +%!assert (set_slice ([2 2], 21, []), ones ([2 2])) +%!assert (set_slice ([2 2], 21, 1), [2 2;1 1]) +%!assert (set_slice ([2 2], 21, 2), [1 1;2 2]) +%!assert (set_slice ([2 2], 21, 3), [1 1;1 1;2 2]) +%!assert (set_slice ([2 2], 21, 4), [1 1;1 1;0 0;2 2]) +%!assert (set_slice ([2 2], 22, []), ones ([2 2])) +%!assert (set_slice ([2 2], 22, 1), [2 2;1 1]') +%!assert (set_slice ([2 2], 22, 2), [1 1;2 2]') +%!assert (set_slice ([ 2 2], 22, 3), [1 1;1 1;2 2]') +%!assert (set_slice ([2 2], 22, 4), [1 1;1 1;0 0;2 2]') +%!assert (set_slice ([2 2], 31, []), ones ([2 2])) +%!assert (set_slice ([2 2], 31, 1), [2 2;1 1]) +%!assert (set_slice ([2 2], 31, 2), [1 1;2 2]) +%!assert (set_slice ( [2 2], 31, 3), [1 1;1 1;2 2]) +%!assert (set_slice ([2 2], 31, 4), [1 1;1 1;0 0;2 2]) +%!assert (set_slice ([2 2], 32, []), ones ([2 2])) +%!assert (set_slice ([2 2], 32, 1), [2 2;1 1]') +%!assert (set_slice ([2 2], 32, 2), [1 1;2 2]') +%!assert (set_slice ([ 2 2], 32, 3), [1 1;1 1;2 2]') +%!assert (set_slice ([2 2], 32, 4), [1 1;1 1;0 0;2 2]') +%!assert (set_slice ([2 2], 33, []), ones ([2 2])) +%!assert (set_slice ([2 2], 33, 1), [2 2;2 2]) +%!assert (set_slice ([2 2], 33, 2), reshape ([1 1 1 1 2 2 2 2],[2 2 2])) +%!assert (set_slice ([ 2 2], 33, 3), reshape ([1 1 1 1 0 0 0 0 2 2 2 2],[2 2 3]))
--- a/test/test_struct.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_struct.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -20,13 +20,13 @@ %!test %! s.a = 1; %! c = fieldnames (s); -%! assert(iscell (c) && strcmp (c{1}, "a")); +%! assert (iscell (c) && strcmp (c{1}, "a")); %% test/octave.test/struct/fieldnames-2.m %!test %! s.a.b = 1; %! c = fieldnames (s.a); -%! assert(iscell (c) && strcmp (c{1}, "b")); +%! assert (iscell (c) && strcmp (c{1}, "b")); %% test/octave.test/struct/fieldnames-3.m %!error <Invalid call to fieldnames> fieldnames (); @@ -34,7 +34,7 @@ %% test/octave.test/struct/fieldnames-4.m %!test %! s.a = 1; -%! fail("fieldnames (s, 1)","Invalid call to fieldnames.*"); +%! fail ("fieldnames (s, 1)", "Invalid call to fieldnames"); %% test/octave.test/struct/fieldnames-5.m %!error fieldnames (1); @@ -43,13 +43,13 @@ %!test %! s.aaa = 1; %! s.a = 2; -%! assert(isfield (s, "a")); +%! assert (isfield (s, "a")); %% test/octave.test/struct/isfield-2.m %!test %! s.aaa = 1; %! s.a = 2; -%! assert(!(isfield (s, "b"))); +%! assert (!(isfield (s, "b"))); %% test/octave.test/struct/isfield-3.m %!error <Invalid call to isfield> isfield (); @@ -58,46 +58,48 @@ %!test %! s.aaa = 1; %! s.a = 2; -%! fail("isfield (s, 'a', 3);","Invalid call to isfield.*"); +%! fail ("isfield (s, 'a', 3);", "Invalid call to isfield"); %% test/octave.test/struct/isfield-5.m -%!assert(isfield (1, "m") == 0); +%!assert (isfield (1, "m") == 0); %% test/octave.test/struct/isfield-6.m %!test %! s.a = 2; -%! assert(isfield (s, 2) == 0); +%! assert (isfield (s, 2) == 0); %% test/octave.test/struct/isstruct-1.m -%!assert(!(isstruct (1))); +%!assert (!(isstruct (1))) %% test/octave.test/struct/isstruct-2.m -%!assert(!(isstruct ([1, 2]))); +%!assert (!(isstruct ([1, 2]))) %% test/octave.test/struct/isstruct-3.m -%!assert(!(isstruct ([]))); +%!assert (!(isstruct ([]))) %% test/octave.test/struct/isstruct-4.m -%!assert(!(isstruct ([1, 2; 3, 4]))); +%!assert (!(isstruct ([1, 2; 3, 4]))) %% test/octave.test/struct/isstruct-5.m -%!assert(!(isstruct ("t"))); +%!assert (!(isstruct ("t"))) %% test/octave.test/struct/isstruct-6.m -%!assert(!(isstruct ("test"))); +%!assert (!(isstruct ("test"))) %% test/octave.test/struct/isstruct-7.m -%!assert(!(isstruct (["test"; "ing"]))); +%!assert (!(isstruct (["test"; "ing"]))) + +%!assert (!(isstruct ({1}))) %% test/octave.test/struct/isstruct-8.m %!test %! s.a = 1; -%! assert(isstruct (s)); +%! assert (isstruct (s)); %% test/octave.test/struct/isstruct-9.m %!test %! s.a.b = 1; -%! assert(isstruct (s.a)); +%! assert (isstruct (s.a)); %% test/octave.test/struct/isstruct-10.m %!error <Invalid call to isstruct> isstruct (); @@ -105,160 +107,160 @@ %% test/octave.test/struct/isstruct-11.m %!test %! s.a = 1; -%! fail("isstruct (s, 1)","Invalid call to isstruct.*"); +%! fail ("isstruct (s, 1)", "Invalid call to isstruct"); ## increment element of matrix stored in struct array field %!test -%! a = struct("c", {[1, 2, 3], [4, 5, 6], [7, 8, 9]}); -%! a(2).c(3)++; -%! assert(a(2).c, [4, 5, 7]); +%! a = struct ("c", {[1, 2, 3], [4, 5, 6], [7, 8, 9]}); +%! a(2).c(3)++; +%! assert (a(2).c, [4, 5, 7]); ## create struct array by assignment to cs-list %!test -%! [a(1:2).x] = deal (1, 3); -%! assert(a, struct("x", {1, 3})); -%! assert({a(1:2).x}, {1, 3}); +%! [a(1:2).x] = deal (1, 3); +%! assert (a, struct ("x", {1, 3})); +%! assert ({a(1:2).x}, {1, 3}); ## assign to subrange of struct array field %!test -%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 100); -%! [b(1:2, [1,3]).name] = deal("aaa", "ddd", "ccc", "fff"); -%! assert ({b.name}, {"aaa", "ddd", "b", "e", "ccc", "fff"}); +%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 100); +%! [b(1:2, [1,3]).name] = deal ("aaa", "ddd", "ccc", "fff"); +%! assert ({b.name}, {"aaa", "ddd", "b", "e", "ccc", "fff"}); ## index into nested struct arrays %!test -%! a = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); -%! a(2).value = a; -%! assert (a(2).value(2,3).name, "f"); +%! a = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); +%! a(2).value = a; +%! assert (a(2).value(2,3).name, "f"); ## assign to subrange of field in nested struct array %!test -%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); -%! b(3, 1).value = b; -%! [b(3, 1).value(1, [1, 3]).name] = deal ("aaa", "ccc"); -%! assert (size (b), [3, 3]); -%! assert (b(3,1).value(1, 3).name, "ccc"); +%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); +%! b(3, 1).value = b; +%! [b(3, 1).value(1, [1, 3]).name] = deal ("aaa", "ccc"); +%! assert (size (b), [3, 3]); +%! assert (b(3,1).value(1, 3).name, "ccc"); -## test 4 dimensional struct array +## test 4-dimensional struct array %!test -%! c(4, 4, 4, 4).name = "a"; -%! c(3, 3, 3, 3).value = 1; -%! assert (c(2,2,2,2), struct ("name", [], "value", [])); +%! c(4, 4, 4, 4).name = "a"; +%! c(3, 3, 3, 3).value = 1; +%! assert (c(2,2,2,2), struct ("name", [], "value", [])); -## assign to subrange of field in 4d struct array +## assign to subrange of field in 4D struct array %!test -%! c(4, 4, 4, 4).name = "a"; -%! c(3, 3, 3, 3).value = 1; -%! [c([1, 3], 2, :, [3, 4]).value] = deal (1); -%! assert (length(find([c.value] == 1)), 17); -%! assert (length(find([c.value])), 17); +%! c(4, 4, 4, 4).name = "a"; +%! c(3, 3, 3, 3).value = 1; +%! [c([1, 3], 2, :, [3, 4]).value] = deal (1); +%! assert (length(find([c.value] == 1)), 17); +%! assert (length(find([c.value])), 17); ## swap elements of struct array %!test -%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); -%! [b([2, 1], [3, 1]).name] = deal(b([1, 2], [1, 2]).name); -%! assert ({b.name}, {"e", "b", "b", "e", "d", "a"}); +%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 0); +%! [b([2, 1], [3, 1]).name] = deal (b([1, 2], [1, 2]).name); +%! assert ({b.name}, {"e", "b", "b", "e", "d", "a"}); ## test internal ordering of struct array fields %!test -%! c(4, 4, 4, 4).value = 3; -%! c(1, 2, 3, 4).value = 2; -%! c(3, 3, 3, 3).value = 1; -%! d = reshape ({c.value}, size(c)); -%! assert ([d{4, 4, 4, 4}, d{1, 2, 3, 4}, d{3, 3, 3, 3}], -%! [3, 2, 1]); +%! c(4, 4, 4, 4).value = 3; +%! c(1, 2, 3, 4).value = 2; +%! c(3, 3, 3, 3).value = 1; +%! d = reshape ({c.value}, size(c)); +%! assert ([d{4, 4, 4, 4}, d{1, 2, 3, 4}, d{3, 3, 3, 3}], +%! [3, 2, 1]); ## test assignment to mixed cs-list of field element subranges %!test -%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 100); -%! [b(1:2, [1, 3]).name, b(2, 1:3).value] = ... -%! deal (1, 2, 3, 4, "5", "6", "7"); -%! assert ({b.name}, {1, 2, "b", "e", 3, 4}); -%! assert ({b.value}, {100, "5", 100, "6", 100, "7"}); +%! b = struct ("name", {"a", "b", "c"; "d", "e", "f"}, "value", 100); +%! [b(1:2, [1, 3]).name, b(2, 1:3).value] = ... +%! deal (1, 2, 3, 4, "5", "6", "7"); +%! assert ({b.name}, {1, 2, "b", "e", 3, 4}); +%! assert ({b.value}, {100, "5", 100, "6", 100, "7"}); %!error <a cs-list cannot be further indexed> -%! [a(1:3).x] = deal ([1, 5], [3, 7], [8, 9]); -%! [a(2:3).x(2)] = deal (10, 11); +%! [a(1:3).x] = deal ([1, 5], [3, 7], [8, 9]); +%! [a(2:3).x(2)] = deal (10, 11); %!error <a cs-list cannot be further indexed> -%! [a(1:3).x] = deal ([1, 5], [3, 7], [8, 9]); -%! a(2:3).x(2); +%! [a(1:3).x] = deal ([1, 5], [3, 7], [8, 9]); +%! a(2:3).x(2); %!error id=Octave:index-out-of-bounds -%! a(1).x.x = 1; -%! a(2).x; +%! a(1).x.x = 1; +%! a(2).x; %!error <invalid number of output arguments for constant expression> -%! a = struct ("value", {1, 2, 3, 4, 5}); -%! [a(2:4).value] = 1; +%! a = struct ("value", {1, 2, 3, 4, 5}); +%! [a(2:4).value] = 1; %!error <invalid assignment to cs-list outside multiple assignment> -%! c(4, 4, 4, 4).name = "a"; -%! c(3, 3, 3, 3).value = 1; -%! c([1, 3], 2, :, [3, 4]).value = 1; +%! c(4, 4, 4, 4).name = "a"; +%! c(3, 3, 3, 3).value = 1; +%! c([1, 3], 2, :, [3, 4]).value = 1; ## test lazy copying in structs: nested assignment to self %!test -%! a.a = 1; -%! a.b = a; -%! a.b.c = a; -%! assert (a.b.c.b, struct ("a", 1)); +%! a.a = 1; +%! a.b = a; +%! a.b.c = a; +%! assert (a.b.c.b, struct ("a", 1)); ## test lazy copying in structs: indirect nested assignment to self %!test -%! a.a = 1; -%! a.b = 2; -%! b.c = a; -%! b.d = 3; -%! c.d = b; -%! c.e = 4; -%! a.b = c; -%! a.b.e = a; -%! assert (a.b.e.b.d.c, struct ("a", 1, "b", 2)); +%! a.a = 1; +%! a.b = 2; +%! b.c = a; +%! b.d = 3; +%! c.d = b; +%! c.e = 4; +%! a.b = c; +%! a.b.e = a; +%! assert (a.b.e.b.d.c, struct ("a", 1, "b", 2)); ## test lazy copying in structs: nested assignment via function %!function aa = do_nest (a); %! aa = a; %! aa.b = a; -%! endfunction +%!endfunction %!test -%! a.c = 1; -%! a = do_nest (a); -%! a = do_nest (a); -%! a = do_nest (a); -%! assert (a.b.b.b, struct ("c", 1)); +%! a.c = 1; +%! a = do_nest (a); +%! a = do_nest (a); +%! a = do_nest (a); +%! assert (a.b.b.b, struct ("c", 1)); ## test lazy copying in structs: nested assignment via function %!function aa = do_nest (a); %! aa = a; %! aa.b = a; %! aa.b.c = aa; -%! endfunction +%!endfunction %!test -%! a.c = 1; -%! a = do_nest (a); -%! a = do_nest (a); -%! a = do_nest (a); -%! assert (a.b.c.b.b.c.b.b.c.b, struct ("c", 1)); +%! a.c = 1; +%! a = do_nest (a); +%! a = do_nest (a); +%! a = do_nest (a); +%! assert (a.b.c.b.b.c.b.b.c.b, struct ("c", 1)); ## test lazy copying in structs: nested assignment on different levels. %!test -%! a.b = 1; -%! b.c = a; -%! b.d.e = a; -%! b.f.g.h = a; -%! b.i.j.k.l = a; -%! a.m = b; -%! a.m.c.b = a; -%! assert (a.m.c.b.m.i.j.k.l, struct ("b", 1)); +%! a.b = 1; +%! b.c = a; +%! b.d.e = a; +%! b.f.g.h = a; +%! b.i.j.k.l = a; +%! a.m = b; +%! a.m.c.b = a; +%! assert (a.m.c.b.m.i.j.k.l, struct ("b", 1)); ## test indexed assignment into empty struct array %!test -%! s = resize(struct(),3,2); -%! s(3).foo = 42; -%! assert (s(3), struct ("foo", 42)); +%! s = resize (struct (), 3,2); +%! s(3).foo = 42; +%! assert (s(3), struct ("foo", 42)); %!error id=Octave:index-out-of-bounds -%! s = resize(struct(),3,2); -%! s(3).foo = 42; -%! s(7); +%! s = resize (struct (),3,2); +%! s(3).foo = 42; +%! s(7);
--- a/test/test_switch.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_switch.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -27,7 +27,7 @@ %! switch 2 case 1 z = a; case 2 z = b; otherwise z = c; endswitch %! switch 3 case 1 p = a; case 2 p = b; otherwise p = c; endswitch %! -%! assert(x == c && y == a && z == b && p == c); +%! assert (x == c && y == a && z == b && p == c); %% test/octave.test/switch/switch-2.m %!test @@ -41,17 +41,17 @@ %! %! for i = 0:3 %! switch (i) -%! case a -%! x(k) = a; -%! case b -%! x(k) = b; -%! otherwise -%! x(k) = c; -%! endswitch -%! k++; +%! case a +%! x(k) = a; +%! case b +%! x(k) = b; +%! otherwise +%! x(k) = c; +%! endswitch +%! k++; %! endfor %! -%! assert(all (x == [3, 1, 2, 3])); +%! assert (all (x == [3, 1, 2, 3])); %% test/octave.test/switch/switch-3.m %!test @@ -64,14 +64,14 @@ %! k = 1; %! %! for i = 0:3 -%! switch (i) -%! case a -%! x(k) = a; -%! endswitch -%! k++; +%! switch (i) +%! case a +%! x(k) = a; +%! endswitch +%! k++; %! endfor %! -%! assert(all (x == [0, 1, 0, 0])); +%! assert (all (x == [0, 1, 0, 0])); %!test %! a = 1; @@ -81,15 +81,15 @@ %! a = 2; %! endswitch %! -%! assert(a == 2); +%! assert (a == 2); %% test/octave.test/switch/switch-4.m -%!error <syntax error> eval("switch endswitch"); +%!error <syntax error> eval ("switch endswitch") %% test/octave.test/switch/switch-5.m -%!error <syntax error> eval("switch case endswitch"); +%!error <syntax error> eval ("switch case endswitch") %% test/octave.test/switch/switch-6.m -%!error <syntax error> eval("switch 1 default 1; endswitch"); +%!error <syntax error> eval ("switch 1 default 1; endswitch")
--- a/test/test_system.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_system.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -20,50 +20,54 @@ %!test %! [t1, u1, s1] = cputime (); %! for i = 1:200 -%! sin (i); +%! sin (i); %! endfor %! [t2, u2, s2] = cputime (); -%! assert(t1 == u1 + s1 && t2 == u2 + s2 && t2 >= t1 && u2 >= u2 && s2 >= s2); - +%! assert (t1, u1 + s1); +%! assert (t2 == u2 + s2); +%! assert (t2 >= t1); +%! assert (u2 >= u2); +%! assert (s2 >= s2); +%!#assert (t1 == u1 + s1 && t2 == u2 + s2 && t2 >= t1 && u2 >= u2 && s2 >= s2); %% test/octave.test/system/tic-toc-1.m %!test %! tic (); %! sleep (2); -%! assert(toc () > 0); +%! assert (toc () > 0); %% test/octave.test/system/pause-1.m %!test %! pause (0); %! printf_assert ("ok\n"); -%! assert(prog_output_assert("ok")); +%! assert (prog_output_assert ("ok")); %% test/octave.test/system/pause-2.m -%!error <Invalid call to pause> pause (1, 2); +%!error <Invalid call to pause> pause (1, 2) %% test/octave.test/system/sleep-1.m %!test %! sleep (0); %! printf_assert ("ok\n"); -%! assert(prog_output_assert("ok")); +%! assert (prog_output_assert ("ok")); %% test/octave.test/system/sleep-2.m -%!error <Invalid call to sleep> sleep (); +%!error <Invalid call to sleep> sleep () %% test/octave.test/system/sleep-3.m -%!error <Invalid call to sleep> sleep (1, 2); +%!error <Invalid call to sleep> sleep (1, 2) %% test/octave.test/system/usleep-1.m %!test %! usleep (0); %! printf_assert ("ok\n"); -%! assert(prog_output_assert("ok")); +%! assert (prog_output_assert ("ok")); %% test/octave.test/system/usleep-2.m -%!error <Invalid call to usleep> usleep (); +%!error <Invalid call to usleep> usleep () %% test/octave.test/system/usleep-3.m -%!error <Invalid call to usleep> usleep (1, 2); +%!error <Invalid call to usleep> usleep (1, 2) %% test/octave.test/system/rename-1.m %!test @@ -77,7 +81,7 @@ %! [s, e] = stat (from); %! if (e < 0) %! [s, e] = stat (to); -%! assert(e == 0); +%! assert (e == 0); %! unlink (to); %! endif %! endif @@ -85,10 +89,10 @@ %! endif %% test/octave.test/system/rename-2.m -%!error <Invalid call to rename> rename (); +%!error <Invalid call to rename> rename () %% test/octave.test/system/rename-3.m -%!error <Invalid call to rename> rename ("foo", "bar", 1); +%!error <Invalid call to rename> rename ("foo", "bar", 1) %% test/octave.test/system/unlink-1.m %!test @@ -97,26 +101,26 @@ %! [s, err] = stat (nm); %! if (! err && fclose (id) == 0 && unlink (nm) == 0) %! [s, err] = stat (nm); -%! assert(err < 0); +%! assert (err < 0); %! endif %! endif %% test/octave.test/system/unlink-2.m -%!error <Invalid call to unlink> unlink (); +%!error <Invalid call to unlink> unlink () %% test/octave.test/system/unlink-3.m -%!error <Invalid call to unlink> unlink ("foo", 1); +%!error <Invalid call to unlink> unlink ("foo", 1) %% test/octave.test/system/readdir-1.m %!test %! [files, status, msg] = readdir (filesep); -%! assert(iscell (files) && status == 0 && strcmp (msg, "")); +%! assert (iscell (files) && status == 0 && strcmp (msg, "")); %% test/octave.test/system/readdir-2.m -%!error <Invalid call to readdir> readdir (); +%!error <Invalid call to readdir> readdir () %% test/octave.test/system/readdir-3.m -%!error <Invalid call to readdir> readdir ("foo", 1); +%!error <Invalid call to readdir> readdir ("foo", 1) %% test/octave.test/system/mk-rm-dir-1.m %!test @@ -125,28 +129,27 @@ %! [s2, e2] = stat (nm); %! e3 = rmdir (nm); %! [s4, e4] = stat (nm); -%! assert((e1 && strcmp (s2.modestr(1), "d") && e3 && e4 < 0)); +%! assert ((e1 && strcmp (s2.modestr(1), "d") && e3 && e4 < 0)); %% test/octave.test/system/mkdir-1.m -%!error <Invalid call to mkdir> mkdir (); +%!error <Invalid call to mkdir> mkdir () %% test/octave.test/system/mkdir-2.m -%!error <Invalid call to mkdir> mkdir ("foo", 1, 2); +%!error <Invalid call to mkdir> mkdir ("foo", 1, 2) %% test/octave.test/system/rmdir-1.m -%!error <Invalid call to rmdir> rmdir (); +%!error <Invalid call to rmdir> rmdir () %% test/octave.test/system/rmdir-2.m %!test %! crr = confirm_recursive_rmdir (); %! confirm_recursive_rmdir (0); -%! assert(!rmdir ("foo", "s")); +%! assert (!rmdir ("foo", "s")); %! confirm_recursive_rmdir (crr); -%% FIXME This test messes up the path it seems!! Why? %% test/octave.test/system/umask-1.m -%!#test -%! umask (0); +%!test +%! orig_umask = umask (0); %! nm = tmpnam (); %! id = fopen (nm, "wb"); %! s1 = stat (nm); @@ -160,18 +163,21 @@ %! fclose (id); %! unlink (nm); %! -%! assert(strcmp (s1.modestr, "-rw-rw-rw-") && strcmp (s2.modestr, "----------")); +%! assert (deblank (s1.modestr), "-rw-rw-rw-"); +%! assert (deblank (s2.modestr), "----------"); +%! # Restore original umask value +%! umask (orig_umask); %% test/octave.test/system/umask-2.m -%!error <Invalid call to umask> umask (); +%!error <Invalid call to umask> umask () %% test/octave.test/system/umask-3.m -%!error <Invalid call to umask> umask (1, 2); +%!error <Invalid call to umask> umask (1, 2) %% test/octave.test/system/stat-1.m %!test %! [s, err, msg] = stat (filesep); -%! assert((err == 0 +%! assert ((err == 0 %! && isstruct (s) %! && isfield (s, "dev") %! && isfield (s, "ino") @@ -186,15 +192,15 @@ %! && ischar (msg))); %% test/octave.test/system/stat-2.m -%!error <Invalid call to stat> stat (); +%!error <Invalid call to stat> stat () %% test/octave.test/system/stat-3.m -%!error <Invalid call to stat> stat ("foo", 1); +%!error <Invalid call to stat> stat ("foo", 1) %% test/octave.test/system/lstat-1.m %!test %! [s, err, msg] = lstat (filesep); -%! assert((err == 0 +%! assert ((err == 0 %! && isstruct (s) %! && isfield (s, "dev") %! && isfield (s, "ino") @@ -209,136 +215,136 @@ %! && ischar (msg))); %% test/octave.test/system/lstat-2.m -%!error <Invalid call to lstat> lstat (); +%!error <Invalid call to lstat> lstat () %% test/octave.test/system/lstat-3.m -%!error <Invalid call to lstat> lstat ("foo", 1); +%!error <Invalid call to lstat> lstat ("foo", 1) %% test/octave.test/system/glob-1.m -%!assert(iscell (glob ([filesep "*"]))); +%!assert (iscell (glob ([filesep "*"]))) %% test/octave.test/system/glob-2.m -%!error <Invalid call to glob*> glob (); +%!error <Invalid call to glob> glob () %% test/octave.test/system/glob-3.m -%!error <Invalid call to glob> glob ("foo", 1); +%!error <Invalid call to glob> glob ("foo", 1) %% test/octave.test/system/fnmatch-1.m %!test %! string_fill_char = setstr (0); -%! assert((fnmatch ("a*a", {"aba"; "xxxba"; "aa"}) == [1; 0; 1] +%! assert ((fnmatch ("a*a", {"aba"; "xxxba"; "aa"}) == [1; 0; 1] %! && fnmatch ({"a*a"; "b*b"}, "bob") %! && fnmatch ("x[0-5]*", {"x1"; "x6"}) == [1; 0] %! && fnmatch ("x[0-5]*", {"x1"; "x6"; "x001"}) == [1; 0; 1] %! && fnmatch ("x???y", {"xabcy"; "xy"}) == [1; 0])); %% test/octave.test/system/fnmatch-2.m -%!error <Invalid call to fnmatch> fnmatch (); +%!error <Invalid call to fnmatch> fnmatch () %% test/octave.test/system/fnmatch-3.m -%!error <Invalid call to fnmatch> fnmatch ("foo", "bar", 3); +%!error <Invalid call to fnmatch> fnmatch ("foo", "bar", 3) %% test/octave.test/system/file_in_path-1.m -%!assert(ischar (file_in_path (path (), "date.m"))); +%!assert (ischar (file_in_path (path (), "date.m"))) %% test/octave.test/system/file_in_path-2.m -%!error <invalid option> file_in_path ("foo", "bar", 1); +%!error <invalid option> file_in_path ("foo", "bar", 1) %% test/octave.test/system/file_in_path-3.m -%!error <Invalid call to file_in_path> file_in_path (); +%!error <Invalid call to file_in_path> file_in_path () %% test/octave.test/system/file_in_path-4.m -%!error <Invalid call to file_in_path> file_in_path ("foo", "bar", "baz", "ooka"); +%!error <Invalid call to file_in_path> file_in_path ("foo", "bar", "baz", "ooka") %% test/octave.test/system/tilde_expand-1.m %!testif HAVE_GETPWUID %! x = getpwuid (getuid ()); -%! assert((strcmp (x.dir, tilde_expand ("~")) +%! assert ((strcmp (x.dir, tilde_expand ("~")) %! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name))) %! && strcmp ("foobar", tilde_expand ("foobar")))); %% test/octave.test/system/tilde_expand-2.m -%!error <Invalid call to tilde_expand> tilde_expand (); +%!error <Invalid call to tilde_expand> tilde_expand () %% test/octave.test/system/tilde_expand-3.m -%!error <Invalid call to tilde_expand> tilde_expand ("str", 2); +%!error <Invalid call to tilde_expand> tilde_expand ("str", 2) %% test/octave.test/system/getpgrp-1.m %!testif HAVE_GETPGRP -%! assert(getpgrp () > 0); +%! assert (getpgrp () > 0); %% test/octave.test/system/getpgrp-2.m -%!error <... getpgrp> getpgrp (1); +%!error <... getpgrp> getpgrp (1) %% test/octave.test/system/getpid-1.m -%!assert(getpid () > 0); +%!assert (getpid () > 0) %% test/octave.test/system/getpid-2.m -%!error <... getpid> getpid (1); +%!error <... getpid> getpid (1) %% test/octave.test/system/getppid-1.m %!testif HAVE_GETPPID -%! assert(getppid () > 0); +%! assert (getppid () > 0); %% test/octave.test/system/getppid-2.m -%!error <... getppid> getppid (1); +%!error <... getppid> getppid (1) %% test/octave.test/system/geteuid-1.m -%!assert(geteuid () >= 0); +%!assert (geteuid () >= 0) %% test/octave.test/system/geteuid-2.m -%!error <... geteuid> geteuid (1); +%!error <... geteuid> geteuid (1) %% test/octave.test/system/getuid-1.m -%!assert(getuid () >= 0); +%!assert (getuid () >= 0) %% test/octave.test/system/getuid-2.m -%!error <... getuid> getuid (1); +%!error <... getuid> getuid (1) %% test/octave.test/system/getegid-1.m -%!assert(getegid () >= 0); +%!assert (getegid () >= 0) %% test/octave.test/system/getegid-2.m -%!error <... getegid> getegid (1); +%!error <... getegid> getegid (1) %% test/octave.test/system/getgid-1.m -%!assert(getgid () >= 0); +%!assert (getgid () >= 0) %% test/octave.test/system/getgid-2.m -%!error <... getgid> getgid (1); +%!error <... getgid> getgid (1) %% test/octave.test/system/getenv-1.m -%!assert(strcmp (getenv ("HOME"), tilde_expand ("~"))); +%!assert (getenv ("HOME"), tilde_expand ("~")) %% test/octave.test/system/getenv-2.m -%!error <Invalid call to getenv> getenv (); +%!error <Invalid call to getenv> getenv () %% test/octave.test/system/getenv-3.m -%!error <Invalid call to getenv> getenv ("foo", 1); +%!error <Invalid call to getenv> getenv ("foo", 1) %% test/octave.test/system/getenv-4.m %!test %! wns = warning ("query", "Octave:num-to-str"); %! warning ("on", "Octave:num-to-str"); -%! fail("getenv (1)","warning"); +%! fail ("getenv (1)", "warning"); %! warning (wns.state, "Octave:num-to-str"); %% test/octave.test/system/putenv-1.m %!test %! putenv ("foobar", "baz"); -%! assert(strcmp (getenv ("foobar"), "baz")); +%! assert (getenv ("foobar"), "baz"); %% test/octave.test/system/putenv-2.m -%!error <Invalid call to putenv> putenv (); +%!error <Invalid call to putenv> putenv () %% test/octave.test/system/putenv-3.m -%!error <Invalid call to putenv> putenv ("foo", "bar", 1); +%!error <Invalid call to putenv> putenv ("foo", "bar", 1) %% test/octave.test/system/putenv-4.m %!test %! wns = warning ("query", "Octave:num-to-str"); %! warning ("on", "Octave:num-to-str"); -%! fail("putenv (1, 2)","warning"); +%! fail ("putenv (1, 2)","warning"); %! warning (wns.state, "Octave:num-to-str"); %% test/octave.test/system/cd-1.m @@ -349,25 +355,25 @@ %! cd (xdir); %! if (ispc () && ! isunix ()) %! # should be a drive letter -%! assert(length (d1), 3); -%! assert(d1(2), ":"); -%! assert(d1(3), "\\"); +%! assert (length (d1), 3); +%! assert (d1(2), ":"); +%! assert (d1(3), "\\"); %! else -%! assert("/", d1); +%! assert ("/", d1); %! endif -%! assert(pwd(), xdir); +%! assert (pwd(), xdir); %% test/octave.test/system/cd-2.m -%!error cd (1); +%!error cd (1) %% test/octave.test/system/pwd-1.m -%!assert(ischar (pwd ())); +%!assert (ischar (pwd ())) %% test/octave.test/system/getpwent-1.m %!testif HAVE_GETPWENT %! s = getpwent (); %! endpwent (); -%! assert((isstruct (s) +%! assert ((isstruct (s) %! && isfield (s, "name") %! && isfield (s, "passwd") %! && isfield (s, "uid") @@ -377,33 +383,33 @@ %! && isfield (s, "shell"))); %% test/octave.test/system/getpwent-2.m -%!error <Invalid call to getpwent> getpwent (1); +%!error <Invalid call to getpwent> getpwent (1) %% test/octave.test/system/getpwuid-1.m %!testif HAVE_GETPWUID %! x = getpwent (); %! y = getpwuid (x.uid); %! endpwent (); -%! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/getpwuid-2.m -%!error <Invalid call to getpwuid> getpwuid (); +%!error <Invalid call to getpwuid> getpwuid () %% test/octave.test/system/getpwuid-3.m -%!error <Invalid call to getpwuid> getpwuid (1, 2); +%!error <Invalid call to getpwuid> getpwuid (1, 2) %% test/octave.test/system/getpwnam-1.m %!testif HAVE_GETPWNAM %! x = getpwent (); %! y = getpwnam (x.name); %! endpwent (); -%! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/getpwnam-2.m -%!error <Invalid call to getpwnam> getpwnam (); +%!error <Invalid call to getpwnam> getpwnam () %% test/octave.test/system/getpwnam-3.m -%!error <Invalid call to getpwnam> getpwnam ("foo", 1); +%!error <Invalid call to getpwnam> getpwnam ("foo", 1) %% test/octave.test/system/setpwent-1.m %!testif HAVE_SETPWENT @@ -411,52 +417,52 @@ %! setpwent (); %! y = getpwent (); %! endpwent (); -%! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/setpwent-2.m -%!error <Invalid call to setpwent> setpwent (1); +%!error <Invalid call to setpwent> setpwent (1) %% test/octave.test/system/endpwent-1.m -%!error <Invalid call to endpwent> endpwent (1); +%!error <Invalid call to endpwent> endpwent (1) %% test/octave.test/system/getgrent-1.m %!testif HAVE_GETGRENT %! x = getgrent (); %! endgrent (); -%! assert((isstruct (x) +%! assert ((isstruct (x) %! && isfield (x, "name") %! && isfield (x, "passwd") %! && isfield (x, "gid") %! && isfield (x, "mem"))); %% test/octave.test/system/getgrent-2.m -%!error <Invalid call to getgrent> getgrent (1); +%!error <Invalid call to getgrent> getgrent (1) %% test/octave.test/system/getgrgid-1.m %!testif HAVE_GETGRGID %! x = getgrent (); %! y = getgrgid (x.gid); %! endgrent (); -%! assert(strcmp (x.name, y.name) && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/getgrgid-2.m -%!error <Invalid call to getgrgid> getgrgid (); +%!error <Invalid call to getgrgid> getgrgid () %% test/octave.test/system/getgrgid-3.m -%!error <Invalid call to getgrgid> getgrgid (1, 2); +%!error <Invalid call to getgrgid> getgrgid (1, 2) %% test/octave.test/system/getgrnam-1.m %!testif HAVE_GETGRNAM %! x = getgrent (); %! y = getgrnam (x.name); %! endgrent (); -%! assert(strcmp (x.name, y.name) && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/getgrnam-2.m -%!error <Invalid call to getgrnam> getgrnam (); +%!error <Invalid call to getgrnam> getgrnam () %% test/octave.test/system/getgrnam-3.m -%!error <Invalid call to getgrnam> getgrnam ("foo", 1); +%!error <Invalid call to getgrnam> getgrnam ("foo", 1) %% test/octave.test/system/setgrent-1.m %!testif HAVE_SETGRENT @@ -464,20 +470,20 @@ %! setgrent (); %! y = getgrent (); %! endgrent (); -%! assert(strcmp (x.name, y.name) && x.gid == y.gid); +%! assert (strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/setgrent-2.m -%!error <Invalid call to setgrent> setgrent (1); +%!error <Invalid call to setgrent> setgrent (1) %% test/octave.test/system/endgrent-1.m -%!error <Invalid call to endgrent> endgrent (1); +%!error <Invalid call to endgrent> endgrent (1) %% test/octave.test/system/isieee-1.m -%!assert(isieee () == 1 || isieee () == 0); +%!assert (isieee () == 1 || isieee () == 0) %% test/octave.test/system/octave_config_info-1.m -%!assert(isstruct (octave_config_info ())); +%!assert (isstruct (octave_config_info ())) %% test/octave.test/system/getrusage-1.m -%!assert(isstruct (getrusage ())); +%!assert (isstruct (getrusage ()))
--- a/test/test_transpose.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_transpose.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -16,23 +16,71 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. -%% test/octave.test/transpose/transpose-1.m +%% Basic tests %!test %! scalar = 2; -%! assert(scalar',2); +%! assert (scalar', 2); -%% test/octave.test/transpose/transpose-2.m %!test %! range = 1:4; -%! assert(range',[1;2;3;4]); +%! assert (range', [1;2;3;4]); -%% test/octave.test/transpose/transpose-3.m %!test %! vector = [1;2;3;4]; -%! assert(vector',[1,2,3,4]); +%! assert (vector', [1,2,3,4]); -%% test/octave.test/transpose/transpose-4.m %!test %! matrix = [1,2;3,4]; -%! assert(matrix',[1,3;2,4]); +%! assert (matrix', [1,3;2,4]); + +%% Basic tests on complex numbers +%!test +%! scalar = 2i; +%! assert (scalar', -2i); + +%!test +%! range = (1:4)*i; +%! assert (range', [-1i;-2i;-3i;-4i]); + +%!test +%! vector = [1;2;3;4]*i; +%! assert (vector', [-1i,-2i,-3i,-4i]); + +%!test +%! matrix = [1,2;3,4]*i; +%! assert (matrix', [-1i,-3i;-2i,-4i]); + +%% Test non-Hermitian transpose +%!test +%! scalar = 2i; +%! assert (scalar.', 2i); +%!test +%! range = (1:4)*i; +%! assert (range.', [1i;2i;3i;4i]); + +%!test +%! vector = [1;2;3;4]*i; +%! assert (vector.', [1i,2i,3i,4i]); + +%!test +%! matrix = [1,2;3,4]*i; +%! assert (matrix.', [1i,3i;2i,4i]); + +%% Basic tests on float complex numbers +%!test +%! scalar = single (2i); +%! assert (scalar', single (-2i)); + +%!test +%! range = single ((1:4)*i); +%! assert (range', single ([-1i;-2i;-3i;-4i])); + +%!test +%! vector = single ([1;2;3;4]*i); +%! assert (vector', single ([-1i,-2i,-3i,-4i])); + +%!test +%! matrix = single ([1,2;3,4]*i); +%! assert (matrix', single ([-1i,-3i;-2i,-4i])); +
--- a/test/test_try.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_try.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -20,106 +20,106 @@ %!test %! try %! catch -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! end_try_catch %% test/octave.test/try/try-2.m %!test %! try -%! clear a +%! clear a; %! a; %! catch %! end_try_catch %! a = 1; -%! assert(a,1); +%! assert (a,1); %% test/octave.test/try/try-3.m %!test %! clear x; %! try -%! clear a +%! clear a; %! a; %! x = 1; %! catch %! end_try_catch %! a = 2; -%! assert(!exist('x')) -%! assert(a,2) +%! assert (!exist ('x')); +%! assert (a,2); %% test/octave.test/try/try-4.m %!test %! try -%! clear a +%! clear a; %! a; %! catch %! x = 1; %! end_try_catch -%! assert(exist('x')) +%! assert (exist ('x')); %% test/octave.test/try/try-5.m %!test %! try %! clear a; %! a; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! assert (strcmp(lasterr()(1:13), "`a' undefined")) +%! assert (lasterr()(1:13), "`a' undefined"); %! end_try_catch -%! assert (strcmp(lasterr()(1:13), "`a' undefined")) +%! assert (lasterr()(1:13), "`a' undefined"); %% test/octave.test/try/try-6.m %!test %! try -%! error ("user-defined error") +%! error ("user-defined error"); %! catch -%! assert(lasterr,"user-defined error"); +%! assert (lasterr, "user-defined error"); %! end_try_catch %% test/octave.test/try/try-7.m %!function ms = mangle (s) %! ## Wrap angle brackets around S. %! ms = cstrcat ("<", s, ">"); +%!endfunction %!test %! try -%! clear a +%! clear a; %! a; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! assert(strcmp(mangle (lasterr)(1:14),"<`a' undefined")) +%! assert (mangle (lasterr)(1:14), "<`a' undefined"); %! end_try_catch - %% test/octave.test/try/try-8.m %!test %! try %! try -%! clear a +%! clear a; %! a; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! assert(strcmp(lasterr()(1:13), "`a' undefined")) +%! assert (lasterr()(1:13), "`a' undefined"); %! end_try_catch -%! clear b +%! clear b; %! b; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! assert(strcmp(lasterr()(1:13), "`b' undefined")) +%! assert (lasterr()(1:13), "`b' undefined"); %! end_try_catch %% test/octave.test/try/try-9.m %!test %! try -%! clear a +%! clear a; %! a; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch %! try -%! assert(strcmp(lasterr()(1:13), "`a' undefined")) -%! clear b +%! assert (lasterr()(1:13), "`a' undefined"); +%! clear b; %! b; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! assert(strcmp(lasterr()(1:13), "`b' undefined")) +%! assert (lasterr()(1:13), "`b' undefined"); %! end_try_catch %! end_try_catch @@ -127,13 +127,13 @@ %!test %! try %! try -%! clear a +%! clear a; %! a; -%! error("Shoudn't get here"); +%! error ("Shoudn't get here"); %! catch -%! error(cstrcat("rethrow: ",lasterr)); +%! error (cstrcat ("rethrow: ", lasterr)); %! end_try_catch %! catch -%! assert(strcmp(lasterr()(1:22), "rethrow: `a' undefined")) +%! assert (lasterr()(1:22), "rethrow: `a' undefined"); %! end_try_catch
--- a/test/test_unwind.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_unwind.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -30,10 +30,12 @@ %! g = save_g; %! y = [y, g]; %! end_unwind_protect +%!endfunction +%! %!test %! global g = -1; %! y = f ([3,4]); -%! assert(y,[0,1,-1]); +%! assert (y, [0,1,-1]); %% test/octave.test/unwind/unwind-2.m %!function y = f (x) @@ -48,9 +50,11 @@ %! unwind_protect_cleanup %! g = save_g; %! y = [y, g]; -%! assert(y,[0,-1]); +%! assert (y, [0,-1]); %! end_unwind_protect +%!endfunction +%! %!test %! global g = -1; -%! fail("y = f (3);","mismatch"); +%! fail ("y = f (3);", "mismatch");
--- a/test/test_while.m Sat Dec 24 23:15:29 2011 +0000 +++ b/test/test_while.m Mon Jan 09 15:19:21 2012 -0500 @@ -1,4 +1,4 @@ -## Copyright (C) 2006-2011 John W. Eaton +## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## @@ -20,51 +20,51 @@ %!test %! i = 0; %! while (eye (2)) -%! i++; -%! printf_assert ("%d\n", i); -%! endwhile; -%! assert(prog_output_assert("")); +%! i++; +%! printf_assert ("%d\n", i); +%! endwhile +%! assert (prog_output_assert ("")); %% test/octave.test/while/while-2.m %!test %! i = 5; %! while (--i) -%! printf_assert ("%d", i); +%! printf_assert ("%d", i); %! endwhile %! printf_assert ("\n"); -%! assert(prog_output_assert("4321")); +%! assert (prog_output_assert ("4321")); %% test/octave.test/while/while-3.m %!test %! i = 5; %! while (i) -%! i--; -%! printf_assert ("%d", i); +%! i--; +%! printf_assert ("%d", i); %! endwhile %! printf_assert ("\n"); -%! assert(prog_output_assert("43210")); +%! assert (prog_output_assert ("43210")); %% test/octave.test/while/while-4.m %!test %! i = 0; %! while (i++ < 20) -%! if (i > 2) -%! break; -%! endif -%! printf_assert ("%d", i); -%! endwhile; +%! if (i > 2) +%! break; +%! endif +%! printf_assert ("%d", i); +%! endwhile %! printf_assert ("\n"); -%! assert(prog_output_assert("12")); +%! assert (prog_output_assert ("12")); %% test/octave.test/while/while-5.m %!test %! i = 0; %! while (++i < 5) -%! if (i < 3) -%! continue; -%! endif -%! printf_assert ("%d", i); +%! if (i < 3) +%! continue; +%! endif +%! printf_assert ("%d", i); %! endwhile %! printf_assert ("\n"); -%! assert(prog_output_assert("34")); +%! assert (prog_output_assert ("34"));